PATCH: Small fixes backported to old IDE SiS driver

From: Alan Cox
Date: Tue Jan 03 2006 - 10:16:44 EST


Some quick backport bits from the libata PATA work to fix things found
in the sis driver. The piix driver needs some fixes too but those are
way to large and need someone working on old IDE with time to do them.

This patch fixes the case where random bits get loaded into SIS timing
registers according to the description of the correct behaviour from
Vojtech Pavlik. It also adds the SiS5517 ATA16 chipset which is not
currently supported by the driver. Thanks to Conrad Harriss for loaning
me the machine with the 5517 chipset.

Alan


Signed-off-by: Alan Cox <alan@xxxxxxxxxx>

--- drivers/ide/pci/sis5513.c~ 2006-01-03 15:01:24.753952872 +0000
+++ drivers/ide/pci/sis5513.c 2006-01-03 15:01:24.753952872 +0000
@@ -111,6 +111,7 @@

{ "SiS5596", PCI_DEVICE_ID_SI_5596, ATA_16 },
{ "SiS5571", PCI_DEVICE_ID_SI_5571, ATA_16 },
+ { "SiS5517", PCI_DEVICE_ID_SI_5517, ATA_16 },
{ "SiS551x", PCI_DEVICE_ID_SI_5511, ATA_16 },
};

@@ -523,6 +524,7 @@
case 3: test1 = 0x30|0x03; break;
case 2: test1 = 0x40|0x04; break;
case 1: test1 = 0x60|0x07; break;
+ case 0: test1 = 0x00; break;
default: break;
}
pci_write_config_byte(dev, drive_pci, test1);
--- include/linux/pci_ids.h~ 2006-01-03 15:00:52.835805168 +0000
+++ include/linux/pci_ids.h 2006-01-03 15:00:52.836805016 +0000
@@ -632,6 +632,7 @@
#define PCI_DEVICE_ID_SI_963 0x0963
#define PCI_DEVICE_ID_SI_5511 0x5511
#define PCI_DEVICE_ID_SI_5513 0x5513
+#define PCI_DEVICE_ID_SI_5517 0x5517
#define PCI_DEVICE_ID_SI_5518 0x5518
#define PCI_DEVICE_ID_SI_5571 0x5571
#define PCI_DEVICE_ID_SI_5581 0x5581

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/