Author: qboosh Date: Fri Aug 18 07:59:58 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- added ahci update
---- Files affected:
SOURCES:
linux-2.4-libata-update.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.4-libata-update.patch
diff -u SOURCES/linux-2.4-libata-update.patch:1.1
SOURCES/linux-2.4-libata-update.patch:1.2
--- SOURCES/linux-2.4-libata-update.patch:1.1 Thu Aug 17 14:59:19 2006
+++ SOURCES/linux-2.4-libata-update.patch Fri Aug 18 09:59:53 2006
@@ -19,3 +19,98 @@
{ }
};
+--- linux-2.4.33/drivers/scsi/ahci.c.orig 2006-08-11 06:18:20.000000000
+0200
++++ linux-2.4.33/drivers/scsi/ahci.c 2006-08-18 09:54:07.315971000 +0200
+@@ -255,6 +255,7 @@
+ };
+
+ static const struct pci_device_id ahci_pci_tbl[] = {
++ /* Intel */
+ { PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ICH6 */
+ { PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+@@ -275,6 +276,48 @@
+ board_ahci }, /* ESB2 */
+ { PCI_VENDOR_ID_INTEL, 0x27c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ICH7-M DH */
++ { PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* ICH8 */
++ { PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* ICH8 */
++ { PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* ICH8 */
++ { PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* ICH8M */
++ { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* ICH8M */
++
++ /* JMicron */
++ { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* JMicron JMB360 */
++ { 0x197b, 0x2361, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* JMicron JMB361 */
++ { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* JMicron JMB363 */
++ { 0x197b, 0x2365, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* JMicron JMB365 */
++ { 0x197b, 0x2366, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* JMicron JMB366 */
++
++ /* ATI */
++ { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* ATI SB600 non-raid */
++ { PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* ATI SB600 raid */
++
++ /* VIA */
++ /* VT8251 would require board_ahci_vt8251 and other changes -
backporting skipped --q */
++
++ /* NVIDIA */
++ { PCI_VENDOR_ID_NVIDIA, 0x044c, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* MCP65 */
++ { PCI_VENDOR_ID_NVIDIA, 0x044d, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* MCP65 */
++ { PCI_VENDOR_ID_NVIDIA, 0x044e, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* MCP65 */
++ { PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
++ board_ahci }, /* MCP65 */
++
+ { } /* terminate list */
+ };
+
+@@ -787,7 +830,6 @@
+ struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
+ void __iomem *mmio = probe_ent->mmio_base;
+ u32 tmp, cap_save;
+- u16 tmp16;
+ unsigned int i, j, using_dac;
+ int rc;
+ void __iomem *port_mmio;
+@@ -821,9 +863,13 @@
+ writel(0xf, mmio + HOST_PORTS_IMPL);
+ (void) readl(mmio + HOST_PORTS_IMPL); /* flush */
+
+- pci_read_config_word(pdev, 0x92, &tmp16);
+- tmp16 |= 0xf;
+- pci_write_config_word(pdev, 0x92, tmp16);
++ if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
++ u16 tmp16;
++
++ pci_read_config_word(pdev, 0x92, &tmp16);
++ tmp16 |= 0xf;
++ pci_write_config_word(pdev, 0x92, tmp16);
++ }
+
+ hpriv->cap = readl(mmio + HOST_CAP);
+ hpriv->port_map = readl(mmio + HOST_PORTS_IMPL);
+@@ -1067,6 +1113,10 @@
+ if (have_msi)
+ hpriv->flags |= AHCI_FLAG_MSI;
+
++ /* JMicron-specific fixup: make sure we're in AHCI mode */
++ if (pdev->vendor == 0x197b)
++ pci_write_config_byte(pdev, 0x41, 0xa1);
++
+ /* initialize adapter */
+ rc = ahci_host_init(probe_ent);
+ if (rc)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.4-libata-update.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
