r1231 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

Christoph Hellwig hch-guest@haydn.debian.org
Wed, 18 Aug 2004 12:43:59 -0600


Author: hch-guest
Date: 2004-08-18 12:43:45 -0600 (Wed, 18 Aug 2004)
New Revision: 1231

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3
Log:

  * Update scsi blacklist for USB multi card readers (Christoph Hellwig).



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-18 18:14:54 UTC (rev 1230)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-18 18:43:45 UTC (rev 1231)
@@ -7,6 +7,8 @@
   * Add bio_uncopy_user leak fix from Kurt Garloff (closes: #256871)
     (Christoph Hellwig).
 
+  * Update scsi blacklist for USB multi card readers (Christoph Hellwig).
+
  -- Andres Salomon <dilinger@voxel.net>  Wed, 18 Aug 2004 02:13:56 -0400
 
 kernel-source-2.6.8 (2.6.8-2) unstable; urgency=high

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-18 18:14:54 UTC (rev 1230)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-18 18:43:45 UTC (rev 1231)
@@ -33,3 +33,4 @@
 ia64_cyclone_nosmp
 fix-sn_console-for-config_smp
 bio_uncopy_user-memleak
+scsi-blacklist

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist.dpatch	2004-08-18 18:14:54 UTC (rev 1230)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist.dpatch	2004-08-18 18:43:45 UTC (rev 1231)
@@ -0,0 +1,88 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: update scsi blacklist for USB multi card readers
+## DP: Patch author: unknown (from Fedora)
+## DP: Upstream status: submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+diff -urNp linux-1100/drivers/scsi/scsi_devinfo.c linux-10000/drivers/scsi/scsi_devinfo.c
+--- linux-1100/drivers/scsi/scsi_devinfo.c
++++ linux-10000/drivers/scsi/scsi_devinfo.c
+@@ -118,10 +118,7 @@ static struct {
+ 	 */
+ 	{"ADAPTEC", "AACRAID", NULL, BLIST_FORCELUN},
+ 	{"ADAPTEC", "Adaptec 5400S", NULL, BLIST_FORCELUN},
+-	{"AFT PRO", "-IX CF", "0.0>", BLIST_FORCELUN},
+-	{"BELKIN", "USB 2 HS-CF", "1.95",  BLIST_FORCELUN},
+ 	{"CANON", "IPUBJD", NULL, BLIST_SPARSELUN},
+-	{"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN},
+ 	{"CMD", "CRA-7280", NULL, BLIST_SPARSELUN},	/* CMD RAID Controller */
+ 	{"CNSI", "G7324", NULL, BLIST_SPARSELUN},	/* Chaparral G7324 RAID */
+ 	{"CNSi", "G8324", NULL, BLIST_SPARSELUN},	/* Chaparral G8324 RAID */
+@@ -142,9 +139,6 @@ static struct {
+ 	{"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN},
+ 	{"EMULEX", "MD21/S2     ESDI", NULL, BLIST_SINGLELUN},
+ 	{"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+-	{"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN},
+-	{"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN},
+-	{"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN},
+ 	{"HITACHI", "DF400", "*", BLIST_SPARSELUN},
+ 	{"HITACHI", "DF500", "*", BLIST_SPARSELUN},
+ 	{"HITACHI", "DF600", "*", BLIST_SPARSELUN},
+@@ -164,7 +158,6 @@ static struct {
+ 	{"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
+ 	{"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
+ 	{"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
+-	{"Medion", "Flash XL  MMC/SD", "2.6D", BLIST_FORCELUN},
+ 	{"MegaRAID", "LD", NULL, BLIST_FORCELUN},
+ 	{"MICROP", "4110", NULL, BLIST_NOTQ},
+ 	{"MYLEX", "DACARMRB", "*", BLIST_REPORTLUN2},
+@@ -178,11 +171,9 @@ static struct {
+ 	{"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
+ 	{"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
+ 	{"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN | BLIST_SINGLELUN},
+-	{"SanDisk", "ImageMate CF-SD1", NULL, BLIST_FORCELUN},
+ 	{"SGI", "RAID3", "*", BLIST_SPARSELUN},
+ 	{"SGI", "RAID5", "*", BLIST_SPARSELUN},
+ 	{"SGI", "TP9100", "*", BLIST_REPORTLUN2},
+-	{"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN},
+ 	{"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
+ 	{"SONY", "TSL", NULL, BLIST_FORCELUN},		/* DDS3 & DDS4 autoloaders */
+ 	{"SUN", "T300", "*", BLIST_SPARSELUN},
+@@ -190,11 +181,31 @@ static struct {
+ 	{"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN},
+ 	{"TOSHIBA", "CDROM", NULL, BLIST_ISROM},
+ 	{"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},
+-	{"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN},
+ 	{"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+ 	{"Zzyzx", "RocketStor 500S", NULL, BLIST_SPARSELUN},
+ 	{"Zzyzx", "RocketStor 2000", NULL, BLIST_SPARSELUN},
+ 	{ NULL, NULL, NULL, 0 },
++
++	/*
++	 * USB multi card readers. Only these should use BLIST_FORCELUN.
++	 */
++	{"AFT PRO", "-IX CF", "0.0>", BLIST_FORCELUN},
++	{"BELKIN", "USB 2 HS-CF", "1.95",  BLIST_FORCELUN},
++	{"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN},
++	{"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN},
++	{"Generic", "USB Storage-SMC", "0090", BLIST_FORCELUN},
++	{"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN},
++	{"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN},
++	{"ICSI", "SD Card", "2.7C", BLIST_FORCELUN},
++	{"IOI", "Media Bay", "*", BLIST_FORCELUN},
++	{"Lexar", "Media Inc. SM/xD", "009E", BLIST_FORCELUN},
++	{"Medion", "Flash XL  MMC/SD", "2.6D", BLIST_FORCELUN},
++	{"SanDisk", "ImageMate CF-SD1", NULL, BLIST_FORCELUN},
++	{"SMSC", "223 U HS-CF", "1.95", BLIST_FORCELUN},
++	{"SMSC", "USB 2 HS-CF", NULL, BLIST_FORCELUN},
++	{"TwinMOS", "7-in-1 Card RWCF", "0100", BLIST_FORCELUN},
++	{"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN},
++	{"Y-E DATA", "CF Card Reader", "1.03", BLIST_FORCELUN},
+ };
+ 
+ /*