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