]> err.no Git - linux-2.6/blob - drivers/memstick/core/mspro_block.c
00e74ea4dd51d199eef4e28cf7d8a6d18bbccad2
[linux-2.6] / drivers / memstick / core / mspro_block.c
1 /*
2  *  Sony MemoryStick Pro storage support
3  *
4  *  Copyright (C) 2007 Alex Dubov <oakad@yahoo.com>
5  *
6  * This program is free software; you can redistribute it and/or modify
7  * it under the terms of the GNU General Public License version 2 as
8  * published by the Free Software Foundation.
9  *
10  * Special thanks to Carlos Corbacho for providing various MemoryStick cards
11  * that made this driver possible.
12  *
13  */
14
15 #include <linux/blkdev.h>
16 #include <linux/idr.h>
17 #include <linux/hdreg.h>
18 #include <linux/kthread.h>
19 #include <linux/memstick.h>
20
21 #define DRIVER_NAME "mspro_block"
22
23 static int major;
24 module_param(major, int, 0644);
25
26 #define MSPRO_BLOCK_MAX_SEGS  32
27 #define MSPRO_BLOCK_MAX_PAGES ((2 << 16) - 1)
28
29 #define MSPRO_BLOCK_SIGNATURE        0xa5c3
30 #define MSPRO_BLOCK_MAX_ATTRIBUTES   41
31
32 enum {
33         MSPRO_BLOCK_ID_SYSINFO         = 0x10,
34         MSPRO_BLOCK_ID_MODELNAME       = 0x15,
35         MSPRO_BLOCK_ID_MBR             = 0x20,
36         MSPRO_BLOCK_ID_PBR16           = 0x21,
37         MSPRO_BLOCK_ID_PBR32           = 0x22,
38         MSPRO_BLOCK_ID_SPECFILEVALUES1 = 0x25,
39         MSPRO_BLOCK_ID_SPECFILEVALUES2 = 0x26,
40         MSPRO_BLOCK_ID_DEVINFO         = 0x30
41 };
42
43 struct mspro_sys_attr {
44         size_t                  size;
45         void                    *data;
46         unsigned char           id;
47         char                    name[32];
48         struct device_attribute dev_attr;
49 };
50
51 struct mspro_attr_entry {
52         unsigned int  address;
53         unsigned int  size;
54         unsigned char id;
55         unsigned char reserved[3];
56 } __attribute__((packed));
57
58 struct mspro_attribute {
59         unsigned short          signature;
60         unsigned short          version;
61         unsigned char           count;
62         unsigned char           reserved[11];
63         struct mspro_attr_entry entries[];
64 } __attribute__((packed));
65
66 struct mspro_sys_info {
67         unsigned char  class;
68         unsigned char  reserved0;
69         unsigned short block_size;
70         unsigned short block_count;
71         unsigned short user_block_count;
72         unsigned short page_size;
73         unsigned char  reserved1[2];
74         unsigned char  assembly_date[8];
75         unsigned int   serial_number;
76         unsigned char  assembly_maker_code;
77         unsigned char  assembly_model_code[3];
78         unsigned short memory_maker_code;
79         unsigned short memory_model_code;
80         unsigned char  reserved2[4];
81         unsigned char  vcc;
82         unsigned char  vpp;
83         unsigned short controller_number;
84         unsigned short controller_function;
85         unsigned short start_sector;
86         unsigned short unit_size;
87         unsigned char  ms_sub_class;
88         unsigned char  reserved3[4];
89         unsigned char  interface_type;
90         unsigned short controller_code;
91         unsigned char  format_type;
92         unsigned char  reserved4;
93         unsigned char  device_type;
94         unsigned char  reserved5[7];
95         unsigned char  mspro_id[16];
96         unsigned char  reserved6[16];
97 } __attribute__((packed));
98
99 struct mspro_mbr {
100         unsigned char boot_partition;
101         unsigned char start_head;
102         unsigned char start_sector;
103         unsigned char start_cylinder;
104         unsigned char partition_type;
105         unsigned char end_head;
106         unsigned char end_sector;
107         unsigned char end_cylinder;
108         unsigned int  start_sectors;
109         unsigned int  sectors_per_partition;
110 } __attribute__((packed));
111
112 struct mspro_devinfo {
113         unsigned short cylinders;
114         unsigned short heads;
115         unsigned short bytes_per_track;
116         unsigned short bytes_per_sector;
117         unsigned short sectors_per_track;
118         unsigned char  reserved[6];
119 } __attribute__((packed));
120
121 struct mspro_block_data {
122         struct memstick_dev   *card;
123         unsigned int          usage_count;
124         struct gendisk        *disk;
125         struct request_queue  *queue;
126         spinlock_t            q_lock;
127         wait_queue_head_t     q_wait;
128         struct task_struct    *q_thread;
129
130         unsigned short        page_size;
131         unsigned short        cylinders;
132         unsigned short        heads;
133         unsigned short        sectors_per_track;
134
135         unsigned char         system;
136         unsigned char         read_only:1,
137                               active:1,
138                               has_request:1,
139                               data_dir:1;
140         unsigned char         transfer_cmd;
141
142         int                   (*mrq_handler)(struct memstick_dev *card,
143                                              struct memstick_request **mrq);
144
145         struct attribute_group attr_group;
146
147         struct scatterlist    req_sg[MSPRO_BLOCK_MAX_SEGS];
148         unsigned int          seg_count;
149         unsigned int          current_seg;
150         unsigned short        current_page;
151 };
152
153 static DEFINE_IDR(mspro_block_disk_idr);
154 static DEFINE_MUTEX(mspro_block_disk_lock);
155
156 /*** Block device ***/
157
158 static int mspro_block_bd_open(struct inode *inode, struct file *filp)
159 {
160         struct gendisk *disk = inode->i_bdev->bd_disk;
161         struct mspro_block_data *msb = disk->private_data;
162         int rc = -ENXIO;
163
164         mutex_lock(&mspro_block_disk_lock);
165
166         if (msb && msb->card) {
167                 msb->usage_count++;
168                 if ((filp->f_mode & FMODE_WRITE) && msb->read_only)
169                         rc = -EROFS;
170                 else
171                         rc = 0;
172         }
173
174         mutex_unlock(&mspro_block_disk_lock);
175
176         return rc;
177 }
178
179
180 static int mspro_block_disk_release(struct gendisk *disk)
181 {
182         struct mspro_block_data *msb = disk->private_data;
183         int disk_id = disk->first_minor >> MEMSTICK_PART_SHIFT;
184
185         mutex_lock(&mspro_block_disk_lock);
186
187         if (msb->usage_count) {
188                 msb->usage_count--;
189                 if (!msb->usage_count) {
190                         kfree(msb);
191                         disk->private_data = NULL;
192                         idr_remove(&mspro_block_disk_idr, disk_id);
193                         put_disk(disk);
194                 }
195         }
196
197         mutex_unlock(&mspro_block_disk_lock);
198
199         return 0;
200 }
201
202 static int mspro_block_bd_release(struct inode *inode, struct file *filp)
203 {
204         struct gendisk *disk = inode->i_bdev->bd_disk;
205         return mspro_block_disk_release(disk);
206 }
207
208 static int mspro_block_bd_getgeo(struct block_device *bdev,
209                                  struct hd_geometry *geo)
210 {
211         struct mspro_block_data *msb = bdev->bd_disk->private_data;
212
213         geo->heads = msb->heads;
214         geo->sectors = msb->sectors_per_track;
215         geo->cylinders = msb->cylinders;
216
217         return 0;
218 }
219
220 static struct block_device_operations ms_block_bdops = {
221         .open    = mspro_block_bd_open,
222         .release = mspro_block_bd_release,
223         .getgeo  = mspro_block_bd_getgeo,
224         .owner   = THIS_MODULE
225 };
226
227 /*** Information ***/
228
229 static struct mspro_sys_attr *mspro_from_sysfs_attr(struct attribute *attr)
230 {
231         struct device_attribute *dev_attr
232                 = container_of(attr, struct device_attribute, attr);
233         return container_of(dev_attr, struct mspro_sys_attr, dev_attr);
234 }
235
236 static const char *mspro_block_attr_name(unsigned char tag)
237 {
238         switch (tag) {
239         case MSPRO_BLOCK_ID_SYSINFO:
240                 return "attr_sysinfo";
241         case MSPRO_BLOCK_ID_MODELNAME:
242                 return "attr_modelname";
243         case MSPRO_BLOCK_ID_MBR:
244                 return "attr_mbr";
245         case MSPRO_BLOCK_ID_PBR16:
246                 return "attr_pbr16";
247         case MSPRO_BLOCK_ID_PBR32:
248                 return "attr_pbr32";
249         case MSPRO_BLOCK_ID_SPECFILEVALUES1:
250                 return "attr_specfilevalues1";
251         case MSPRO_BLOCK_ID_SPECFILEVALUES2:
252                 return "attr_specfilevalues2";
253         case MSPRO_BLOCK_ID_DEVINFO:
254                 return "attr_devinfo";
255         default:
256                 return NULL;
257         };
258 }
259
260 typedef ssize_t (*sysfs_show_t)(struct device *dev,
261                                 struct device_attribute *attr,
262                                 char *buffer);
263
264 static ssize_t mspro_block_attr_show_default(struct device *dev,
265                                              struct device_attribute *attr,
266                                              char *buffer)
267 {
268         struct mspro_sys_attr *s_attr = container_of(attr,
269                                                      struct mspro_sys_attr,
270                                                      dev_attr);
271
272         ssize_t cnt, rc = 0;
273
274         for (cnt = 0; cnt < s_attr->size; cnt++) {
275                 if (cnt && !(cnt % 16)) {
276                         if (PAGE_SIZE - rc)
277                                 buffer[rc++] = '\n';
278                 }
279
280                 rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "%02x ",
281                                 ((unsigned char *)s_attr->data)[cnt]);
282         }
283         return rc;
284 }
285
286 static ssize_t mspro_block_attr_show_sysinfo(struct device *dev,
287                                              struct device_attribute *attr,
288                                              char *buffer)
289 {
290         struct mspro_sys_attr *x_attr = container_of(attr,
291                                                      struct mspro_sys_attr,
292                                                      dev_attr);
293         struct mspro_sys_info *x_sys = x_attr->data;
294         ssize_t rc = 0;
295
296         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "class: %x\n",
297                         x_sys->class);
298         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "block size: %x\n",
299                         be16_to_cpu(x_sys->block_size));
300         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "block count: %x\n",
301                         be16_to_cpu(x_sys->block_count));
302         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "user block count: %x\n",
303                         be16_to_cpu(x_sys->user_block_count));
304         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "page size: %x\n",
305                         be16_to_cpu(x_sys->page_size));
306         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "assembly date: "
307                         "%d %04u-%02u-%02u %02u:%02u:%02u\n",
308                         x_sys->assembly_date[0],
309                         be16_to_cpu(*(unsigned short *)
310                                     &x_sys->assembly_date[1]),
311                         x_sys->assembly_date[3], x_sys->assembly_date[4],
312                         x_sys->assembly_date[5], x_sys->assembly_date[6],
313                         x_sys->assembly_date[7]);
314         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "serial number: %x\n",
315                         be32_to_cpu(x_sys->serial_number));
316         rc += scnprintf(buffer + rc, PAGE_SIZE - rc,
317                         "assembly maker code: %x\n",
318                         x_sys->assembly_maker_code);
319         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "assembly model code: "
320                         "%02x%02x%02x\n", x_sys->assembly_model_code[0],
321                         x_sys->assembly_model_code[1],
322                         x_sys->assembly_model_code[2]);
323         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "memory maker code: %x\n",
324                         be16_to_cpu(x_sys->memory_maker_code));
325         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "memory model code: %x\n",
326                         be16_to_cpu(x_sys->memory_model_code));
327         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "vcc: %x\n",
328                         x_sys->vcc);
329         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "vpp: %x\n",
330                         x_sys->vpp);
331         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "controller number: %x\n",
332                         be16_to_cpu(x_sys->controller_number));
333         rc += scnprintf(buffer + rc, PAGE_SIZE - rc,
334                         "controller function: %x\n",
335                         be16_to_cpu(x_sys->controller_function));
336         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "start sector: %x\n",
337                         be16_to_cpu(x_sys->start_sector));
338         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "unit size: %x\n",
339                         be16_to_cpu(x_sys->unit_size));
340         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "sub class: %x\n",
341                         x_sys->ms_sub_class);
342         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "interface type: %x\n",
343                         x_sys->interface_type);
344         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "controller code: %x\n",
345                         be16_to_cpu(x_sys->controller_code));
346         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "format type: %x\n",
347                         x_sys->format_type);
348         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "device type: %x\n",
349                         x_sys->device_type);
350         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "mspro id: %s\n",
351                         x_sys->mspro_id);
352         return rc;
353 }
354
355 static ssize_t mspro_block_attr_show_modelname(struct device *dev,
356                                                struct device_attribute *attr,
357                                                char *buffer)
358 {
359         struct mspro_sys_attr *s_attr = container_of(attr,
360                                                      struct mspro_sys_attr,
361                                                      dev_attr);
362
363         return scnprintf(buffer, PAGE_SIZE, "%s", (char *)s_attr->data);
364 }
365
366 static ssize_t mspro_block_attr_show_mbr(struct device *dev,
367                                          struct device_attribute *attr,
368                                          char *buffer)
369 {
370         struct mspro_sys_attr *x_attr = container_of(attr,
371                                                      struct mspro_sys_attr,
372                                                      dev_attr);
373         struct mspro_mbr *x_mbr = x_attr->data;
374         ssize_t rc = 0;
375
376         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "boot partition: %x\n",
377                         x_mbr->boot_partition);
378         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "start head: %x\n",
379                         x_mbr->start_head);
380         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "start sector: %x\n",
381                         x_mbr->start_sector);
382         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "start cylinder: %x\n",
383                         x_mbr->start_cylinder);
384         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "partition type: %x\n",
385                         x_mbr->partition_type);
386         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "end head: %x\n",
387                         x_mbr->end_head);
388         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "end sector: %x\n",
389                         x_mbr->end_sector);
390         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "end cylinder: %x\n",
391                         x_mbr->end_cylinder);
392         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "start sectors: %x\n",
393                         x_mbr->start_sectors);
394         rc += scnprintf(buffer + rc, PAGE_SIZE - rc,
395                         "sectors per partition: %x\n",
396                         x_mbr->sectors_per_partition);
397         return rc;
398 }
399
400 static ssize_t mspro_block_attr_show_devinfo(struct device *dev,
401                                              struct device_attribute *attr,
402                                              char *buffer)
403 {
404         struct mspro_sys_attr *x_attr = container_of(attr,
405                                                      struct mspro_sys_attr,
406                                                      dev_attr);
407         struct mspro_devinfo *x_devinfo = x_attr->data;
408         ssize_t rc = 0;
409
410         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "cylinders: %x\n",
411                         be16_to_cpu(x_devinfo->cylinders));
412         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "heads: %x\n",
413                         be16_to_cpu(x_devinfo->heads));
414         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "bytes per track: %x\n",
415                         be16_to_cpu(x_devinfo->bytes_per_track));
416         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "bytes per sector: %x\n",
417                         be16_to_cpu(x_devinfo->bytes_per_sector));
418         rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "sectors per track: %x\n",
419                         be16_to_cpu(x_devinfo->sectors_per_track));
420         return rc;
421 }
422
423 static sysfs_show_t mspro_block_attr_show(unsigned char tag)
424 {
425         switch (tag) {
426         case MSPRO_BLOCK_ID_SYSINFO:
427                 return mspro_block_attr_show_sysinfo;
428         case MSPRO_BLOCK_ID_MODELNAME:
429                 return mspro_block_attr_show_modelname;
430         case MSPRO_BLOCK_ID_MBR:
431                 return mspro_block_attr_show_mbr;
432         case MSPRO_BLOCK_ID_DEVINFO:
433                 return mspro_block_attr_show_devinfo;
434         default:
435                 return mspro_block_attr_show_default;
436         }
437 }
438
439 /*** Protocol handlers ***/
440
441 /*
442  * Functions prefixed with "h_" are protocol callbacks. They can be called from
443  * interrupt context. Return value of 0 means that request processing is still
444  * ongoing, while special error value of -EAGAIN means that current request is
445  * finished (and request processor should come back some time later).
446  */
447
448 static int h_mspro_block_req_init(struct memstick_dev *card,
449                                   struct memstick_request **mrq)
450 {
451         struct mspro_block_data *msb = memstick_get_drvdata(card);
452
453         *mrq = &card->current_mrq;
454         card->next_request = msb->mrq_handler;
455         return 0;
456 }
457
458 static int h_mspro_block_default(struct memstick_dev *card,
459                                  struct memstick_request **mrq)
460 {
461         complete(&card->mrq_complete);
462         if (!(*mrq)->error)
463                 return -EAGAIN;
464         else
465                 return (*mrq)->error;
466 }
467
468 static int h_mspro_block_get_ro(struct memstick_dev *card,
469                                 struct memstick_request **mrq)
470 {
471         struct mspro_block_data *msb = memstick_get_drvdata(card);
472
473         if ((*mrq)->error) {
474                 complete(&card->mrq_complete);
475                 return (*mrq)->error;
476         }
477
478         if ((*mrq)->data[offsetof(struct ms_status_register, status0)]
479             & MEMSTICK_STATUS0_WP)
480                 msb->read_only = 1;
481         else
482                 msb->read_only = 0;
483
484         complete(&card->mrq_complete);
485         return -EAGAIN;
486 }
487
488 static int h_mspro_block_wait_for_ced(struct memstick_dev *card,
489                                       struct memstick_request **mrq)
490 {
491         if ((*mrq)->error) {
492                 complete(&card->mrq_complete);
493                 return (*mrq)->error;
494         }
495
496         dev_dbg(&card->dev, "wait for ced: value %x\n", (*mrq)->data[0]);
497
498         if ((*mrq)->data[0] & (MEMSTICK_INT_CMDNAK | MEMSTICK_INT_ERR)) {
499                 card->current_mrq.error = -EFAULT;
500                 complete(&card->mrq_complete);
501                 return card->current_mrq.error;
502         }
503
504         if (!((*mrq)->data[0] & MEMSTICK_INT_CED))
505                 return 0;
506         else {
507                 card->current_mrq.error = 0;
508                 complete(&card->mrq_complete);
509                 return -EAGAIN;
510         }
511 }
512
513 static int h_mspro_block_transfer_data(struct memstick_dev *card,
514                                        struct memstick_request **mrq)
515 {
516         struct memstick_host *host = card->host;
517         struct mspro_block_data *msb = memstick_get_drvdata(card);
518         unsigned char t_val = 0;
519         struct scatterlist t_sg = { 0 };
520         size_t t_offset;
521
522         if ((*mrq)->error) {
523                 complete(&card->mrq_complete);
524                 return (*mrq)->error;
525         }
526
527         switch ((*mrq)->tpc) {
528         case MS_TPC_WRITE_REG:
529                 memstick_init_req(*mrq, MS_TPC_SET_CMD, &msb->transfer_cmd, 1);
530                 (*mrq)->get_int_reg = 1;
531                 return 0;
532         case MS_TPC_SET_CMD:
533                 t_val = (*mrq)->int_reg;
534                 memstick_init_req(*mrq, MS_TPC_GET_INT, NULL, 1);
535                 if (host->caps & MEMSTICK_CAP_AUTO_GET_INT)
536                         goto has_int_reg;
537                 return 0;
538         case MS_TPC_GET_INT:
539                 t_val = (*mrq)->data[0];
540 has_int_reg:
541                 if (t_val & (MEMSTICK_INT_CMDNAK | MEMSTICK_INT_ERR)) {
542                         t_val = MSPRO_CMD_STOP;
543                         memstick_init_req(*mrq, MS_TPC_SET_CMD, &t_val, 1);
544                         card->next_request = h_mspro_block_default;
545                         return 0;
546                 }
547
548                 if (msb->current_page
549                     == (msb->req_sg[msb->current_seg].length
550                         / msb->page_size)) {
551                         msb->current_page = 0;
552                         msb->current_seg++;
553
554                         if (msb->current_seg == msb->seg_count) {
555                                 if (t_val & MEMSTICK_INT_CED) {
556                                         complete(&card->mrq_complete);
557                                         return -EAGAIN;
558                                 } else {
559                                         card->next_request
560                                                 = h_mspro_block_wait_for_ced;
561                                         memstick_init_req(*mrq, MS_TPC_GET_INT,
562                                                           NULL, 1);
563                                         return 0;
564                                 }
565                         }
566                 }
567
568                 if (!(t_val & MEMSTICK_INT_BREQ)) {
569                         memstick_init_req(*mrq, MS_TPC_GET_INT, NULL, 1);
570                         return 0;
571                 }
572
573                 t_offset = msb->req_sg[msb->current_seg].offset;
574                 t_offset += msb->current_page * msb->page_size;
575
576                 sg_set_page(&t_sg,
577                             nth_page(sg_page(&(msb->req_sg[msb->current_seg])),
578                                      t_offset >> PAGE_SHIFT),
579                             msb->page_size, offset_in_page(t_offset));
580
581                 memstick_init_req_sg(*mrq, msb->data_dir == READ
582                                            ? MS_TPC_READ_LONG_DATA
583                                            : MS_TPC_WRITE_LONG_DATA,
584                                      &t_sg);
585                 (*mrq)->get_int_reg = 1;
586                 return 0;
587         case MS_TPC_READ_LONG_DATA:
588         case MS_TPC_WRITE_LONG_DATA:
589                 msb->current_page++;
590                 if (host->caps & MEMSTICK_CAP_AUTO_GET_INT) {
591                         t_val = (*mrq)->int_reg;
592                         goto has_int_reg;
593                 } else {
594                         memstick_init_req(*mrq, MS_TPC_GET_INT, NULL, 1);
595                         return 0;
596                 }
597
598         default:
599                 BUG();
600         }
601 }
602
603 /*** Data transfer ***/
604
605 static void mspro_block_process_request(struct memstick_dev *card,
606                                         struct request *req)
607 {
608         struct mspro_block_data *msb = memstick_get_drvdata(card);
609         struct mspro_param_register param;
610         int rc, chunk, cnt;
611         unsigned short page_count;
612         sector_t t_sec;
613         unsigned long flags;
614
615         do {
616                 page_count = 0;
617                 msb->current_seg = 0;
618                 msb->seg_count = blk_rq_map_sg(req->q, req, msb->req_sg);
619
620                 if (msb->seg_count) {
621                         msb->current_page = 0;
622                         for (rc = 0; rc < msb->seg_count; rc++)
623                                 page_count += msb->req_sg[rc].length
624                                               / msb->page_size;
625
626                         t_sec = req->sector;
627                         sector_div(t_sec, msb->page_size >> 9);
628                         param.system = msb->system;
629                         param.data_count = cpu_to_be16(page_count);
630                         param.data_address = cpu_to_be32((uint32_t)t_sec);
631                         param.tpc_param = 0;
632
633                         msb->data_dir = rq_data_dir(req);
634                         msb->transfer_cmd = msb->data_dir == READ
635                                             ? MSPRO_CMD_READ_DATA
636                                             : MSPRO_CMD_WRITE_DATA;
637
638                         dev_dbg(&card->dev, "data transfer: cmd %x, "
639                                 "lba %x, count %x\n", msb->transfer_cmd,
640                                 be32_to_cpu(param.data_address),
641                                 page_count);
642
643                         card->next_request = h_mspro_block_req_init;
644                         msb->mrq_handler = h_mspro_block_transfer_data;
645                         memstick_init_req(&card->current_mrq, MS_TPC_WRITE_REG,
646                                           &param, sizeof(param));
647                         memstick_new_req(card->host);
648                         wait_for_completion(&card->mrq_complete);
649                         rc = card->current_mrq.error;
650
651                         if (rc || (card->current_mrq.tpc == MSPRO_CMD_STOP)) {
652                                 for (cnt = 0; cnt < msb->current_seg; cnt++)
653                                         page_count += msb->req_sg[cnt].length
654                                                       / msb->page_size;
655
656                                 if (msb->current_page)
657                                         page_count += msb->current_page - 1;
658
659                                 if (page_count && (msb->data_dir == READ))
660                                         rc = msb->page_size * page_count;
661                                 else
662                                         rc = -EIO;
663                         } else
664                                 rc = msb->page_size * page_count;
665                 } else
666                         rc = -EFAULT;
667
668                 spin_lock_irqsave(&msb->q_lock, flags);
669                 if (rc >= 0)
670                         chunk = __blk_end_request(req, 0, rc);
671                 else
672                         chunk = __blk_end_request(req, rc, 0);
673
674                 dev_dbg(&card->dev, "end chunk %d, %d\n", rc, chunk);
675                 spin_unlock_irqrestore(&msb->q_lock, flags);
676         } while (chunk);
677 }
678
679 static int mspro_block_has_request(struct mspro_block_data *msb)
680 {
681         int rc = 0;
682         unsigned long flags;
683
684         spin_lock_irqsave(&msb->q_lock, flags);
685         if (kthread_should_stop() || msb->has_request)
686                 rc = 1;
687         spin_unlock_irqrestore(&msb->q_lock, flags);
688         return rc;
689 }
690
691 static int mspro_block_queue_thread(void *data)
692 {
693         struct memstick_dev *card = data;
694         struct memstick_host *host = card->host;
695         struct mspro_block_data *msb = memstick_get_drvdata(card);
696         struct request *req;
697         unsigned long flags;
698
699         while (1) {
700                 wait_event(msb->q_wait, mspro_block_has_request(msb));
701                 dev_dbg(&card->dev, "thread iter\n");
702
703                 spin_lock_irqsave(&msb->q_lock, flags);
704                 req = elv_next_request(msb->queue);
705                 dev_dbg(&card->dev, "next req %p\n", req);
706                 if (!req) {
707                         msb->has_request = 0;
708                         if (kthread_should_stop()) {
709                                 spin_unlock_irqrestore(&msb->q_lock, flags);
710                                 break;
711                         }
712                 } else
713                         msb->has_request = 1;
714                 spin_unlock_irqrestore(&msb->q_lock, flags);
715
716                 if (req) {
717                         mutex_lock(&host->lock);
718                         mspro_block_process_request(card, req);
719                         mutex_unlock(&host->lock);
720                 }
721         }
722         dev_dbg(&card->dev, "thread finished\n");
723         return 0;
724 }
725
726 static void mspro_block_request(struct request_queue *q)
727 {
728         struct memstick_dev *card = q->queuedata;
729         struct mspro_block_data *msb = memstick_get_drvdata(card);
730         struct request *req = NULL;
731
732         if (msb->q_thread) {
733                 msb->has_request = 1;
734                 wake_up_all(&msb->q_wait);
735         } else {
736                 while ((req = elv_next_request(q)) != NULL)
737                         end_queued_request(req, -ENODEV);
738         }
739 }
740
741 /*** Initialization ***/
742
743 static int mspro_block_wait_for_ced(struct memstick_dev *card)
744 {
745         struct mspro_block_data *msb = memstick_get_drvdata(card);
746
747         card->next_request = h_mspro_block_req_init;
748         msb->mrq_handler = h_mspro_block_wait_for_ced;
749         memstick_init_req(&card->current_mrq, MS_TPC_GET_INT, NULL, 1);
750         memstick_new_req(card->host);
751         wait_for_completion(&card->mrq_complete);
752         return card->current_mrq.error;
753 }
754
755 static int mspro_block_switch_to_parallel(struct memstick_dev *card)
756 {
757         struct memstick_host *host = card->host;
758         struct mspro_block_data *msb = memstick_get_drvdata(card);
759         struct mspro_param_register param = {
760                 .system = 0,
761                 .data_count = 0,
762                 .data_address = 0,
763                 .tpc_param = 0
764         };
765
766         card->next_request = h_mspro_block_req_init;
767         msb->mrq_handler = h_mspro_block_default;
768         memstick_init_req(&card->current_mrq, MS_TPC_WRITE_REG, &param,
769                           sizeof(param));
770         memstick_new_req(host);
771         wait_for_completion(&card->mrq_complete);
772         if (card->current_mrq.error)
773                 return card->current_mrq.error;
774
775         msb->system = MEMSTICK_SYS_PAR4;
776         host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_PAR4);
777
778         card->next_request = h_mspro_block_req_init;
779         msb->mrq_handler = h_mspro_block_default;
780         memstick_init_req(&card->current_mrq, MS_TPC_GET_INT, NULL, 1);
781         memstick_new_req(card->host);
782         wait_for_completion(&card->mrq_complete);
783
784         if (card->current_mrq.error) {
785                 msb->system = 0x80;
786                 host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_SERIAL);
787                 return -EFAULT;
788         }
789
790         return 0;
791 }
792
793 /* Memory allocated for attributes by this function should be freed by
794  * mspro_block_data_clear, no matter if the initialization process succeded
795  * or failed.
796  */
797 static int mspro_block_read_attributes(struct memstick_dev *card)
798 {
799         struct mspro_block_data *msb = memstick_get_drvdata(card);
800         struct mspro_param_register param = {
801                 .system = msb->system,
802                 .data_count = cpu_to_be16(1),
803                 .data_address = 0,
804                 .tpc_param = 0
805         };
806         struct mspro_attribute *attr = NULL;
807         struct mspro_sys_attr *s_attr = NULL;
808         unsigned char *buffer = NULL;
809         int cnt, rc, attr_count;
810         unsigned int addr;
811         unsigned short page_count;
812
813         attr = kmalloc(msb->page_size, GFP_KERNEL);
814         if (!attr)
815                 return -ENOMEM;
816
817         sg_init_one(&msb->req_sg[0], attr, msb->page_size);
818         msb->seg_count = 1;
819         msb->current_seg = 0;
820         msb->current_page = 0;
821         msb->data_dir = READ;
822         msb->transfer_cmd = MSPRO_CMD_READ_ATRB;
823
824         card->next_request = h_mspro_block_req_init;
825         msb->mrq_handler = h_mspro_block_transfer_data;
826         memstick_init_req(&card->current_mrq, MS_TPC_WRITE_REG, &param,
827                           sizeof(param));
828         memstick_new_req(card->host);
829         wait_for_completion(&card->mrq_complete);
830         if (card->current_mrq.error) {
831                 rc = card->current_mrq.error;
832                 goto out_free_attr;
833         }
834
835         if (be16_to_cpu(attr->signature) != MSPRO_BLOCK_SIGNATURE) {
836                 printk(KERN_ERR "%s: unrecognized device signature %x\n",
837                        card->dev.bus_id, be16_to_cpu(attr->signature));
838                 rc = -ENODEV;
839                 goto out_free_attr;
840         }
841
842         if (attr->count > MSPRO_BLOCK_MAX_ATTRIBUTES) {
843                 printk(KERN_WARNING "%s: way too many attribute entries\n",
844                        card->dev.bus_id);
845                 attr_count = MSPRO_BLOCK_MAX_ATTRIBUTES;
846         } else
847                 attr_count = attr->count;
848
849         msb->attr_group.attrs = kzalloc((attr_count + 1)
850                                         * sizeof(struct attribute),
851                                         GFP_KERNEL);
852         if (!msb->attr_group.attrs) {
853                 rc = -ENOMEM;
854                 goto out_free_attr;
855         }
856         msb->attr_group.name = "media_attributes";
857
858         buffer = kmalloc(msb->page_size, GFP_KERNEL);
859         if (!buffer) {
860                 rc = -ENOMEM;
861                 goto out_free_attr;
862         }
863         memcpy(buffer, (char *)attr, msb->page_size);
864         page_count = 1;
865
866         for (cnt = 0; cnt < attr_count; ++cnt) {
867                 s_attr = kzalloc(sizeof(struct mspro_sys_attr), GFP_KERNEL);
868                 if (!s_attr) {
869                         rc = -ENOMEM;
870                         goto out_free_buffer;
871                 }
872
873                 msb->attr_group.attrs[cnt] = &s_attr->dev_attr.attr;
874                 addr = be32_to_cpu(attr->entries[cnt].address);
875                 rc = be32_to_cpu(attr->entries[cnt].size);
876                 dev_dbg(&card->dev, "adding attribute %d: id %x, address %x, "
877                         "size %x\n", cnt, attr->entries[cnt].id, addr, rc);
878                 s_attr->id = attr->entries[cnt].id;
879                 if (mspro_block_attr_name(s_attr->id))
880                         snprintf(s_attr->name, sizeof(s_attr->name), "%s",
881                                  mspro_block_attr_name(attr->entries[cnt].id));
882                 else
883                         snprintf(s_attr->name, sizeof(s_attr->name),
884                                  "attr_x%02x", attr->entries[cnt].id);
885
886                 s_attr->dev_attr.attr.name = s_attr->name;
887                 s_attr->dev_attr.attr.mode = S_IRUGO;
888                 s_attr->dev_attr.attr.owner = THIS_MODULE;
889                 s_attr->dev_attr.show = mspro_block_attr_show(s_attr->id);
890
891                 if (!rc)
892                         continue;
893
894                 s_attr->size = rc;
895                 s_attr->data = kmalloc(rc, GFP_KERNEL);
896                 if (!s_attr->data) {
897                         rc = -ENOMEM;
898                         goto out_free_buffer;
899                 }
900
901                 if (((addr / msb->page_size)
902                      == be32_to_cpu(param.data_address))
903                     && (((addr + rc - 1) / msb->page_size)
904                         == be32_to_cpu(param.data_address))) {
905                         memcpy(s_attr->data, buffer + addr % msb->page_size,
906                                rc);
907                         continue;
908                 }
909
910                 if (page_count <= (rc / msb->page_size)) {
911                         kfree(buffer);
912                         page_count = (rc / msb->page_size) + 1;
913                         buffer = kmalloc(page_count * msb->page_size,
914                                          GFP_KERNEL);
915                         if (!buffer) {
916                                 rc = -ENOMEM;
917                                 goto out_free_attr;
918                         }
919                 }
920
921                 param.system = msb->system;
922                 param.data_count = cpu_to_be16((rc / msb->page_size) + 1);
923                 param.data_address = cpu_to_be32(addr / msb->page_size);
924                 param.tpc_param = 0;
925
926                 sg_init_one(&msb->req_sg[0], buffer,
927                             be16_to_cpu(param.data_count) * msb->page_size);
928                 msb->seg_count = 1;
929                 msb->current_seg = 0;
930                 msb->current_page = 0;
931                 msb->data_dir = READ;
932                 msb->transfer_cmd = MSPRO_CMD_READ_ATRB;
933
934                 dev_dbg(&card->dev, "reading attribute pages %x, %x\n",
935                         be32_to_cpu(param.data_address),
936                         be16_to_cpu(param.data_count));
937
938                 card->next_request = h_mspro_block_req_init;
939                 msb->mrq_handler = h_mspro_block_transfer_data;
940                 memstick_init_req(&card->current_mrq, MS_TPC_WRITE_REG,
941                                   (char *)&param, sizeof(param));
942                 memstick_new_req(card->host);
943                 wait_for_completion(&card->mrq_complete);
944                 if (card->current_mrq.error) {
945                         rc = card->current_mrq.error;
946                         goto out_free_buffer;
947                 }
948
949                 memcpy(s_attr->data, buffer + addr % msb->page_size, rc);
950         }
951
952         rc = 0;
953 out_free_buffer:
954         kfree(buffer);
955 out_free_attr:
956         kfree(attr);
957         return rc;
958 }
959
960 static int mspro_block_init_card(struct memstick_dev *card)
961 {
962         struct mspro_block_data *msb = memstick_get_drvdata(card);
963         struct memstick_host *host = card->host;
964         int rc = 0;
965
966         msb->system = MEMSTICK_SYS_SERIAL;
967         card->reg_addr.r_offset = offsetof(struct mspro_register, status);
968         card->reg_addr.r_length = sizeof(struct ms_status_register);
969         card->reg_addr.w_offset = offsetof(struct mspro_register, param);
970         card->reg_addr.w_length = sizeof(struct mspro_param_register);
971
972         if (memstick_set_rw_addr(card))
973                 return -EIO;
974
975         if (host->caps & MEMSTICK_CAP_PAR4) {
976                 if (mspro_block_switch_to_parallel(card))
977                         printk(KERN_WARNING "%s: could not switch to "
978                                "parallel interface\n", card->dev.bus_id);
979         }
980
981         rc = mspro_block_wait_for_ced(card);
982         if (rc)
983                 return rc;
984         dev_dbg(&card->dev, "card activated\n");
985
986         card->next_request = h_mspro_block_req_init;
987         msb->mrq_handler = h_mspro_block_get_ro;
988         memstick_init_req(&card->current_mrq, MS_TPC_READ_REG, NULL,
989                           sizeof(struct ms_status_register));
990         memstick_new_req(card->host);
991         wait_for_completion(&card->mrq_complete);
992         if (card->current_mrq.error)
993                 return card->current_mrq.error;
994
995         dev_dbg(&card->dev, "card r/w status %d\n", msb->read_only ? 0 : 1);
996
997         msb->page_size = 512;
998         rc = mspro_block_read_attributes(card);
999         if (rc)
1000                 return rc;
1001
1002         dev_dbg(&card->dev, "attributes loaded\n");
1003         return 0;
1004
1005 }
1006
1007 static int mspro_block_init_disk(struct memstick_dev *card)
1008 {
1009         struct mspro_block_data *msb = memstick_get_drvdata(card);
1010         struct memstick_host *host = card->host;
1011         struct mspro_devinfo *dev_info = NULL;
1012         struct mspro_sys_info *sys_info = NULL;
1013         struct mspro_sys_attr *s_attr = NULL;
1014         int rc, disk_id;
1015         u64 limit = BLK_BOUNCE_HIGH;
1016         unsigned long capacity;
1017
1018         if (host->cdev.dev->dma_mask && *(host->cdev.dev->dma_mask))
1019                 limit = *(host->cdev.dev->dma_mask);
1020
1021         for (rc = 0; msb->attr_group.attrs[rc]; ++rc) {
1022                 s_attr = mspro_from_sysfs_attr(msb->attr_group.attrs[rc]);
1023
1024                 if (s_attr->id == MSPRO_BLOCK_ID_DEVINFO)
1025                         dev_info = s_attr->data;
1026                 else if (s_attr->id == MSPRO_BLOCK_ID_SYSINFO)
1027                         sys_info = s_attr->data;
1028         }
1029
1030         if (!dev_info || !sys_info)
1031                 return -ENODEV;
1032
1033         msb->cylinders = be16_to_cpu(dev_info->cylinders);
1034         msb->heads = be16_to_cpu(dev_info->heads);
1035         msb->sectors_per_track = be16_to_cpu(dev_info->sectors_per_track);
1036
1037         msb->page_size = be16_to_cpu(sys_info->unit_size);
1038
1039         if (!idr_pre_get(&mspro_block_disk_idr, GFP_KERNEL))
1040                 return -ENOMEM;
1041
1042         mutex_lock(&mspro_block_disk_lock);
1043         rc = idr_get_new(&mspro_block_disk_idr, card, &disk_id);
1044         mutex_unlock(&mspro_block_disk_lock);
1045
1046         if (rc)
1047                 return rc;
1048
1049         if ((disk_id << MEMSTICK_PART_SHIFT) > 255) {
1050                 rc = -ENOSPC;
1051                 goto out_release_id;
1052         }
1053
1054         msb->disk = alloc_disk(1 << MEMSTICK_PART_SHIFT);
1055         if (!msb->disk) {
1056                 rc = -ENOMEM;
1057                 goto out_release_id;
1058         }
1059
1060         spin_lock_init(&msb->q_lock);
1061         init_waitqueue_head(&msb->q_wait);
1062
1063         msb->queue = blk_init_queue(mspro_block_request, &msb->q_lock);
1064         if (!msb->queue) {
1065                 rc = -ENOMEM;
1066                 goto out_put_disk;
1067         }
1068
1069         msb->queue->queuedata = card;
1070
1071         blk_queue_bounce_limit(msb->queue, limit);
1072         blk_queue_max_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES);
1073         blk_queue_max_phys_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);
1074         blk_queue_max_hw_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);
1075         blk_queue_max_segment_size(msb->queue,
1076                                    MSPRO_BLOCK_MAX_PAGES * msb->page_size);
1077
1078         msb->disk->major = major;
1079         msb->disk->first_minor = disk_id << MEMSTICK_PART_SHIFT;
1080         msb->disk->fops = &ms_block_bdops;
1081         msb->usage_count = 1;
1082         msb->disk->private_data = msb;
1083         msb->disk->queue = msb->queue;
1084         msb->disk->driverfs_dev = &card->dev;
1085
1086         sprintf(msb->disk->disk_name, "mspblk%d", disk_id);
1087
1088         blk_queue_hardsect_size(msb->queue, msb->page_size);
1089
1090         capacity = be16_to_cpu(sys_info->user_block_count);
1091         capacity *= be16_to_cpu(sys_info->block_size);
1092         capacity *= msb->page_size >> 9;
1093         set_capacity(msb->disk, capacity);
1094         dev_dbg(&card->dev, "capacity set %ld\n", capacity);
1095         msb->q_thread = kthread_run(mspro_block_queue_thread, card,
1096                                     DRIVER_NAME"d");
1097         if (IS_ERR(msb->q_thread))
1098                 goto out_put_disk;
1099
1100         mutex_unlock(&host->lock);
1101         add_disk(msb->disk);
1102         mutex_lock(&host->lock);
1103         msb->active = 1;
1104         return 0;
1105
1106 out_put_disk:
1107         put_disk(msb->disk);
1108 out_release_id:
1109         mutex_lock(&mspro_block_disk_lock);
1110         idr_remove(&mspro_block_disk_idr, disk_id);
1111         mutex_unlock(&mspro_block_disk_lock);
1112         return rc;
1113 }
1114
1115 static void mspro_block_data_clear(struct mspro_block_data *msb)
1116 {
1117         int cnt;
1118         struct mspro_sys_attr *s_attr;
1119
1120         if (msb->attr_group.attrs) {
1121                 for (cnt = 0; msb->attr_group.attrs[cnt]; ++cnt) {
1122                         s_attr = mspro_from_sysfs_attr(msb->attr_group
1123                                                            .attrs[cnt]);
1124                         kfree(s_attr->data);
1125                         kfree(s_attr);
1126                 }
1127                 kfree(msb->attr_group.attrs);
1128         }
1129
1130         msb->card = NULL;
1131 }
1132
1133 static int mspro_block_check_card(struct memstick_dev *card)
1134 {
1135         struct mspro_block_data *msb = memstick_get_drvdata(card);
1136
1137         return (msb->active == 1);
1138 }
1139
1140 static int mspro_block_probe(struct memstick_dev *card)
1141 {
1142         struct mspro_block_data *msb;
1143         int rc = 0;
1144
1145         msb = kzalloc(sizeof(struct mspro_block_data), GFP_KERNEL);
1146         if (!msb)
1147                 return -ENOMEM;
1148         memstick_set_drvdata(card, msb);
1149         msb->card = card;
1150
1151         rc = mspro_block_init_card(card);
1152
1153         if (rc)
1154                 goto out_free;
1155
1156         rc = sysfs_create_group(&card->dev.kobj, &msb->attr_group);
1157         if (rc)
1158                 goto out_free;
1159
1160         rc = mspro_block_init_disk(card);
1161         if (!rc) {
1162                 card->check = mspro_block_check_card;
1163                 return 0;
1164         }
1165
1166         sysfs_remove_group(&card->dev.kobj, &msb->attr_group);
1167 out_free:
1168         memstick_set_drvdata(card, NULL);
1169         mspro_block_data_clear(msb);
1170         kfree(msb);
1171         return rc;
1172 }
1173
1174 static void mspro_block_remove(struct memstick_dev *card)
1175 {
1176         struct mspro_block_data *msb = memstick_get_drvdata(card);
1177         struct task_struct *q_thread = NULL;
1178         unsigned long flags;
1179
1180         del_gendisk(msb->disk);
1181         dev_dbg(&card->dev, "mspro block remove\n");
1182         spin_lock_irqsave(&msb->q_lock, flags);
1183         q_thread = msb->q_thread;
1184         msb->q_thread = NULL;
1185         msb->active = 0;
1186         spin_unlock_irqrestore(&msb->q_lock, flags);
1187
1188         if (q_thread) {
1189                 mutex_unlock(&card->host->lock);
1190                 kthread_stop(q_thread);
1191                 mutex_lock(&card->host->lock);
1192         }
1193
1194         dev_dbg(&card->dev, "queue thread stopped\n");
1195
1196         blk_cleanup_queue(msb->queue);
1197
1198         sysfs_remove_group(&card->dev.kobj, &msb->attr_group);
1199
1200         mutex_lock(&mspro_block_disk_lock);
1201         mspro_block_data_clear(msb);
1202         mutex_unlock(&mspro_block_disk_lock);
1203
1204         mspro_block_disk_release(msb->disk);
1205         memstick_set_drvdata(card, NULL);
1206 }
1207
1208 #ifdef CONFIG_PM
1209
1210 static int mspro_block_suspend(struct memstick_dev *card, pm_message_t state)
1211 {
1212         struct mspro_block_data *msb = memstick_get_drvdata(card);
1213         struct task_struct *q_thread = NULL;
1214         unsigned long flags;
1215
1216         spin_lock_irqsave(&msb->q_lock, flags);
1217         q_thread = msb->q_thread;
1218         msb->q_thread = NULL;
1219         msb->active = 0;
1220         blk_stop_queue(msb->queue);
1221         spin_unlock_irqrestore(&msb->q_lock, flags);
1222
1223         if (q_thread)
1224                 kthread_stop(q_thread);
1225
1226         return 0;
1227 }
1228
1229 static int mspro_block_resume(struct memstick_dev *card)
1230 {
1231         struct mspro_block_data *msb = memstick_get_drvdata(card);
1232         unsigned long flags;
1233         int rc = 0;
1234
1235 #ifdef CONFIG_MEMSTICK_UNSAFE_RESUME
1236
1237         struct mspro_block_data *new_msb;
1238         struct memstick_host *host = card->host;
1239         struct mspro_sys_attr *s_attr, *r_attr;
1240         unsigned char cnt;
1241
1242         mutex_lock(&host->lock);
1243         new_msb = kzalloc(sizeof(struct mspro_block_data), GFP_KERNEL);
1244         if (!new_msb) {
1245                 rc = -ENOMEM;
1246                 goto out_unlock;
1247         }
1248
1249         new_msb->card = card;
1250         memstick_set_drvdata(card, new_msb);
1251         if (mspro_block_init_card(card))
1252                 goto out_free;
1253
1254         for (cnt = 0; new_msb->attr_group.attrs[cnt]
1255                       && msb->attr_group.attrs[cnt]; ++cnt) {
1256                 s_attr = mspro_from_sysfs_attr(new_msb->attr_group.attrs[cnt]);
1257                 r_attr = mspro_from_sysfs_attr(msb->attr_group.attrs[cnt]);
1258
1259                 if (s_attr->id == MSPRO_BLOCK_ID_SYSINFO
1260                     && r_attr->id == s_attr->id) {
1261                         if (memcmp(s_attr->data, r_attr->data, s_attr->size))
1262                                 break;
1263
1264                         memstick_set_drvdata(card, msb);
1265                         msb->q_thread = kthread_run(mspro_block_queue_thread,
1266                                                     card, DRIVER_NAME"d");
1267                         if (IS_ERR(msb->q_thread))
1268                                 msb->q_thread = NULL;
1269                         else
1270                                 msb->active = 1;
1271
1272                         break;
1273                 }
1274         }
1275
1276 out_free:
1277         memstick_set_drvdata(card, msb);
1278         mspro_block_data_clear(new_msb);
1279         kfree(new_msb);
1280 out_unlock:
1281         mutex_unlock(&host->lock);
1282
1283 #endif /* CONFIG_MEMSTICK_UNSAFE_RESUME */
1284
1285         spin_lock_irqsave(&msb->q_lock, flags);
1286         blk_start_queue(msb->queue);
1287         spin_unlock_irqrestore(&msb->q_lock, flags);
1288         return rc;
1289 }
1290
1291 #else
1292
1293 #define mspro_block_suspend NULL
1294 #define mspro_block_resume NULL
1295
1296 #endif /* CONFIG_PM */
1297
1298 static struct memstick_device_id mspro_block_id_tbl[] = {
1299         {MEMSTICK_MATCH_ALL, MEMSTICK_TYPE_PRO, MEMSTICK_CATEGORY_STORAGE_DUO,
1300          MEMSTICK_CLASS_GENERIC_DUO},
1301         {}
1302 };
1303
1304
1305 static struct memstick_driver mspro_block_driver = {
1306         .driver = {
1307                 .name  = DRIVER_NAME,
1308                 .owner = THIS_MODULE
1309         },
1310         .id_table = mspro_block_id_tbl,
1311         .probe    = mspro_block_probe,
1312         .remove   = mspro_block_remove,
1313         .suspend  = mspro_block_suspend,
1314         .resume   = mspro_block_resume
1315 };
1316
1317 static int __init mspro_block_init(void)
1318 {
1319         int rc = -ENOMEM;
1320
1321         rc = register_blkdev(major, DRIVER_NAME);
1322         if (rc < 0) {
1323                 printk(KERN_ERR DRIVER_NAME ": failed to register "
1324                        "major %d, error %d\n", major, rc);
1325                 return rc;
1326         }
1327         if (!major)
1328                 major = rc;
1329
1330         rc = memstick_register_driver(&mspro_block_driver);
1331         if (rc)
1332                 unregister_blkdev(major, DRIVER_NAME);
1333         return rc;
1334 }
1335
1336 static void __exit mspro_block_exit(void)
1337 {
1338         memstick_unregister_driver(&mspro_block_driver);
1339         unregister_blkdev(major, DRIVER_NAME);
1340         idr_destroy(&mspro_block_disk_idr);
1341 }
1342
1343 module_init(mspro_block_init);
1344 module_exit(mspro_block_exit);
1345
1346 MODULE_LICENSE("GPL");
1347 MODULE_AUTHOR("Alex Dubov");
1348 MODULE_DESCRIPTION("Sony MemoryStickPro block device driver");
1349 MODULE_DEVICE_TABLE(memstick, mspro_block_id_tbl);