piix.c - previously available patch not implemented

[Jon Wikne]

Hi list,

Last year, around 2.6.16.*, there was a patch around that helped
me get the PIIX driver to run with the Intel 82801FBM (ICH6M) chip
on my Toshiba Tecra A3 laptop.

Now, compiling the 2.6.21_rc2 kernel on this machine, to my
astonishment I find that this patch has still not reached the
mainstream kernel.

I do not know whether there might be a good reason for this,
but this patch is essential for me, and most likely others as
well. I include the patch that works for me below, ported and
relative to piix.c version 0.46 taken from the 2.6.21_rc2.


Cheers,
-- Jon Wikne
University of Oslo


diff -u ./linux-2.6.21-rc2/drivers/ide/pci/piix.c% ./linux-2.6.21-rc2/drivers/ide/pci/piix.c
--- ./linux-2.6.21-rc2/drivers/ide/pci/piix.c%  2007-02-28 05:59:12.000000000 +0100
+++ ./linux-2.6.21-rc2/drivers/ide/pci/piix.c   2007-03-05 17:38:13.000000000 +0100
@@ -132,6 +132,7 @@
                case PCI_DEVICE_ID_INTEL_82801DB_11:
                case PCI_DEVICE_ID_INTEL_82801EB_11:
                case PCI_DEVICE_ID_INTEL_ESB_2:
+               case PCI_DEVICE_ID_INTEL_ICH6_5:
                case PCI_DEVICE_ID_INTEL_ICH6_19:
                case PCI_DEVICE_ID_INTEL_ICH7_21:
                case PCI_DEVICE_ID_INTEL_ESB2_18:
@@ -421,6 +422,7 @@
                case PCI_DEVICE_ID_INTEL_82801EB_11:
                case PCI_DEVICE_ID_INTEL_82801E_11:
                case PCI_DEVICE_ID_INTEL_ESB_2:
+               case PCI_DEVICE_ID_INTEL_ICH6_5:
                case PCI_DEVICE_ID_INTEL_ICH6_19:
                case PCI_DEVICE_ID_INTEL_ICH7_21:
                case PCI_DEVICE_ID_INTEL_ESB2_18:
@@ -598,6 +600,7 @@
        /* 22 */ DECLARE_PIIX_DEV("ICH4"),
        /* 23 */ DECLARE_PIIX_DEV("ESB2"),
        /* 24 */ DECLARE_PIIX_DEV("ICH8M"),
+       /* 25 */ DECLARE_PIIX_DEV("ICH6M"),
 };

 /**
@@ -675,6 +678,7 @@
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22},
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 23},
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 24},
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 25},
        { 0, },
 };
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
diff -u ./linux-2.6.21-rc2/include/linux/pci_ids.h% ./linux-2.6.21-rc2/include/linux/pci_ids.h
--- ./linux-2.6.21-rc2/include/linux/pci_ids.h% 2007-02-28 05:59:12.000000000 +0100
+++ ./linux-2.6.21-rc2/include/linux/pci_ids.h  2007-03-05 17:41:54.000000000 +0100
@@ -2235,6 +2235,7 @@
 #define PCI_DEVICE_ID_INTEL_ICH6_0     0x2640
 #define PCI_DEVICE_ID_INTEL_ICH6_1     0x2641
 #define PCI_DEVICE_ID_INTEL_ICH6_2     0x2642
+#define PCI_DEVICE_ID_INTEL_ICH6_5      0x2653
 #define PCI_DEVICE_ID_INTEL_ICH6_16    0x266a
 #define PCI_DEVICE_ID_INTEL_ICH6_17    0x266d
 #define PCI_DEVICE_ID_INTEL_ICH6_18    0x266e

-
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/