3 files changed, 62 insertions, 268 deletions

diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index af3969a9c963..e824b672e05a 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -74,53 +74,9 @@ enum {
 static DEFINE_SPINLOCK(viodasd_spinlock);
 
 #define VIOMAXREQ               16
-#define VIOMAXBLOCKDMA          12
 
 #define DEVICE_NO(cell) ((struct viodasd_device *)(cell) - &viodasd_devices[0])
 
-struct open_data {
-        u64     disk_size;
-        u16     max_disk;
-        u16     cylinders;
-        u16     tracks;
-        u16     sectors;
-        u16     bytes_per_sector;
-};
-
-struct rw_data {
-        u64     offset;
-        struct {
-                u32     token;
-                u32     reserved;
-                u64     len;
-        } dma_info[VIOMAXBLOCKDMA];
-};
-
-struct vioblocklpevent {
-        struct HvLpEvent        event;
-        u32                     reserved;
-        u16                     version;
-        u16                     sub_result;
-        u16                     disk;
-        u16                     flags;
-        union {
-                struct open_data        open_data;
-                struct rw_data          rw_data;
-                u64                     changed;
-        } u;
-};
-
-#define vioblockflags_ro   0x0001
-
-enum vioblocksubtype {
-        vioblockopen = 0x0001,
-        vioblockclose = 0x0002,
-        vioblockread = 0x0003,
-        vioblockwrite = 0x0004,
-        vioblockflush = 0x0005,
-        vioblockcheck = 0x0007
-};
-
 struct viodasd_waitevent {
         struct completion       com;
         int                     rc;
@@ -429,7 +385,7 @@ static void do_viodasd_request(struct request_queue *q)
  * Probe a single disk and fill in the viodasd_device structure
  * for it.
  */
-static void probe_disk(struct viodasd_device *d)
+static int probe_disk(struct viodasd_device *d)
 {
         HvLpEvent_Rc hvrc;
         struct viodasd_waitevent we;
@@ -453,14 +409,14 @@ retry:
                         0, 0, 0);
         if (hvrc != 0) {
                 printk(VIOD_KERN_WARNING "bad rc on HV open %d\n", (int)hvrc);
-                return;
+                return 0;
         }
 
         wait_for_completion(&we.com);
 
         if (we.rc != 0) {
                 if (flags != 0)
-                        return;
+                        return 0;
                 /* try again with read only flag set */
                 flags = vioblockflags_ro;
                 goto retry;
@@ -490,15 +446,32 @@ retry:
         if (hvrc != 0) {
                 printk(VIOD_KERN_WARNING
                        "bad rc sending event to OS/400 %d\n", (int)hvrc);
-                return;
+                return 0;
         }
+
+        if (d->dev == NULL) {
+                /* this is when we reprobe for new disks */
+                if (vio_create_viodasd(dev_no) == NULL) {
+                        printk(VIOD_KERN_WARNING
+                                "cannot allocate virtual device for disk %d\n",
+                                dev_no);
+                        return 0;
+                }
+                /*
+                 * The vio_create_viodasd will have recursed into this
+                 * routine with d->dev set to the new vio device and
+                 * will finish the setup of the disk below.
+                 */
+                return 1;
+        }
+
         /* create the request queue for the disk */
         spin_lock_init(&d->q_lock);
         q = blk_init_queue(do_viodasd_request, &d->q_lock);
         if (q == NULL) {
                 printk(VIOD_KERN_WARNING "cannot allocate queue for disk %d\n",
                                 dev_no);
-                return;
+                return 0;
         }
         g = alloc_disk(1 << PARTITION_SHIFT);
         if (g == NULL) {
@@ -506,7 +479,7 @@ retry:
                                 "cannot allocate disk structure for disk %d\n",
                                 dev_no);
                 blk_cleanup_queue(q);
-                return;
+                return 0;
         }
 
         d->disk = g;
@@ -538,6 +511,7 @@ retry:
 
         /* register us in the global list */
         add_disk(g);
+        return 1;
 }
 
 /* returns the total number of scatterlist elements converted */
@@ -718,8 +692,7 @@ static int viodasd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         struct viodasd_device *d = &viodasd_devices[vdev->unit_address];
 
         d->dev = &vdev->dev;
-        probe_disk(d);
-        if (d->disk == NULL)
+        if (!probe_disk(d))
                 return -ENODEV;
         return 0;
 }
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index e51550db1575..880b5dce3a62 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -56,30 +56,6 @@
 #define VIOCD_KERN_WARNING              KERN_WARNING "viocd: "
 #define VIOCD_KERN_INFO                 KERN_INFO "viocd: "
 
-struct viocdlpevent {
-        struct HvLpEvent        event;
-        u32                     reserved;
-        u16                     version;
-        u16                     sub_result;
-        u16                     disk;
-        u16                     flags;
-        u32                     token;
-        u64                     offset;         /* On open, max number of disks */
-        u64                     len;            /* On open, size of the disk */
-        u32                     block_size;     /* Only set on open */
-        u32                     media_size;     /* Only set on open */
-};
-
-enum viocdsubtype {
-        viocdopen = 0x0001,
-        viocdclose = 0x0002,
-        viocdread = 0x0003,
-        viocdwrite = 0x0004,
-        viocdlockdoor = 0x0005,
-        viocdgetinfo = 0x0006,
-        viocdcheck = 0x0007
-};
-
 /*
  * Should probably make this a module parameter....sigh
  */
@@ -131,22 +107,13 @@ static struct capability_entry capability_table[] __initdata = {
 /* These are our internal structures for keeping track of devices */
 static int viocd_numdev;
 
-struct cdrom_info {
-        char    rsrcname[10];
-        char    type[4];
-        char    model[3];
-};
-/*
- * This needs to be allocated since it is passed to the
- * Hypervisor and we may be a module.
- */
-static struct cdrom_info *viocd_unitinfo;
-static dma_addr_t unitinfo_dmaaddr;
-
 struct disk_info {
         struct gendisk                  *viocd_disk;
         struct cdrom_device_info        viocd_info;
         struct device                   *dev;
+        const char                      *rsrcname;
+        const char                      *type;
+        const char                      *model;
 };
 static struct disk_info viocd_diskinfo[VIOCD_MAX_CD];
 
@@ -164,9 +131,9 @@ static int proc_viocd_show(struct seq_file *m, void *v)
         for (i = 0; i < viocd_numdev; i++) {
                 seq_printf(m, "viocd device %d is iSeries resource %10.10s"
                                 "type %4.4s, model %3.3s\n",
-                                i, viocd_unitinfo[i].rsrcname,
-                                viocd_unitinfo[i].type,
-                                viocd_unitinfo[i].model);
+                                i, viocd_diskinfo[i].rsrcname,
+                                viocd_diskinfo[i].type,
+                                viocd_diskinfo[i].model);
         }
         return 0;
 }
@@ -216,61 +183,6 @@ struct block_device_operations viocd_fops = {
         .media_changed =        viocd_blk_media_changed,
 };
 
-/* Get info on CD devices from OS/400 */
-static void __init get_viocd_info(void)
-{
-        HvLpEvent_Rc hvrc;
-        int i;
-        struct viocd_waitevent we;
-
-        viocd_unitinfo = dma_alloc_coherent(iSeries_vio_dev,
-                        sizeof(*viocd_unitinfo) * VIOCD_MAX_CD,
-                        &unitinfo_dmaaddr, GFP_ATOMIC);
-        if (viocd_unitinfo == NULL) {
-                printk(VIOCD_KERN_WARNING "error allocating unitinfo\n");
-                return;
-        }
-
-        memset(viocd_unitinfo, 0, sizeof(*viocd_unitinfo) * VIOCD_MAX_CD);
-
-        init_completion(&we.com);
-
-        hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
-                        HvLpEvent_Type_VirtualIo,
-                        viomajorsubtype_cdio | viocdgetinfo,
-                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
-                        viopath_sourceinst(viopath_hostLp),
-                        viopath_targetinst(viopath_hostLp),
-                        (u64)&we, VIOVERSION << 16, unitinfo_dmaaddr, 0,
-                        sizeof(*viocd_unitinfo) * VIOCD_MAX_CD, 0);
-        if (hvrc != HvLpEvent_Rc_Good) {
-                printk(VIOCD_KERN_WARNING "cdrom error sending event. rc %d\n",
-                                (int)hvrc);
-                goto error_ret;
-        }
-
-        wait_for_completion(&we.com);
-
-        if (we.rc) {
-                const struct vio_error_entry *err =
-                        vio_lookup_rc(viocd_err_table, we.sub_result);
-                printk(VIOCD_KERN_WARNING "bad rc %d:0x%04X on getinfo: %s\n",
-                                we.rc, we.sub_result, err->msg);
-                goto error_ret;
-        }
-
-        for (i = 0; (i < VIOCD_MAX_CD) && viocd_unitinfo[i].rsrcname[0]; i++)
-                viocd_numdev++;
-
-error_ret:
-        if (viocd_numdev == 0) {
-                dma_free_coherent(iSeries_vio_dev,
-                                sizeof(*viocd_unitinfo) * VIOCD_MAX_CD,
-                                viocd_unitinfo, unitinfo_dmaaddr);
-                viocd_unitinfo = NULL;
-        }
-}
-
 static int viocd_open(struct cdrom_device_info *cdi, int purpose)
 {
         struct disk_info *diskinfo = cdi->handle;
@@ -581,7 +493,6 @@ static void vio_handle_cd_event(struct HvLpEvent *event)
                                         bevent->block_size / 512);
                 }
                 /* FALLTHROUGH !! */
-        case viocdgetinfo:
         case viocdlockdoor:
                 pwe = (struct viocd_waitevent *)event->xCorrelationToken;
 return_complete:
@@ -665,22 +576,30 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         int deviceno;
         struct disk_info *d;
         struct cdrom_device_info *c;
-        struct cdrom_info *ci;
         struct request_queue *q;
+        struct device_node *node = vdev->dev.archdata.of_node;
 
         deviceno = vdev->unit_address;
-        if (deviceno >= viocd_numdev)
+        if (deviceno > VIOCD_MAX_CD)
                 return -ENODEV;
+        if (!node)
+                return -ENODEV;
+
+        if (deviceno >= viocd_numdev)
+                viocd_numdev = deviceno + 1;
 
         d = &viocd_diskinfo[deviceno];
+        d->rsrcname = of_get_property(node, "linux,vio_rsrcname", NULL);
+        d->type = of_get_property(node, "linux,vio_type", NULL);
+        d->model = of_get_property(node, "linux,vio_model", NULL);
+
         c = &d->viocd_info;
-        ci = &viocd_unitinfo[deviceno];
 
         c->ops = &viocd_dops;
         c->speed = 4;
         c->capacity = 1;
         c->handle = d;
-        c->mask = ~find_capability(ci->type);
+        c->mask = ~find_capability(d->type);
         sprintf(c->name, VIOCD_DEVICE "%c", 'a' + deviceno);
 
         if (register_cdrom(c) != 0) {
@@ -690,7 +609,7 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         }
         printk(VIOCD_KERN_INFO "cd %s is iSeries resource %10.10s "
                         "type %4.4s, model %3.3s\n",
-                        c->name, ci->rsrcname, ci->type, ci->model);
+                        c->name, d->rsrcname, d->type, d->model);
         q = blk_init_queue(do_viocd_request, &viocd_reqlock);
         if (q == NULL) {
                 printk(VIOCD_KERN_WARNING "Cannot allocate queue for %s!\n",
@@ -799,8 +718,6 @@ static int __init viocd_init(void)
         /* Initialize our request handler */
         vio_setHandler(viomajorsubtype_cdio, vio_handle_cd_event);
 
-        get_viocd_info();
-
         spin_lock_init(&viocd_reqlock);
 
         ret = vio_register_driver(&viocd_driver);
@@ -816,9 +733,6 @@ static int __init viocd_init(void)
         return 0;
 
 out_free_info:
-        dma_free_coherent(iSeries_vio_dev,
-                        sizeof(*viocd_unitinfo) * VIOCD_MAX_CD,
-                        viocd_unitinfo, unitinfo_dmaaddr);
         vio_clearHandler(viomajorsubtype_cdio);
         viopath_close(viopath_hostLp, viomajorsubtype_cdio, MAX_CD_REQ + 2);
 out_unregister:
@@ -830,10 +744,6 @@ static void __exit viocd_exit(void)
 {
         remove_proc_entry("iSeries/viocd", NULL);
         vio_unregister_driver(&viocd_driver);
-        if (viocd_unitinfo != NULL)
-                dma_free_coherent(iSeries_vio_dev,
-                                sizeof(*viocd_unitinfo) * VIOCD_MAX_CD,
-                                viocd_unitinfo, unitinfo_dmaaddr);
         viopath_close(viopath_hostLp, viomajorsubtype_cdio, MAX_CD_REQ + 2);
         vio_clearHandler(viomajorsubtype_cdio);
         unregister_blkdev(VIOCD_MAJOR, VIOCD_DEVICE);
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index e12275df6ea2..f1d60f0cef8f 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -92,47 +92,6 @@ struct viot_devinfo_struct {
 #define VIOTAPOP_SETPART       14
 #define VIOTAPOP_UNLOAD        15
 
-struct viotapelpevent {
-        struct HvLpEvent event;
-        u32 reserved;
-        u16 version;
-        u16 sub_type_result;
-        u16 tape;
-        u16 flags;
-        u32 token;
-        u64 len;
-        union {
-                struct {
-                        u32 tape_op;
-                        u32 count;
-                } op;
-                struct {
-                        u32 type;
-                        u32 resid;
-                        u32 dsreg;
-                        u32 gstat;
-                        u32 erreg;
-                        u32 file_no;
-                        u32 block_no;
-                } get_status;
-                struct {
-                        u32 block_no;
-                } get_pos;
-        } u;
-};
-
-enum viotapesubtype {
-        viotapeopen = 0x0001,
-        viotapeclose = 0x0002,
-        viotaperead = 0x0003,
-        viotapewrite = 0x0004,
-        viotapegetinfo = 0x0005,
-        viotapeop = 0x0006,
-        viotapegetpos = 0x0007,
-        viotapesetpos = 0x0008,
-        viotapegetstatus = 0x0009
-};
-
 enum viotaperc {
         viotape_InvalidRange = 0x0601,
         viotape_InvalidToken = 0x0602,
@@ -223,14 +182,11 @@ static const struct vio_error_entry viotape_err_table[] = {
 #define VIOT_WRITING            2
 
 /* Our info on the tapes */
-struct tape_descr {
-        char rsrcname[10];
-        char type[4];
-        char model[3];
-};
-
-static struct tape_descr *viotape_unitinfo;
-static dma_addr_t viotape_unitinfo_token;
+static struct {
+        const char *rsrcname;
+        const char *type;
+        const char *model;
+} viotape_unitinfo[VIOTAPE_MAX_TAPE];
 
 static struct mtget viomtget[VIOTAPE_MAX_TAPE];
 
@@ -381,53 +337,6 @@ int tape_rc_to_errno(int tape_rc, char *operation, int tapeno)
         return -err->errno;
 }
 
-/* Get info on all tapes from OS/400 */
-static int get_viotape_info(void)
-{
-        HvLpEvent_Rc hvrc;
-        int i;
-        size_t len = sizeof(*viotape_unitinfo) * VIOTAPE_MAX_TAPE;
-        struct op_struct *op = get_op_struct();
-
-        if (op == NULL)
-                return -ENOMEM;
-
-        viotape_unitinfo = dma_alloc_coherent(iSeries_vio_dev, len,
-                &viotape_unitinfo_token, GFP_ATOMIC);
-        if (viotape_unitinfo == NULL) {
-                free_op_struct(op);
-                return -ENOMEM;
-        }
-
-        memset(viotape_unitinfo, 0, len);
-
-        hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
-                        HvLpEvent_Type_VirtualIo,
-                        viomajorsubtype_tape | viotapegetinfo,
-                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
-                        viopath_sourceinst(viopath_hostLp),
-                        viopath_targetinst(viopath_hostLp),
-                        (u64) (unsigned long) op, VIOVERSION << 16,
-                        viotape_unitinfo_token, len, 0, 0);
-        if (hvrc != HvLpEvent_Rc_Good) {
-                printk(VIOTAPE_KERN_WARN "hv error on op %d\n",
-                                (int)hvrc);
-                free_op_struct(op);
-                return -EIO;
-        }
-
-        wait_for_completion(&op->com);
-
-        free_op_struct(op);
-
-        for (i = 0;
-             ((i < VIOTAPE_MAX_TAPE) && (viotape_unitinfo[i].rsrcname[0]));
-             i++)
-                viotape_numdev++;
-        return 0;
-}
-
-
 /* Write */
 static ssize_t viotap_write(struct file *file, const char *buf,
                 size_t count, loff_t * ppos)
@@ -899,7 +808,6 @@ static void vioHandleTapeEvent(struct HvLpEvent *event)
         tapeminor = event->xSubtype & VIOMINOR_SUBTYPE_MASK;
         op = (struct op_struct *)event->xCorrelationToken;
         switch (tapeminor) {
-        case viotapegetinfo:
         case viotapeopen:
         case viotapeclose:
                 op->rc = tevent->sub_type_result;
@@ -942,11 +850,23 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 {
         int i = vdev->unit_address;
         int j;
+        struct device_node *node = vdev->dev.archdata.of_node;
 
-        if (i >= viotape_numdev)
+        if (i > VIOTAPE_MAX_TAPE)
+                return -ENODEV;
+        if (!node)
                 return -ENODEV;
 
+        if (i >= viotape_numdev)
+                viotape_numdev = i + 1;
+
         tape_device[i] = &vdev->dev;
+        viotape_unitinfo[i].rsrcname = of_get_property(node,
+                                        "linux,vio_rsrcname", NULL);
+        viotape_unitinfo[i].type = of_get_property(node, "linux,vio_type",
+                                        NULL);
+        viotape_unitinfo[i].model = of_get_property(node, "linux,vio_model",
+                                        NULL);
 
         state[i].cur_part = 0;
         for (j = 0; j < MAX_PARTITIONS; ++j)
@@ -1044,11 +964,6 @@ int __init viotap_init(void)
                 goto unreg_chrdev;
         }
 
-        if ((ret = get_viotape_info()) < 0) {
-                printk(VIOTAPE_KERN_WARN "Unable to obtain virtual device information");
-                goto unreg_class;
-        }
-
         ret = vio_register_driver(&viotape_driver);
         if (ret)
                 goto unreg_class;
@@ -1102,10 +1017,6 @@ static void __exit viotap_exit(void)
         vio_unregister_driver(&viotape_driver);
         class_destroy(tape_class);
         unregister_chrdev(VIOTAPE_MAJOR, "viotape");
-        if (viotape_unitinfo)
-                dma_free_coherent(iSeries_vio_dev,
-                                sizeof(viotape_unitinfo[0]) * VIOTAPE_MAX_TAPE,
-                                viotape_unitinfo, viotape_unitinfo_token);
         viopath_close(viopath_hostLp, viomajorsubtype_tape, VIOTAPE_MAXREQ + 2);
         vio_clearHandler(viomajorsubtype_tape);
         clear_op_struct_pool();