Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of git...

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_eckd.c

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 773b3fe275b239b08968c6a7e72e1356bf06674e..49f9d221e23d4de9dd0deda5867565d29330f3a7 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -6,6 +6,8 @@
  *                 Martin Schwidefsky <schwidefsky@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
+ * EMC Symmetrix ioctl Copyright EMC Corporation, 2008
+ * Author.........: Nigel Hislop <hislop_nigel@emc.com>
  *
  */
 
@@ -84,7 +86,7 @@ dasd_eckd_probe (struct ccw_device *cdev)
        if (ret) {
                printk(KERN_WARNING
                       "dasd_eckd_probe: could not set ccw-device options "
-                      "for %s\n", cdev->dev.bus_id);
+                      "for %s\n", dev_name(&cdev->dev));
                return ret;
        }
        ret = dasd_generic_probe(cdev, &dasd_eckd_discipline);
@@ -1501,12 +1503,27 @@ static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,
                return;
        }
 
-       /* just report other unsolicited interrupts */
-       DEV_MESSAGE(KERN_DEBUG, device, "%s",
-                   "unsolicited interrupt received");
-       device->discipline->dump_sense(device, NULL, irb);
-       dasd_schedule_device_bh(device);
+       if ((irb->scsw.cmd.cc == 1) &&
+           (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
+           (irb->scsw.cmd.actl & SCSW_ACTL_START_PEND) &&
+           (irb->scsw.cmd.stctl & SCSW_STCTL_STATUS_PEND)) {
+               /* fake irb do nothing, they are handled elsewhere */
+               dasd_schedule_device_bh(device);
+               return;
+       }
+
+       if (!(irb->esw.esw0.erw.cons)) {
+               /* just report other unsolicited interrupts */
+               DEV_MESSAGE(KERN_ERR, device, "%s",
+                           "unsolicited interrupt received");
+       } else {
+               DEV_MESSAGE(KERN_ERR, device, "%s",
+                           "unsolicited interrupt received "
+                           "(sense available)");
+               device->discipline->dump_sense(device, NULL, irb);
+       }
 
+       dasd_schedule_device_bh(device);
        return;
 };
 
@@ -2068,6 +2085,103 @@ dasd_eckd_set_attrib(struct dasd_device *device, void __user *argp)
        return 0;
 }
 
+/*
+ * Issue syscall I/O to EMC Symmetrix array.
+ * CCWs are PSF and RSSD
+ */
+static int dasd_symm_io(struct dasd_device *device, void __user *argp)
+{
+       struct dasd_symmio_parms usrparm;
+       char *psf_data, *rssd_result;
+       struct dasd_ccw_req *cqr;
+       struct ccw1 *ccw;
+       int rc;
+
+       /* Copy parms from caller */
+       rc = -EFAULT;
+       if (copy_from_user(&usrparm, argp, sizeof(usrparm)))
+               goto out;
+#ifndef CONFIG_64BIT
+       /* Make sure pointers are sane even on 31 bit. */
+       if ((usrparm.psf_data >> 32) != 0 || (usrparm.rssd_result >> 32) != 0) {
+               rc = -EINVAL;
+               goto out;
+       }
+#endif
+       /* alloc I/O data area */
+       psf_data = kzalloc(usrparm.psf_data_len, GFP_KERNEL | GFP_DMA);
+       rssd_result = kzalloc(usrparm.rssd_result_len, GFP_KERNEL | GFP_DMA);
+       if (!psf_data || !rssd_result) {
+               rc = -ENOMEM;
+               goto out_free;
+       }
+
+       /* get syscall header from user space */
+       rc = -EFAULT;
+       if (copy_from_user(psf_data,
+                          (void __user *)(unsigned long) usrparm.psf_data,
+                          usrparm.psf_data_len))
+               goto out_free;
+
+       /* sanity check on syscall header */
+       if (psf_data[0] != 0x17 && psf_data[1] != 0xce) {
+               rc = -EINVAL;
+               goto out_free;
+       }
+
+       /* setup CCWs for PSF + RSSD */
+       cqr = dasd_smalloc_request("ECKD", 2 , 0, device);
+       if (IS_ERR(cqr)) {
+               DEV_MESSAGE(KERN_WARNING, device, "%s",
+                       "Could not allocate initialization request");
+               rc = PTR_ERR(cqr);
+               goto out_free;
+       }
+
+       cqr->startdev = device;
+       cqr->memdev = device;
+       cqr->retries = 3;
+       cqr->expires = 10 * HZ;
+       cqr->buildclk = get_clock();
+       cqr->status = DASD_CQR_FILLED;
+
+       /* Build the ccws */
+       ccw = cqr->cpaddr;
+
+       /* PSF ccw */
+       ccw->cmd_code = DASD_ECKD_CCW_PSF;
+       ccw->count = usrparm.psf_data_len;
+       ccw->flags |= CCW_FLAG_CC;
+       ccw->cda = (__u32)(addr_t) psf_data;
+
+       ccw++;
+
+       /* RSSD ccw  */
+       ccw->cmd_code = DASD_ECKD_CCW_RSSD;
+       ccw->count = usrparm.rssd_result_len;
+       ccw->flags = CCW_FLAG_SLI ;
+       ccw->cda = (__u32)(addr_t) rssd_result;
+
+       rc = dasd_sleep_on(cqr);
+       if (rc)
+               goto out_sfree;
+
+       rc = -EFAULT;
+       if (copy_to_user((void __user *)(unsigned long) usrparm.rssd_result,
+                          rssd_result, usrparm.rssd_result_len))
+               goto out_sfree;
+       rc = 0;
+
+out_sfree:
+       dasd_sfree_request(cqr, cqr->memdev);
+out_free:
+       kfree(rssd_result);
+       kfree(psf_data);
+out:
+       DBF_DEV_EVENT(DBF_WARNING, device, "Symmetrix ioctl: rc=%d", rc);
+       return rc;
+}
+
 static int
 dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)
 {
@@ -2086,6 +2200,8 @@ dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)
                return dasd_eckd_reserve(device);
        case BIODASDSLCK:
                return dasd_eckd_steal_lock(device);
+       case BIODASDSYMMIO:
+               return dasd_symm_io(device, argp);
        default:
                return -ENOIOCTLCMD;
        }
@@ -2145,13 +2261,13 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
        /* dump the sense data */
        len = sprintf(page,  KERN_ERR PRINTK_HEADER
                      " I/O status report for device %s:\n",
-                     device->cdev->dev.bus_id);
+                     dev_name(&device->cdev->dev));
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
                       irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " device %s: Failing CCW: %p\n",
-                      device->cdev->dev.bus_id,
+                      dev_name(&device->cdev->dev),
                       (void *) (addr_t) irb->scsw.cmd.cpa);
        if (irb->esw.esw0.erw.cons) {
                for (sl = 0; sl < 4; sl++) {