PATCH: Fix 2.6.18-rc6 IDE breakage, add missing ident needed for current VIA boards
Ok Linus this should do the trick and is tested on the chipsets I have. There are two patches here. The first reverses the broken PCI_DEVICE conversion back to the old format. The second adds a missing PCI ID so you can actually boot 2.6.18 on 2 month old VIA motherboards (right now only 2.6.18-mm works).
CC'd to Jeff to check the PCI ident but its a) in several distro kernels and b) in 2.6.18-mm [twice ??]
drivers/ide/pci/aec62xx.c +6 -6
@@ -425,12 +425,12 @@return d->init_setup (dev, d); } -static const struct pci_device_id aec62xx_pci_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP850UF ),0 }, - {PCI_DEVICE (PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP860 ),1 }, - {PCI_DEVICE (PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP860R ),2 }, - {PCI_DEVICE (PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP865 ),3 }, - {PCI_DEVICE (PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP865R ),4 }, +static struct pci_device_id aec62xx_pci_tbl[] = { + {PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP850UF ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP860 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, + {PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP860R ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,2 }, + {PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP865 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,3 }, + {PCI_VENDOR_ID_ARTOP ,PCI_DEVICE_ID_ARTOP_ATP865R ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,4 }, {0 , }, };MODULE_DEVICE_TABLE (pci, aec62xx_pci_tbl);
drivers/ide/pci/serverworks.c +5 -5
@@ -649,11 +649,11 @@ }static struct pci_device_id svwks_pci_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_OSB4IDE ),0 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB5IDE ),1 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ),2 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 ),3 }, - {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_HT1000IDE ),4 }, + {PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_OSB4IDE ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB5IDE ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, + {PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,2 }, + {PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,3 }, + {PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_HT1000IDE ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,4 }, {0 , }, };MODULE_DEVICE_TABLE (pci, svwks_pci_tbl);
drivers/ide/pci/siimage.c +3 -3
@@ -1082,10 +1082,10 @@ }static struct pci_device_id siimage_pci_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_CMD ,PCI_DEVICE_ID_SII_680 ),0 }, + {PCI_VENDOR_ID_CMD ,PCI_DEVICE_ID_SII_680 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, #ifdef CONFIG_BLK_DEV_IDE_SATA - {PCI_DEVICE (PCI_VENDOR_ID_CMD ,PCI_DEVICE_ID_SII_3112 ),1 }, - {PCI_DEVICE (PCI_VENDOR_ID_CMD ,PCI_DEVICE_ID_SII_1210SA ),2 }, + {PCI_VENDOR_ID_CMD ,PCI_DEVICE_ID_SII_3112 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, + {PCI_VENDOR_ID_CMD ,PCI_DEVICE_ID_SII_1210SA ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,2 }, #endif {0 , }, };
drivers/scsi/sata_via.c +1 -0
@@ -77,6 +77,7 @@static void vt6420_error_handler (struct ata_port *ap);static const struct pci_device_id svia_pci_tbl[] = { + {0x1106 ,0x0591 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , vt6420 }, {0x1106 ,0x3149 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , vt6420 }, {0x1106 ,0x3249 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , vt6421 },
Quoted 4 lines · Alan Cox
Ok Linus this should do the trick and is tested on the chipsets I have.
There are two patches here. The first reverses the brokenPCI_DEVICE
conversion back to the old format. The second adds a missing PCI ID so you can actually boot 2.6.18 on 2 month old VIA motherboards (right now only 2.6.18-mm works).
Two totally separate issues should be two totally separate patches.
For the first:
* just add the missing zeroes. No need to revert PCI_DEVICE() usage.
For the second:
* the sata_via PCI ID has been queued for 2.6.19 for quite a while. I don't see a hugely pressing need for it to be in 2.6.18, but it's not a big deal to me.
Jeff
Ar Llu, 2006-09-11 am 09:31 -0400, ysgrifennodd Jeff Garzik:
Quoted 2 lines
For the first:
* just add the missing zeroes. No need to revertPCI_DEVICE()usage.
Safer to revert thats all
Quoted 4 lines
For the second:
* thesata_viaPCI ID has been queued for 2.6.19 for quite a while. I don't see a hugely pressing need for it to be in 2.6.18, but it's not a big deal to me.
Many of the current VIA mainboards have that ID so I would say its pressing as it is "out there", and if 2.6.19 is another 2 months away...
Quoted 9 lines · Alan Cox
Ar Llu, 2006-09-11 am 09:31 -0400, ysgrifennodd Jeff Garzik:
...Quoted 4 lines
For the second:
* thesata_viaPCI ID has been queued for 2.6.19 for quite a while. I don't see a hugely pressing need for it to be in 2.6.18, but it's not a big deal to me.Many of the current VIA mainboards have that ID so I would say its pressing as it is "out there", and if 2.6.19 is another 2 months away...
Unless I missed the reason why kernel releases will suddenly become more frequent, it's another 3 months away...
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed