Author: qboosh Date: Thu Aug 17 10:37:40 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- IDE backports from 2.6.18 (piix only: ICH7, ICH4-L, ESB2, ICH8M)
---- Files affected:
SOURCES:
linux-2.4-ide-update.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/linux-2.4-ide-update.patch
diff -u /dev/null SOURCES/linux-2.4-ide-update.patch:1.1
--- /dev/null Thu Aug 17 12:37:40 2006
+++ SOURCES/linux-2.4-ide-update.patch Thu Aug 17 12:37:35 2006
@@ -0,0 +1,212 @@
+--- linux-2.4.33/include/linux/pci_ids.h.orig 2006-08-17 11:02:44.215971000
+0200
++++ linux-2.4.33/include/linux/pci_ids.h 2006-08-17 12:11:45.195971000
+0200
+@@ -1939,6 +1939,7 @@
+ #define PCI_DEVICE_ID_INTEL_82801CA_11 0x248b
+ #define PCI_DEVICE_ID_INTEL_82801CA_12 0x248c
+ #define PCI_DEVICE_ID_INTEL_82801DB_0 0x24c0
++#define PCI_DEVICE_ID_INTEL_82801DB_1 0x24c1
+ #define PCI_DEVICE_ID_INTEL_82801DB_2 0x24c2
+ #define PCI_DEVICE_ID_INTEL_82801DB_3 0x24c3
+ #define PCI_DEVICE_ID_INTEL_82801DB_4 0x24c4
+@@ -1975,8 +1976,21 @@
+ #define PCI_DEVICE_ID_INTEL_ESB_13 0x25ae
+ #define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640
+ #define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641
+-#define PCI_DEVICE_ID_INTEL_ICH6_2 0x266f
+ #define PCI_DEVICE_ID_INTEL_ICH6_18 0x266e
++#define PCI_DEVICE_ID_INTEL_ICH6_19 0x266f
++#define PCI_DEVICE_ID_INTEL_ESB2_0 0x2670
++#define PCI_DEVICE_ID_INTEL_ESB2_18 0x269e
++#define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8
++#define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9
++#define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0
++#define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd
++#define PCI_DEVICE_ID_INTEL_ICH7_21 0x27df
++#define PCI_DEVICE_ID_INTEL_ICH8_0 0x2810
++#define PCI_DEVICE_ID_INTEL_ICH8_1 0x2811
++#define PCI_DEVICE_ID_INTEL_ICH8_2 0x2812
++#define PCI_DEVICE_ID_INTEL_ICH8_3 0x2814
++#define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815
++#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850
+ #define PCI_DEVICE_ID_INTEL_82850_HB 0x2530
+ #define PCI_DEVICE_ID_INTEL_82845G_HB 0x2560
+ #define PCI_DEVICE_ID_INTEL_SMCH 0x3590
+--- linux-2.4.33/arch/i386/kernel/pci-irq.c.orig 2006-08-17
11:02:44.315971000 +0200
++++ linux-2.4.33/arch/i386/kernel/pci-irq.c 2006-08-17 12:05:52.415971000
+0200
+@@ -652,7 +652,19 @@
+ case PCI_DEVICE_ID_INTEL_82801E_0:
+ case PCI_DEVICE_ID_INTEL_82801EB_0:
+ case PCI_DEVICE_ID_INTEL_ESB_0:
++ case PCI_DEVICE_ID_INTEL_ESB_1:
+ case PCI_DEVICE_ID_INTEL_ICH6_0:
++ case PCI_DEVICE_ID_INTEL_ICH6_1:
++ case PCI_DEVICE_ID_INTEL_ICH7_0:
++ case PCI_DEVICE_ID_INTEL_ICH7_1:
++ case PCI_DEVICE_ID_INTEL_ICH7_30:
++ case PCI_DEVICE_ID_INTEL_ICH7_31:
++ case PCI_DEVICE_ID_INTEL_ESB2_0:
++ case PCI_DEVICE_ID_INTEL_ICH8_0:
++ case PCI_DEVICE_ID_INTEL_ICH8_1:
++ case PCI_DEVICE_ID_INTEL_ICH8_2:
++ case PCI_DEVICE_ID_INTEL_ICH8_3:
++ case PCI_DEVICE_ID_INTEL_ICH8_4:
+ r->name = "PIIX/ICH";
+ r->get = pirq_piix_get;
+ r->set = pirq_piix_set;
+--- linux-2.4.33/drivers/ide/pci/piix.c.orig 2004-11-17 12:54:21.000000000
+0100
++++ linux-2.4.33/drivers/ide/pci/piix.c 2006-08-17 12:22:01.685971000
+0200
+@@ -149,12 +149,16 @@
+ case PCI_DEVICE_ID_INTEL_82801BA_9:
+ case PCI_DEVICE_ID_INTEL_82801CA_10:
+ case PCI_DEVICE_ID_INTEL_82801CA_11:
++ case PCI_DEVICE_ID_INTEL_82801DB_1:
+ case PCI_DEVICE_ID_INTEL_82801DB_10:
+ case PCI_DEVICE_ID_INTEL_82801DB_11:
+ 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_2:
++ case PCI_DEVICE_ID_INTEL_ICH6_19:
++ case PCI_DEVICE_ID_INTEL_ICH7_21:
++ case PCI_DEVICE_ID_INTEL_ESB2_18:
++ case PCI_DEVICE_ID_INTEL_ICH8_6:
+ p += sprintf(p, "PIIX4 Ultra 100 ");
+ break;
+ case PCI_DEVICE_ID_INTEL_82372FB_1:
+@@ -289,11 +293,15 @@
+ case PCI_DEVICE_ID_INTEL_82801CA_10:
+ case PCI_DEVICE_ID_INTEL_82801CA_11:
+ case PCI_DEVICE_ID_INTEL_82801E_11:
++ case PCI_DEVICE_ID_INTEL_82801DB_1:
+ case PCI_DEVICE_ID_INTEL_82801DB_10:
+ 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_2:
++ case PCI_DEVICE_ID_INTEL_ICH6_19:
++ case PCI_DEVICE_ID_INTEL_ICH7_21:
++ case PCI_DEVICE_ID_INTEL_ESB2_18:
++ case PCI_DEVICE_ID_INTEL_ICH8_6:
+ mode = 3;
+ break;
+ /* UDMA 66 capable */
+@@ -677,12 +685,16 @@
+ case PCI_DEVICE_ID_INTEL_82801BA_9:
+ case PCI_DEVICE_ID_INTEL_82801CA_10:
+ case PCI_DEVICE_ID_INTEL_82801CA_11:
++ case PCI_DEVICE_ID_INTEL_82801DB_1:
+ case PCI_DEVICE_ID_INTEL_82801DB_10:
+ case PCI_DEVICE_ID_INTEL_82801DB_11:
+ 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_2:
++ case PCI_DEVICE_ID_INTEL_ICH6_19:
++ case PCI_DEVICE_ID_INTEL_ICH7_21:
++ case PCI_DEVICE_ID_INTEL_ESB2_18:
++ case PCI_DEVICE_ID_INTEL_ICH8_6:
+ {
+ unsigned int extra = 0;
+ pci_read_config_dword(dev, 0x54, &extra);
+@@ -848,8 +860,8 @@
+ /* Only on the original revision: IDE DMA can hang */
+ if(rev == 0x00)
+ no_piix_dma = 1;
+- /* On all revisions PXB bus lock must be disabled for IDE */
+- else if(cfg & (1<<14))
++ /* On all revisions below 5 PXB bus lock must be disabled for
IDE */
++ else if(cfg & (1<<14) && rev < 5)
+ no_piix_dma = 2;
+ }
+ if(no_piix_dma)
+@@ -881,7 +893,11 @@
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_1, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 18},
+ #endif
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_2, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 19},
+- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 20},
++ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_19, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 20},
++ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 21},
++ { 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},
+ { 0, },
+ };
+
+--- linux-2.4.33/drivers/ide/pci/piix.h.orig 2006-08-17 11:16:26.835971000
+0200
++++ linux-2.4.33/drivers/ide/pci/piix.h 2006-08-17 12:24:51.385971000
+0200
+@@ -321,7 +321,7 @@
+ .extra = 0,
+ },{ /* 20 */
+ .vendor = PCI_VENDOR_ID_INTEL,
+- .device = PCI_DEVICE_ID_INTEL_ICH6_2,
++ .device = PCI_DEVICE_ID_INTEL_ICH6_19,
+ .name = "ICH6",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+@@ -333,6 +333,66 @@
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
++ },{ /* 21 */
++ .vendor = PCI_VENDOR_ID_INTEL,
++ .device = PCI_DEVICE_ID_INTEL_ICH7_21,
++ .name = "ICH7",
++ .init_setup = init_setup_piix,
++ .init_chipset = init_chipset_piix,
++ .init_iops = NULL,
++ .init_hwif = init_hwif_piix,
++ .init_dma = init_dma_piix,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
++ .bootable = ON_BOARD,
++ .extra = 0,
++ },{
++ },{ /* 22 */
++ .vendor = PCI_VENDOR_ID_INTEL,
++ .device = PCI_DEVICE_ID_INTEL_82801DB_1,
++ .name = "ICH4",
++ .init_setup = init_setup_piix,
++ .init_chipset = init_chipset_piix,
++ .init_iops = NULL,
++ .init_hwif = init_hwif_piix,
++ .init_dma = init_dma_piix,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
++ .bootable = ON_BOARD,
++ .extra = 0,
++ },{
++ },{ /* 23 */
++ .vendor = PCI_VENDOR_ID_INTEL,
++ .device = PCI_DEVICE_ID_INTEL_ESB2_18,
++ .name = "ESB2",
++ .init_setup = init_setup_piix,
++ .init_chipset = init_chipset_piix,
++ .init_iops = NULL,
++ .init_hwif = init_hwif_piix,
++ .init_dma = init_dma_piix,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
++ .bootable = ON_BOARD,
++ .extra = 0,
++ },{
++ },{ /* 24 */
++ .vendor = PCI_VENDOR_ID_INTEL,
++ .device = PCI_DEVICE_ID_INTEL_ICH8_6,
++ .name = "ICH8M",
++ .init_setup = init_setup_piix,
++ .init_chipset = init_chipset_piix,
++ .init_iops = NULL,
++ .init_hwif = init_hwif_piix,
++ .init_dma = init_dma_piix,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
++ .bootable = ON_BOARD,
++ .extra = 0,
++ },{
+ },{
+ .vendor = 0,
+ .device = 0,
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
