Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b32aaffcdc694650d299a59501c5b3e267fca343

Authored by Matthew Wilcox
Committed by James Bottomley
1 parent 4797215389
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] Use ARRAY_SIZE in spi_print_msg 

Replace the custom NO_*_MSGS definitions with uses of ARRAY_SIZE.
This fixes a bug in the definition of NO_EXTENDED_MSGS.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

drivers/scsi/scsi_transport_spi.c
Diff comments   View file @ b32aaff
1 /* 1 /*
2 * Parallel SCSI (SPI) transport specific attributes exported to sysfs. 2 * Parallel SCSI (SPI) transport specific attributes exported to sysfs.
3 * 3 *
4 * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved. 4 * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved.
5 * Copyright (c) 2004, 2005 James Bottomley <James.Bottomley@SteelEye.com> 5 * Copyright (c) 2004, 2005 James Bottomley <James.Bottomley@SteelEye.com>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */ 20 */
21 #include <linux/config.h> 21 #include <linux/config.h>
22 #include <linux/ctype.h> 22 #include <linux/ctype.h>
23 #include <linux/init.h> 23 #include <linux/init.h>
24 #include <linux/module.h> 24 #include <linux/module.h>
25 #include <linux/workqueue.h> 25 #include <linux/workqueue.h>
26 #include <linux/blkdev.h> 26 #include <linux/blkdev.h>
27 #include <asm/semaphore.h> 27 #include <asm/semaphore.h>
28 #include <scsi/scsi.h> 28 #include <scsi/scsi.h>
29 #include "scsi_priv.h" 29 #include "scsi_priv.h"
30 #include <scsi/scsi_device.h> 30 #include <scsi/scsi_device.h>
31 #include <scsi/scsi_host.h> 31 #include <scsi/scsi_host.h>
32 #include <scsi/scsi_cmnd.h> 32 #include <scsi/scsi_cmnd.h>
33 #include <scsi/scsi_eh.h> 33 #include <scsi/scsi_eh.h>
34 #include <scsi/scsi_transport.h> 34 #include <scsi/scsi_transport.h>
35 #include <scsi/scsi_transport_spi.h> 35 #include <scsi/scsi_transport_spi.h>
36 36
37 #define SPI_NUM_ATTRS 14 /* increase this if you add attributes */ 37 #define SPI_NUM_ATTRS 14 /* increase this if you add attributes */
38 #define SPI_OTHER_ATTRS 1 /* Increase this if you add "always 38 #define SPI_OTHER_ATTRS 1 /* Increase this if you add "always
39 * on" attributes */ 39 * on" attributes */
40 #define SPI_HOST_ATTRS 1 40 #define SPI_HOST_ATTRS 1
41 41
42 #define SPI_MAX_ECHO_BUFFER_SIZE 4096 42 #define SPI_MAX_ECHO_BUFFER_SIZE 4096
43 43
44 #define DV_LOOPS 3 44 #define DV_LOOPS 3
45 #define DV_TIMEOUT (10*HZ) 45 #define DV_TIMEOUT (10*HZ)
46 #define DV_RETRIES 3 /* should only need at most 46 #define DV_RETRIES 3 /* should only need at most
47 * two cc/ua clears */ 47 * two cc/ua clears */
48 48
49 /* Private data accessors (keep these out of the header file) */ 49 /* Private data accessors (keep these out of the header file) */
50 #define spi_dv_pending(x) (((struct spi_transport_attrs *)&(x)->starget_data)->dv_pending) 50 #define spi_dv_pending(x) (((struct spi_transport_attrs *)&(x)->starget_data)->dv_pending)
51 #define spi_dv_sem(x) (((struct spi_transport_attrs *)&(x)->starget_data)->dv_sem) 51 #define spi_dv_sem(x) (((struct spi_transport_attrs *)&(x)->starget_data)->dv_sem)
52 52
53 struct spi_internal { 53 struct spi_internal {
54 struct scsi_transport_template t; 54 struct scsi_transport_template t;
55 struct spi_function_template *f; 55 struct spi_function_template *f;
56 /* The actual attributes */ 56 /* The actual attributes */
57 struct class_device_attribute private_attrs[SPI_NUM_ATTRS]; 57 struct class_device_attribute private_attrs[SPI_NUM_ATTRS];
58 /* The array of null terminated pointers to attributes 58 /* The array of null terminated pointers to attributes
59 * needed by scsi_sysfs.c */ 59 * needed by scsi_sysfs.c */
60 struct class_device_attribute *attrs[SPI_NUM_ATTRS + SPI_OTHER_ATTRS + 1]; 60 struct class_device_attribute *attrs[SPI_NUM_ATTRS + SPI_OTHER_ATTRS + 1];
61 struct class_device_attribute private_host_attrs[SPI_HOST_ATTRS]; 61 struct class_device_attribute private_host_attrs[SPI_HOST_ATTRS];
62 struct class_device_attribute *host_attrs[SPI_HOST_ATTRS + 1]; 62 struct class_device_attribute *host_attrs[SPI_HOST_ATTRS + 1];
63 }; 63 };
64 64
65 #define to_spi_internal(tmpl) container_of(tmpl, struct spi_internal, t) 65 #define to_spi_internal(tmpl) container_of(tmpl, struct spi_internal, t)
66 66
67 static const int ppr_to_ps[] = { 67 static const int ppr_to_ps[] = {
68 /* The PPR values 0-6 are reserved, fill them in when 68 /* The PPR values 0-6 are reserved, fill them in when
69 * the committee defines them */ 69 * the committee defines them */
70 -1, /* 0x00 */ 70 -1, /* 0x00 */
71 -1, /* 0x01 */ 71 -1, /* 0x01 */
72 -1, /* 0x02 */ 72 -1, /* 0x02 */
73 -1, /* 0x03 */ 73 -1, /* 0x03 */
74 -1, /* 0x04 */ 74 -1, /* 0x04 */
75 -1, /* 0x05 */ 75 -1, /* 0x05 */
76 -1, /* 0x06 */ 76 -1, /* 0x06 */
77 3125, /* 0x07 */ 77 3125, /* 0x07 */
78 6250, /* 0x08 */ 78 6250, /* 0x08 */
79 12500, /* 0x09 */ 79 12500, /* 0x09 */
80 25000, /* 0x0a */ 80 25000, /* 0x0a */
81 30300, /* 0x0b */ 81 30300, /* 0x0b */
82 50000, /* 0x0c */ 82 50000, /* 0x0c */
83 }; 83 };
84 /* The PPR values at which you calculate the period in ns by multiplying 84 /* The PPR values at which you calculate the period in ns by multiplying
85 * by 4 */ 85 * by 4 */
86 #define SPI_STATIC_PPR 0x0c 86 #define SPI_STATIC_PPR 0x0c
87 87
88 static int sprint_frac(char *dest, int value, int denom) 88 static int sprint_frac(char *dest, int value, int denom)
89 { 89 {
90 int frac = value % denom; 90 int frac = value % denom;
91 int result = sprintf(dest, "%d", value / denom); 91 int result = sprintf(dest, "%d", value / denom);
92 92
93 if (frac == 0) 93 if (frac == 0)
94 return result; 94 return result;
95 dest[result++] = '.'; 95 dest[result++] = '.';
96 96
97 do { 97 do {
98 denom /= 10; 98 denom /= 10;
99 sprintf(dest + result, "%d", frac / denom); 99 sprintf(dest + result, "%d", frac / denom);
100 result++; 100 result++;
101 frac %= denom; 101 frac %= denom;
102 } while (frac); 102 } while (frac);
103 103
104 dest[result++] = '\0'; 104 dest[result++] = '\0';
105 return result; 105 return result;
106 } 106 }
107 107
108 static int spi_execute(struct scsi_device *sdev, const void *cmd, 108 static int spi_execute(struct scsi_device *sdev, const void *cmd,
109 enum dma_data_direction dir, 109 enum dma_data_direction dir,
110 void *buffer, unsigned bufflen, 110 void *buffer, unsigned bufflen,
111 struct scsi_sense_hdr *sshdr) 111 struct scsi_sense_hdr *sshdr)
112 { 112 {
113 int i, result; 113 int i, result;
114 unsigned char sense[SCSI_SENSE_BUFFERSIZE]; 114 unsigned char sense[SCSI_SENSE_BUFFERSIZE];
115 115
116 for(i = 0; i < DV_RETRIES; i++) { 116 for(i = 0; i < DV_RETRIES; i++) {
117 result = scsi_execute(sdev, cmd, dir, buffer, bufflen, 117 result = scsi_execute(sdev, cmd, dir, buffer, bufflen,
118 sense, DV_TIMEOUT, /* retries */ 1, 118 sense, DV_TIMEOUT, /* retries */ 1,
119 REQ_FAILFAST); 119 REQ_FAILFAST);
120 if (result & DRIVER_SENSE) { 120 if (result & DRIVER_SENSE) {
121 struct scsi_sense_hdr sshdr_tmp; 121 struct scsi_sense_hdr sshdr_tmp;
122 if (!sshdr) 122 if (!sshdr)
123 sshdr = &sshdr_tmp; 123 sshdr = &sshdr_tmp;
124 124
125 if (scsi_normalize_sense(sense, sizeof(*sense), 125 if (scsi_normalize_sense(sense, sizeof(*sense),
126 sshdr) 126 sshdr)
127 && sshdr->sense_key == UNIT_ATTENTION) 127 && sshdr->sense_key == UNIT_ATTENTION)
128 continue; 128 continue;
129 } 129 }
130 break; 130 break;
131 } 131 }
132 return result; 132 return result;
133 } 133 }
134 134
135 static struct { 135 static struct {
136 enum spi_signal_type value; 136 enum spi_signal_type value;
137 char *name; 137 char *name;
138 } signal_types[] = { 138 } signal_types[] = {
139 { SPI_SIGNAL_UNKNOWN, "unknown" }, 139 { SPI_SIGNAL_UNKNOWN, "unknown" },
140 { SPI_SIGNAL_SE, "SE" }, 140 { SPI_SIGNAL_SE, "SE" },
141 { SPI_SIGNAL_LVD, "LVD" }, 141 { SPI_SIGNAL_LVD, "LVD" },
142 { SPI_SIGNAL_HVD, "HVD" }, 142 { SPI_SIGNAL_HVD, "HVD" },
143 }; 143 };
144 144
145 static inline const char *spi_signal_to_string(enum spi_signal_type type) 145 static inline const char *spi_signal_to_string(enum spi_signal_type type)
146 { 146 {
147 int i; 147 int i;
148 148
149 for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) { 149 for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) {
150 if (type == signal_types[i].value) 150 if (type == signal_types[i].value)
151 return signal_types[i].name; 151 return signal_types[i].name;
152 } 152 }
153 return NULL; 153 return NULL;
154 } 154 }
155 static inline enum spi_signal_type spi_signal_to_value(const char *name) 155 static inline enum spi_signal_type spi_signal_to_value(const char *name)
156 { 156 {
157 int i, len; 157 int i, len;
158 158
159 for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) { 159 for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) {
160 len = strlen(signal_types[i].name); 160 len = strlen(signal_types[i].name);
161 if (strncmp(name, signal_types[i].name, len) == 0 && 161 if (strncmp(name, signal_types[i].name, len) == 0 &&
162 (name[len] == '\n' || name[len] == '\0')) 162 (name[len] == '\n' || name[len] == '\0'))
163 return signal_types[i].value; 163 return signal_types[i].value;
164 } 164 }
165 return SPI_SIGNAL_UNKNOWN; 165 return SPI_SIGNAL_UNKNOWN;
166 } 166 }
167 167
168 static int spi_host_setup(struct transport_container *tc, struct device *dev, 168 static int spi_host_setup(struct transport_container *tc, struct device *dev,
169 struct class_device *cdev) 169 struct class_device *cdev)
170 { 170 {
171 struct Scsi_Host *shost = dev_to_shost(dev); 171 struct Scsi_Host *shost = dev_to_shost(dev);
172 172
173 spi_signalling(shost) = SPI_SIGNAL_UNKNOWN; 173 spi_signalling(shost) = SPI_SIGNAL_UNKNOWN;
174 174
175 return 0; 175 return 0;
176 } 176 }
177 177
178 static DECLARE_TRANSPORT_CLASS(spi_host_class, 178 static DECLARE_TRANSPORT_CLASS(spi_host_class,
179 "spi_host", 179 "spi_host",
180 spi_host_setup, 180 spi_host_setup,
181 NULL, 181 NULL,
182 NULL); 182 NULL);
183 183
184 static int spi_host_match(struct attribute_container *cont, 184 static int spi_host_match(struct attribute_container *cont,
185 struct device *dev) 185 struct device *dev)
186 { 186 {
187 struct Scsi_Host *shost; 187 struct Scsi_Host *shost;
188 struct spi_internal *i; 188 struct spi_internal *i;
189 189
190 if (!scsi_is_host_device(dev)) 190 if (!scsi_is_host_device(dev))
191 return 0; 191 return 0;
192 192
193 shost = dev_to_shost(dev); 193 shost = dev_to_shost(dev);
194 if (!shost->transportt || shost->transportt->host_attrs.ac.class 194 if (!shost->transportt || shost->transportt->host_attrs.ac.class
195 != &spi_host_class.class) 195 != &spi_host_class.class)
196 return 0; 196 return 0;
197 197
198 i = to_spi_internal(shost->transportt); 198 i = to_spi_internal(shost->transportt);
199 199
200 return &i->t.host_attrs.ac == cont; 200 return &i->t.host_attrs.ac == cont;
201 } 201 }
202 202
203 static int spi_device_configure(struct transport_container *tc, 203 static int spi_device_configure(struct transport_container *tc,
204 struct device *dev, 204 struct device *dev,
205 struct class_device *cdev) 205 struct class_device *cdev)
206 { 206 {
207 struct scsi_device *sdev = to_scsi_device(dev); 207 struct scsi_device *sdev = to_scsi_device(dev);
208 struct scsi_target *starget = sdev->sdev_target; 208 struct scsi_target *starget = sdev->sdev_target;
209 209
210 /* Populate the target capability fields with the values 210 /* Populate the target capability fields with the values
211 * gleaned from the device inquiry */ 211 * gleaned from the device inquiry */
212 212
213 spi_support_sync(starget) = scsi_device_sync(sdev); 213 spi_support_sync(starget) = scsi_device_sync(sdev);
214 spi_support_wide(starget) = scsi_device_wide(sdev); 214 spi_support_wide(starget) = scsi_device_wide(sdev);
215 spi_support_dt(starget) = scsi_device_dt(sdev); 215 spi_support_dt(starget) = scsi_device_dt(sdev);
216 spi_support_dt_only(starget) = scsi_device_dt_only(sdev); 216 spi_support_dt_only(starget) = scsi_device_dt_only(sdev);
217 spi_support_ius(starget) = scsi_device_ius(sdev); 217 spi_support_ius(starget) = scsi_device_ius(sdev);
218 spi_support_qas(starget) = scsi_device_qas(sdev); 218 spi_support_qas(starget) = scsi_device_qas(sdev);
219 219
220 return 0; 220 return 0;
221 } 221 }
222 222
223 static int spi_setup_transport_attrs(struct transport_container *tc, 223 static int spi_setup_transport_attrs(struct transport_container *tc,
224 struct device *dev, 224 struct device *dev,
225 struct class_device *cdev) 225 struct class_device *cdev)
226 { 226 {
227 struct scsi_target *starget = to_scsi_target(dev); 227 struct scsi_target *starget = to_scsi_target(dev);
228 228
229 spi_period(starget) = -1; /* illegal value */ 229 spi_period(starget) = -1; /* illegal value */
230 spi_min_period(starget) = 0; 230 spi_min_period(starget) = 0;
231 spi_offset(starget) = 0; /* async */ 231 spi_offset(starget) = 0; /* async */
232 spi_max_offset(starget) = 255; 232 spi_max_offset(starget) = 255;
233 spi_width(starget) = 0; /* narrow */ 233 spi_width(starget) = 0; /* narrow */
234 spi_max_width(starget) = 1; 234 spi_max_width(starget) = 1;
235 spi_iu(starget) = 0; /* no IU */ 235 spi_iu(starget) = 0; /* no IU */
236 spi_dt(starget) = 0; /* ST */ 236 spi_dt(starget) = 0; /* ST */
237 spi_qas(starget) = 0; 237 spi_qas(starget) = 0;
238 spi_wr_flow(starget) = 0; 238 spi_wr_flow(starget) = 0;
239 spi_rd_strm(starget) = 0; 239 spi_rd_strm(starget) = 0;
240 spi_rti(starget) = 0; 240 spi_rti(starget) = 0;
241 spi_pcomp_en(starget) = 0; 241 spi_pcomp_en(starget) = 0;
242 spi_hold_mcs(starget) = 0; 242 spi_hold_mcs(starget) = 0;
243 spi_dv_pending(starget) = 0; 243 spi_dv_pending(starget) = 0;
244 spi_initial_dv(starget) = 0; 244 spi_initial_dv(starget) = 0;
245 init_MUTEX(&spi_dv_sem(starget)); 245 init_MUTEX(&spi_dv_sem(starget));
246 246
247 return 0; 247 return 0;
248 } 248 }
249 249
250 #define spi_transport_show_simple(field, format_string) \ 250 #define spi_transport_show_simple(field, format_string) \
251 \ 251 \
252 static ssize_t \ 252 static ssize_t \
253 show_spi_transport_##field(struct class_device *cdev, char *buf) \ 253 show_spi_transport_##field(struct class_device *cdev, char *buf) \
254 { \ 254 { \
255 struct scsi_target *starget = transport_class_to_starget(cdev); \ 255 struct scsi_target *starget = transport_class_to_starget(cdev); \
256 struct spi_transport_attrs *tp; \ 256 struct spi_transport_attrs *tp; \
257 \ 257 \
258 tp = (struct spi_transport_attrs *)&starget->starget_data; \ 258 tp = (struct spi_transport_attrs *)&starget->starget_data; \
259 return snprintf(buf, 20, format_string, tp->field); \ 259 return snprintf(buf, 20, format_string, tp->field); \
260 } 260 }
261 261
262 #define spi_transport_store_simple(field, format_string) \ 262 #define spi_transport_store_simple(field, format_string) \
263 \ 263 \
264 static ssize_t \ 264 static ssize_t \
265 store_spi_transport_##field(struct class_device *cdev, const char *buf, \ 265 store_spi_transport_##field(struct class_device *cdev, const char *buf, \
266 size_t count) \ 266 size_t count) \
267 { \ 267 { \
268 int val; \ 268 int val; \
269 struct scsi_target *starget = transport_class_to_starget(cdev); \ 269 struct scsi_target *starget = transport_class_to_starget(cdev); \
270 struct spi_transport_attrs *tp; \ 270 struct spi_transport_attrs *tp; \
271 \ 271 \
272 tp = (struct spi_transport_attrs *)&starget->starget_data; \ 272 tp = (struct spi_transport_attrs *)&starget->starget_data; \
273 val = simple_strtoul(buf, NULL, 0); \ 273 val = simple_strtoul(buf, NULL, 0); \
274 tp->field = val; \ 274 tp->field = val; \
275 return count; \ 275 return count; \
276 } 276 }
277 277
278 #define spi_transport_show_function(field, format_string) \ 278 #define spi_transport_show_function(field, format_string) \
279 \ 279 \
280 static ssize_t \ 280 static ssize_t \
281 show_spi_transport_##field(struct class_device *cdev, char *buf) \ 281 show_spi_transport_##field(struct class_device *cdev, char *buf) \
282 { \ 282 { \
283 struct scsi_target *starget = transport_class_to_starget(cdev); \ 283 struct scsi_target *starget = transport_class_to_starget(cdev); \
284 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); \ 284 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); \
285 struct spi_transport_attrs *tp; \ 285 struct spi_transport_attrs *tp; \
286 struct spi_internal *i = to_spi_internal(shost->transportt); \ 286 struct spi_internal *i = to_spi_internal(shost->transportt); \
287 tp = (struct spi_transport_attrs *)&starget->starget_data; \ 287 tp = (struct spi_transport_attrs *)&starget->starget_data; \
288 if (i->f->get_##field) \ 288 if (i->f->get_##field) \
289 i->f->get_##field(starget); \ 289 i->f->get_##field(starget); \
290 return snprintf(buf, 20, format_string, tp->field); \ 290 return snprintf(buf, 20, format_string, tp->field); \
291 } 291 }
292 292
293 #define spi_transport_store_function(field, format_string) \ 293 #define spi_transport_store_function(field, format_string) \
294 static ssize_t \ 294 static ssize_t \
295 store_spi_transport_##field(struct class_device *cdev, const char *buf, \ 295 store_spi_transport_##field(struct class_device *cdev, const char *buf, \
296 size_t count) \ 296 size_t count) \
297 { \ 297 { \
298 int val; \ 298 int val; \
299 struct scsi_target *starget = transport_class_to_starget(cdev); \ 299 struct scsi_target *starget = transport_class_to_starget(cdev); \
300 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); \ 300 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); \
301 struct spi_internal *i = to_spi_internal(shost->transportt); \ 301 struct spi_internal *i = to_spi_internal(shost->transportt); \
302 \ 302 \
303 val = simple_strtoul(buf, NULL, 0); \ 303 val = simple_strtoul(buf, NULL, 0); \
304 i->f->set_##field(starget, val); \ 304 i->f->set_##field(starget, val); \
305 return count; \ 305 return count; \
306 } 306 }
307 307
308 #define spi_transport_store_max(field, format_string) \ 308 #define spi_transport_store_max(field, format_string) \
309 static ssize_t \ 309 static ssize_t \
310 store_spi_transport_##field(struct class_device *cdev, const char *buf, \ 310 store_spi_transport_##field(struct class_device *cdev, const char *buf, \
311 size_t count) \ 311 size_t count) \
312 { \ 312 { \
313 int val; \ 313 int val; \
314 struct scsi_target *starget = transport_class_to_starget(cdev); \ 314 struct scsi_target *starget = transport_class_to_starget(cdev); \
315 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); \ 315 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); \
316 struct spi_internal *i = to_spi_internal(shost->transportt); \ 316 struct spi_internal *i = to_spi_internal(shost->transportt); \
317 struct spi_transport_attrs *tp \ 317 struct spi_transport_attrs *tp \
318 = (struct spi_transport_attrs *)&starget->starget_data; \ 318 = (struct spi_transport_attrs *)&starget->starget_data; \
319 \ 319 \
320 val = simple_strtoul(buf, NULL, 0); \ 320 val = simple_strtoul(buf, NULL, 0); \
321 if (val > tp->max_##field) \ 321 if (val > tp->max_##field) \
322 val = tp->max_##field; \ 322 val = tp->max_##field; \
323 i->f->set_##field(starget, val); \ 323 i->f->set_##field(starget, val); \
324 return count; \ 324 return count; \
325 } 325 }
326 326
327 #define spi_transport_rd_attr(field, format_string) \ 327 #define spi_transport_rd_attr(field, format_string) \
328 spi_transport_show_function(field, format_string) \ 328 spi_transport_show_function(field, format_string) \
329 spi_transport_store_function(field, format_string) \ 329 spi_transport_store_function(field, format_string) \
330 static CLASS_DEVICE_ATTR(field, S_IRUGO | S_IWUSR, \ 330 static CLASS_DEVICE_ATTR(field, S_IRUGO | S_IWUSR, \
331 show_spi_transport_##field, \ 331 show_spi_transport_##field, \
332 store_spi_transport_##field); 332 store_spi_transport_##field);
333 333
334 #define spi_transport_simple_attr(field, format_string) \ 334 #define spi_transport_simple_attr(field, format_string) \
335 spi_transport_show_simple(field, format_string) \ 335 spi_transport_show_simple(field, format_string) \
336 spi_transport_store_simple(field, format_string) \ 336 spi_transport_store_simple(field, format_string) \
337 static CLASS_DEVICE_ATTR(field, S_IRUGO | S_IWUSR, \ 337 static CLASS_DEVICE_ATTR(field, S_IRUGO | S_IWUSR, \
338 show_spi_transport_##field, \ 338 show_spi_transport_##field, \
339 store_spi_transport_##field); 339 store_spi_transport_##field);
340 340
341 #define spi_transport_max_attr(field, format_string) \ 341 #define spi_transport_max_attr(field, format_string) \
342 spi_transport_show_function(field, format_string) \ 342 spi_transport_show_function(field, format_string) \
343 spi_transport_store_max(field, format_string) \ 343 spi_transport_store_max(field, format_string) \
344 spi_transport_simple_attr(max_##field, format_string) \ 344 spi_transport_simple_attr(max_##field, format_string) \
345 static CLASS_DEVICE_ATTR(field, S_IRUGO | S_IWUSR, \ 345 static CLASS_DEVICE_ATTR(field, S_IRUGO | S_IWUSR, \
346 show_spi_transport_##field, \ 346 show_spi_transport_##field, \
347 store_spi_transport_##field); 347 store_spi_transport_##field);
348 348
349 /* The Parallel SCSI Tranport Attributes: */ 349 /* The Parallel SCSI Tranport Attributes: */
350 spi_transport_max_attr(offset, "%d\n"); 350 spi_transport_max_attr(offset, "%d\n");
351 spi_transport_max_attr(width, "%d\n"); 351 spi_transport_max_attr(width, "%d\n");
352 spi_transport_rd_attr(iu, "%d\n"); 352 spi_transport_rd_attr(iu, "%d\n");
353 spi_transport_rd_attr(dt, "%d\n"); 353 spi_transport_rd_attr(dt, "%d\n");
354 spi_transport_rd_attr(qas, "%d\n"); 354 spi_transport_rd_attr(qas, "%d\n");
355 spi_transport_rd_attr(wr_flow, "%d\n"); 355 spi_transport_rd_attr(wr_flow, "%d\n");
356 spi_transport_rd_attr(rd_strm, "%d\n"); 356 spi_transport_rd_attr(rd_strm, "%d\n");
357 spi_transport_rd_attr(rti, "%d\n"); 357 spi_transport_rd_attr(rti, "%d\n");
358 spi_transport_rd_attr(pcomp_en, "%d\n"); 358 spi_transport_rd_attr(pcomp_en, "%d\n");
359 spi_transport_rd_attr(hold_mcs, "%d\n"); 359 spi_transport_rd_attr(hold_mcs, "%d\n");
360 360
361 /* we only care about the first child device so we return 1 */ 361 /* we only care about the first child device so we return 1 */
362 static int child_iter(struct device *dev, void *data) 362 static int child_iter(struct device *dev, void *data)
363 { 363 {
364 struct scsi_device *sdev = to_scsi_device(dev); 364 struct scsi_device *sdev = to_scsi_device(dev);
365 365
366 spi_dv_device(sdev); 366 spi_dv_device(sdev);
367 return 1; 367 return 1;
368 } 368 }
369 369
370 static ssize_t 370 static ssize_t
371 store_spi_revalidate(struct class_device *cdev, const char *buf, size_t count) 371 store_spi_revalidate(struct class_device *cdev, const char *buf, size_t count)
372 { 372 {
373 struct scsi_target *starget = transport_class_to_starget(cdev); 373 struct scsi_target *starget = transport_class_to_starget(cdev);
374 374
375 device_for_each_child(&starget->dev, NULL, child_iter); 375 device_for_each_child(&starget->dev, NULL, child_iter);
376 return count; 376 return count;
377 } 377 }
378 static CLASS_DEVICE_ATTR(revalidate, S_IWUSR, NULL, store_spi_revalidate); 378 static CLASS_DEVICE_ATTR(revalidate, S_IWUSR, NULL, store_spi_revalidate);
379 379
380 /* Translate the period into ns according to the current spec 380 /* Translate the period into ns according to the current spec
381 * for SDTR/PPR messages */ 381 * for SDTR/PPR messages */
382 static ssize_t 382 static ssize_t
383 show_spi_transport_period_helper(struct class_device *cdev, char *buf, 383 show_spi_transport_period_helper(struct class_device *cdev, char *buf,
384 int period) 384 int period)
385 { 385 {
386 int len, picosec; 386 int len, picosec;
387 387
388 if (period < 0 || period > 0xff) { 388 if (period < 0 || period > 0xff) {
389 picosec = -1; 389 picosec = -1;
390 } else if (period <= SPI_STATIC_PPR) { 390 } else if (period <= SPI_STATIC_PPR) {
391 picosec = ppr_to_ps[period]; 391 picosec = ppr_to_ps[period];
392 } else { 392 } else {
393 picosec = period * 4000; 393 picosec = period * 4000;
394 } 394 }
395 395
396 if (picosec == -1) { 396 if (picosec == -1) {
397 len = sprintf(buf, "reserved"); 397 len = sprintf(buf, "reserved");
398 } else { 398 } else {
399 len = sprint_frac(buf, picosec, 1000); 399 len = sprint_frac(buf, picosec, 1000);
400 } 400 }
401 401
402 buf[len++] = '\n'; 402 buf[len++] = '\n';
403 buf[len] = '\0'; 403 buf[len] = '\0';
404 return len; 404 return len;
405 } 405 }
406 406
407 static ssize_t 407 static ssize_t
408 store_spi_transport_period_helper(struct class_device *cdev, const char *buf, 408 store_spi_transport_period_helper(struct class_device *cdev, const char *buf,
409 size_t count, int *periodp) 409 size_t count, int *periodp)
410 { 410 {
411 int j, picosec, period = -1; 411 int j, picosec, period = -1;
412 char *endp; 412 char *endp;
413 413
414 picosec = simple_strtoul(buf, &endp, 10) * 1000; 414 picosec = simple_strtoul(buf, &endp, 10) * 1000;
415 if (*endp == '.') { 415 if (*endp == '.') {
416 int mult = 100; 416 int mult = 100;
417 do { 417 do {
418 endp++; 418 endp++;
419 if (!isdigit(*endp)) 419 if (!isdigit(*endp))
420 break; 420 break;
421 picosec += (*endp - '0') * mult; 421 picosec += (*endp - '0') * mult;
422 mult /= 10; 422 mult /= 10;
423 } while (mult > 0); 423 } while (mult > 0);
424 } 424 }
425 425
426 for (j = 0; j <= SPI_STATIC_PPR; j++) { 426 for (j = 0; j <= SPI_STATIC_PPR; j++) {
427 if (ppr_to_ps[j] < picosec) 427 if (ppr_to_ps[j] < picosec)
428 continue; 428 continue;
429 period = j; 429 period = j;
430 break; 430 break;
431 } 431 }
432 432
433 if (period == -1) 433 if (period == -1)
434 period = picosec / 4000; 434 period = picosec / 4000;
435 435
436 if (period > 0xff) 436 if (period > 0xff)
437 period = 0xff; 437 period = 0xff;
438 438
439 *periodp = period; 439 *periodp = period;
440 440
441 return count; 441 return count;
442 } 442 }
443 443
444 static ssize_t 444 static ssize_t
445 show_spi_transport_period(struct class_device *cdev, char *buf) 445 show_spi_transport_period(struct class_device *cdev, char *buf)
446 { 446 {
447 struct scsi_target *starget = transport_class_to_starget(cdev); 447 struct scsi_target *starget = transport_class_to_starget(cdev);
448 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); 448 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
449 struct spi_internal *i = to_spi_internal(shost->transportt); 449 struct spi_internal *i = to_spi_internal(shost->transportt);
450 struct spi_transport_attrs *tp = 450 struct spi_transport_attrs *tp =
451 (struct spi_transport_attrs *)&starget->starget_data; 451 (struct spi_transport_attrs *)&starget->starget_data;
452 452
453 if (i->f->get_period) 453 if (i->f->get_period)
454 i->f->get_period(starget); 454 i->f->get_period(starget);
455 455
456 return show_spi_transport_period_helper(cdev, buf, tp->period); 456 return show_spi_transport_period_helper(cdev, buf, tp->period);
457 } 457 }
458 458
459 static ssize_t 459 static ssize_t
460 store_spi_transport_period(struct class_device *cdev, const char *buf, 460 store_spi_transport_period(struct class_device *cdev, const char *buf,
461 size_t count) 461 size_t count)
462 { 462 {
463 struct scsi_target *starget = transport_class_to_starget(cdev); 463 struct scsi_target *starget = transport_class_to_starget(cdev);
464 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); 464 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
465 struct spi_internal *i = to_spi_internal(shost->transportt); 465 struct spi_internal *i = to_spi_internal(shost->transportt);
466 struct spi_transport_attrs *tp = 466 struct spi_transport_attrs *tp =
467 (struct spi_transport_attrs *)&starget->starget_data; 467 (struct spi_transport_attrs *)&starget->starget_data;
468 int period, retval; 468 int period, retval;
469 469
470 retval = store_spi_transport_period_helper(cdev, buf, count, &period); 470 retval = store_spi_transport_period_helper(cdev, buf, count, &period);
471 471
472 if (period < tp->min_period) 472 if (period < tp->min_period)
473 period = tp->min_period; 473 period = tp->min_period;
474 474
475 i->f->set_period(starget, period); 475 i->f->set_period(starget, period);
476 476
477 return retval; 477 return retval;
478 } 478 }
479 479
480 static CLASS_DEVICE_ATTR(period, S_IRUGO | S_IWUSR, 480 static CLASS_DEVICE_ATTR(period, S_IRUGO | S_IWUSR,
481 show_spi_transport_period, 481 show_spi_transport_period,
482 store_spi_transport_period); 482 store_spi_transport_period);
483 483
484 static ssize_t 484 static ssize_t
485 show_spi_transport_min_period(struct class_device *cdev, char *buf) 485 show_spi_transport_min_period(struct class_device *cdev, char *buf)
486 { 486 {
487 struct scsi_target *starget = transport_class_to_starget(cdev); 487 struct scsi_target *starget = transport_class_to_starget(cdev);
488 struct spi_transport_attrs *tp = 488 struct spi_transport_attrs *tp =
489 (struct spi_transport_attrs *)&starget->starget_data; 489 (struct spi_transport_attrs *)&starget->starget_data;
490 490
491 return show_spi_transport_period_helper(cdev, buf, tp->min_period); 491 return show_spi_transport_period_helper(cdev, buf, tp->min_period);
492 } 492 }
493 493
494 static ssize_t 494 static ssize_t
495 store_spi_transport_min_period(struct class_device *cdev, const char *buf, 495 store_spi_transport_min_period(struct class_device *cdev, const char *buf,
496 size_t count) 496 size_t count)
497 { 497 {
498 struct scsi_target *starget = transport_class_to_starget(cdev); 498 struct scsi_target *starget = transport_class_to_starget(cdev);
499 struct spi_transport_attrs *tp = 499 struct spi_transport_attrs *tp =
500 (struct spi_transport_attrs *)&starget->starget_data; 500 (struct spi_transport_attrs *)&starget->starget_data;
501 501
502 return store_spi_transport_period_helper(cdev, buf, count, 502 return store_spi_transport_period_helper(cdev, buf, count,
503 &tp->min_period); 503 &tp->min_period);
504 } 504 }
505 505
506 506
507 static CLASS_DEVICE_ATTR(min_period, S_IRUGO | S_IWUSR, 507 static CLASS_DEVICE_ATTR(min_period, S_IRUGO | S_IWUSR,
508 show_spi_transport_min_period, 508 show_spi_transport_min_period,
509 store_spi_transport_min_period); 509 store_spi_transport_min_period);
510 510
511 511
512 static ssize_t show_spi_host_signalling(struct class_device *cdev, char *buf) 512 static ssize_t show_spi_host_signalling(struct class_device *cdev, char *buf)
513 { 513 {
514 struct Scsi_Host *shost = transport_class_to_shost(cdev); 514 struct Scsi_Host *shost = transport_class_to_shost(cdev);
515 struct spi_internal *i = to_spi_internal(shost->transportt); 515 struct spi_internal *i = to_spi_internal(shost->transportt);
516 516
517 if (i->f->get_signalling) 517 if (i->f->get_signalling)
518 i->f->get_signalling(shost); 518 i->f->get_signalling(shost);
519 519
520 return sprintf(buf, "%s\n", spi_signal_to_string(spi_signalling(shost))); 520 return sprintf(buf, "%s\n", spi_signal_to_string(spi_signalling(shost)));
521 } 521 }
522 static ssize_t store_spi_host_signalling(struct class_device *cdev, 522 static ssize_t store_spi_host_signalling(struct class_device *cdev,
523 const char *buf, size_t count) 523 const char *buf, size_t count)
524 { 524 {
525 struct Scsi_Host *shost = transport_class_to_shost(cdev); 525 struct Scsi_Host *shost = transport_class_to_shost(cdev);
526 struct spi_internal *i = to_spi_internal(shost->transportt); 526 struct spi_internal *i = to_spi_internal(shost->transportt);
527 enum spi_signal_type type = spi_signal_to_value(buf); 527 enum spi_signal_type type = spi_signal_to_value(buf);
528 528
529 if (type != SPI_SIGNAL_UNKNOWN) 529 if (type != SPI_SIGNAL_UNKNOWN)
530 i->f->set_signalling(shost, type); 530 i->f->set_signalling(shost, type);
531 531
532 return count; 532 return count;
533 } 533 }
534 static CLASS_DEVICE_ATTR(signalling, S_IRUGO | S_IWUSR, 534 static CLASS_DEVICE_ATTR(signalling, S_IRUGO | S_IWUSR,
535 show_spi_host_signalling, 535 show_spi_host_signalling,
536 store_spi_host_signalling); 536 store_spi_host_signalling);
537 537
538 #define DV_SET(x, y) \ 538 #define DV_SET(x, y) \
539 if(i->f->set_##x) \ 539 if(i->f->set_##x) \
540 i->f->set_##x(sdev->sdev_target, y) 540 i->f->set_##x(sdev->sdev_target, y)
541 541
542 enum spi_compare_returns { 542 enum spi_compare_returns {
543 SPI_COMPARE_SUCCESS, 543 SPI_COMPARE_SUCCESS,
544 SPI_COMPARE_FAILURE, 544 SPI_COMPARE_FAILURE,
545 SPI_COMPARE_SKIP_TEST, 545 SPI_COMPARE_SKIP_TEST,
546 }; 546 };
547 547
548 548
549 /* This is for read/write Domain Validation: If the device supports 549 /* This is for read/write Domain Validation: If the device supports
550 * an echo buffer, we do read/write tests to it */ 550 * an echo buffer, we do read/write tests to it */
551 static enum spi_compare_returns 551 static enum spi_compare_returns
552 spi_dv_device_echo_buffer(struct scsi_device *sdev, u8 *buffer, 552 spi_dv_device_echo_buffer(struct scsi_device *sdev, u8 *buffer,
553 u8 *ptr, const int retries) 553 u8 *ptr, const int retries)
554 { 554 {
555 int len = ptr - buffer; 555 int len = ptr - buffer;
556 int j, k, r, result; 556 int j, k, r, result;
557 unsigned int pattern = 0x0000ffff; 557 unsigned int pattern = 0x0000ffff;
558 struct scsi_sense_hdr sshdr; 558 struct scsi_sense_hdr sshdr;
559 559
560 const char spi_write_buffer[] = { 560 const char spi_write_buffer[] = {
561 WRITE_BUFFER, 0x0a, 0, 0, 0, 0, 0, len >> 8, len & 0xff, 0 561 WRITE_BUFFER, 0x0a, 0, 0, 0, 0, 0, len >> 8, len & 0xff, 0
562 }; 562 };
563 const char spi_read_buffer[] = { 563 const char spi_read_buffer[] = {
564 READ_BUFFER, 0x0a, 0, 0, 0, 0, 0, len >> 8, len & 0xff, 0 564 READ_BUFFER, 0x0a, 0, 0, 0, 0, 0, len >> 8, len & 0xff, 0
565 }; 565 };
566 566
567 /* set up the pattern buffer. Doesn't matter if we spill 567 /* set up the pattern buffer. Doesn't matter if we spill
568 * slightly beyond since that's where the read buffer is */ 568 * slightly beyond since that's where the read buffer is */
569 for (j = 0; j < len; ) { 569 for (j = 0; j < len; ) {
570 570
571 /* fill the buffer with counting (test a) */ 571 /* fill the buffer with counting (test a) */
572 for ( ; j < min(len, 32); j++) 572 for ( ; j < min(len, 32); j++)
573 buffer[j] = j; 573 buffer[j] = j;
574 k = j; 574 k = j;
575 /* fill the buffer with alternating words of 0x0 and 575 /* fill the buffer with alternating words of 0x0 and
576 * 0xffff (test b) */ 576 * 0xffff (test b) */
577 for ( ; j < min(len, k + 32); j += 2) { 577 for ( ; j < min(len, k + 32); j += 2) {
578 u16 *word = (u16 *)&buffer[j]; 578 u16 *word = (u16 *)&buffer[j];
579 579
580 *word = (j & 0x02) ? 0x0000 : 0xffff; 580 *word = (j & 0x02) ? 0x0000 : 0xffff;
581 } 581 }
582 k = j; 582 k = j;
583 /* fill with crosstalk (alternating 0x5555 0xaaa) 583 /* fill with crosstalk (alternating 0x5555 0xaaa)
584 * (test c) */ 584 * (test c) */
585 for ( ; j < min(len, k + 32); j += 2) { 585 for ( ; j < min(len, k + 32); j += 2) {
586 u16 *word = (u16 *)&buffer[j]; 586 u16 *word = (u16 *)&buffer[j];
587 587
588 *word = (j & 0x02) ? 0x5555 : 0xaaaa; 588 *word = (j & 0x02) ? 0x5555 : 0xaaaa;
589 } 589 }
590 k = j; 590 k = j;
591 /* fill with shifting bits (test d) */ 591 /* fill with shifting bits (test d) */
592 for ( ; j < min(len, k + 32); j += 4) { 592 for ( ; j < min(len, k + 32); j += 4) {
593 u32 *word = (unsigned int *)&buffer[j]; 593 u32 *word = (unsigned int *)&buffer[j];
594 u32 roll = (pattern & 0x80000000) ? 1 : 0; 594 u32 roll = (pattern & 0x80000000) ? 1 : 0;
595 595
596 *word = pattern; 596 *word = pattern;
597 pattern = (pattern << 1) | roll; 597 pattern = (pattern << 1) | roll;
598 } 598 }
599 /* don't bother with random data (test e) */ 599 /* don't bother with random data (test e) */
600 } 600 }
601 601
602 for (r = 0; r < retries; r++) { 602 for (r = 0; r < retries; r++) {
603 result = spi_execute(sdev, spi_write_buffer, DMA_TO_DEVICE, 603 result = spi_execute(sdev, spi_write_buffer, DMA_TO_DEVICE,
604 buffer, len, &sshdr); 604 buffer, len, &sshdr);
605 if(result || !scsi_device_online(sdev)) { 605 if(result || !scsi_device_online(sdev)) {
606 606
607 scsi_device_set_state(sdev, SDEV_QUIESCE); 607 scsi_device_set_state(sdev, SDEV_QUIESCE);
608 if (scsi_sense_valid(&sshdr) 608 if (scsi_sense_valid(&sshdr)
609 && sshdr.sense_key == ILLEGAL_REQUEST 609 && sshdr.sense_key == ILLEGAL_REQUEST
610 /* INVALID FIELD IN CDB */ 610 /* INVALID FIELD IN CDB */
611 && sshdr.asc == 0x24 && sshdr.ascq == 0x00) 611 && sshdr.asc == 0x24 && sshdr.ascq == 0x00)
612 /* This would mean that the drive lied 612 /* This would mean that the drive lied
613 * to us about supporting an echo 613 * to us about supporting an echo
614 * buffer (unfortunately some Western 614 * buffer (unfortunately some Western
615 * Digital drives do precisely this) 615 * Digital drives do precisely this)
616 */ 616 */
617 return SPI_COMPARE_SKIP_TEST; 617 return SPI_COMPARE_SKIP_TEST;
618 618
619 619
620 sdev_printk(KERN_ERR, sdev, "Write Buffer failure %x\n", result); 620 sdev_printk(KERN_ERR, sdev, "Write Buffer failure %x\n", result);
621 return SPI_COMPARE_FAILURE; 621 return SPI_COMPARE_FAILURE;
622 } 622 }
623 623
624 memset(ptr, 0, len); 624 memset(ptr, 0, len);
625 spi_execute(sdev, spi_read_buffer, DMA_FROM_DEVICE, 625 spi_execute(sdev, spi_read_buffer, DMA_FROM_DEVICE,
626 ptr, len, NULL); 626 ptr, len, NULL);
627 scsi_device_set_state(sdev, SDEV_QUIESCE); 627 scsi_device_set_state(sdev, SDEV_QUIESCE);
628 628
629 if (memcmp(buffer, ptr, len) != 0) 629 if (memcmp(buffer, ptr, len) != 0)
630 return SPI_COMPARE_FAILURE; 630 return SPI_COMPARE_FAILURE;
631 } 631 }
632 return SPI_COMPARE_SUCCESS; 632 return SPI_COMPARE_SUCCESS;
633 } 633 }
634 634
635 /* This is for the simplest form of Domain Validation: a read test 635 /* This is for the simplest form of Domain Validation: a read test
636 * on the inquiry data from the device */ 636 * on the inquiry data from the device */
637 static enum spi_compare_returns 637 static enum spi_compare_returns
638 spi_dv_device_compare_inquiry(struct scsi_device *sdev, u8 *buffer, 638 spi_dv_device_compare_inquiry(struct scsi_device *sdev, u8 *buffer,
639 u8 *ptr, const int retries) 639 u8 *ptr, const int retries)
640 { 640 {
641 int r, result; 641 int r, result;
642 const int len = sdev->inquiry_len; 642 const int len = sdev->inquiry_len;
643 const char spi_inquiry[] = { 643 const char spi_inquiry[] = {
644 INQUIRY, 0, 0, 0, len, 0 644 INQUIRY, 0, 0, 0, len, 0
645 }; 645 };
646 646
647 for (r = 0; r < retries; r++) { 647 for (r = 0; r < retries; r++) {
648 memset(ptr, 0, len); 648 memset(ptr, 0, len);
649 649
650 result = spi_execute(sdev, spi_inquiry, DMA_FROM_DEVICE, 650 result = spi_execute(sdev, spi_inquiry, DMA_FROM_DEVICE,
651 ptr, len, NULL); 651 ptr, len, NULL);
652 652
653 if(result || !scsi_device_online(sdev)) { 653 if(result || !scsi_device_online(sdev)) {
654 scsi_device_set_state(sdev, SDEV_QUIESCE); 654 scsi_device_set_state(sdev, SDEV_QUIESCE);
655 return SPI_COMPARE_FAILURE; 655 return SPI_COMPARE_FAILURE;
656 } 656 }
657 657
658 /* If we don't have the inquiry data already, the 658 /* If we don't have the inquiry data already, the
659 * first read gets it */ 659 * first read gets it */
660 if (ptr == buffer) { 660 if (ptr == buffer) {
661 ptr += len; 661 ptr += len;
662 --r; 662 --r;
663 continue; 663 continue;
664 } 664 }
665 665
666 if (memcmp(buffer, ptr, len) != 0) 666 if (memcmp(buffer, ptr, len) != 0)
667 /* failure */ 667 /* failure */
668 return SPI_COMPARE_FAILURE; 668 return SPI_COMPARE_FAILURE;
669 } 669 }
670 return SPI_COMPARE_SUCCESS; 670 return SPI_COMPARE_SUCCESS;
671 } 671 }
672 672
673 static enum spi_compare_returns 673 static enum spi_compare_returns
674 spi_dv_retrain(struct scsi_device *sdev, u8 *buffer, u8 *ptr, 674 spi_dv_retrain(struct scsi_device *sdev, u8 *buffer, u8 *ptr,
675 enum spi_compare_returns 675 enum spi_compare_returns
676 (*compare_fn)(struct scsi_device *, u8 *, u8 *, int)) 676 (*compare_fn)(struct scsi_device *, u8 *, u8 *, int))
677 { 677 {
678 struct spi_internal *i = to_spi_internal(sdev->host->transportt); 678 struct spi_internal *i = to_spi_internal(sdev->host->transportt);
679 struct scsi_target *starget = sdev->sdev_target; 679 struct scsi_target *starget = sdev->sdev_target;
680 int period = 0, prevperiod = 0; 680 int period = 0, prevperiod = 0;
681 enum spi_compare_returns retval; 681 enum spi_compare_returns retval;
682 682
683 683
684 for (;;) { 684 for (;;) {
685 int newperiod; 685 int newperiod;
686 retval = compare_fn(sdev, buffer, ptr, DV_LOOPS); 686 retval = compare_fn(sdev, buffer, ptr, DV_LOOPS);
687 687
688 if (retval == SPI_COMPARE_SUCCESS 688 if (retval == SPI_COMPARE_SUCCESS
689 || retval == SPI_COMPARE_SKIP_TEST) 689 || retval == SPI_COMPARE_SKIP_TEST)
690 break; 690 break;
691 691
692 /* OK, retrain, fallback */ 692 /* OK, retrain, fallback */
693 if (i->f->get_iu) 693 if (i->f->get_iu)
694 i->f->get_iu(starget); 694 i->f->get_iu(starget);
695 if (i->f->get_qas) 695 if (i->f->get_qas)
696 i->f->get_qas(starget); 696 i->f->get_qas(starget);
697 if (i->f->get_period) 697 if (i->f->get_period)
698 i->f->get_period(sdev->sdev_target); 698 i->f->get_period(sdev->sdev_target);
699 699
700 /* Here's the fallback sequence; first try turning off 700 /* Here's the fallback sequence; first try turning off
701 * IU, then QAS (if we can control them), then finally 701 * IU, then QAS (if we can control them), then finally
702 * fall down the periods */ 702 * fall down the periods */
703 if (i->f->set_iu && spi_iu(starget)) { 703 if (i->f->set_iu && spi_iu(starget)) {
704 starget_printk(KERN_ERR, starget, "Domain Validation Disabing Information Units\n"); 704 starget_printk(KERN_ERR, starget, "Domain Validation Disabing Information Units\n");
705 DV_SET(iu, 0); 705 DV_SET(iu, 0);
706 } else if (i->f->set_qas && spi_qas(starget)) { 706 } else if (i->f->set_qas && spi_qas(starget)) {
707 starget_printk(KERN_ERR, starget, "Domain Validation Disabing Quick Arbitration and Selection\n"); 707 starget_printk(KERN_ERR, starget, "Domain Validation Disabing Quick Arbitration and Selection\n");
708 DV_SET(qas, 0); 708 DV_SET(qas, 0);
709 } else { 709 } else {
710 newperiod = spi_period(starget); 710 newperiod = spi_period(starget);
711 period = newperiod > period ? newperiod : period; 711 period = newperiod > period ? newperiod : period;
712 if (period < 0x0d) 712 if (period < 0x0d)
713 period++; 713 period++;
714 else 714 else
715 period += period >> 1; 715 period += period >> 1;
716 716
717 if (unlikely(period > 0xff || period == prevperiod)) { 717 if (unlikely(period > 0xff || period == prevperiod)) {
718 /* Total failure; set to async and return */ 718 /* Total failure; set to async and return */
719 starget_printk(KERN_ERR, starget, "Domain Validation Failure, dropping back to Asynchronous\n"); 719 starget_printk(KERN_ERR, starget, "Domain Validation Failure, dropping back to Asynchronous\n");
720 DV_SET(offset, 0); 720 DV_SET(offset, 0);
721 return SPI_COMPARE_FAILURE; 721 return SPI_COMPARE_FAILURE;
722 } 722 }
723 starget_printk(KERN_ERR, starget, "Domain Validation detected failure, dropping back\n"); 723 starget_printk(KERN_ERR, starget, "Domain Validation detected failure, dropping back\n");
724 DV_SET(period, period); 724 DV_SET(period, period);
725 prevperiod = period; 725 prevperiod = period;
726 } 726 }
727 } 727 }
728 return retval; 728 return retval;
729 } 729 }
730 730
731 static int 731 static int
732 spi_dv_device_get_echo_buffer(struct scsi_device *sdev, u8 *buffer) 732 spi_dv_device_get_echo_buffer(struct scsi_device *sdev, u8 *buffer)
733 { 733 {
734 int l, result; 734 int l, result;
735 735
736 /* first off do a test unit ready. This can error out 736 /* first off do a test unit ready. This can error out
737 * because of reservations or some other reason. If it 737 * because of reservations or some other reason. If it
738 * fails, the device won't let us write to the echo buffer 738 * fails, the device won't let us write to the echo buffer
739 * so just return failure */ 739 * so just return failure */
740 740
741 const char spi_test_unit_ready[] = { 741 const char spi_test_unit_ready[] = {
742 TEST_UNIT_READY, 0, 0, 0, 0, 0 742 TEST_UNIT_READY, 0, 0, 0, 0, 0
743 }; 743 };
744 744
745 const char spi_read_buffer_descriptor[] = { 745 const char spi_read_buffer_descriptor[] = {
746 READ_BUFFER, 0x0b, 0, 0, 0, 0, 0, 0, 4, 0 746 READ_BUFFER, 0x0b, 0, 0, 0, 0, 0, 0, 4, 0
747 }; 747 };
748 748
749 749
750 /* We send a set of three TURs to clear any outstanding 750 /* We send a set of three TURs to clear any outstanding
751 * unit attention conditions if they exist (Otherwise the 751 * unit attention conditions if they exist (Otherwise the
752 * buffer tests won't be happy). If the TUR still fails 752 * buffer tests won't be happy). If the TUR still fails
753 * (reservation conflict, device not ready, etc) just 753 * (reservation conflict, device not ready, etc) just
754 * skip the write tests */ 754 * skip the write tests */
755 for (l = 0; ; l++) { 755 for (l = 0; ; l++) {
756 result = spi_execute(sdev, spi_test_unit_ready, DMA_NONE, 756 result = spi_execute(sdev, spi_test_unit_ready, DMA_NONE,
757 NULL, 0, NULL); 757 NULL, 0, NULL);
758 758
759 if(result) { 759 if(result) {
760 if(l >= 3) 760 if(l >= 3)
761 return 0; 761 return 0;
762 } else { 762 } else {
763 /* TUR succeeded */ 763 /* TUR succeeded */
764 break; 764 break;
765 } 765 }
766 } 766 }
767 767
768 result = spi_execute(sdev, spi_read_buffer_descriptor, 768 result = spi_execute(sdev, spi_read_buffer_descriptor,
769 DMA_FROM_DEVICE, buffer, 4, NULL); 769 DMA_FROM_DEVICE, buffer, 4, NULL);
770 770
771 if (result) 771 if (result)
772 /* Device has no echo buffer */ 772 /* Device has no echo buffer */
773 return 0; 773 return 0;
774 774
775 return buffer[3] + ((buffer[2] & 0x1f) << 8); 775 return buffer[3] + ((buffer[2] & 0x1f) << 8);
776 } 776 }
777 777
778 static void 778 static void
779 spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer) 779 spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
780 { 780 {
781 struct spi_internal *i = to_spi_internal(sdev->host->transportt); 781 struct spi_internal *i = to_spi_internal(sdev->host->transportt);
782 struct scsi_target *starget = sdev->sdev_target; 782 struct scsi_target *starget = sdev->sdev_target;
783 int len = sdev->inquiry_len; 783 int len = sdev->inquiry_len;
784 /* first set us up for narrow async */ 784 /* first set us up for narrow async */
785 DV_SET(offset, 0); 785 DV_SET(offset, 0);
786 DV_SET(width, 0); 786 DV_SET(width, 0);
787 787
788 if (spi_dv_device_compare_inquiry(sdev, buffer, buffer, DV_LOOPS) 788 if (spi_dv_device_compare_inquiry(sdev, buffer, buffer, DV_LOOPS)
789 != SPI_COMPARE_SUCCESS) { 789 != SPI_COMPARE_SUCCESS) {
790 starget_printk(KERN_ERR, starget, "Domain Validation Initial Inquiry Failed\n"); 790 starget_printk(KERN_ERR, starget, "Domain Validation Initial Inquiry Failed\n");
791 /* FIXME: should probably offline the device here? */ 791 /* FIXME: should probably offline the device here? */
792 return; 792 return;
793 } 793 }
794 794
795 /* test width */ 795 /* test width */
796 if (i->f->set_width && spi_max_width(starget) && 796 if (i->f->set_width && spi_max_width(starget) &&
797 scsi_device_wide(sdev)) { 797 scsi_device_wide(sdev)) {
798 i->f->set_width(starget, 1); 798 i->f->set_width(starget, 1);
799 799
800 if (spi_dv_device_compare_inquiry(sdev, buffer, 800 if (spi_dv_device_compare_inquiry(sdev, buffer,
801 buffer + len, 801 buffer + len,
802 DV_LOOPS) 802 DV_LOOPS)
803 != SPI_COMPARE_SUCCESS) { 803 != SPI_COMPARE_SUCCESS) {
804 starget_printk(KERN_ERR, starget, "Wide Transfers Fail\n"); 804 starget_printk(KERN_ERR, starget, "Wide Transfers Fail\n");
805 i->f->set_width(starget, 0); 805 i->f->set_width(starget, 0);
806 } 806 }
807 } 807 }
808 808
809 if (!i->f->set_period) 809 if (!i->f->set_period)
810 return; 810 return;
811 811
812 /* device can't handle synchronous */ 812 /* device can't handle synchronous */
813 if (!scsi_device_sync(sdev) && !scsi_device_dt(sdev)) 813 if (!scsi_device_sync(sdev) && !scsi_device_dt(sdev))
814 return; 814 return;
815 815
816 /* len == -1 is the signal that we need to ascertain the 816 /* len == -1 is the signal that we need to ascertain the
817 * presence of an echo buffer before trying to use it. len == 817 * presence of an echo buffer before trying to use it. len ==
818 * 0 means we don't have an echo buffer */ 818 * 0 means we don't have an echo buffer */
819 len = -1; 819 len = -1;
820 820
821 retry: 821 retry:
822 822
823 /* now set up to the maximum */ 823 /* now set up to the maximum */
824 DV_SET(offset, spi_max_offset(starget)); 824 DV_SET(offset, spi_max_offset(starget));
825 DV_SET(period, spi_min_period(starget)); 825 DV_SET(period, spi_min_period(starget));
826 /* try QAS requests; this should be harmless to set if the 826 /* try QAS requests; this should be harmless to set if the
827 * target supports it */ 827 * target supports it */
828 if (scsi_device_qas(sdev)) 828 if (scsi_device_qas(sdev))
829 DV_SET(qas, 1); 829 DV_SET(qas, 1);
830 /* Also try IU transfers */ 830 /* Also try IU transfers */
831 if (scsi_device_ius(sdev)) 831 if (scsi_device_ius(sdev))
832 DV_SET(iu, 1); 832 DV_SET(iu, 1);
833 if (spi_min_period(starget) < 9) { 833 if (spi_min_period(starget) < 9) {
834 /* This u320 (or u640). Ignore the coupled parameters 834 /* This u320 (or u640). Ignore the coupled parameters
835 * like DT and IU, but set the optional ones */ 835 * like DT and IU, but set the optional ones */
836 DV_SET(rd_strm, 1); 836 DV_SET(rd_strm, 1);
837 DV_SET(wr_flow, 1); 837 DV_SET(wr_flow, 1);
838 DV_SET(rti, 1); 838 DV_SET(rti, 1);
839 if (spi_min_period(starget) == 8) 839 if (spi_min_period(starget) == 8)
840 DV_SET(pcomp_en, 1); 840 DV_SET(pcomp_en, 1);
841 } 841 }
842 /* Do the read only INQUIRY tests */ 842 /* Do the read only INQUIRY tests */
843 spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len, 843 spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len,
844 spi_dv_device_compare_inquiry); 844 spi_dv_device_compare_inquiry);
845 /* See if we actually managed to negotiate and sustain DT */ 845 /* See if we actually managed to negotiate and sustain DT */
846 if (i->f->get_dt) 846 if (i->f->get_dt)
847 i->f->get_dt(starget); 847 i->f->get_dt(starget);
848 848
849 /* see if the device has an echo buffer. If it does we can do 849 /* see if the device has an echo buffer. If it does we can do
850 * the SPI pattern write tests. Because of some broken 850 * the SPI pattern write tests. Because of some broken
851 * devices, we *only* try this on a device that has actually 851 * devices, we *only* try this on a device that has actually
852 * negotiated DT */ 852 * negotiated DT */
853 853
854 if (len == -1 && spi_dt(starget)) 854 if (len == -1 && spi_dt(starget))
855 len = spi_dv_device_get_echo_buffer(sdev, buffer); 855 len = spi_dv_device_get_echo_buffer(sdev, buffer);
856 856
857 if (len <= 0) { 857 if (len <= 0) {
858 starget_printk(KERN_INFO, starget, "Domain Validation skipping write tests\n"); 858 starget_printk(KERN_INFO, starget, "Domain Validation skipping write tests\n");
859 return; 859 return;
860 } 860 }
861 861
862 if (len > SPI_MAX_ECHO_BUFFER_SIZE) { 862 if (len > SPI_MAX_ECHO_BUFFER_SIZE) {
863 starget_printk(KERN_WARNING, starget, "Echo buffer size %d is too big, trimming to %d\n", len, SPI_MAX_ECHO_BUFFER_SIZE); 863 starget_printk(KERN_WARNING, starget, "Echo buffer size %d is too big, trimming to %d\n", len, SPI_MAX_ECHO_BUFFER_SIZE);
864 len = SPI_MAX_ECHO_BUFFER_SIZE; 864 len = SPI_MAX_ECHO_BUFFER_SIZE;
865 } 865 }
866 866
867 if (spi_dv_retrain(sdev, buffer, buffer + len, 867 if (spi_dv_retrain(sdev, buffer, buffer + len,
868 spi_dv_device_echo_buffer) 868 spi_dv_device_echo_buffer)
869 == SPI_COMPARE_SKIP_TEST) { 869 == SPI_COMPARE_SKIP_TEST) {
870 /* OK, the stupid drive can't do a write echo buffer 870 /* OK, the stupid drive can't do a write echo buffer
871 * test after all, fall back to the read tests */ 871 * test after all, fall back to the read tests */
872 len = 0; 872 len = 0;
873 goto retry; 873 goto retry;
874 } 874 }
875 } 875 }
876 876
877 877
878 /** spi_dv_device - Do Domain Validation on the device 878 /** spi_dv_device - Do Domain Validation on the device
879 * @sdev: scsi device to validate 879 * @sdev: scsi device to validate
880 * 880 *
881 * Performs the domain validation on the given device in the 881 * Performs the domain validation on the given device in the
882 * current execution thread. Since DV operations may sleep, 882 * current execution thread. Since DV operations may sleep,
883 * the current thread must have user context. Also no SCSI 883 * the current thread must have user context. Also no SCSI
884 * related locks that would deadlock I/O issued by the DV may 884 * related locks that would deadlock I/O issued by the DV may
885 * be held. 885 * be held.
886 */ 886 */
887 void 887 void
888 spi_dv_device(struct scsi_device *sdev) 888 spi_dv_device(struct scsi_device *sdev)
889 { 889 {
890 struct scsi_target *starget = sdev->sdev_target; 890 struct scsi_target *starget = sdev->sdev_target;
891 u8 *buffer; 891 u8 *buffer;
892 const int len = SPI_MAX_ECHO_BUFFER_SIZE*2; 892 const int len = SPI_MAX_ECHO_BUFFER_SIZE*2;
893 893
894 if (unlikely(scsi_device_get(sdev))) 894 if (unlikely(scsi_device_get(sdev)))
895 return; 895 return;
896 896
897 buffer = kmalloc(len, GFP_KERNEL); 897 buffer = kmalloc(len, GFP_KERNEL);
898 898
899 if (unlikely(!buffer)) 899 if (unlikely(!buffer))
900 goto out_put; 900 goto out_put;
901 901
902 memset(buffer, 0, len); 902 memset(buffer, 0, len);
903 903
904 /* We need to verify that the actual device will quiesce; the 904 /* We need to verify that the actual device will quiesce; the
905 * later target quiesce is just a nice to have */ 905 * later target quiesce is just a nice to have */
906 if (unlikely(scsi_device_quiesce(sdev))) 906 if (unlikely(scsi_device_quiesce(sdev)))
907 goto out_free; 907 goto out_free;
908 908
909 scsi_target_quiesce(starget); 909 scsi_target_quiesce(starget);
910 910
911 spi_dv_pending(starget) = 1; 911 spi_dv_pending(starget) = 1;
912 down(&spi_dv_sem(starget)); 912 down(&spi_dv_sem(starget));
913 913
914 starget_printk(KERN_INFO, starget, "Beginning Domain Validation\n"); 914 starget_printk(KERN_INFO, starget, "Beginning Domain Validation\n");
915 915
916 spi_dv_device_internal(sdev, buffer); 916 spi_dv_device_internal(sdev, buffer);
917 917
918 starget_printk(KERN_INFO, starget, "Ending Domain Validation\n"); 918 starget_printk(KERN_INFO, starget, "Ending Domain Validation\n");
919 919
920 up(&spi_dv_sem(starget)); 920 up(&spi_dv_sem(starget));
921 spi_dv_pending(starget) = 0; 921 spi_dv_pending(starget) = 0;
922 922
923 scsi_target_resume(starget); 923 scsi_target_resume(starget);
924 924
925 spi_initial_dv(starget) = 1; 925 spi_initial_dv(starget) = 1;
926 926
927 out_free: 927 out_free:
928 kfree(buffer); 928 kfree(buffer);
929 out_put: 929 out_put:
930 scsi_device_put(sdev); 930 scsi_device_put(sdev);
931 } 931 }
932 EXPORT_SYMBOL(spi_dv_device); 932 EXPORT_SYMBOL(spi_dv_device);
933 933
934 struct work_queue_wrapper { 934 struct work_queue_wrapper {
935 struct work_struct work; 935 struct work_struct work;
936 struct scsi_device *sdev; 936 struct scsi_device *sdev;
937 }; 937 };
938 938
939 static void 939 static void
940 spi_dv_device_work_wrapper(void *data) 940 spi_dv_device_work_wrapper(void *data)
941 { 941 {
942 struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data; 942 struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data;
943 struct scsi_device *sdev = wqw->sdev; 943 struct scsi_device *sdev = wqw->sdev;
944 944
945 kfree(wqw); 945 kfree(wqw);
946 spi_dv_device(sdev); 946 spi_dv_device(sdev);
947 spi_dv_pending(sdev->sdev_target) = 0; 947 spi_dv_pending(sdev->sdev_target) = 0;
948 scsi_device_put(sdev); 948 scsi_device_put(sdev);
949 } 949 }
950 950
951 951
952 /** 952 /**
953 * spi_schedule_dv_device - schedule domain validation to occur on the device 953 * spi_schedule_dv_device - schedule domain validation to occur on the device
954 * @sdev: The device to validate 954 * @sdev: The device to validate
955 * 955 *
956 * Identical to spi_dv_device() above, except that the DV will be 956 * Identical to spi_dv_device() above, except that the DV will be
957 * scheduled to occur in a workqueue later. All memory allocations 957 * scheduled to occur in a workqueue later. All memory allocations
958 * are atomic, so may be called from any context including those holding 958 * are atomic, so may be called from any context including those holding
959 * SCSI locks. 959 * SCSI locks.
960 */ 960 */
961 void 961 void
962 spi_schedule_dv_device(struct scsi_device *sdev) 962 spi_schedule_dv_device(struct scsi_device *sdev)
963 { 963 {
964 struct work_queue_wrapper *wqw = 964 struct work_queue_wrapper *wqw =
965 kmalloc(sizeof(struct work_queue_wrapper), GFP_ATOMIC); 965 kmalloc(sizeof(struct work_queue_wrapper), GFP_ATOMIC);
966 966
967 if (unlikely(!wqw)) 967 if (unlikely(!wqw))
968 return; 968 return;
969 969
970 if (unlikely(spi_dv_pending(sdev->sdev_target))) { 970 if (unlikely(spi_dv_pending(sdev->sdev_target))) {
971 kfree(wqw); 971 kfree(wqw);
972 return; 972 return;
973 } 973 }
974 /* Set pending early (dv_device doesn't check it, only sets it) */ 974 /* Set pending early (dv_device doesn't check it, only sets it) */
975 spi_dv_pending(sdev->sdev_target) = 1; 975 spi_dv_pending(sdev->sdev_target) = 1;
976 if (unlikely(scsi_device_get(sdev))) { 976 if (unlikely(scsi_device_get(sdev))) {
977 kfree(wqw); 977 kfree(wqw);
978 spi_dv_pending(sdev->sdev_target) = 0; 978 spi_dv_pending(sdev->sdev_target) = 0;
979 return; 979 return;
980 } 980 }
981 981
982 INIT_WORK(&wqw->work, spi_dv_device_work_wrapper, wqw); 982 INIT_WORK(&wqw->work, spi_dv_device_work_wrapper, wqw);
983 wqw->sdev = sdev; 983 wqw->sdev = sdev;
984 984
985 schedule_work(&wqw->work); 985 schedule_work(&wqw->work);
986 } 986 }
987 EXPORT_SYMBOL(spi_schedule_dv_device); 987 EXPORT_SYMBOL(spi_schedule_dv_device);
988 988
989 /** 989 /**
990 * spi_display_xfer_agreement - Print the current target transfer agreement 990 * spi_display_xfer_agreement - Print the current target transfer agreement
991 * @starget: The target for which to display the agreement 991 * @starget: The target for which to display the agreement
992 * 992 *
993 * Each SPI port is required to maintain a transfer agreement for each 993 * Each SPI port is required to maintain a transfer agreement for each
994 * other port on the bus. This function prints a one-line summary of 994 * other port on the bus. This function prints a one-line summary of
995 * the current agreement; more detailed information is available in sysfs. 995 * the current agreement; more detailed information is available in sysfs.
996 */ 996 */
997 void spi_display_xfer_agreement(struct scsi_target *starget) 997 void spi_display_xfer_agreement(struct scsi_target *starget)
998 { 998 {
999 struct spi_transport_attrs *tp; 999 struct spi_transport_attrs *tp;
1000 tp = (struct spi_transport_attrs *)&starget->starget_data; 1000 tp = (struct spi_transport_attrs *)&starget->starget_data;
1001 1001
1002 if (tp->offset > 0 && tp->period > 0) { 1002 if (tp->offset > 0 && tp->period > 0) {
1003 unsigned int picosec, kb100; 1003 unsigned int picosec, kb100;
1004 char *scsi = "FAST-?"; 1004 char *scsi = "FAST-?";
1005 char tmp[8]; 1005 char tmp[8];
1006 1006
1007 if (tp->period <= SPI_STATIC_PPR) { 1007 if (tp->period <= SPI_STATIC_PPR) {
1008 picosec = ppr_to_ps[tp->period]; 1008 picosec = ppr_to_ps[tp->period];
1009 switch (tp->period) { 1009 switch (tp->period) {
1010 case 7: scsi = "FAST-320"; break; 1010 case 7: scsi = "FAST-320"; break;
1011 case 8: scsi = "FAST-160"; break; 1011 case 8: scsi = "FAST-160"; break;
1012 case 9: scsi = "FAST-80"; break; 1012 case 9: scsi = "FAST-80"; break;
1013 case 10: 1013 case 10:
1014 case 11: scsi = "FAST-40"; break; 1014 case 11: scsi = "FAST-40"; break;
1015 case 12: scsi = "FAST-20"; break; 1015 case 12: scsi = "FAST-20"; break;
1016 } 1016 }
1017 } else { 1017 } else {
1018 picosec = tp->period * 4000; 1018 picosec = tp->period * 4000;
1019 if (tp->period < 25) 1019 if (tp->period < 25)
1020 scsi = "FAST-20"; 1020 scsi = "FAST-20";
1021 else if (tp->period < 50) 1021 else if (tp->period < 50)
1022 scsi = "FAST-10"; 1022 scsi = "FAST-10";
1023 else 1023 else
1024 scsi = "FAST-5"; 1024 scsi = "FAST-5";
1025 } 1025 }
1026 1026
1027 kb100 = (10000000 + picosec / 2) / picosec; 1027 kb100 = (10000000 + picosec / 2) / picosec;
1028 if (tp->width) 1028 if (tp->width)
1029 kb100 *= 2; 1029 kb100 *= 2;
1030 sprint_frac(tmp, picosec, 1000); 1030 sprint_frac(tmp, picosec, 1000);
1031 1031
1032 dev_info(&starget->dev, 1032 dev_info(&starget->dev,
1033 "%s %sSCSI %d.%d MB/s %s%s%s%s%s%s%s%s (%s ns, offset %d)\n", 1033 "%s %sSCSI %d.%d MB/s %s%s%s%s%s%s%s%s (%s ns, offset %d)\n",
1034 scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10, 1034 scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10,
1035 tp->dt ? "DT" : "ST", 1035 tp->dt ? "DT" : "ST",
1036 tp->iu ? " IU" : "", 1036 tp->iu ? " IU" : "",
1037 tp->qas ? " QAS" : "", 1037 tp->qas ? " QAS" : "",
1038 tp->rd_strm ? " RDSTRM" : "", 1038 tp->rd_strm ? " RDSTRM" : "",
1039 tp->rti ? " RTI" : "", 1039 tp->rti ? " RTI" : "",
1040 tp->wr_flow ? " WRFLOW" : "", 1040 tp->wr_flow ? " WRFLOW" : "",
1041 tp->pcomp_en ? " PCOMP" : "", 1041 tp->pcomp_en ? " PCOMP" : "",
1042 tp->hold_mcs ? " HMCS" : "", 1042 tp->hold_mcs ? " HMCS" : "",
1043 tmp, tp->offset); 1043 tmp, tp->offset);
1044 } else { 1044 } else {
1045 dev_info(&starget->dev, "%sasynchronous\n", 1045 dev_info(&starget->dev, "%sasynchronous\n",
1046 tp->width ? "wide " : ""); 1046 tp->width ? "wide " : "");
1047 } 1047 }
1048 } 1048 }
1049 EXPORT_SYMBOL(spi_display_xfer_agreement); 1049 EXPORT_SYMBOL(spi_display_xfer_agreement);
1050 1050
1051 #ifdef CONFIG_SCSI_CONSTANTS 1051 #ifdef CONFIG_SCSI_CONSTANTS
1052 static const char * const one_byte_msgs[] = { 1052 static const char * const one_byte_msgs[] = {
1053 /* 0x00 */ "Command Complete", NULL, "Save Pointers", 1053 /* 0x00 */ "Command Complete", NULL, "Save Pointers",
1054 /* 0x03 */ "Restore Pointers", "Disconnect", "Initiator Error", 1054 /* 0x03 */ "Restore Pointers", "Disconnect", "Initiator Error",
1055 /* 0x06 */ "Abort", "Message Reject", "Nop", "Message Parity Error", 1055 /* 0x06 */ "Abort", "Message Reject", "Nop", "Message Parity Error",
1056 /* 0x0a */ "Linked Command Complete", "Linked Command Complete w/flag", 1056 /* 0x0a */ "Linked Command Complete", "Linked Command Complete w/flag",
1057 /* 0x0c */ "Bus device reset", "Abort Tag", "Clear Queue", 1057 /* 0x0c */ "Bus device reset", "Abort Tag", "Clear Queue",
1058 /* 0x0f */ "Initiate Recovery", "Release Recovery" 1058 /* 0x0f */ "Initiate Recovery", "Release Recovery"
1059 }; 1059 };
1060 #define NO_ONE_BYTE_MSGS (sizeof(one_byte_msgs) / sizeof (const char *))
1061 1060
1062 static const char * const two_byte_msgs[] = { 1061 static const char * const two_byte_msgs[] = {
1063 /* 0x20 */ "Simple Queue Tag", "Head of Queue Tag", "Ordered Queue Tag", 1062 /* 0x20 */ "Simple Queue Tag", "Head of Queue Tag", "Ordered Queue Tag",
1064 /* 0x23 */ "Ignore Wide Residue" 1063 /* 0x23 */ "Ignore Wide Residue"
1065 }; 1064 };
1066 #define NO_TWO_BYTE_MSGS (sizeof(two_byte_msgs) / sizeof (const char *))
1067 1065
1068 static const char * const extended_msgs[] = { 1066 static const char * const extended_msgs[] = {
1069 /* 0x00 */ "Modify Data Pointer", "Synchronous Data Transfer Request", 1067 /* 0x00 */ "Modify Data Pointer", "Synchronous Data Transfer Request",
1070 /* 0x02 */ "SCSI-I Extended Identify", "Wide Data Transfer Request" 1068 /* 0x02 */ "SCSI-I Extended Identify", "Wide Data Transfer Request"
1071 }; 1069 };
1072 #define NO_EXTENDED_MSGS (sizeof(two_byte_msgs) / sizeof (const char *))
1073 1070
1074 1071
1075 int spi_print_msg(const unsigned char *msg) 1072 int spi_print_msg(const unsigned char *msg)
1076 { 1073 {
1077 int len = 0, i; 1074 int len = 0, i;
1078 if (msg[0] == EXTENDED_MESSAGE) { 1075 if (msg[0] == EXTENDED_MESSAGE) {
1079 len = 3 + msg[1]; 1076 len = 3 + msg[1];
1080 if (msg[2] < NO_EXTENDED_MSGS) 1077 if (msg[2] < ARRAY_SIZE(extended_msgs))
1081 printk ("%s ", extended_msgs[msg[2]]); 1078 printk ("%s ", extended_msgs[msg[2]]);
1082 else 1079 else
1083 printk ("Extended Message, reserved code (0x%02x) ", 1080 printk ("Extended Message, reserved code (0x%02x) ",
1084 (int) msg[2]); 1081 (int) msg[2]);
1085 switch (msg[2]) { 1082 switch (msg[2]) {
1086 case EXTENDED_MODIFY_DATA_POINTER: 1083 case EXTENDED_MODIFY_DATA_POINTER:
1087 printk("pointer = %d", (int) (msg[3] << 24) | 1084 printk("pointer = %d", (int) (msg[3] << 24) |
1088 (msg[4] << 16) | (msg[5] << 8) | msg[6]); 1085 (msg[4] << 16) | (msg[5] << 8) | msg[6]);
1089 break; 1086 break;
1090 case EXTENDED_SDTR: 1087 case EXTENDED_SDTR:
1091 printk("period = %d ns, offset = %d", 1088 printk("period = %d ns, offset = %d",
1092 (int) msg[3] * 4, (int) msg[4]); 1089 (int) msg[3] * 4, (int) msg[4]);
1093 break; 1090 break;
1094 case EXTENDED_WDTR: 1091 case EXTENDED_WDTR:
1095 printk("width = 2^%d bytes", msg[3]); 1092 printk("width = 2^%d bytes", msg[3]);
1096 break; 1093 break;
1097 default: 1094 default:
1098 for (i = 2; i < len; ++i) 1095 for (i = 2; i < len; ++i)
1099 printk("%02x ", msg[i]); 1096 printk("%02x ", msg[i]);
1100 } 1097 }
1101 /* Identify */ 1098 /* Identify */
1102 } else if (msg[0] & 0x80) { 1099 } else if (msg[0] & 0x80) {
1103 printk("Identify disconnect %sallowed %s %d ", 1100 printk("Identify disconnect %sallowed %s %d ",
1104 (msg[0] & 0x40) ? "" : "not ", 1101 (msg[0] & 0x40) ? "" : "not ",
1105 (msg[0] & 0x20) ? "target routine" : "lun", 1102 (msg[0] & 0x20) ? "target routine" : "lun",
1106 msg[0] & 0x7); 1103 msg[0] & 0x7);
1107 len = 1; 1104 len = 1;
1108 /* Normal One byte */ 1105 /* Normal One byte */
1109 } else if (msg[0] < 0x1f) { 1106 } else if (msg[0] < 0x1f) {
1110 if (msg[0] < NO_ONE_BYTE_MSGS) 1107 if (msg[0] < ARRAY_SIZE(one_byte_msgs))
1111 printk(one_byte_msgs[msg[0]]); 1108 printk(one_byte_msgs[msg[0]]);
1112 else 1109 else
1113 printk("reserved (%02x) ", msg[0]); 1110 printk("reserved (%02x) ", msg[0]);
1114 len = 1; 1111 len = 1;
1115 /* Two byte */ 1112 /* Two byte */
1116 } else if (msg[0] <= 0x2f) { 1113 } else if (msg[0] <= 0x2f) {
1117 if ((msg[0] - 0x20) < NO_TWO_BYTE_MSGS) 1114 if ((msg[0] - 0x20) < ARRAY_SIZE(two_byte_msgs))
1118 printk("%s %02x ", two_byte_msgs[msg[0] - 0x20], 1115 printk("%s %02x ", two_byte_msgs[msg[0] - 0x20],
1119 msg[1]); 1116 msg[1]);
1120 else 1117 else
1121 printk("reserved two byte (%02x %02x) ", 1118 printk("reserved two byte (%02x %02x) ",
1122 msg[0], msg[1]); 1119 msg[0], msg[1]);
1123 len = 2; 1120 len = 2;
1124 } else 1121 } else
1125 printk("reserved"); 1122 printk("reserved");
1126 return len; 1123 return len;
1127 } 1124 }
1128 EXPORT_SYMBOL(spi_print_msg); 1125 EXPORT_SYMBOL(spi_print_msg);
1129 1126
1130 #else /* ifndef CONFIG_SCSI_CONSTANTS */ 1127 #else /* ifndef CONFIG_SCSI_CONSTANTS */
1131 1128
1132 int spi_print_msg(const unsigned char *msg) 1129 int spi_print_msg(const unsigned char *msg)
1133 { 1130 {
1134 int len = 0, i; 1131 int len = 0, i;
1135 1132
1136 if (msg[0] == EXTENDED_MESSAGE) { 1133 if (msg[0] == EXTENDED_MESSAGE) {
1137 len = 3 + msg[1]; 1134 len = 3 + msg[1];
1138 for (i = 0; i < len; ++i) 1135 for (i = 0; i < len; ++i)
1139 printk("%02x ", msg[i]); 1136 printk("%02x ", msg[i]);
1140 /* Identify */ 1137 /* Identify */
1141 } else if (msg[0] & 0x80) { 1138 } else if (msg[0] & 0x80) {
1142 printk("%02x ", msg[0]); 1139 printk("%02x ", msg[0]);
1143 len = 1; 1140 len = 1;
1144 /* Normal One byte */ 1141 /* Normal One byte */
1145 } else if (msg[0] < 0x1f) { 1142 } else if (msg[0] < 0x1f) {
1146 printk("%02x ", msg[0]); 1143 printk("%02x ", msg[0]);
1147 len = 1; 1144 len = 1;
1148 /* Two byte */ 1145 /* Two byte */
1149 } else if (msg[0] <= 0x2f) { 1146 } else if (msg[0] <= 0x2f) {
1150 printk("%02x %02x", msg[0], msg[1]); 1147 printk("%02x %02x", msg[0], msg[1]);
1151 len = 2; 1148 len = 2;
1152 } else 1149 } else
1153 printk("%02x ", msg[0]); 1150 printk("%02x ", msg[0]);
1154 return len; 1151 return len;
1155 } 1152 }
1156 EXPORT_SYMBOL(spi_print_msg); 1153 EXPORT_SYMBOL(spi_print_msg);
1157 #endif /* ! CONFIG_SCSI_CONSTANTS */ 1154 #endif /* ! CONFIG_SCSI_CONSTANTS */
1158 1155
1159 #define SETUP_ATTRIBUTE(field) \ 1156 #define SETUP_ATTRIBUTE(field) \
1160 i->private_attrs[count] = class_device_attr_##field; \ 1157 i->private_attrs[count] = class_device_attr_##field; \
1161 if (!i->f->set_##field) { \ 1158 if (!i->f->set_##field) { \
1162 i->private_attrs[count].attr.mode = S_IRUGO; \ 1159 i->private_attrs[count].attr.mode = S_IRUGO; \
1163 i->private_attrs[count].store = NULL; \ 1160 i->private_attrs[count].store = NULL; \
1164 } \ 1161 } \
1165 i->attrs[count] = &i->private_attrs[count]; \ 1162 i->attrs[count] = &i->private_attrs[count]; \
1166 if (i->f->show_##field) \ 1163 if (i->f->show_##field) \
1167 count++ 1164 count++
1168 1165
1169 #define SETUP_RELATED_ATTRIBUTE(field, rel_field) \ 1166 #define SETUP_RELATED_ATTRIBUTE(field, rel_field) \
1170 i->private_attrs[count] = class_device_attr_##field; \ 1167 i->private_attrs[count] = class_device_attr_##field; \
1171 if (!i->f->set_##rel_field) { \ 1168 if (!i->f->set_##rel_field) { \
1172 i->private_attrs[count].attr.mode = S_IRUGO; \ 1169 i->private_attrs[count].attr.mode = S_IRUGO; \
1173 i->private_attrs[count].store = NULL; \ 1170 i->private_attrs[count].store = NULL; \
1174 } \ 1171 } \
1175 i->attrs[count] = &i->private_attrs[count]; \ 1172 i->attrs[count] = &i->private_attrs[count]; \
1176 if (i->f->show_##rel_field) \ 1173 if (i->f->show_##rel_field) \
1177 count++ 1174 count++
1178 1175
1179 #define SETUP_HOST_ATTRIBUTE(field) \ 1176 #define SETUP_HOST_ATTRIBUTE(field) \
1180 i->private_host_attrs[count] = class_device_attr_##field; \ 1177 i->private_host_attrs[count] = class_device_attr_##field; \
1181 if (!i->f->set_##field) { \ 1178 if (!i->f->set_##field) { \
1182 i->private_host_attrs[count].attr.mode = S_IRUGO; \ 1179 i->private_host_attrs[count].attr.mode = S_IRUGO; \
1183 i->private_host_attrs[count].store = NULL; \ 1180 i->private_host_attrs[count].store = NULL; \
1184 } \ 1181 } \
1185 i->host_attrs[count] = &i->private_host_attrs[count]; \ 1182 i->host_attrs[count] = &i->private_host_attrs[count]; \
1186 count++ 1183 count++
1187 1184
1188 static int spi_device_match(struct attribute_container *cont, 1185 static int spi_device_match(struct attribute_container *cont,
1189 struct device *dev) 1186 struct device *dev)
1190 { 1187 {
1191 struct scsi_device *sdev; 1188 struct scsi_device *sdev;
1192 struct Scsi_Host *shost; 1189 struct Scsi_Host *shost;
1193 struct spi_internal *i; 1190 struct spi_internal *i;
1194 1191
1195 if (!scsi_is_sdev_device(dev)) 1192 if (!scsi_is_sdev_device(dev))
1196 return 0; 1193 return 0;
1197 1194
1198 sdev = to_scsi_device(dev); 1195 sdev = to_scsi_device(dev);
1199 shost = sdev->host; 1196 shost = sdev->host;
1200 if (!shost->transportt || shost->transportt->host_attrs.ac.class 1197 if (!shost->transportt || shost->transportt->host_attrs.ac.class
1201 != &spi_host_class.class) 1198 != &spi_host_class.class)
1202 return 0; 1199 return 0;
1203 /* Note: this class has no device attributes, so it has 1200 /* Note: this class has no device attributes, so it has
1204 * no per-HBA allocation and thus we don't need to distinguish 1201 * no per-HBA allocation and thus we don't need to distinguish
1205 * the attribute containers for the device */ 1202 * the attribute containers for the device */
1206 i = to_spi_internal(shost->transportt); 1203 i = to_spi_internal(shost->transportt);
1207 if (i->f->deny_binding && i->f->deny_binding(sdev->sdev_target)) 1204 if (i->f->deny_binding && i->f->deny_binding(sdev->sdev_target))
1208 return 0; 1205 return 0;
1209 return 1; 1206 return 1;
1210 } 1207 }
1211 1208
1212 static int spi_target_match(struct attribute_container *cont, 1209 static int spi_target_match(struct attribute_container *cont,
1213 struct device *dev) 1210 struct device *dev)
1214 { 1211 {
1215 struct Scsi_Host *shost; 1212 struct Scsi_Host *shost;
1216 struct scsi_target *starget; 1213 struct scsi_target *starget;
1217 struct spi_internal *i; 1214 struct spi_internal *i;
1218 1215
1219 if (!scsi_is_target_device(dev)) 1216 if (!scsi_is_target_device(dev))
1220 return 0; 1217 return 0;
1221 1218
1222 shost = dev_to_shost(dev->parent); 1219 shost = dev_to_shost(dev->parent);
1223 if (!shost->transportt || shost->transportt->host_attrs.ac.class 1220 if (!shost->transportt || shost->transportt->host_attrs.ac.class
1224 != &spi_host_class.class) 1221 != &spi_host_class.class)
1225 return 0; 1222 return 0;
1226 1223
1227 i = to_spi_internal(shost->transportt); 1224 i = to_spi_internal(shost->transportt);
1228 starget = to_scsi_target(dev); 1225 starget = to_scsi_target(dev);
1229 1226
1230 if (i->f->deny_binding && i->f->deny_binding(starget)) 1227 if (i->f->deny_binding && i->f->deny_binding(starget))
1231 return 0; 1228 return 0;
1232 1229
1233 return &i->t.target_attrs.ac == cont; 1230 return &i->t.target_attrs.ac == cont;
1234 } 1231 }
1235 1232
1236 static DECLARE_TRANSPORT_CLASS(spi_transport_class, 1233 static DECLARE_TRANSPORT_CLASS(spi_transport_class,
1237 "spi_transport", 1234 "spi_transport",
1238 spi_setup_transport_attrs, 1235 spi_setup_transport_attrs,
1239 NULL, 1236 NULL,
1240 NULL); 1237 NULL);
1241 1238
1242 static DECLARE_ANON_TRANSPORT_CLASS(spi_device_class, 1239 static DECLARE_ANON_TRANSPORT_CLASS(spi_device_class,
1243 spi_device_match, 1240 spi_device_match,
1244 spi_device_configure); 1241 spi_device_configure);
1245 1242
1246 struct scsi_transport_template * 1243 struct scsi_transport_template *
1247 spi_attach_transport(struct spi_function_template *ft) 1244 spi_attach_transport(struct spi_function_template *ft)
1248 { 1245 {
1249 struct spi_internal *i = kmalloc(sizeof(struct spi_internal), 1246 struct spi_internal *i = kmalloc(sizeof(struct spi_internal),
1250 GFP_KERNEL); 1247 GFP_KERNEL);
1251 int count = 0; 1248 int count = 0;
1252 if (unlikely(!i)) 1249 if (unlikely(!i))
1253 return NULL; 1250 return NULL;
1254 1251
1255 memset(i, 0, sizeof(struct spi_internal)); 1252 memset(i, 0, sizeof(struct spi_internal));
1256 1253
1257 1254
1258 i->t.target_attrs.ac.class = &spi_transport_class.class; 1255 i->t.target_attrs.ac.class = &spi_transport_class.class;
1259 i->t.target_attrs.ac.attrs = &i->attrs[0]; 1256 i->t.target_attrs.ac.attrs = &i->attrs[0];
1260 i->t.target_attrs.ac.match = spi_target_match; 1257 i->t.target_attrs.ac.match = spi_target_match;
1261 transport_container_register(&i->t.target_attrs); 1258 transport_container_register(&i->t.target_attrs);
1262 i->t.target_size = sizeof(struct spi_transport_attrs); 1259 i->t.target_size = sizeof(struct spi_transport_attrs);
1263 i->t.host_attrs.ac.class = &spi_host_class.class; 1260 i->t.host_attrs.ac.class = &spi_host_class.class;
1264 i->t.host_attrs.ac.attrs = &i->host_attrs[0]; 1261 i->t.host_attrs.ac.attrs = &i->host_attrs[0];
1265 i->t.host_attrs.ac.match = spi_host_match; 1262 i->t.host_attrs.ac.match = spi_host_match;
1266 transport_container_register(&i->t.host_attrs); 1263 transport_container_register(&i->t.host_attrs);
1267 i->t.host_size = sizeof(struct spi_host_attrs); 1264 i->t.host_size = sizeof(struct spi_host_attrs);
1268 i->f = ft; 1265 i->f = ft;
1269 1266
1270 SETUP_ATTRIBUTE(period); 1267 SETUP_ATTRIBUTE(period);
1271 SETUP_RELATED_ATTRIBUTE(min_period, period); 1268 SETUP_RELATED_ATTRIBUTE(min_period, period);
1272 SETUP_ATTRIBUTE(offset); 1269 SETUP_ATTRIBUTE(offset);
1273 SETUP_RELATED_ATTRIBUTE(max_offset, offset); 1270 SETUP_RELATED_ATTRIBUTE(max_offset, offset);
1274 SETUP_ATTRIBUTE(width); 1271 SETUP_ATTRIBUTE(width);
1275 SETUP_RELATED_ATTRIBUTE(max_width, width); 1272 SETUP_RELATED_ATTRIBUTE(max_width, width);
1276 SETUP_ATTRIBUTE(iu); 1273 SETUP_ATTRIBUTE(iu);
1277 SETUP_ATTRIBUTE(dt); 1274 SETUP_ATTRIBUTE(dt);
1278 SETUP_ATTRIBUTE(qas); 1275 SETUP_ATTRIBUTE(qas);
1279 SETUP_ATTRIBUTE(wr_flow); 1276 SETUP_ATTRIBUTE(wr_flow);
1280 SETUP_ATTRIBUTE(rd_strm); 1277 SETUP_ATTRIBUTE(rd_strm);
1281 SETUP_ATTRIBUTE(rti); 1278 SETUP_ATTRIBUTE(rti);
1282 SETUP_ATTRIBUTE(pcomp_en); 1279 SETUP_ATTRIBUTE(pcomp_en);
1283 SETUP_ATTRIBUTE(hold_mcs); 1280 SETUP_ATTRIBUTE(hold_mcs);
1284 1281
1285 /* if you add an attribute but forget to increase SPI_NUM_ATTRS 1282 /* if you add an attribute but forget to increase SPI_NUM_ATTRS
1286 * this bug will trigger */ 1283 * this bug will trigger */
1287 BUG_ON(count > SPI_NUM_ATTRS); 1284 BUG_ON(count > SPI_NUM_ATTRS);
1288 1285
1289 i->attrs[count++] = &class_device_attr_revalidate; 1286 i->attrs[count++] = &class_device_attr_revalidate;
1290 1287
1291 i->attrs[count] = NULL; 1288 i->attrs[count] = NULL;
1292 1289
1293 count = 0; 1290 count = 0;
1294 SETUP_HOST_ATTRIBUTE(signalling); 1291 SETUP_HOST_ATTRIBUTE(signalling);
1295 1292
1296 BUG_ON(count > SPI_HOST_ATTRS); 1293 BUG_ON(count > SPI_HOST_ATTRS);
1297 1294
1298 i->host_attrs[count] = NULL; 1295 i->host_attrs[count] = NULL;
1299 1296
1300 return &i->t; 1297 return &i->t;
1301 } 1298 }
1302 EXPORT_SYMBOL(spi_attach_transport); 1299 EXPORT_SYMBOL(spi_attach_transport);
1303 1300
1304 void spi_release_transport(struct scsi_transport_template *t) 1301 void spi_release_transport(struct scsi_transport_template *t)
1305 { 1302 {
1306 struct spi_internal *i = to_spi_internal(t); 1303 struct spi_internal *i = to_spi_internal(t);
1307 1304
1308 transport_container_unregister(&i->t.target_attrs); 1305 transport_container_unregister(&i->t.target_attrs);
1309 transport_container_unregister(&i->t.host_attrs); 1306 transport_container_unregister(&i->t.host_attrs);
1310 1307
1311 kfree(i); 1308 kfree(i);
1312 } 1309 }
1313 EXPORT_SYMBOL(spi_release_transport); 1310 EXPORT_SYMBOL(spi_release_transport);
1314 1311
1315 static __init int spi_transport_init(void) 1312 static __init int spi_transport_init(void)
1316 { 1313 {
1317 int error = transport_class_register(&spi_transport_class); 1314 int error = transport_class_register(&spi_transport_class);
1318 if (error) 1315 if (error)
1319 return error; 1316 return error;
1320 error = anon_transport_class_register(&spi_device_class); 1317 error = anon_transport_class_register(&spi_device_class);
1321 return transport_class_register(&spi_host_class); 1318 return transport_class_register(&spi_host_class);
1322 } 1319 }
1323 1320
1324 static void __exit spi_transport_exit(void) 1321 static void __exit spi_transport_exit(void)
1325 { 1322 {
1326 transport_class_unregister(&spi_transport_class); 1323 transport_class_unregister(&spi_transport_class);
1327 anon_transport_class_unregister(&spi_device_class); 1324 anon_transport_class_unregister(&spi_device_class);
1328 transport_class_unregister(&spi_host_class); 1325 transport_class_unregister(&spi_host_class);
1329 } 1326 }
1330 1327
1331 MODULE_AUTHOR("Martin Hicks"); 1328 MODULE_AUTHOR("Martin Hicks");
1332 MODULE_DESCRIPTION("SPI Transport Attributes"); 1329 MODULE_DESCRIPTION("SPI Transport Attributes");
1333 MODULE_LICENSE("GPL"); 1330 MODULE_LICENSE("GPL");
1334 1331
1335 module_init(spi_transport_init); 1332 module_init(spi_transport_init);
1336 module_exit(spi_transport_exit); 1333 module_exit(spi_transport_exit);
1337 1334