Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c93ff979a40e99f7229544cc8298c820b8eda17e

Authored by Randy Dunlap
Committed by James Bottomley
1 parent 6af6632a1c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] kernel-doc: use correct function name 

Use correct function name in kernel-doc.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

drivers/scsi/scsi_devinfo.c
Diff comments   View file @ c93ff97
1 1
2 #include <linux/blkdev.h> 2 #include <linux/blkdev.h>
3 #include <linux/init.h> 3 #include <linux/init.h>
4 #include <linux/kernel.h> 4 #include <linux/kernel.h>
5 #include <linux/module.h> 5 #include <linux/module.h>
6 #include <linux/moduleparam.h> 6 #include <linux/moduleparam.h>
7 #include <linux/proc_fs.h> 7 #include <linux/proc_fs.h>
8 #include <linux/seq_file.h> 8 #include <linux/seq_file.h>
9 9
10 #include <scsi/scsi_device.h> 10 #include <scsi/scsi_device.h>
11 #include <scsi/scsi_devinfo.h> 11 #include <scsi/scsi_devinfo.h>
12 12
13 #include "scsi_priv.h" 13 #include "scsi_priv.h"
14 14
15 15
16 /* 16 /*
17 * scsi_dev_info_list: structure to hold black/white listed devices. 17 * scsi_dev_info_list: structure to hold black/white listed devices.
18 */ 18 */
19 struct scsi_dev_info_list { 19 struct scsi_dev_info_list {
20 struct list_head dev_info_list; 20 struct list_head dev_info_list;
21 char vendor[8]; 21 char vendor[8];
22 char model[16]; 22 char model[16];
23 unsigned flags; 23 unsigned flags;
24 unsigned compatible; /* for use with scsi_static_device_list entries */ 24 unsigned compatible; /* for use with scsi_static_device_list entries */
25 }; 25 };
26 26
27 27
28 static const char spaces[] = " "; /* 16 of them */ 28 static const char spaces[] = " "; /* 16 of them */
29 static unsigned scsi_default_dev_flags; 29 static unsigned scsi_default_dev_flags;
30 static LIST_HEAD(scsi_dev_info_list); 30 static LIST_HEAD(scsi_dev_info_list);
31 static char scsi_dev_flags[256]; 31 static char scsi_dev_flags[256];
32 32
33 /* 33 /*
34 * scsi_static_device_list: deprecated list of devices that require 34 * scsi_static_device_list: deprecated list of devices that require
35 * settings that differ from the default, includes black-listed (broken) 35 * settings that differ from the default, includes black-listed (broken)
36 * devices. The entries here are added to the tail of scsi_dev_info_list 36 * devices. The entries here are added to the tail of scsi_dev_info_list
37 * via scsi_dev_info_list_init. 37 * via scsi_dev_info_list_init.
38 * 38 *
39 * Do not add to this list, use the command line or proc interface to add 39 * Do not add to this list, use the command line or proc interface to add
40 * to the scsi_dev_info_list. This table will eventually go away. 40 * to the scsi_dev_info_list. This table will eventually go away.
41 */ 41 */
42 static struct { 42 static struct {
43 char *vendor; 43 char *vendor;
44 char *model; 44 char *model;
45 char *revision; /* revision known to be bad, unused */ 45 char *revision; /* revision known to be bad, unused */
46 unsigned flags; 46 unsigned flags;
47 } scsi_static_device_list[] __initdata = { 47 } scsi_static_device_list[] __initdata = {
48 /* 48 /*
49 * The following devices are known not to tolerate a lun != 0 scan 49 * The following devices are known not to tolerate a lun != 0 scan
50 * for one reason or another. Some will respond to all luns, 50 * for one reason or another. Some will respond to all luns,
51 * others will lock up. 51 * others will lock up.
52 */ 52 */
53 {"Aashima", "IMAGERY 2400SP", "1.03", BLIST_NOLUN}, /* locks up */ 53 {"Aashima", "IMAGERY 2400SP", "1.03", BLIST_NOLUN}, /* locks up */
54 {"CHINON", "CD-ROM CDS-431", "H42", BLIST_NOLUN}, /* locks up */ 54 {"CHINON", "CD-ROM CDS-431", "H42", BLIST_NOLUN}, /* locks up */
55 {"CHINON", "CD-ROM CDS-535", "Q14", BLIST_NOLUN}, /* locks up */ 55 {"CHINON", "CD-ROM CDS-535", "Q14", BLIST_NOLUN}, /* locks up */
56 {"DENON", "DRD-25X", "V", BLIST_NOLUN}, /* locks up */ 56 {"DENON", "DRD-25X", "V", BLIST_NOLUN}, /* locks up */
57 {"HITACHI", "DK312C", "CM81", BLIST_NOLUN}, /* responds to all lun */ 57 {"HITACHI", "DK312C", "CM81", BLIST_NOLUN}, /* responds to all lun */
58 {"HITACHI", "DK314C", "CR21", BLIST_NOLUN}, /* responds to all lun */ 58 {"HITACHI", "DK314C", "CR21", BLIST_NOLUN}, /* responds to all lun */
59 {"IBM", "2104-DU3", NULL, BLIST_NOLUN}, /* locks up */ 59 {"IBM", "2104-DU3", NULL, BLIST_NOLUN}, /* locks up */
60 {"IBM", "2104-TU3", NULL, BLIST_NOLUN}, /* locks up */ 60 {"IBM", "2104-TU3", NULL, BLIST_NOLUN}, /* locks up */
61 {"IMS", "CDD521/10", "2.06", BLIST_NOLUN}, /* locks up */ 61 {"IMS", "CDD521/10", "2.06", BLIST_NOLUN}, /* locks up */
62 {"MAXTOR", "XT-3280", "PR02", BLIST_NOLUN}, /* locks up */ 62 {"MAXTOR", "XT-3280", "PR02", BLIST_NOLUN}, /* locks up */
63 {"MAXTOR", "XT-4380S", "B3C", BLIST_NOLUN}, /* locks up */ 63 {"MAXTOR", "XT-4380S", "B3C", BLIST_NOLUN}, /* locks up */
64 {"MAXTOR", "MXT-1240S", "I1.2", BLIST_NOLUN}, /* locks up */ 64 {"MAXTOR", "MXT-1240S", "I1.2", BLIST_NOLUN}, /* locks up */
65 {"MAXTOR", "XT-4170S", "B5A", BLIST_NOLUN}, /* locks up */ 65 {"MAXTOR", "XT-4170S", "B5A", BLIST_NOLUN}, /* locks up */
66 {"MAXTOR", "XT-8760S", "B7B", BLIST_NOLUN}, /* locks up */ 66 {"MAXTOR", "XT-8760S", "B7B", BLIST_NOLUN}, /* locks up */
67 {"MEDIAVIS", "RENO CD-ROMX2A", "2.03", BLIST_NOLUN}, /* responds to all lun */ 67 {"MEDIAVIS", "RENO CD-ROMX2A", "2.03", BLIST_NOLUN}, /* responds to all lun */
68 {"MICROTEK", "ScanMakerIII", "2.30", BLIST_NOLUN}, /* responds to all lun */ 68 {"MICROTEK", "ScanMakerIII", "2.30", BLIST_NOLUN}, /* responds to all lun */
69 {"NEC", "CD-ROM DRIVE:841", "1.0", BLIST_NOLUN},/* locks up */ 69 {"NEC", "CD-ROM DRIVE:841", "1.0", BLIST_NOLUN},/* locks up */
70 {"PHILIPS", "PCA80SC", "V4-2", BLIST_NOLUN}, /* responds to all lun */ 70 {"PHILIPS", "PCA80SC", "V4-2", BLIST_NOLUN}, /* responds to all lun */
71 {"RODIME", "RO3000S", "2.33", BLIST_NOLUN}, /* locks up */ 71 {"RODIME", "RO3000S", "2.33", BLIST_NOLUN}, /* locks up */
72 {"SUN", "SENA", NULL, BLIST_NOLUN}, /* responds to all luns */ 72 {"SUN", "SENA", NULL, BLIST_NOLUN}, /* responds to all luns */
73 /* 73 /*
74 * The following causes a failed REQUEST SENSE on lun 1 for 74 * The following causes a failed REQUEST SENSE on lun 1 for
75 * aha152x controller, which causes SCSI code to reset bus. 75 * aha152x controller, which causes SCSI code to reset bus.
76 */ 76 */
77 {"SANYO", "CRD-250S", "1.20", BLIST_NOLUN}, 77 {"SANYO", "CRD-250S", "1.20", BLIST_NOLUN},
78 /* 78 /*
79 * The following causes a failed REQUEST SENSE on lun 1 for 79 * The following causes a failed REQUEST SENSE on lun 1 for
80 * aha152x controller, which causes SCSI code to reset bus. 80 * aha152x controller, which causes SCSI code to reset bus.
81 */ 81 */
82 {"SEAGATE", "ST157N", "\004|j", BLIST_NOLUN}, 82 {"SEAGATE", "ST157N", "\004|j", BLIST_NOLUN},
83 {"SEAGATE", "ST296", "921", BLIST_NOLUN}, /* responds to all lun */ 83 {"SEAGATE", "ST296", "921", BLIST_NOLUN}, /* responds to all lun */
84 {"SEAGATE", "ST1581", "6538", BLIST_NOLUN}, /* responds to all lun */ 84 {"SEAGATE", "ST1581", "6538", BLIST_NOLUN}, /* responds to all lun */
85 {"SONY", "CD-ROM CDU-541", "4.3d", BLIST_NOLUN}, 85 {"SONY", "CD-ROM CDU-541", "4.3d", BLIST_NOLUN},
86 {"SONY", "CD-ROM CDU-55S", "1.0i", BLIST_NOLUN}, 86 {"SONY", "CD-ROM CDU-55S", "1.0i", BLIST_NOLUN},
87 {"SONY", "CD-ROM CDU-561", "1.7x", BLIST_NOLUN}, 87 {"SONY", "CD-ROM CDU-561", "1.7x", BLIST_NOLUN},
88 {"SONY", "CD-ROM CDU-8012", NULL, BLIST_NOLUN}, 88 {"SONY", "CD-ROM CDU-8012", NULL, BLIST_NOLUN},
89 {"SONY", "SDT-5000", "3.17", BLIST_SELECT_NO_ATN}, 89 {"SONY", "SDT-5000", "3.17", BLIST_SELECT_NO_ATN},
90 {"TANDBERG", "TDC 3600", "U07", BLIST_NOLUN}, /* locks up */ 90 {"TANDBERG", "TDC 3600", "U07", BLIST_NOLUN}, /* locks up */
91 {"TEAC", "CD-R55S", "1.0H", BLIST_NOLUN}, /* locks up */ 91 {"TEAC", "CD-R55S", "1.0H", BLIST_NOLUN}, /* locks up */
92 /* 92 /*
93 * The following causes a failed REQUEST SENSE on lun 1 for 93 * The following causes a failed REQUEST SENSE on lun 1 for
94 * seagate controller, which causes SCSI code to reset bus. 94 * seagate controller, which causes SCSI code to reset bus.
95 */ 95 */
96 {"TEAC", "CD-ROM", "1.06", BLIST_NOLUN}, 96 {"TEAC", "CD-ROM", "1.06", BLIST_NOLUN},
97 {"TEAC", "MT-2ST/45S2-27", "RV M", BLIST_NOLUN}, /* responds to all lun */ 97 {"TEAC", "MT-2ST/45S2-27", "RV M", BLIST_NOLUN}, /* responds to all lun */
98 /* 98 /*
99 * The following causes a failed REQUEST SENSE on lun 1 for 99 * The following causes a failed REQUEST SENSE on lun 1 for
100 * seagate controller, which causes SCSI code to reset bus. 100 * seagate controller, which causes SCSI code to reset bus.
101 */ 101 */
102 {"HP", "C1750A", "3226", BLIST_NOLUN}, /* scanjet iic */ 102 {"HP", "C1750A", "3226", BLIST_NOLUN}, /* scanjet iic */
103 {"HP", "C1790A", "", BLIST_NOLUN}, /* scanjet iip */ 103 {"HP", "C1790A", "", BLIST_NOLUN}, /* scanjet iip */
104 {"HP", "C2500A", "", BLIST_NOLUN}, /* scanjet iicx */ 104 {"HP", "C2500A", "", BLIST_NOLUN}, /* scanjet iicx */
105 {"MEDIAVIS", "CDR-H93MV", "1.31", BLIST_NOLUN}, /* locks up */ 105 {"MEDIAVIS", "CDR-H93MV", "1.31", BLIST_NOLUN}, /* locks up */
106 {"MICROTEK", "ScanMaker II", "5.61", BLIST_NOLUN}, /* responds to all lun */ 106 {"MICROTEK", "ScanMaker II", "5.61", BLIST_NOLUN}, /* responds to all lun */
107 {"MITSUMI", "CD-R CR-2201CS", "6119", BLIST_NOLUN}, /* locks up */ 107 {"MITSUMI", "CD-R CR-2201CS", "6119", BLIST_NOLUN}, /* locks up */
108 {"NEC", "D3856", "0009", BLIST_NOLUN}, 108 {"NEC", "D3856", "0009", BLIST_NOLUN},
109 {"QUANTUM", "LPS525S", "3110", BLIST_NOLUN}, /* locks up */ 109 {"QUANTUM", "LPS525S", "3110", BLIST_NOLUN}, /* locks up */
110 {"QUANTUM", "PD1225S", "3110", BLIST_NOLUN}, /* locks up */ 110 {"QUANTUM", "PD1225S", "3110", BLIST_NOLUN}, /* locks up */
111 {"QUANTUM", "FIREBALL ST4.3S", "0F0C", BLIST_NOLUN}, /* locks up */ 111 {"QUANTUM", "FIREBALL ST4.3S", "0F0C", BLIST_NOLUN}, /* locks up */
112 {"RELISYS", "Scorpio", NULL, BLIST_NOLUN}, /* responds to all lun */ 112 {"RELISYS", "Scorpio", NULL, BLIST_NOLUN}, /* responds to all lun */
113 {"SANKYO", "CP525", "6.64", BLIST_NOLUN}, /* causes failed REQ SENSE, extra reset */ 113 {"SANKYO", "CP525", "6.64", BLIST_NOLUN}, /* causes failed REQ SENSE, extra reset */
114 {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN}, 114 {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN},
115 {"transtec", "T5008", "0001", BLIST_NOREPORTLUN }, 115 {"transtec", "T5008", "0001", BLIST_NOREPORTLUN },
116 {"YAMAHA", "CDR100", "1.00", BLIST_NOLUN}, /* locks up */ 116 {"YAMAHA", "CDR100", "1.00", BLIST_NOLUN}, /* locks up */
117 {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */ 117 {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */
118 {"YAMAHA", "CRW8424S", "1.0", BLIST_NOLUN}, /* locks up */ 118 {"YAMAHA", "CRW8424S", "1.0", BLIST_NOLUN}, /* locks up */
119 {"YAMAHA", "CRW6416S", "1.0c", BLIST_NOLUN}, /* locks up */ 119 {"YAMAHA", "CRW6416S", "1.0c", BLIST_NOLUN}, /* locks up */
120 {"", "Scanner", "1.80", BLIST_NOLUN}, /* responds to all lun */ 120 {"", "Scanner", "1.80", BLIST_NOLUN}, /* responds to all lun */
121 121
122 /* 122 /*
123 * Other types of devices that have special flags. 123 * Other types of devices that have special flags.
124 * Note that all USB devices should have the BLIST_INQUIRY_36 flag. 124 * Note that all USB devices should have the BLIST_INQUIRY_36 flag.
125 */ 125 */
126 {"3PARdata", "VV", NULL, BLIST_REPORTLUN2}, 126 {"3PARdata", "VV", NULL, BLIST_REPORTLUN2},
127 {"ADAPTEC", "AACRAID", NULL, BLIST_FORCELUN}, 127 {"ADAPTEC", "AACRAID", NULL, BLIST_FORCELUN},
128 {"ADAPTEC", "Adaptec 5400S", NULL, BLIST_FORCELUN}, 128 {"ADAPTEC", "Adaptec 5400S", NULL, BLIST_FORCELUN},
129 {"AFT PRO", "-IX CF", "0.0>", BLIST_FORCELUN}, 129 {"AFT PRO", "-IX CF", "0.0>", BLIST_FORCELUN},
130 {"BELKIN", "USB 2 HS-CF", "1.95", BLIST_FORCELUN | BLIST_INQUIRY_36}, 130 {"BELKIN", "USB 2 HS-CF", "1.95", BLIST_FORCELUN | BLIST_INQUIRY_36},
131 {"BROWNIE", "1200U3P", NULL, BLIST_NOREPORTLUN}, 131 {"BROWNIE", "1200U3P", NULL, BLIST_NOREPORTLUN},
132 {"BROWNIE", "1600U3P", NULL, BLIST_NOREPORTLUN}, 132 {"BROWNIE", "1600U3P", NULL, BLIST_NOREPORTLUN},
133 {"CANON", "IPUBJD", NULL, BLIST_SPARSELUN}, 133 {"CANON", "IPUBJD", NULL, BLIST_SPARSELUN},
134 {"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN | BLIST_INQUIRY_36}, 134 {"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN | BLIST_INQUIRY_36},
135 {"CMD", "CRA-7280", NULL, BLIST_SPARSELUN}, /* CMD RAID Controller */ 135 {"CMD", "CRA-7280", NULL, BLIST_SPARSELUN}, /* CMD RAID Controller */
136 {"CNSI", "G7324", NULL, BLIST_SPARSELUN}, /* Chaparral G7324 RAID */ 136 {"CNSI", "G7324", NULL, BLIST_SPARSELUN}, /* Chaparral G7324 RAID */
137 {"CNSi", "G8324", NULL, BLIST_SPARSELUN}, /* Chaparral G8324 RAID */ 137 {"CNSi", "G8324", NULL, BLIST_SPARSELUN}, /* Chaparral G8324 RAID */
138 {"COMPAQ", "ARRAY CONTROLLER", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | 138 {"COMPAQ", "ARRAY CONTROLLER", NULL, BLIST_SPARSELUN | BLIST_LARGELUN |
139 BLIST_MAX_512 | BLIST_REPORTLUN2}, /* Compaq RA4x00 */ 139 BLIST_MAX_512 | BLIST_REPORTLUN2}, /* Compaq RA4x00 */
140 {"COMPAQ", "LOGICAL VOLUME", NULL, BLIST_FORCELUN | BLIST_MAX_512}, /* Compaq RA4x00 */ 140 {"COMPAQ", "LOGICAL VOLUME", NULL, BLIST_FORCELUN | BLIST_MAX_512}, /* Compaq RA4x00 */
141 {"COMPAQ", "CR3500", NULL, BLIST_FORCELUN}, 141 {"COMPAQ", "CR3500", NULL, BLIST_FORCELUN},
142 {"COMPAQ", "MSA1000", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD}, 142 {"COMPAQ", "MSA1000", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
143 {"COMPAQ", "MSA1000 VOLUME", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD}, 143 {"COMPAQ", "MSA1000 VOLUME", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
144 {"COMPAQ", "HSV110", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD}, 144 {"COMPAQ", "HSV110", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
145 {"DDN", "SAN DataDirector", "*", BLIST_SPARSELUN}, 145 {"DDN", "SAN DataDirector", "*", BLIST_SPARSELUN},
146 {"DEC", "HSG80", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD}, 146 {"DEC", "HSG80", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
147 {"DELL", "PV660F", NULL, BLIST_SPARSELUN}, 147 {"DELL", "PV660F", NULL, BLIST_SPARSELUN},
148 {"DELL", "PV660F PSEUDO", NULL, BLIST_SPARSELUN}, 148 {"DELL", "PV660F PSEUDO", NULL, BLIST_SPARSELUN},
149 {"DELL", "PSEUDO DEVICE .", NULL, BLIST_SPARSELUN}, /* Dell PV 530F */ 149 {"DELL", "PSEUDO DEVICE .", NULL, BLIST_SPARSELUN}, /* Dell PV 530F */
150 {"DELL", "PV530F", NULL, BLIST_SPARSELUN}, 150 {"DELL", "PV530F", NULL, BLIST_SPARSELUN},
151 {"DELL", "PERCRAID", NULL, BLIST_FORCELUN}, 151 {"DELL", "PERCRAID", NULL, BLIST_FORCELUN},
152 {"DGC", "RAID", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, storage on LUN 0 */ 152 {"DGC", "RAID", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, storage on LUN 0 */
153 {"DGC", "DISK", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, no storage on LUN 0 */ 153 {"DGC", "DISK", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, no storage on LUN 0 */
154 {"EMC", "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 154 {"EMC", "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
155 {"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN}, 155 {"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN},
156 {"EMULEX", "MD21/S2 ESDI", NULL, BLIST_SINGLELUN}, 156 {"EMULEX", "MD21/S2 ESDI", NULL, BLIST_SINGLELUN},
157 {"easyRAID", "16P", NULL, BLIST_NOREPORTLUN}, 157 {"easyRAID", "16P", NULL, BLIST_NOREPORTLUN},
158 {"easyRAID", "X6P", NULL, BLIST_NOREPORTLUN}, 158 {"easyRAID", "X6P", NULL, BLIST_NOREPORTLUN},
159 {"easyRAID", "F8", NULL, BLIST_NOREPORTLUN}, 159 {"easyRAID", "F8", NULL, BLIST_NOREPORTLUN},
160 {"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 160 {"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
161 {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36}, 161 {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36},
162 {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36}, 162 {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36},
163 {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36}, 163 {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36},
164 {"HITACHI", "DF400", "*", BLIST_SPARSELUN}, 164 {"HITACHI", "DF400", "*", BLIST_SPARSELUN},
165 {"HITACHI", "DF500", "*", BLIST_SPARSELUN}, 165 {"HITACHI", "DF500", "*", BLIST_SPARSELUN},
166 {"HITACHI", "DF600", "*", BLIST_SPARSELUN}, 166 {"HITACHI", "DF600", "*", BLIST_SPARSELUN},
167 {"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN}, 167 {"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
168 {"HITACHI", "OPEN-E", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN}, 168 {"HITACHI", "OPEN-E", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
169 {"HITACHI", "OP-C-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 169 {"HITACHI", "OP-C-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
170 {"HITACHI", "3380-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 170 {"HITACHI", "3380-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
171 {"HITACHI", "3390-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 171 {"HITACHI", "3390-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
172 {"HITACHI", "6586-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 172 {"HITACHI", "6586-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
173 {"HITACHI", "6588-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 173 {"HITACHI", "6588-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
174 {"HP", "A6189A", NULL, BLIST_SPARSELUN | BLIST_LARGELUN}, /* HP VA7400 */ 174 {"HP", "A6189A", NULL, BLIST_SPARSELUN | BLIST_LARGELUN}, /* HP VA7400 */
175 {"HP", "OPEN-", "*", BLIST_REPORTLUN2}, /* HP XP Arrays */ 175 {"HP", "OPEN-", "*", BLIST_REPORTLUN2}, /* HP XP Arrays */
176 {"HP", "NetRAID-4M", NULL, BLIST_FORCELUN}, 176 {"HP", "NetRAID-4M", NULL, BLIST_FORCELUN},
177 {"HP", "HSV100", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD}, 177 {"HP", "HSV100", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
178 {"HP", "C1557A", NULL, BLIST_FORCELUN}, 178 {"HP", "C1557A", NULL, BLIST_FORCELUN},
179 {"HP", "C3323-300", "4269", BLIST_NOTQ}, 179 {"HP", "C3323-300", "4269", BLIST_NOTQ},
180 {"HP", "C5713A", NULL, BLIST_NOREPORTLUN}, 180 {"HP", "C5713A", NULL, BLIST_NOREPORTLUN},
181 {"HP", "DF400", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 181 {"HP", "DF400", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
182 {"HP", "DF500", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 182 {"HP", "DF500", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
183 {"HP", "DF600", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 183 {"HP", "DF600", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
184 {"HP", "OP-C-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 184 {"HP", "OP-C-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
185 {"HP", "3380-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 185 {"HP", "3380-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
186 {"HP", "3390-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 186 {"HP", "3390-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
187 {"HP", "6586-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 187 {"HP", "6586-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
188 {"HP", "6588-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 188 {"HP", "6588-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
189 {"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN}, 189 {"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN},
190 {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 190 {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
191 {"IBM", "2105", NULL, BLIST_RETRY_HWERROR}, 191 {"IBM", "2105", NULL, BLIST_RETRY_HWERROR},
192 {"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN}, 192 {"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN},
193 {"IOMEGA", "Io20S *F", NULL, BLIST_KEY}, 193 {"IOMEGA", "Io20S *F", NULL, BLIST_KEY},
194 {"INSITE", "Floptical F*8I", NULL, BLIST_KEY}, 194 {"INSITE", "Floptical F*8I", NULL, BLIST_KEY},
195 {"INSITE", "I325VM", NULL, BLIST_KEY}, 195 {"INSITE", "I325VM", NULL, BLIST_KEY},
196 {"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, 196 {"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
197 {"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN}, 197 {"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN},
198 {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 198 {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
199 {"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, 199 {"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
200 {"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, 200 {"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
201 {"Medion", "Flash XL MMC/SD", "2.6D", BLIST_FORCELUN}, 201 {"Medion", "Flash XL MMC/SD", "2.6D", BLIST_FORCELUN},
202 {"MegaRAID", "LD", NULL, BLIST_FORCELUN}, 202 {"MegaRAID", "LD", NULL, BLIST_FORCELUN},
203 {"MICROP", "4110", NULL, BLIST_NOTQ}, 203 {"MICROP", "4110", NULL, BLIST_NOTQ},
204 {"MYLEX", "DACARMRB", "*", BLIST_REPORTLUN2}, 204 {"MYLEX", "DACARMRB", "*", BLIST_REPORTLUN2},
205 {"nCipher", "Fastness Crypto", NULL, BLIST_FORCELUN}, 205 {"nCipher", "Fastness Crypto", NULL, BLIST_FORCELUN},
206 {"NAKAMICH", "MJ-4.8S", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 206 {"NAKAMICH", "MJ-4.8S", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
207 {"NAKAMICH", "MJ-5.16S", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 207 {"NAKAMICH", "MJ-5.16S", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
208 {"NEC", "PD-1 ODX654P", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 208 {"NEC", "PD-1 ODX654P", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
209 {"NEC", "iStorage", NULL, BLIST_REPORTLUN2}, 209 {"NEC", "iStorage", NULL, BLIST_REPORTLUN2},
210 {"NRC", "MBR-7", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 210 {"NRC", "MBR-7", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
211 {"NRC", "MBR-7.4", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 211 {"NRC", "MBR-7.4", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
212 {"PIONEER", "CD-ROM DRM-600", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 212 {"PIONEER", "CD-ROM DRM-600", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
213 {"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 213 {"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
214 {"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 214 {"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
215 {"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, 215 {"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
216 {"Promise", "", NULL, BLIST_SPARSELUN}, 216 {"Promise", "", NULL, BLIST_SPARSELUN},
217 {"QUANTUM", "XP34301", "1071", BLIST_NOTQ}, 217 {"QUANTUM", "XP34301", "1071", BLIST_NOTQ},
218 {"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN | BLIST_SINGLELUN}, 218 {"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN | BLIST_SINGLELUN},
219 {"SanDisk", "ImageMate CF-SD1", NULL, BLIST_FORCELUN}, 219 {"SanDisk", "ImageMate CF-SD1", NULL, BLIST_FORCELUN},
220 {"SEAGATE", "ST34555N", "0930", BLIST_NOTQ}, /* Chokes on tagged INQUIRY */ 220 {"SEAGATE", "ST34555N", "0930", BLIST_NOTQ}, /* Chokes on tagged INQUIRY */
221 {"SEAGATE", "ST3390N", "9546", BLIST_NOTQ}, 221 {"SEAGATE", "ST3390N", "9546", BLIST_NOTQ},
222 {"SGI", "RAID3", "*", BLIST_SPARSELUN}, 222 {"SGI", "RAID3", "*", BLIST_SPARSELUN},
223 {"SGI", "RAID5", "*", BLIST_SPARSELUN}, 223 {"SGI", "RAID5", "*", BLIST_SPARSELUN},
224 {"SGI", "TP9100", "*", BLIST_REPORTLUN2}, 224 {"SGI", "TP9100", "*", BLIST_REPORTLUN2},
225 {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, 225 {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
226 {"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, 226 {"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
227 {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36}, 227 {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
228 {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN}, 228 {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
229 {"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */ 229 {"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */
230 {"ST650211", "CF", NULL, BLIST_RETRY_HWERROR}, 230 {"ST650211", "CF", NULL, BLIST_RETRY_HWERROR},
231 {"SUN", "T300", "*", BLIST_SPARSELUN}, 231 {"SUN", "T300", "*", BLIST_SPARSELUN},
232 {"SUN", "T4", "*", BLIST_SPARSELUN}, 232 {"SUN", "T4", "*", BLIST_SPARSELUN},
233 {"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN}, 233 {"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN},
234 {"Tornado-", "F4", "*", BLIST_NOREPORTLUN}, 234 {"Tornado-", "F4", "*", BLIST_NOREPORTLUN},
235 {"TOSHIBA", "CDROM", NULL, BLIST_ISROM}, 235 {"TOSHIBA", "CDROM", NULL, BLIST_ISROM},
236 {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM}, 236 {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},
237 {"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36}, 237 {"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36},
238 {"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN}, 238 {"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN},
239 {"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN}, 239 {"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN},
240 {"WangDAT", "Model 1300", "02.4", BLIST_SELECT_NO_ATN}, 240 {"WangDAT", "Model 1300", "02.4", BLIST_SELECT_NO_ATN},
241 {"WDC WD25", "00JB-00FUA0", NULL, BLIST_NOREPORTLUN}, 241 {"WDC WD25", "00JB-00FUA0", NULL, BLIST_NOREPORTLUN},
242 {"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 242 {"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
243 {"Zzyzx", "RocketStor 500S", NULL, BLIST_SPARSELUN}, 243 {"Zzyzx", "RocketStor 500S", NULL, BLIST_SPARSELUN},
244 {"Zzyzx", "RocketStor 2000", NULL, BLIST_SPARSELUN}, 244 {"Zzyzx", "RocketStor 2000", NULL, BLIST_SPARSELUN},
245 { NULL, NULL, NULL, 0 }, 245 { NULL, NULL, NULL, 0 },
246 }; 246 };
247 247
248 /* 248 /*
249 * scsi_strcpy_devinfo: called from scsi_dev_info_list_add to copy into 249 * scsi_strcpy_devinfo: called from scsi_dev_info_list_add to copy into
250 * devinfo vendor and model strings. 250 * devinfo vendor and model strings.
251 */ 251 */
252 static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length, 252 static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length,
253 char *from, int compatible) 253 char *from, int compatible)
254 { 254 {
255 size_t from_length; 255 size_t from_length;
256 256
257 from_length = strlen(from); 257 from_length = strlen(from);
258 strncpy(to, from, min(to_length, from_length)); 258 strncpy(to, from, min(to_length, from_length));
259 if (from_length < to_length) { 259 if (from_length < to_length) {
260 if (compatible) { 260 if (compatible) {
261 /* 261 /*
262 * NUL terminate the string if it is short. 262 * NUL terminate the string if it is short.
263 */ 263 */
264 to[from_length] = '\0'; 264 to[from_length] = '\0';
265 } else { 265 } else {
266 /* 266 /*
267 * space pad the string if it is short. 267 * space pad the string if it is short.
268 */ 268 */
269 strncpy(&to[from_length], spaces, 269 strncpy(&to[from_length], spaces,
270 to_length - from_length); 270 to_length - from_length);
271 } 271 }
272 } 272 }
273 if (from_length > to_length) 273 if (from_length > to_length)
274 printk(KERN_WARNING "%s: %s string '%s' is too long\n", 274 printk(KERN_WARNING "%s: %s string '%s' is too long\n",
275 __FUNCTION__, name, from); 275 __FUNCTION__, name, from);
276 } 276 }
277 277
278 /** 278 /**
279 * scsi_dev_info_list_add - add one dev_info list entry. 279 * scsi_dev_info_list_add - add one dev_info list entry.
280 * @compatible: if true, null terminate short strings. Otherwise space pad. 280 * @compatible: if true, null terminate short strings. Otherwise space pad.
281 * @vendor: vendor string 281 * @vendor: vendor string
282 * @model: model (product) string 282 * @model: model (product) string
283 * @strflags: integer string 283 * @strflags: integer string
284 * @flags: if strflags NULL, use this flag value 284 * @flags: if strflags NULL, use this flag value
285 * 285 *
286 * Description: 286 * Description:
287 * Create and add one dev_info entry for @vendor, @model, @strflags or 287 * Create and add one dev_info entry for @vendor, @model, @strflags or
288 * @flag. If @compatible, add to the tail of the list, do not space 288 * @flag. If @compatible, add to the tail of the list, do not space
289 * pad, and set devinfo->compatible. The scsi_static_device_list entries 289 * pad, and set devinfo->compatible. The scsi_static_device_list entries
290 * are added with @compatible 1 and @clfags NULL. 290 * are added with @compatible 1 and @clfags NULL.
291 * 291 *
292 * Returns: 0 OK, -error on failure. 292 * Returns: 0 OK, -error on failure.
293 **/ 293 **/
294 static int scsi_dev_info_list_add(int compatible, char *vendor, char *model, 294 static int scsi_dev_info_list_add(int compatible, char *vendor, char *model,
295 char *strflags, int flags) 295 char *strflags, int flags)
296 { 296 {
297 struct scsi_dev_info_list *devinfo; 297 struct scsi_dev_info_list *devinfo;
298 298
299 devinfo = kmalloc(sizeof(*devinfo), GFP_KERNEL); 299 devinfo = kmalloc(sizeof(*devinfo), GFP_KERNEL);
300 if (!devinfo) { 300 if (!devinfo) {
301 printk(KERN_ERR "%s: no memory\n", __FUNCTION__); 301 printk(KERN_ERR "%s: no memory\n", __FUNCTION__);
302 return -ENOMEM; 302 return -ENOMEM;
303 } 303 }
304 304
305 scsi_strcpy_devinfo("vendor", devinfo->vendor, sizeof(devinfo->vendor), 305 scsi_strcpy_devinfo("vendor", devinfo->vendor, sizeof(devinfo->vendor),
306 vendor, compatible); 306 vendor, compatible);
307 scsi_strcpy_devinfo("model", devinfo->model, sizeof(devinfo->model), 307 scsi_strcpy_devinfo("model", devinfo->model, sizeof(devinfo->model),
308 model, compatible); 308 model, compatible);
309 309
310 if (strflags) 310 if (strflags)
311 devinfo->flags = simple_strtoul(strflags, NULL, 0); 311 devinfo->flags = simple_strtoul(strflags, NULL, 0);
312 else 312 else
313 devinfo->flags = flags; 313 devinfo->flags = flags;
314 314
315 devinfo->compatible = compatible; 315 devinfo->compatible = compatible;
316 316
317 if (compatible) 317 if (compatible)
318 list_add_tail(&devinfo->dev_info_list, &scsi_dev_info_list); 318 list_add_tail(&devinfo->dev_info_list, &scsi_dev_info_list);
319 else 319 else
320 list_add(&devinfo->dev_info_list, &scsi_dev_info_list); 320 list_add(&devinfo->dev_info_list, &scsi_dev_info_list);
321 321
322 return 0; 322 return 0;
323 } 323 }
324 324
325 /** 325 /**
326 * scsi_dev_info_list_add_str - parse dev_list and add to the scsi_dev_info_list. 326 * scsi_dev_info_list_add_str - parse dev_list and add to the scsi_dev_info_list.
327 * @dev_list: string of device flags to add 327 * @dev_list: string of device flags to add
328 * 328 *
329 * Description: 329 * Description:
330 * Parse dev_list, and add entries to the scsi_dev_info_list. 330 * Parse dev_list, and add entries to the scsi_dev_info_list.
331 * dev_list is of the form "vendor:product:flag,vendor:product:flag". 331 * dev_list is of the form "vendor:product:flag,vendor:product:flag".
332 * dev_list is modified via strsep. Can be called for command line 332 * dev_list is modified via strsep. Can be called for command line
333 * addition, for proc or mabye a sysfs interface. 333 * addition, for proc or mabye a sysfs interface.
334 * 334 *
335 * Returns: 0 if OK, -error on failure. 335 * Returns: 0 if OK, -error on failure.
336 **/ 336 **/
337 static int scsi_dev_info_list_add_str(char *dev_list) 337 static int scsi_dev_info_list_add_str(char *dev_list)
338 { 338 {
339 char *vendor, *model, *strflags, *next; 339 char *vendor, *model, *strflags, *next;
340 char *next_check; 340 char *next_check;
341 int res = 0; 341 int res = 0;
342 342
343 next = dev_list; 343 next = dev_list;
344 if (next && next[0] == '"') { 344 if (next && next[0] == '"') {
345 /* 345 /*
346 * Ignore both the leading and trailing quote. 346 * Ignore both the leading and trailing quote.
347 */ 347 */
348 next++; 348 next++;
349 next_check = ",\""; 349 next_check = ",\"";
350 } else { 350 } else {
351 next_check = ","; 351 next_check = ",";
352 } 352 }
353 353
354 /* 354 /*
355 * For the leading and trailing '"' case, the for loop comes 355 * For the leading and trailing '"' case, the for loop comes
356 * through the last time with vendor[0] == '\0'. 356 * through the last time with vendor[0] == '\0'.
357 */ 357 */
358 for (vendor = strsep(&next, ":"); vendor && (vendor[0] != '\0') 358 for (vendor = strsep(&next, ":"); vendor && (vendor[0] != '\0')
359 && (res == 0); vendor = strsep(&next, ":")) { 359 && (res == 0); vendor = strsep(&next, ":")) {
360 strflags = NULL; 360 strflags = NULL;
361 model = strsep(&next, ":"); 361 model = strsep(&next, ":");
362 if (model) 362 if (model)
363 strflags = strsep(&next, next_check); 363 strflags = strsep(&next, next_check);
364 if (!model || !strflags) { 364 if (!model || !strflags) {
365 printk(KERN_ERR "%s: bad dev info string '%s' '%s'" 365 printk(KERN_ERR "%s: bad dev info string '%s' '%s'"
366 " '%s'\n", __FUNCTION__, vendor, model, 366 " '%s'\n", __FUNCTION__, vendor, model,
367 strflags); 367 strflags);
368 res = -EINVAL; 368 res = -EINVAL;
369 } else 369 } else
370 res = scsi_dev_info_list_add(0 /* compatible */, vendor, 370 res = scsi_dev_info_list_add(0 /* compatible */, vendor,
371 model, strflags, 0); 371 model, strflags, 0);
372 } 372 }
373 return res; 373 return res;
374 } 374 }
375 375
376 /** 376 /**
377 * get_device_flags - get device specific flags from the dynamic device list. 377 * get_device_flags - get device specific flags from the dynamic device list.
378 * @sdev: &scsi_device to get flags for 378 * @sdev: &scsi_device to get flags for
379 * @vendor: vendor name 379 * @vendor: vendor name
380 * @model: model name 380 * @model: model name
381 * 381 *
382 * Description: 382 * Description:
383 * Search the scsi_dev_info_list for an entry matching @vendor and 383 * Search the scsi_dev_info_list for an entry matching @vendor and
384 * @model, if found, return the matching flags value, else return 384 * @model, if found, return the matching flags value, else return
385 * the host or global default settings. Called during scan time. 385 * the host or global default settings. Called during scan time.
386 **/ 386 **/
387 int scsi_get_device_flags(struct scsi_device *sdev, 387 int scsi_get_device_flags(struct scsi_device *sdev,
388 const unsigned char *vendor, 388 const unsigned char *vendor,
389 const unsigned char *model) 389 const unsigned char *model)
390 { 390 {
391 struct scsi_dev_info_list *devinfo; 391 struct scsi_dev_info_list *devinfo;
392 unsigned int bflags; 392 unsigned int bflags;
393 393
394 bflags = sdev->sdev_bflags; 394 bflags = sdev->sdev_bflags;
395 if (!bflags) 395 if (!bflags)
396 bflags = scsi_default_dev_flags; 396 bflags = scsi_default_dev_flags;
397 397
398 list_for_each_entry(devinfo, &scsi_dev_info_list, dev_info_list) { 398 list_for_each_entry(devinfo, &scsi_dev_info_list, dev_info_list) {
399 if (devinfo->compatible) { 399 if (devinfo->compatible) {
400 /* 400 /*
401 * Behave like the older version of get_device_flags. 401 * Behave like the older version of get_device_flags.
402 */ 402 */
403 size_t max; 403 size_t max;
404 /* 404 /*
405 * XXX why skip leading spaces? If an odd INQUIRY 405 * XXX why skip leading spaces? If an odd INQUIRY
406 * value, that should have been part of the 406 * value, that should have been part of the
407 * scsi_static_device_list[] entry, such as " FOO" 407 * scsi_static_device_list[] entry, such as " FOO"
408 * rather than "FOO". Since this code is already 408 * rather than "FOO". Since this code is already
409 * here, and we don't know what device it is 409 * here, and we don't know what device it is
410 * trying to work with, leave it as-is. 410 * trying to work with, leave it as-is.
411 */ 411 */
412 max = 8; /* max length of vendor */ 412 max = 8; /* max length of vendor */
413 while ((max > 0) && *vendor == ' ') { 413 while ((max > 0) && *vendor == ' ') {
414 max--; 414 max--;
415 vendor++; 415 vendor++;
416 } 416 }
417 /* 417 /*
418 * XXX removing the following strlen() would be 418 * XXX removing the following strlen() would be
419 * good, using it means that for a an entry not in 419 * good, using it means that for a an entry not in
420 * the list, we scan every byte of every vendor 420 * the list, we scan every byte of every vendor
421 * listed in scsi_static_device_list[], and never match 421 * listed in scsi_static_device_list[], and never match
422 * a single one (and still have to compare at 422 * a single one (and still have to compare at
423 * least the first byte of each vendor). 423 * least the first byte of each vendor).
424 */ 424 */
425 if (memcmp(devinfo->vendor, vendor, 425 if (memcmp(devinfo->vendor, vendor,
426 min(max, strlen(devinfo->vendor)))) 426 min(max, strlen(devinfo->vendor))))
427 continue; 427 continue;
428 /* 428 /*
429 * Skip spaces again. 429 * Skip spaces again.
430 */ 430 */
431 max = 16; /* max length of model */ 431 max = 16; /* max length of model */
432 while ((max > 0) && *model == ' ') { 432 while ((max > 0) && *model == ' ') {
433 max--; 433 max--;
434 model++; 434 model++;
435 } 435 }
436 if (memcmp(devinfo->model, model, 436 if (memcmp(devinfo->model, model,
437 min(max, strlen(devinfo->model)))) 437 min(max, strlen(devinfo->model))))
438 continue; 438 continue;
439 return devinfo->flags; 439 return devinfo->flags;
440 } else { 440 } else {
441 if (!memcmp(devinfo->vendor, vendor, 441 if (!memcmp(devinfo->vendor, vendor,
442 sizeof(devinfo->vendor)) && 442 sizeof(devinfo->vendor)) &&
443 !memcmp(devinfo->model, model, 443 !memcmp(devinfo->model, model,
444 sizeof(devinfo->model))) 444 sizeof(devinfo->model)))
445 return devinfo->flags; 445 return devinfo->flags;
446 } 446 }
447 } 447 }
448 return bflags; 448 return bflags;
449 } 449 }
450 450
451 #ifdef CONFIG_SCSI_PROC_FS 451 #ifdef CONFIG_SCSI_PROC_FS
452 /* 452 /*
453 * proc_scsi_dev_info_read: dump the scsi_dev_info_list via 453 * proc_scsi_dev_info_read: dump the scsi_dev_info_list via
454 * /proc/scsi/device_info 454 * /proc/scsi/device_info
455 */ 455 */
456 static int proc_scsi_devinfo_read(char *buffer, char **start, 456 static int proc_scsi_devinfo_read(char *buffer, char **start,
457 off_t offset, int length) 457 off_t offset, int length)
458 { 458 {
459 struct scsi_dev_info_list *devinfo; 459 struct scsi_dev_info_list *devinfo;
460 int size, len = 0; 460 int size, len = 0;
461 off_t begin = 0; 461 off_t begin = 0;
462 off_t pos = 0; 462 off_t pos = 0;
463 463
464 list_for_each_entry(devinfo, &scsi_dev_info_list, dev_info_list) { 464 list_for_each_entry(devinfo, &scsi_dev_info_list, dev_info_list) {
465 size = sprintf(buffer + len, "'%.8s' '%.16s' 0x%x\n", 465 size = sprintf(buffer + len, "'%.8s' '%.16s' 0x%x\n",
466 devinfo->vendor, devinfo->model, devinfo->flags); 466 devinfo->vendor, devinfo->model, devinfo->flags);
467 len += size; 467 len += size;
468 pos = begin + len; 468 pos = begin + len;
469 if (pos < offset) { 469 if (pos < offset) {
470 len = 0; 470 len = 0;
471 begin = pos; 471 begin = pos;
472 } 472 }
473 if (pos > offset + length) 473 if (pos > offset + length)
474 goto stop_output; 474 goto stop_output;
475 } 475 }
476 476
477 stop_output: 477 stop_output:
478 *start = buffer + (offset - begin); /* Start of wanted data */ 478 *start = buffer + (offset - begin); /* Start of wanted data */
479 len -= (offset - begin); /* Start slop */ 479 len -= (offset - begin); /* Start slop */
480 if (len > length) 480 if (len > length)
481 len = length; /* Ending slop */ 481 len = length; /* Ending slop */
482 return (len); 482 return (len);
483 } 483 }
484 484
485 /* 485 /*
486 * proc_scsi_dev_info_write - allow additions to scsi_dev_info_list via /proc. 486 * proc_scsi_dev_info_write - allow additions to scsi_dev_info_list via /proc.
487 * 487 *
488 * Description: Adds a black/white list entry for vendor and model with an 488 * Description: Adds a black/white list entry for vendor and model with an
489 * integer value of flag to the scsi device info list. 489 * integer value of flag to the scsi device info list.
490 * To use, echo "vendor:model:flag" > /proc/scsi/device_info 490 * To use, echo "vendor:model:flag" > /proc/scsi/device_info
491 */ 491 */
492 static int proc_scsi_devinfo_write(struct file *file, const char __user *buf, 492 static int proc_scsi_devinfo_write(struct file *file, const char __user *buf,
493 unsigned long length, void *data) 493 unsigned long length, void *data)
494 { 494 {
495 char *buffer; 495 char *buffer;
496 int err = length; 496 int err = length;
497 497
498 if (!buf || length>PAGE_SIZE) 498 if (!buf || length>PAGE_SIZE)
499 return -EINVAL; 499 return -EINVAL;
500 if (!(buffer = (char *) __get_free_page(GFP_KERNEL))) 500 if (!(buffer = (char *) __get_free_page(GFP_KERNEL)))
501 return -ENOMEM; 501 return -ENOMEM;
502 if (copy_from_user(buffer, buf, length)) { 502 if (copy_from_user(buffer, buf, length)) {
503 err =-EFAULT; 503 err =-EFAULT;
504 goto out; 504 goto out;
505 } 505 }
506 506
507 if (length < PAGE_SIZE) 507 if (length < PAGE_SIZE)
508 buffer[length] = '\0'; 508 buffer[length] = '\0';
509 else if (buffer[PAGE_SIZE-1]) { 509 else if (buffer[PAGE_SIZE-1]) {
510 err = -EINVAL; 510 err = -EINVAL;
511 goto out; 511 goto out;
512 } 512 }
513 513
514 scsi_dev_info_list_add_str(buffer); 514 scsi_dev_info_list_add_str(buffer);
515 515
516 out: 516 out:
517 free_page((unsigned long)buffer); 517 free_page((unsigned long)buffer);
518 return err; 518 return err;
519 } 519 }
520 #endif /* CONFIG_SCSI_PROC_FS */ 520 #endif /* CONFIG_SCSI_PROC_FS */
521 521
522 module_param_string(dev_flags, scsi_dev_flags, sizeof(scsi_dev_flags), 0); 522 module_param_string(dev_flags, scsi_dev_flags, sizeof(scsi_dev_flags), 0);
523 MODULE_PARM_DESC(dev_flags, 523 MODULE_PARM_DESC(dev_flags,
524 "Given scsi_dev_flags=vendor:model:flags[,v:m:f] add black/white" 524 "Given scsi_dev_flags=vendor:model:flags[,v:m:f] add black/white"
525 " list entries for vendor and model with an integer value of flags" 525 " list entries for vendor and model with an integer value of flags"
526 " to the scsi device info list"); 526 " to the scsi device info list");
527 527
528 module_param_named(default_dev_flags, scsi_default_dev_flags, int, S_IRUGO|S_IWUSR); 528 module_param_named(default_dev_flags, scsi_default_dev_flags, int, S_IRUGO|S_IWUSR);
529 MODULE_PARM_DESC(default_dev_flags, 529 MODULE_PARM_DESC(default_dev_flags,
530 "scsi default device flag integer value"); 530 "scsi default device flag integer value");
531 531
532 /** 532 /**
533 * scsi_dev_info_list_delete - called from scsi.c:exit_scsi to remove the scsi_dev_info_list. 533 * scsi_dev_info_list_delete - called from scsi.c:exit_scsi to remove the scsi_dev_info_list.
534 **/ 534 **/
535 void scsi_exit_devinfo(void) 535 void scsi_exit_devinfo(void)
536 { 536 {
537 struct list_head *lh, *lh_next; 537 struct list_head *lh, *lh_next;
538 struct scsi_dev_info_list *devinfo; 538 struct scsi_dev_info_list *devinfo;
539 539
540 #ifdef CONFIG_SCSI_PROC_FS 540 #ifdef CONFIG_SCSI_PROC_FS
541 remove_proc_entry("scsi/device_info", NULL); 541 remove_proc_entry("scsi/device_info", NULL);
542 #endif 542 #endif
543 543
544 list_for_each_safe(lh, lh_next, &scsi_dev_info_list) { 544 list_for_each_safe(lh, lh_next, &scsi_dev_info_list) {
545 devinfo = list_entry(lh, struct scsi_dev_info_list, 545 devinfo = list_entry(lh, struct scsi_dev_info_list,
546 dev_info_list); 546 dev_info_list);
547 kfree(devinfo); 547 kfree(devinfo);
548 } 548 }
549 } 549 }
550 550
551 /** 551 /**
552 * scsi_dev_list_init - set up the dynamic device list. 552 * scsi_init_devinfo - set up the dynamic device list.
553 * 553 *
554 * Description: 554 * Description:
555 * Add command line entries from scsi_dev_flags, then add 555 * Add command line entries from scsi_dev_flags, then add
556 * scsi_static_device_list entries to the scsi device info list. 556 * scsi_static_device_list entries to the scsi device info list.
557 */ 557 */
558 int __init scsi_init_devinfo(void) 558 int __init scsi_init_devinfo(void)
559 { 559 {
560 #ifdef CONFIG_SCSI_PROC_FS 560 #ifdef CONFIG_SCSI_PROC_FS
561 struct proc_dir_entry *p; 561 struct proc_dir_entry *p;
562 #endif 562 #endif
563 int error, i; 563 int error, i;
564 564
565 error = scsi_dev_info_list_add_str(scsi_dev_flags); 565 error = scsi_dev_info_list_add_str(scsi_dev_flags);
566 if (error) 566 if (error)
567 return error; 567 return error;
568 568
569 for (i = 0; scsi_static_device_list[i].vendor; i++) { 569 for (i = 0; scsi_static_device_list[i].vendor; i++) {
570 error = scsi_dev_info_list_add(1 /* compatibile */, 570 error = scsi_dev_info_list_add(1 /* compatibile */,
571 scsi_static_device_list[i].vendor, 571 scsi_static_device_list[i].vendor,
572 scsi_static_device_list[i].model, 572 scsi_static_device_list[i].model,
573 NULL, 573 NULL,
574 scsi_static_device_list[i].flags); 574 scsi_static_device_list[i].flags);
575 if (error) 575 if (error)
576 goto out; 576 goto out;
577 } 577 }
578 578
579 #ifdef CONFIG_SCSI_PROC_FS 579 #ifdef CONFIG_SCSI_PROC_FS
580 p = create_proc_entry("scsi/device_info", 0, NULL); 580 p = create_proc_entry("scsi/device_info", 0, NULL);
581 if (!p) { 581 if (!p) {
582 error = -ENOMEM; 582 error = -ENOMEM;
583 goto out; 583 goto out;
584 } 584 }
585 585
586 p->owner = THIS_MODULE; 586 p->owner = THIS_MODULE;
587 p->get_info = proc_scsi_devinfo_read; 587 p->get_info = proc_scsi_devinfo_read;
588 p->write_proc = proc_scsi_devinfo_write; 588 p->write_proc = proc_scsi_devinfo_write;
589 #endif /* CONFIG_SCSI_PROC_FS */ 589 #endif /* CONFIG_SCSI_PROC_FS */
590 590
591 out: 591 out:
592 if (error) 592 if (error)
593 scsi_exit_devinfo(); 593 scsi_exit_devinfo();
594 return error; 594 return error;
595 } 595 }
596 596