[PATCH] Small fixes backported to old IDE SiS driver (d266ab88) · Commits · 戴 / test

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. Signed-off-by:

Alan Cox <alan@redhat.com> Acked-by:

Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

drivers/ide/pci/sis5513.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ static const struct {

		{ "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 },
		};

		@@ -524,6 +525,7 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
		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

+1 −0

Original line number	Diff line number	Diff line
		@@ -642,6 +642,7 @@
		#define PCI_DEVICE_ID_SI_965 0x0965
		#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

Admin message