r1481 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series
Joshua Kwan
joshk@haydn.debian.org
Sun, 29 Aug 2004 18:22:40 -0600
Author: joshk
Date: 2004-08-29 18:21:48 -0600 (Sun, 29 Aug 2004)
New Revision: 1481
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5
Log:
add 072_6300esb_sata.diff (wishlist bug)
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-08-29 21:15:19 UTC (rev 1480)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-08-30 00:21:48 UTC (rev 1481)
@@ -1,4 +1,4 @@
-kernel-source-2.4.27 (2.4.27-5) unstable; urgency=high
+kernel-source-2.4.27 (2.4.27-5) UNRELEASED; urgency=high
* Fix a goofup in debian/apply that didn't really affect normal users.
* 070_ide_scan_pcibus.diff: Add this very crucial hunk of code that was
@@ -7,8 +7,10 @@
* 071_dep_fw_loader-2.diff: Simplify 066_dep_fw_loader.diff (removed) so
that it works with make xconfig as well. (Closes: #268436)
* Remove obsoleted README.NMU.
+ * 072_6300esb_sata.diff: Enable DMA support for Intel 6300ESB SATA disk
+ controller through piix. (Closes: #254748)
- -- Joshua Kwan <joshk@triplehelix.org> Sat, 28 Aug 2004 18:23:06 -0700
+ -- Joshua Kwan <joshk@triplehelix.org> Sun, 29 Aug 2004 16:54:52 -0700
kernel-source-2.4.27 (2.4.27-4) unstable; urgency=high
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff 2004-08-29 21:15:19 UTC (rev 1480)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff 2004-08-30 00:21:48 UTC (rev 1481)
@@ -0,0 +1,59 @@
+diff -Ndru kernel-source-2.4.26/drivers/ide/pci/piix.c kernel-source-2.4.26-pe750/drivers/ide/pci/piix.c
+--- kernel-source-2.4.26/drivers/ide/pci/piix.c Wed Apr 14 13:05:30 2004
++++ kernel-source-2.4.26-pe750/drivers/ide/pci/piix.c Tue Jun 15 20:50:25 2004
+@@ -155,6 +155,7 @@
+ 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_ESB_3:
+ p += sprintf(p, "PIIX4 Ultra 100 ");
+ break;
+ case PCI_DEVICE_ID_INTEL_82372FB_1:
+@@ -294,6 +295,7 @@
+ 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_ESB_3:
+ mode = 3;
+ break;
+ /* UDMA 66 capable */
+@@ -686,6 +688,7 @@
+ 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_ESB_3:
+ {
+ unsigned int extra = 0;
+ pci_read_config_dword(dev, 0x54, &extra);
+@@ -883,6 +886,7 @@
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18},
+ { 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_ESB_3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},
+ { 0, },
+ };
+
+diff -Ndru kernel-source-2.4.26/drivers/ide/pci/piix.h kernel-source-2.4.26-pe750/drivers/ide/pci/piix.h
+--- kernel-source-2.4.26/drivers/ide/pci/piix.h Wed Apr 14 13:05:30 2004
++++ kernel-source-2.4.26-pe750/drivers/ide/pci/piix.h Wed Jun 16 07:59:41 2004
+@@ -333,6 +333,20 @@
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
++ },{ /* 21 */
++ .vendor = PCI_VENDOR_ID_INTEL,
++ .device = PCI_DEVICE_ID_INTEL_ESB_3,
++ .name = "ICH5",
++ .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,
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5 2004-08-29 21:15:19 UTC (rev 1480)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5 2004-08-30 00:21:48 UTC (rev 1481)
@@ -1,3 +1,4 @@
+ 070_ide_scan_pcibus.diff
- 066_dep_fw_loader.diff
+ 071_dep_fw_loader-2.diff
++ 072_6300esb_sata.diff