d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix support for the old CMD 646 chips, interrupt setup was wrong.

Browse Source
This commit is contained in:
sos 2003-02-25 12:56:37 +00:00
parent 0553f85eca
commit 855a905ec2
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/ata/ata-chipset.c
View File

@ -314,10 +314,10 @@ ata_ali_ident(device_t dev)
struct ata_pci_controller *ctlr = device_get_softc(dev);
struct ata_chip_id *idx;
static struct ata_chip_id ids[] =
{{ ATA_ALI_5229, 0xc4, 0, ALICABLE, ATA_UDMA5, "AcerLabs Aladdin" },
{ ATA_ALI_5229, 0xc2, 0, ALICABLE, ATA_UDMA4, "AcerLabs Aladdin" },
{ ATA_ALI_5229, 0x20, 0, ALIOLD, ATA_UDMA2, "AcerLabs Aladdin" },
{ ATA_ALI_5229, 0x00, 0, ALIOLD, ATA_WDMA2, "AcerLabs Aladdin" },
{{ ATA_ALI_5229, 0xc4, 0, ALICABLE, ATA_UDMA5, "AcerLabs Aladdin" },
{ ATA_ALI_5229, 0xc2, 0, ALICABLE, ATA_UDMA4, "AcerLabs Aladdin" },
{ ATA_ALI_5229, 0x20, 0, ALIOLD, ATA_UDMA2, "AcerLabs Aladdin" },
{ ATA_ALI_5229, 0x00, 0, ALIOLD, ATA_WDMA2, "AcerLabs Aladdin" },
{ 0, 0, 0, 0, 0, 0}};
char buffer[64];
@ -1276,11 +1276,11 @@ ata_sii_ident(device_t dev)
struct ata_pci_controller *ctlr = device_get_softc(dev);
struct ata_chip_id *idx;
static struct ata_chip_id ids[] =
{{ ATA_SII0680, 0x00, SII_SETCLK, 0x00, ATA_UDMA6, "SiI 0680" },
{ ATA_CMD649, 0x00, 0, SII_INTR, ATA_UDMA5, "CMD 649" },
{ ATA_CMD648, 0x00, 0, SII_INTR, ATA_UDMA4, "CMD 648" },
{ ATA_CMD646, 0x07, 0, 0x00, ATA_UDMA2, "CMD 646U2" },
{ ATA_CMD646, 0x00, 0, 0x00, ATA_WDMA2, "CMD 646" },
{{ ATA_SII0680, 0x00, 0, SII_SETCLK, ATA_UDMA6, "SiI 0680" },
{ ATA_CMD649, 0x00, 0, SII_INTR, ATA_UDMA5, "CMD 649" },
{ ATA_CMD648, 0x00, 0, SII_INTR, ATA_UDMA4, "CMD 648" },
{ ATA_CMD646, 0x07, 0, SII_ENINTR, ATA_UDMA2, "CMD 646U2" },
{ ATA_CMD646, 0x00, 0, SII_ENINTR, ATA_WDMA2, "CMD 646" },
{ 0, 0, 0, 0, 0, 0}};
char buffer[64];
@ -1313,7 +1313,10 @@ ata_sii_chipinit(device_t dev)
return ENXIO;
}
if (ctlr->chip->cfg1 == SII_SETCLK) {
if (ctlr->chip->cfg2 & SII_ENINTR)
pci_write_config(dev, 0x71, 0x01, 1);
if (ctlr->chip->cfg2 & SII_SETCLK) {
if ((pci_read_config(dev, 0x8a, 1) & 0x30) != 0x10)
pci_write_config(dev, 0x8a,
(pci_read_config(dev, 0x8a, 1) & 0x0F) | 0x10, 1);

3
sys/dev/ata/ata-pci.h
View File

@ -220,8 +220,9 @@ struct ata_pci_controller {
#define SWKS66 1
#define SWKS100 2
#define SII_SETCLK 1
#define SII_INTR 0x01
#define SII_SETCLK 0x02
#define SII_ENINTR 0x04
#define SIS_SOUTH 1
#define SIS133NEW 2