[kernel] r9507 - in dists/etch/linux-2.6/debian: . patches/features/all/drivers patches/series

Dann Frazier dannf at alioth.debian.org
Thu Sep 13 01:19:26 UTC 2007 

Author: dannf
Date: Thu Sep 13 01:19:26 2007
New Revision: 9507

Log:
HP's testing of the ich9 controller support in this release (pci additions) found that some configs supported by ich8/ich9 hardware did not work. e.g., slave controller in native mode undetected - this was due to an invalid map that has been fixed upstream. This fix also means ich8m might work w/ etch, though that's untested

Added:
   dists/etch/linux-2.6/debian/patches/features/all/drivers/ata_piix-ich8-fix-map-for-combined-mode.patch
   dists/etch/linux-2.6/debian/patches/features/all/drivers/ata_piix-ich8-fix-native-mode-slave-port.patch
Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/patches/series/14

Modified: dists/etch/linux-2.6/debian/changelog
==============================================================================
--- dists/etch/linux-2.6/debian/changelog	(original)
+++ dists/etch/linux-2.6/debian/changelog	Thu Sep 13 01:19:26 2007
@@ -4,7 +4,7 @@
   * [bluetooth] Fix panic caused by race between RFCOMM socket layer and
     RFCOMM TTY layer. Thanks to Mikko Rapeli. (closes: #394742)
   * Add support for AMD/ATI SB700 hardware, see #429622
-  * Add pci ids for Intel ICH9 controllers, see #435877
+  * Add support for Intel ICH9 controllers, see #435877
   * [hppa] remove misuse of global_ack_eiem, fixing a race condition that
     resulted in frequent lockups on SMP systems. See: #435878
 
@@ -22,8 +22,8 @@
     This has only been shown to happen with certain serial devices so can only
     be triggered by a user who already has additional priveleges (dialout
     group). (closes: #404815)
-  
- -- dann frazier <dannf at debian.org>  Mon, 10 Sep 2007 23:28:17 -0600
+
+ -- dann frazier <dannf at debian.org>  Wed, 12 Sep 2007 18:53:12 -0600
 
 linux-2.6 (2.6.18.dfsg.1-13etch2) stable-security; urgency=high
 

Added: dists/etch/linux-2.6/debian/patches/features/all/drivers/ata_piix-ich8-fix-map-for-combined-mode.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/features/all/drivers/ata_piix-ich8-fix-map-for-combined-mode.patch	Thu Sep 13 01:19:26 2007
@@ -0,0 +1,32 @@
+From: Tejun Heo <htejun at gmail.com>
+Date: Mon, 6 Aug 2007 17:43:27 +0000 (+0900)
+Subject: ata_piix: update map 10b for ich8m
+X-Git-Tag: v2.6.23-rc4~131^2~5
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ac2b04371fffd964b0d1c3369a9972bed7a5c5d9
+
+ata_piix: update map 10b for ich8m
+
+Fix map entry 10b for ich8.  It's [P0 P2 IDE IDE] like ich6 / ich6m.
+
+Signed-off-by: Tejun Heo <htejun at gmail.com>
+Cc: <Kristen Carlson Accardi> kristen.c.accardi at intel.com
+Signed-off-by: Jeff Garzik <jeff at garzik.org>
+---
+
+Backported to Debian's 2.6.18 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-2.6-2.6.18.dfsg.1.orig/drivers/scsi/ata_piix.c linux-2.6-2.6.18.dfsg.1/drivers/scsi/ata_piix.c
+--- linux-2.6-2.6.18.dfsg.1.orig/drivers/scsi/ata_piix.c	2007-09-12 18:47:41.000000000 -0600
++++ linux-2.6-2.6.18.dfsg.1/drivers/scsi/ata_piix.c	2007-09-12 18:50:38.000000000 -0600
+@@ -373,9 +373,9 @@ static const struct piix_map_db ich8_map
+ 	.present_shift = 8,
+ 	.map = {
+ 		/* PM   PS   SM   SS       MAP */
+-		{  P0,  NA,  P1,  NA }, /* 00b (hardwired) */
++		{  P0,  P2,  P1,  P3 }, /* 00b (hardwired when in AHCI) */
+ 		{  RV,  RV,  RV,  RV },
+-		{  RV,  RV,  RV,  RV }, /* 10b (never) */
++		{  P0,  P2, IDE, IDE }, /* 10b (IDE mode) */
+ 		{  RV,  RV,  RV,  RV },
+ 	},
+ };

Added: dists/etch/linux-2.6/debian/patches/features/all/drivers/ata_piix-ich8-fix-native-mode-slave-port.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/features/all/drivers/ata_piix-ich8-fix-native-mode-slave-port.patch	Thu Sep 13 01:19:26 2007
@@ -0,0 +1,34 @@
+From: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
+Date: Thu, 19 Oct 2006 20:27:39 +0000 (-0700)
+Subject: [PATCH] libata: use correct map_db values for ICH8
+X-Git-Tag: v2.6.19-rc3~12^2~4
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=158f30c8945fea7cf0d0161cd9463cf2f3d2c19e
+
+[PATCH] libata: use correct map_db values for ICH8
+
+Use valid values for ICH8 map_db.  With the old values, when the
+controller was in Native mode, and SCC was 1 (drives configured for
+IDE), any drive plugged into a slave port was not recognized.  For
+Combined Mode (and SCC is still 1), 2 is a value value for MAP.map_value,
+and needs to be recognized.
+
+Signed-off-by:  Kristen Carlson Accardi <kristen.c.accardi at intel.com>
+Signed-off-by: Jeff Garzik <jeff at garzik.org>
+---
+
+Backported to Debian's 2.6.18 by dann frazier <dannf at debian.org>
+
+--- linux-2.6-2.6.18.dfsg.1.orig/drivers/scsi/ata_piix.c	2007-09-12 18:47:41.000000000 -0600
++++ linux-2.6-2.6.18.dfsg.1/drivers/scsi/ata_piix.c	2007-09-12 18:49:09.000000000 -0600
+@@ -373,9 +373,9 @@ static const struct piix_map_db ich8_map
+ 	.present_shift = 8,
+ 	.map = {
+ 		/* PM   PS   SM   SS       MAP */
+-		{  P0,  NA,  P1,  NA }, /* 00b (hardwired) */
++		{  P0,  P2,  P1,  P3 }, /* 00b (hardwired when in AHCI) */
+ 		{  RV,  RV,  RV,  RV },
+-		{  RV,  RV,  RV,  RV }, /* 10b (never) */
++		{  IDE,  IDE,  NA,  NA }, /* 10b (IDE mode) */
+ 		{  RV,  RV,  RV,  RV },
+ 	},
+ };

Modified: dists/etch/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/etch/linux-2.6/debian/patches/series/14	(original)
+++ dists/etch/linux-2.6/debian/patches/series/14	Thu Sep 13 01:19:26 2007
@@ -7,6 +7,8 @@
 + features/all/drivers/i2c-piix4-sb600.patch
 + features/all/drivers/i2c-piix4-sb700.patch
 + features/all/drivers/ata_piix-ich9-ide-mode.patch
++ features/all/drivers/ata_piix-ich8-fix-native-mode-slave-port.patch
++ features/all/drivers/ata_piix-ich8-fix-map-for-combined-mode.patch
 + features/all/drivers/ahci-ignore-sb600-internal-error.patch
 + features/all/drivers/3w-9560se.patch
 - bugfix/reset-pdeathsig-on-suid.patch

More information about the Kernel-svn-changes mailing list