vserver 1.9.5.x5

[linux-2.6.git] / drivers / scsi / scsi_devinfo.c

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 0153b77..cf9e7dc 100644 (file)
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -28,7 +28,7 @@ struct scsi_dev_info_list {
 static const char spaces[] = "                "; /* 16 of them */
 static unsigned scsi_default_dev_flags;
 static LIST_HEAD(scsi_dev_info_list);
-static __initdata char scsi_dev_flags[256];
+static char scsi_dev_flags[256];
 
 /*
  * scsi_static_device_list: deprecated list of devices that require
@@ -83,6 +83,7 @@ static struct {
        {"SONY", "CD-ROM CDU-55S", "1.0i", BLIST_NOLUN},
        {"SONY", "CD-ROM CDU-561", "1.7x", BLIST_NOLUN},
        {"SONY", "CD-ROM CDU-8012", NULL, BLIST_NOLUN},
+       {"SONY", "SDT-5000", "3.17", BLIST_SELECT_NO_ATN},
        {"TANDBERG", "TDC 3600", "U07", BLIST_NOLUN},   /* locks up */
        {"TEAC", "CD-R55S", "1.0H", BLIST_NOLUN},       /* locks up */
        /*
@@ -115,13 +116,15 @@ static struct {
 
        /*
         * Other types of devices that have special flags.
+        * Note that all USB devices should have the BLIST_INQUIRY_36 flag.
         */
+       {"3PARdata", "VV", NULL, BLIST_REPORTLUN2},
        {"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},
+       {"BELKIN", "USB 2 HS-CF", "1.95",  BLIST_FORCELUN | BLIST_INQUIRY_36},
        {"CANON", "IPUBJD", NULL, BLIST_SPARSELUN},
-       {"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN},
+       {"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN | BLIST_INQUIRY_36},
        {"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 +145,9 @@ 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},
+       {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36},
+       {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36},
+       {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36},
        {"HITACHI", "DF400", "*", BLIST_SPARSELUN},
        {"HITACHI", "DF500", "*", BLIST_SPARSELUN},
        {"HITACHI", "DF600", "*", BLIST_SPARSELUN},
@@ -153,6 +156,7 @@ static struct {
        {"HP", "NetRAID-4M", NULL, BLIST_FORCELUN},
        {"HP", "HSV100", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
        {"HP", "C1557A", NULL, BLIST_FORCELUN},
+       {"HP", "C3323-300", "4269", BLIST_NOTQ},
        {"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN},
        {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
        {"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN},
@@ -179,10 +183,13 @@ static struct {
        {"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},
+       {"SEAGATE", "ST34555N", "0930", BLIST_NOTQ},    /* Chokes on tagged INQUIRY */
+       {"SEAGATE", "ST3390N", "9546", BLIST_NOTQ},
        {"SGI", "RAID3", "*", BLIST_SPARSELUN},
        {"SGI", "RAID5", "*", BLIST_SPARSELUN},
        {"SGI", "TP9100", "*", BLIST_REPORTLUN2},
-       {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN},
+       {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
+       {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
        {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
        {"SONY", "TSL", NULL, BLIST_FORCELUN},          /* DDS3 & DDS4 autoloaders */
        {"SUN", "T300", "*", BLIST_SPARSELUN},
@@ -190,7 +197,10 @@ 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},
+       {"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36},
+       {"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN},
+       {"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN},
+       {"WangDAT", "Model 1300", "02.4", BLIST_SELECT_NO_ATN},
        {"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
        {"Zzyzx", "RocketStor 500S", NULL, BLIST_SPARSELUN},
        {"Zzyzx", "RocketStor 2000", NULL, BLIST_SPARSELUN},
@@ -510,7 +520,7 @@ void scsi_exit_devinfo(void)
  *     Add command line @dev_list entries, then add
  *     scsi_static_device_list entries to the scsi device info list.
  **/
-int scsi_init_devinfo(void)
+int __init scsi_init_devinfo(void)
 {
 #ifdef CONFIG_SCSI_PROC_FS
        struct proc_dir_entry *p;