[S390] convert xpram printks to pr_xxx macros.
[safe/jmp/linux-2.6] / drivers / s390 / block / dasd_eckd.c
index 822e2a2..bd2c52e 100644 (file)
@@ -1,15 +1,16 @@
-/* 
+/*
  * File...........: linux/drivers/s390/block/dasd_eckd.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
- *                 Horst Hummel <Horst.Hummel@de.ibm.com> 
+ *                 Horst Hummel <Horst.Hummel@de.ibm.com>
  *                 Carsten Otte <Cotte@de.ibm.com>
  *                 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>
  *
  */
 
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -24,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/todclk.h>
 #include <asm/uaccess.h>
+#include <asm/cio.h>
 #include <asm/ccwdev.h>
 
 #include "dasd_int.h"
@@ -52,29 +54,19 @@ MODULE_LICENSE("GPL");
 
 static struct dasd_discipline dasd_eckd_discipline;
 
-struct dasd_eckd_private {
-       struct dasd_eckd_characteristics rdc_data;
-       struct dasd_eckd_confdata conf_data;
-       struct dasd_eckd_path path_data;
-       struct eckd_count count_area[5];
-       int init_cqr_status;
-       int uses_cdl;
-       struct attrib_data_t attrib;    /* e.g. cache operations */
-};
-
 /* The ccw bus type uses this table to find devices that it sends to
  * dasd_eckd_probe */
 static struct ccw_device_id dasd_eckd_ids[] = {
-       { CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3390, 0), driver_info: 0x1},
-       { CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3390, 0), driver_info: 0x2},
-       { CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3390, 0), driver_info: 0x3},
-       { CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3380, 0), driver_info: 0x4},
-       { CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3380, 0), driver_info: 0x5},
-       { CCW_DEVICE_DEVTYPE (0x9343, 0, 0x9345, 0), driver_info: 0x6},
-       { CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3390, 0), driver_info: 0x7},
-       { CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3380, 0), driver_info: 0x8},
-       { CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3390, 0), driver_info: 0x9},
-       { CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3380, 0), driver_info: 0xa},
+       { CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3390, 0), .driver_info = 0x1},
+       { CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3390, 0), .driver_info = 0x2},
+       { CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3390, 0), .driver_info = 0x3},
+       { CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3380, 0), .driver_info = 0x4},
+       { CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3380, 0), .driver_info = 0x5},
+       { CCW_DEVICE_DEVTYPE (0x9343, 0, 0x9345, 0), .driver_info = 0x6},
+       { CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3390, 0), .driver_info = 0x7},
+       { CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3380, 0), .driver_info = 0x8},
+       { CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3390, 0), .driver_info = 0x9},
+       { CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3380, 0), .driver_info = 0xa},
        { /* end of list */ },
 };
 
@@ -89,17 +81,22 @@ dasd_eckd_probe (struct ccw_device *cdev)
 {
        int ret;
 
-       ret = dasd_generic_probe (cdev, &dasd_eckd_discipline);
-       if (ret)
+       /* set ECKD specific ccw-device options */
+       ret = ccw_device_set_options(cdev, CCWDEV_ALLOW_FORCE);
+       if (ret) {
+               printk(KERN_WARNING
+                      "dasd_eckd_probe: could not set ccw-device options "
+                      "for %s\n", dev_name(&cdev->dev));
                return ret;
-       ccw_device_set_options(cdev, CCWDEV_DO_PATHGROUP | CCWDEV_ALLOW_FORCE);
-       return 0;
+       }
+       ret = dasd_generic_probe(cdev, &dasd_eckd_discipline);
+       return ret;
 }
 
 static int
 dasd_eckd_set_online(struct ccw_device *cdev)
 {
-       return dasd_generic_set_online (cdev, &dasd_eckd_discipline);
+       return dasd_generic_set_online(cdev, &dasd_eckd_discipline);
 }
 
 static struct ccw_driver dasd_eckd_driver = {
@@ -129,44 +126,7 @@ ceil_quot(unsigned int d1, unsigned int d2)
        return (d1 + (d2 - 1)) / d2;
 }
 
-static inline int
-bytes_per_record(struct dasd_eckd_characteristics *rdc, int kl, int dl)
-{
-       unsigned int fl1, fl2, int1, int2;
-       int bpr;
-
-       switch (rdc->formula) {
-       case 0x01:
-               fl1 = round_up_multiple(ECKD_F2(rdc) + dl, ECKD_F1(rdc));
-               fl2 = round_up_multiple(kl ? ECKD_F2(rdc) + kl : 0,
-                                       ECKD_F1(rdc));
-               bpr = fl1 + fl2;
-               break;
-       case 0x02:
-               int1 = ceil_quot(dl + ECKD_F6(rdc), ECKD_F5(rdc) << 1);
-               int2 = ceil_quot(kl + ECKD_F6(rdc), ECKD_F5(rdc) << 1);
-               fl1 = round_up_multiple(ECKD_F1(rdc) * ECKD_F2(rdc) + dl +
-                                       ECKD_F6(rdc) + ECKD_F4(rdc) * int1,
-                                       ECKD_F1(rdc));
-               fl2 = round_up_multiple(ECKD_F1(rdc) * ECKD_F3(rdc) + kl +
-                                       ECKD_F6(rdc) + ECKD_F4(rdc) * int2,
-                                       ECKD_F1(rdc));
-               bpr = fl1 + fl2;
-               break;
-       default:
-               bpr = 0;
-               break;
-       }
-       return bpr;
-}
-
-static inline unsigned int
-bytes_per_track(struct dasd_eckd_characteristics *rdc)
-{
-       return *(unsigned int *) (rdc->byte_per_track) >> 8;
-}
-
-static inline unsigned int
+static unsigned int
 recs_per_track(struct dasd_eckd_characteristics * rdc,
               unsigned int kl, unsigned int dl)
 {
@@ -199,37 +159,39 @@ recs_per_track(struct dasd_eckd_characteristics * rdc,
        return 0;
 }
 
-static inline void
+static int
 check_XRC (struct ccw1         *de_ccw,
            struct DE_eckd_data *data,
            struct dasd_device  *device)
 {
         struct dasd_eckd_private *private;
+       int rc;
 
         private = (struct dasd_eckd_private *) device->private;
+       if (!private->rdc_data.facilities.XRC_supported)
+               return 0;
 
         /* switch on System Time Stamp - needed for XRC Support */
-        if (private->rdc_data.facilities.XRC_supported) {
-                
-                data->ga_extended |= 0x08; /* switch on 'Time Stamp Valid'   */
-                data->ga_extended |= 0x02; /* switch on 'Extended Parameter' */
-                
-                data->ep_sys_time = get_clock ();
-                
-                de_ccw->count = sizeof (struct DE_eckd_data);
-                de_ccw->flags |= CCW_FLAG_SLI;  
-        }
-
-        return;
-
-} /* end check_XRC */
-
-static inline void
+       data->ga_extended |= 0x08; /* switch on 'Time Stamp Valid'   */
+       data->ga_extended |= 0x02; /* switch on 'Extended Parameter' */
+
+       rc = get_sync_clock(&data->ep_sys_time);
+       /* Ignore return code if sync clock is switched off. */
+       if (rc == -ENOSYS || rc == -EACCES)
+               rc = 0;
+
+       de_ccw->count = sizeof(struct DE_eckd_data);
+       de_ccw->flags |= CCW_FLAG_SLI;
+       return rc;
+}
+
+static int
 define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
              int totrk, int cmd, struct dasd_device * device)
 {
        struct dasd_eckd_private *private;
        struct ch_t geo, beg, end;
+       int rc = 0;
 
        private = (struct dasd_eckd_private *) device->private;
 
@@ -238,7 +200,7 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
        ccw->count = 16;
        ccw->cda = (__u32) __pa(data);
 
-       memset(data, 0, sizeof (struct DE_eckd_data));
+       memset(data, 0, sizeof(struct DE_eckd_data));
        switch (cmd) {
        case DASD_ECKD_CCW_READ_HOME_ADDRESS:
        case DASD_ECKD_CCW_READ_RECORD_ZERO:
@@ -258,12 +220,12 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
        case DASD_ECKD_CCW_WRITE_KD_MT:
                data->mask.perm = 0x02;
                data->attributes.operation = private->attrib.operation;
-                check_XRC (ccw, data, device);
+               rc = check_XRC (ccw, data, device);
                break;
        case DASD_ECKD_CCW_WRITE_CKD:
        case DASD_ECKD_CCW_WRITE_CKD_MT:
                data->attributes.operation = DASD_BYPASS_CACHE;
-                check_XRC (ccw, data, device);
+               rc = check_XRC (ccw, data, device);
                break;
        case DASD_ECKD_CCW_ERASE:
        case DASD_ECKD_CCW_WRITE_HOME_ADDRESS:
@@ -271,7 +233,7 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
                data->mask.perm = 0x3;
                data->mask.auth = 0x1;
                data->attributes.operation = DASD_BYPASS_CACHE;
-                check_XRC (ccw, data, device);
+               rc = check_XRC (ccw, data, device);
                break;
        default:
                DEV_MESSAGE(KERN_ERR, device, "unknown opcode 0x%x", cmd);
@@ -296,8 +258,8 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
        /* check for sequential prestage - enhance cylinder range */
        if (data->attributes.operation == DASD_SEQ_PRESTAGE ||
            data->attributes.operation == DASD_SEQ_ACCESS) {
-               
-               if (end.cyl + private->attrib.nr_cyl < geo.cyl) 
+
+               if (end.cyl + private->attrib.nr_cyl < geo.cyl)
                        end.cyl += private->attrib.nr_cyl;
                else
                        end.cyl = (geo.cyl - 1);
@@ -307,9 +269,136 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
        data->beg_ext.head = beg.head;
        data->end_ext.cyl = end.cyl;
        data->end_ext.head = end.head;
+       return rc;
+}
+
+static int check_XRC_on_prefix(struct PFX_eckd_data *pfxdata,
+                              struct dasd_device  *device)
+{
+       struct dasd_eckd_private *private;
+       int rc;
+
+       private = (struct dasd_eckd_private *) device->private;
+       if (!private->rdc_data.facilities.XRC_supported)
+               return 0;
+
+       /* switch on System Time Stamp - needed for XRC Support */
+       pfxdata->define_extend.ga_extended |= 0x08; /* 'Time Stamp Valid'   */
+       pfxdata->define_extend.ga_extended |= 0x02; /* 'Extended Parameter' */
+       pfxdata->validity.time_stamp = 1;           /* 'Time Stamp Valid'   */
+
+       rc = get_sync_clock(&pfxdata->define_extend.ep_sys_time);
+       /* Ignore return code if sync clock is switched off. */
+       if (rc == -ENOSYS || rc == -EACCES)
+               rc = 0;
+       return rc;
+}
+
+static int prefix(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata, int trk,
+                 int totrk, int cmd, struct dasd_device *basedev,
+                 struct dasd_device *startdev)
+{
+       struct dasd_eckd_private *basepriv, *startpriv;
+       struct DE_eckd_data *data;
+       struct ch_t geo, beg, end;
+       int rc = 0;
+
+       basepriv = (struct dasd_eckd_private *) basedev->private;
+       startpriv = (struct dasd_eckd_private *) startdev->private;
+       data = &pfxdata->define_extend;
+
+       ccw->cmd_code = DASD_ECKD_CCW_PFX;
+       ccw->flags = 0;
+       ccw->count = sizeof(*pfxdata);
+       ccw->cda = (__u32) __pa(pfxdata);
+
+       memset(pfxdata, 0, sizeof(*pfxdata));
+       /* prefix data */
+       pfxdata->format = 0;
+       pfxdata->base_address = basepriv->ned->unit_addr;
+       pfxdata->base_lss = basepriv->ned->ID;
+       pfxdata->validity.define_extend = 1;
+
+       /* private uid is kept up to date, conf_data may be outdated */
+       if (startpriv->uid.type != UA_BASE_DEVICE) {
+               pfxdata->validity.verify_base = 1;
+               if (startpriv->uid.type == UA_HYPER_PAV_ALIAS)
+                       pfxdata->validity.hyper_pav = 1;
+       }
+
+       /* define extend data (mostly)*/
+       switch (cmd) {
+       case DASD_ECKD_CCW_READ_HOME_ADDRESS:
+       case DASD_ECKD_CCW_READ_RECORD_ZERO:
+       case DASD_ECKD_CCW_READ:
+       case DASD_ECKD_CCW_READ_MT:
+       case DASD_ECKD_CCW_READ_CKD:
+       case DASD_ECKD_CCW_READ_CKD_MT:
+       case DASD_ECKD_CCW_READ_KD:
+       case DASD_ECKD_CCW_READ_KD_MT:
+       case DASD_ECKD_CCW_READ_COUNT:
+               data->mask.perm = 0x1;
+               data->attributes.operation = basepriv->attrib.operation;
+               break;
+       case DASD_ECKD_CCW_WRITE:
+       case DASD_ECKD_CCW_WRITE_MT:
+       case DASD_ECKD_CCW_WRITE_KD:
+       case DASD_ECKD_CCW_WRITE_KD_MT:
+               data->mask.perm = 0x02;
+               data->attributes.operation = basepriv->attrib.operation;
+               rc = check_XRC_on_prefix(pfxdata, basedev);
+               break;
+       case DASD_ECKD_CCW_WRITE_CKD:
+       case DASD_ECKD_CCW_WRITE_CKD_MT:
+               data->attributes.operation = DASD_BYPASS_CACHE;
+               rc = check_XRC_on_prefix(pfxdata, basedev);
+               break;
+       case DASD_ECKD_CCW_ERASE:
+       case DASD_ECKD_CCW_WRITE_HOME_ADDRESS:
+       case DASD_ECKD_CCW_WRITE_RECORD_ZERO:
+               data->mask.perm = 0x3;
+               data->mask.auth = 0x1;
+               data->attributes.operation = DASD_BYPASS_CACHE;
+               rc = check_XRC_on_prefix(pfxdata, basedev);
+               break;
+       default:
+               DEV_MESSAGE(KERN_ERR, basedev, "unknown opcode 0x%x", cmd);
+               break;
+       }
+
+       data->attributes.mode = 0x3;    /* ECKD */
+
+       if ((basepriv->rdc_data.cu_type == 0x2105 ||
+            basepriv->rdc_data.cu_type == 0x2107 ||
+            basepriv->rdc_data.cu_type == 0x1750)
+           && !(basepriv->uses_cdl && trk < 2))
+               data->ga_extended |= 0x40; /* Regular Data Format Mode */
+
+       geo.cyl = basepriv->rdc_data.no_cyl;
+       geo.head = basepriv->rdc_data.trk_per_cyl;
+       beg.cyl = trk / geo.head;
+       beg.head = trk % geo.head;
+       end.cyl = totrk / geo.head;
+       end.head = totrk % geo.head;
+
+       /* check for sequential prestage - enhance cylinder range */
+       if (data->attributes.operation == DASD_SEQ_PRESTAGE ||
+           data->attributes.operation == DASD_SEQ_ACCESS) {
+
+               if (end.cyl + basepriv->attrib.nr_cyl < geo.cyl)
+                       end.cyl += basepriv->attrib.nr_cyl;
+               else
+                       end.cyl = (geo.cyl - 1);
+       }
+
+       data->beg_ext.cyl = beg.cyl;
+       data->beg_ext.head = beg.head;
+       data->end_ext.cyl = end.cyl;
+       data->end_ext.head = end.head;
+       return rc;
 }
 
-static inline void
+static void
 locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, int trk,
              int rec_on_trk, int no_rec, int cmd,
              struct dasd_device * device, int reclen)
@@ -317,7 +406,7 @@ locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, int trk,
        struct dasd_eckd_private *private;
        int sector;
        int dn, d;
-                               
+
        private = (struct dasd_eckd_private *) device->private;
 
        DBF_DEV_EVENT(DBF_INFO, device,
@@ -329,7 +418,7 @@ locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, int trk,
        ccw->count = 16;
        ccw->cda = (__u32) __pa(data);
 
-       memset(data, 0, sizeof (struct LO_eckd_data));
+       memset(data, 0, sizeof(struct LO_eckd_data));
        sector = 0;
        if (rec_on_trk) {
                switch (private->rdc_data.dev_type) {
@@ -446,8 +535,188 @@ dasd_eckd_cdl_reclen(int recid)
        return LABEL_SIZE;
 }
 
-static int
-dasd_eckd_read_conf(struct dasd_device *device)
+/*
+ * Generate device unique id that specifies the physical device.
+ */
+static int dasd_eckd_generate_uid(struct dasd_device *device,
+                                 struct dasd_uid *uid)
+{
+       struct dasd_eckd_private *private;
+       int count;
+
+       private = (struct dasd_eckd_private *) device->private;
+       if (!private)
+               return -ENODEV;
+       if (!private->ned || !private->gneq)
+               return -ENODEV;
+
+       memset(uid, 0, sizeof(struct dasd_uid));
+       memcpy(uid->vendor, private->ned->HDA_manufacturer,
+              sizeof(uid->vendor) - 1);
+       EBCASC(uid->vendor, sizeof(uid->vendor) - 1);
+       memcpy(uid->serial, private->ned->HDA_location,
+              sizeof(uid->serial) - 1);
+       EBCASC(uid->serial, sizeof(uid->serial) - 1);
+       uid->ssid = private->gneq->subsystemID;
+       uid->real_unit_addr = private->ned->unit_addr;;
+       if (private->sneq) {
+               uid->type = private->sneq->sua_flags;
+               if (uid->type == UA_BASE_PAV_ALIAS)
+                       uid->base_unit_addr = private->sneq->base_unit_addr;
+       } else {
+               uid->type = UA_BASE_DEVICE;
+       }
+       if (private->vdsneq) {
+               for (count = 0; count < 16; count++) {
+                       sprintf(uid->vduit+2*count, "%02x",
+                               private->vdsneq->uit[count]);
+               }
+       }
+       return 0;
+}
+
+static struct dasd_ccw_req *dasd_eckd_build_rcd_lpm(struct dasd_device *device,
+                                                   void *rcd_buffer,
+                                                   struct ciw *ciw, __u8 lpm)
+{
+       struct dasd_ccw_req *cqr;
+       struct ccw1 *ccw;
+
+       cqr = dasd_smalloc_request("ECKD", 1 /* RCD */, ciw->count, device);
+
+       if (IS_ERR(cqr)) {
+               DEV_MESSAGE(KERN_WARNING, device, "%s",
+                           "Could not allocate RCD request");
+               return cqr;
+       }
+
+       ccw = cqr->cpaddr;
+       ccw->cmd_code = ciw->cmd;
+       ccw->cda = (__u32)(addr_t)rcd_buffer;
+       ccw->count = ciw->count;
+
+       cqr->startdev = device;
+       cqr->memdev = device;
+       cqr->block = NULL;
+       cqr->expires = 10*HZ;
+       cqr->lpm = lpm;
+       clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
+       cqr->retries = 2;
+       cqr->buildclk = get_clock();
+       cqr->status = DASD_CQR_FILLED;
+       return cqr;
+}
+
+static int dasd_eckd_read_conf_lpm(struct dasd_device *device,
+                                  void **rcd_buffer,
+                                  int *rcd_buffer_size, __u8 lpm)
+{
+       struct ciw *ciw;
+       char *rcd_buf = NULL;
+       int ret;
+       struct dasd_ccw_req *cqr;
+
+       /*
+        * scan for RCD command in extended SenseID data
+        */
+       ciw = ccw_device_get_ciw(device->cdev, CIW_TYPE_RCD);
+       if (!ciw || ciw->cmd == 0) {
+               ret = -EOPNOTSUPP;
+               goto out_error;
+       }
+       rcd_buf = kzalloc(ciw->count, GFP_KERNEL | GFP_DMA);
+       if (!rcd_buf) {
+               ret = -ENOMEM;
+               goto out_error;
+       }
+
+       /*
+        * buffer has to start with EBCDIC "V1.0" to show
+        * support for virtual device SNEQ
+        */
+       rcd_buf[0] = 0xE5;
+       rcd_buf[1] = 0xF1;
+       rcd_buf[2] = 0x4B;
+       rcd_buf[3] = 0xF0;
+       cqr = dasd_eckd_build_rcd_lpm(device, rcd_buf, ciw, lpm);
+       if (IS_ERR(cqr)) {
+               ret =  PTR_ERR(cqr);
+               goto out_error;
+       }
+       ret = dasd_sleep_on(cqr);
+       /*
+        * on success we update the user input parms
+        */
+       dasd_sfree_request(cqr, cqr->memdev);
+       if (ret)
+               goto out_error;
+
+       *rcd_buffer_size = ciw->count;
+       *rcd_buffer = rcd_buf;
+       return 0;
+out_error:
+       kfree(rcd_buf);
+       *rcd_buffer = NULL;
+       *rcd_buffer_size = 0;
+       return ret;
+}
+
+static int dasd_eckd_identify_conf_parts(struct dasd_eckd_private *private)
+{
+
+       struct dasd_sneq *sneq;
+       int i, count;
+
+       private->ned = NULL;
+       private->sneq = NULL;
+       private->vdsneq = NULL;
+       private->gneq = NULL;
+       count = private->conf_len / sizeof(struct dasd_sneq);
+       sneq = (struct dasd_sneq *)private->conf_data;
+       for (i = 0; i < count; ++i) {
+               if (sneq->flags.identifier == 1 && sneq->format == 1)
+                       private->sneq = sneq;
+               else if (sneq->flags.identifier == 1 && sneq->format == 4)
+                       private->vdsneq = (struct vd_sneq *)sneq;
+               else if (sneq->flags.identifier == 2)
+                       private->gneq = (struct dasd_gneq *)sneq;
+               else if (sneq->flags.identifier == 3 && sneq->res1 == 1)
+                       private->ned = (struct dasd_ned *)sneq;
+               sneq++;
+       }
+       if (!private->ned || !private->gneq) {
+               private->ned = NULL;
+               private->sneq = NULL;
+               private->vdsneq = NULL;
+               private->gneq = NULL;
+               return -EINVAL;
+       }
+       return 0;
+
+};
+
+static unsigned char dasd_eckd_path_access(void *conf_data, int conf_len)
+{
+       struct dasd_gneq *gneq;
+       int i, count, found;
+
+       count = conf_len / sizeof(*gneq);
+       gneq = (struct dasd_gneq *)conf_data;
+       found = 0;
+       for (i = 0; i < count; ++i) {
+               if (gneq->flags.identifier == 2) {
+                       found = 1;
+                       break;
+               }
+               gneq++;
+       }
+       if (found)
+               return ((char *)gneq)[18] & 0x07;
+       else
+               return 0;
+}
+
+static int dasd_eckd_read_conf(struct dasd_device *device)
 {
        void *conf_data;
        int conf_len, conf_data_saved;
@@ -461,12 +730,11 @@ dasd_eckd_read_conf(struct dasd_device *device)
        path_data->opm = ccw_device_get_path_mask(device->cdev);
        lpm = 0x80;
        conf_data_saved = 0;
-
        /* get configuration data per operational path */
        for (lpm = 0x80; lpm; lpm>>= 1) {
                if (lpm & path_data->opm){
-                       rc = read_conf_data_lpm(device->cdev, &conf_data,
-                                               &conf_len, lpm);
+                       rc = dasd_eckd_read_conf_lpm(device, &conf_data,
+                                                    &conf_len, lpm);
                        if (rc && rc != -EOPNOTSUPP) {  /* -EOPNOTSUPP is ok */
                                MESSAGE(KERN_WARNING,
                                        "Read configuration data returned "
@@ -476,24 +744,22 @@ dasd_eckd_read_conf(struct dasd_device *device)
                        if (conf_data == NULL) {
                                MESSAGE(KERN_WARNING, "%s", "No configuration "
                                        "data retrieved");
-                               continue;       /* no errror */
-                       }
-                       if (conf_len != sizeof (struct dasd_eckd_confdata)) {
-                               MESSAGE(KERN_WARNING,
-                                       "sizes of configuration data mismatch"
-                                       "%d (read) vs %ld (expected)",
-                                       conf_len,
-                                       sizeof (struct dasd_eckd_confdata));
-                               kfree(conf_data);
-                               continue;       /* no errror */
+                               continue;       /* no error */
                        }
                        /* save first valid configuration data */
-                       if (!conf_data_saved){
-                               memcpy(&private->conf_data, conf_data,
-                                      sizeof (struct dasd_eckd_confdata));
+                       if (!conf_data_saved) {
+                               kfree(private->conf_data);
+                               private->conf_data = conf_data;
+                               private->conf_len = conf_len;
+                               if (dasd_eckd_identify_conf_parts(private)) {
+                                       private->conf_data = NULL;
+                                       private->conf_len = 0;
+                                       kfree(conf_data);
+                                       continue;
+                               }
                                conf_data_saved++;
                        }
-                       switch (((char *)conf_data)[242] & 0x07){
+                       switch (dasd_eckd_path_access(conf_data, conf_len)) {
                        case 0x02:
                                path_data->npm |= lpm;
                                break;
@@ -501,23 +767,175 @@ dasd_eckd_read_conf(struct dasd_device *device)
                                path_data->ppm |= lpm;
                                break;
                        }
-                       kfree(conf_data);
+                       if (conf_data != private->conf_data)
+                               kfree(conf_data);
                }
        }
        return 0;
 }
 
+static int dasd_eckd_read_features(struct dasd_device *device)
+{
+       struct dasd_psf_prssd_data *prssdp;
+       struct dasd_rssd_features *features;
+       struct dasd_ccw_req *cqr;
+       struct ccw1 *ccw;
+       int rc;
+       struct dasd_eckd_private *private;
+
+       private = (struct dasd_eckd_private *) device->private;
+       cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
+                                  1 /* PSF */  + 1 /* RSSD */ ,
+                                  (sizeof(struct dasd_psf_prssd_data) +
+                                   sizeof(struct dasd_rssd_features)),
+                                  device);
+       if (IS_ERR(cqr)) {
+               DEV_MESSAGE(KERN_WARNING, device, "%s",
+                           "Could not allocate initialization request");
+               return PTR_ERR(cqr);
+       }
+       cqr->startdev = device;
+       cqr->memdev = device;
+       cqr->block = NULL;
+       clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
+       cqr->retries = 5;
+       cqr->expires = 10 * HZ;
+
+       /* Prepare for Read Subsystem Data */
+       prssdp = (struct dasd_psf_prssd_data *) cqr->data;
+       memset(prssdp, 0, sizeof(struct dasd_psf_prssd_data));
+       prssdp->order = PSF_ORDER_PRSSD;
+       prssdp->suborder = 0x41;        /* Read Feature Codes */
+       /* all other bytes of prssdp must be zero */
+
+       ccw = cqr->cpaddr;
+       ccw->cmd_code = DASD_ECKD_CCW_PSF;
+       ccw->count = sizeof(struct dasd_psf_prssd_data);
+       ccw->flags |= CCW_FLAG_CC;
+       ccw->cda = (__u32)(addr_t) prssdp;
+
+       /* Read Subsystem Data - feature codes */
+       features = (struct dasd_rssd_features *) (prssdp + 1);
+       memset(features, 0, sizeof(struct dasd_rssd_features));
+
+       ccw++;
+       ccw->cmd_code = DASD_ECKD_CCW_RSSD;
+       ccw->count = sizeof(struct dasd_rssd_features);
+       ccw->cda = (__u32)(addr_t) features;
+
+       cqr->buildclk = get_clock();
+       cqr->status = DASD_CQR_FILLED;
+       rc = dasd_sleep_on(cqr);
+       if (rc == 0) {
+               prssdp = (struct dasd_psf_prssd_data *) cqr->data;
+               features = (struct dasd_rssd_features *) (prssdp + 1);
+               memcpy(&private->features, features,
+                      sizeof(struct dasd_rssd_features));
+       }
+       dasd_sfree_request(cqr, cqr->memdev);
+       return rc;
+}
+
+
+/*
+ * Build CP for Perform Subsystem Function - SSC.
+ */
+static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device)
+{
+       struct dasd_ccw_req *cqr;
+       struct dasd_psf_ssc_data *psf_ssc_data;
+       struct ccw1 *ccw;
 
+       cqr = dasd_smalloc_request("ECKD", 1 /* PSF */ ,
+                                 sizeof(struct dasd_psf_ssc_data),
+                                 device);
+
+       if (IS_ERR(cqr)) {
+               DEV_MESSAGE(KERN_WARNING, device, "%s",
+                          "Could not allocate PSF-SSC request");
+               return cqr;
+       }
+       psf_ssc_data = (struct dasd_psf_ssc_data *)cqr->data;
+       psf_ssc_data->order = PSF_ORDER_SSC;
+       psf_ssc_data->suborder = 0x88;
+       psf_ssc_data->reserved[0] = 0x88;
+
+       ccw = cqr->cpaddr;
+       ccw->cmd_code = DASD_ECKD_CCW_PSF;
+       ccw->cda = (__u32)(addr_t)psf_ssc_data;
+       ccw->count = 66;
+
+       cqr->startdev = device;
+       cqr->memdev = device;
+       cqr->block = NULL;
+       cqr->expires = 10*HZ;
+       cqr->buildclk = get_clock();
+       cqr->status = DASD_CQR_FILLED;
+       return cqr;
+}
+
+/*
+ * Perform Subsystem Function.
+ * It is necessary to trigger CIO for channel revalidation since this
+ * call might change behaviour of DASD devices.
+ */
+static int
+dasd_eckd_psf_ssc(struct dasd_device *device)
+{
+       struct dasd_ccw_req *cqr;
+       int rc;
+
+       cqr = dasd_eckd_build_psf_ssc(device);
+       if (IS_ERR(cqr))
+               return PTR_ERR(cqr);
+
+       rc = dasd_sleep_on(cqr);
+       if (!rc)
+               /* trigger CIO to reprobe devices */
+               css_schedule_reprobe();
+       dasd_sfree_request(cqr, cqr->memdev);
+       return rc;
+}
+
+/*
+ * Valide storage server of current device.
+ */
+static int dasd_eckd_validate_server(struct dasd_device *device)
+{
+       int rc;
+       struct dasd_eckd_private *private;
+
+       /* Currently PAV is the only reason to 'validate' server on LPAR */
+       if (dasd_nopav || MACHINE_IS_VM)
+               return 0;
+
+       rc = dasd_eckd_psf_ssc(device);
+       /* may be requested feature is not available on server,
+        * therefore just report error and go ahead */
+       private = (struct dasd_eckd_private *) device->private;
+       DEV_MESSAGE(KERN_INFO, device,
+                   "PSF-SSC on storage subsystem %s.%s.%04x returned rc=%d",
+                   private->uid.vendor, private->uid.serial,
+                   private->uid.ssid, rc);
+       /* RE-Read Configuration Data */
+       return dasd_eckd_read_conf(device);
+}
+
+/*
+ * Check device characteristics.
+ * If the device is accessible using ECKD discipline, the device is enabled.
+ */
 static int
 dasd_eckd_check_characteristics(struct dasd_device *device)
 {
        struct dasd_eckd_private *private;
+       struct dasd_block *block;
        void *rdc_data;
-       int rc;
+       int is_known, rc;
 
        private = (struct dasd_eckd_private *) device->private;
        if (private == NULL) {
-               private = kmalloc(sizeof(struct dasd_eckd_private),
+               private = kzalloc(sizeof(struct dasd_eckd_private),
                                  GFP_KERNEL | GFP_DMA);
                if (private == NULL) {
                        DEV_MESSAGE(KERN_WARNING, device, "%s",
@@ -525,7 +943,6 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                                    "data");
                        return -ENOMEM;
                }
-               memset(private, 0, sizeof(struct dasd_eckd_private));
                device->private = (void *) private;
        }
        /* Invalidate status of initial analysis. */
@@ -534,16 +951,57 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
        private->attrib.operation = DASD_NORMAL_CACHE;
        private->attrib.nr_cyl = 0;
 
+       /* Read Configuration Data */
+       rc = dasd_eckd_read_conf(device);
+       if (rc)
+               goto out_err1;
+
+       /* Generate device unique id and register in devmap */
+       rc = dasd_eckd_generate_uid(device, &private->uid);
+       if (rc)
+               goto out_err1;
+       dasd_set_uid(device->cdev, &private->uid);
+
+       if (private->uid.type == UA_BASE_DEVICE) {
+               block = dasd_alloc_block();
+               if (IS_ERR(block)) {
+                       DEV_MESSAGE(KERN_WARNING, device, "%s",
+                                   "could not allocate dasd block structure");
+                       rc = PTR_ERR(block);
+                       goto out_err1;
+               }
+               device->block = block;
+               block->base = device;
+       }
+
+       /* register lcu with alias handling, enable PAV if this is a new lcu */
+       is_known = dasd_alias_make_device_known_to_lcu(device);
+       if (is_known < 0) {
+               rc = is_known;
+               goto out_err2;
+       }
+       if (!is_known) {
+               /* new lcu found */
+               rc = dasd_eckd_validate_server(device); /* will switch pav on */
+               if (rc)
+                       goto out_err3;
+       }
+
+       /* Read Feature Codes */
+       rc = dasd_eckd_read_features(device);
+       if (rc)
+               goto out_err3;
+
        /* Read Device Characteristics */
        rdc_data = (void *) &(private->rdc_data);
-       rc = read_dev_chars(device->cdev, &rdc_data, 64);
+       memset(rdc_data, 0, sizeof(rdc_data));
+       rc = dasd_generic_read_dev_chars(device, "ECKD", &rdc_data, 64);
        if (rc) {
                DEV_MESSAGE(KERN_WARNING, device,
-                           "Read device characteristics returned error %d",
-                           rc);
-               return rc;
+                           "Read device characteristics returned "
+                           "rc=%d", rc);
+               goto out_err3;
        }
-
        DEV_MESSAGE(KERN_INFO, device,
                    "%04X/%02X(CU:%04X/%02X) Cyl:%d Head:%d Sec:%d",
                    private->rdc_data.dev_type,
@@ -553,11 +1011,33 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                    private->rdc_data.no_cyl,
                    private->rdc_data.trk_per_cyl,
                    private->rdc_data.sec_per_trk);
+       return 0;
 
-       /* Read Configuration Data */
-       rc = dasd_eckd_read_conf (device);
+out_err3:
+       dasd_alias_disconnect_device_from_lcu(device);
+out_err2:
+       dasd_free_block(device->block);
+       device->block = NULL;
+out_err1:
+       kfree(private->conf_data);
+       kfree(device->private);
+       device->private = NULL;
        return rc;
+}
+
+static void dasd_eckd_uncheck_device(struct dasd_device *device)
+{
+       struct dasd_eckd_private *private;
 
+       private = (struct dasd_eckd_private *) device->private;
+       dasd_alias_disconnect_device_from_lcu(device);
+       private->ned = NULL;
+       private->sneq = NULL;
+       private->vdsneq = NULL;
+       private->gneq = NULL;
+       private->conf_len = 0;
+       kfree(private->conf_data);
+       private->conf_data = NULL;
 }
 
 static struct dasd_ccw_req *
@@ -583,7 +1063,7 @@ dasd_eckd_analysis_ccw(struct dasd_device *device)
        /* Define extent for the first 3 tracks. */
        define_extent(ccw++, cqr->data, 0, 2,
                      DASD_ECKD_CCW_READ_COUNT, device);
-       LO_data = cqr->data + sizeof (struct DE_eckd_data);
+       LO_data = cqr->data + sizeof(struct DE_eckd_data);
        /* Locate record for the first 4 records on track 0. */
        ccw[-1].flags |= CCW_FLAG_CC;
        locate_record(ccw++, LO_data++, 0, 0, 4,
@@ -611,7 +1091,9 @@ dasd_eckd_analysis_ccw(struct dasd_device *device)
        ccw->count = 8;
        ccw->cda = (__u32)(addr_t) count_data;
 
-       cqr->device = device;
+       cqr->block = NULL;
+       cqr->startdev = device;
+       cqr->memdev = device;
        cqr->retries = 0;
        cqr->buildclk = get_clock();
        cqr->status = DASD_CQR_FILLED;
@@ -631,7 +1113,7 @@ dasd_eckd_analysis_callback(struct dasd_ccw_req *init_cqr, void *data)
        struct dasd_eckd_private *private;
        struct dasd_device *device;
 
-       device = init_cqr->device;
+       device = init_cqr->startdev;
        private = (struct dasd_eckd_private *) device->private;
        private->init_cqr_status = init_cqr->status;
        dasd_sfree_request(init_cqr, device);
@@ -639,13 +1121,13 @@ dasd_eckd_analysis_callback(struct dasd_ccw_req *init_cqr, void *data)
 }
 
 static int
-dasd_eckd_start_analysis(struct dasd_device *device)
+dasd_eckd_start_analysis(struct dasd_block *block)
 {
        struct dasd_eckd_private *private;
        struct dasd_ccw_req *init_cqr;
 
-       private = (struct dasd_eckd_private *) device->private;
-       init_cqr = dasd_eckd_analysis_ccw(device);
+       private = (struct dasd_eckd_private *) block->base->private;
+       init_cqr = dasd_eckd_analysis_ccw(block->base);
        if (IS_ERR(init_cqr))
                return PTR_ERR(init_cqr);
        init_cqr->callback = dasd_eckd_analysis_callback;
@@ -656,13 +1138,15 @@ dasd_eckd_start_analysis(struct dasd_device *device)
 }
 
 static int
-dasd_eckd_end_analysis(struct dasd_device *device)
+dasd_eckd_end_analysis(struct dasd_block *block)
 {
+       struct dasd_device *device;
        struct dasd_eckd_private *private;
        struct eckd_count *count_area;
        unsigned int sb, blk_per_trk;
        int status, i;
 
+       device = block->base;
        private = (struct dasd_eckd_private *) device->private;
        status = private->init_cqr_status;
        private->init_cqr_status = -1;
@@ -674,7 +1158,7 @@ dasd_eckd_end_analysis(struct dasd_device *device)
 
        private->uses_cdl = 1;
        /* Calculate number of blocks/records per track. */
-       blk_per_trk = recs_per_track(&private->rdc_data, 0, device->bp_block);
+       blk_per_trk = recs_per_track(&private->rdc_data, 0, block->bp_block);
        /* Check Track 0 for Compatible Disk Layout */
        count_area = NULL;
        for (i = 0; i < 3; i++) {
@@ -704,56 +1188,65 @@ dasd_eckd_end_analysis(struct dasd_device *device)
        if (count_area != NULL && count_area->kl == 0) {
                /* we found notthing violating our disk layout */
                if (dasd_check_blocksize(count_area->dl) == 0)
-                       device->bp_block = count_area->dl;
+                       block->bp_block = count_area->dl;
        }
-       if (device->bp_block == 0) {
+       if (block->bp_block == 0) {
                DEV_MESSAGE(KERN_WARNING, device, "%s",
                            "Volume has incompatible disk layout");
                return -EMEDIUMTYPE;
        }
-       device->s2b_shift = 0;  /* bits to shift 512 to get a block */
-       for (sb = 512; sb < device->bp_block; sb = sb << 1)
-               device->s2b_shift++;
+       block->s2b_shift = 0;   /* bits to shift 512 to get a block */
+       for (sb = 512; sb < block->bp_block; sb = sb << 1)
+               block->s2b_shift++;
 
-       blk_per_trk = recs_per_track(&private->rdc_data, 0, device->bp_block);
-       device->blocks = (private->rdc_data.no_cyl *
+       blk_per_trk = recs_per_track(&private->rdc_data, 0, block->bp_block);
+       block->blocks = (private->rdc_data.no_cyl *
                          private->rdc_data.trk_per_cyl *
                          blk_per_trk);
 
        DEV_MESSAGE(KERN_INFO, device,
                    "(%dkB blks): %dkB at %dkB/trk %s",
-                   (device->bp_block >> 10),
+                   (block->bp_block >> 10),
                    ((private->rdc_data.no_cyl *
                      private->rdc_data.trk_per_cyl *
-                     blk_per_trk * (device->bp_block >> 9)) >> 1),
-                   ((blk_per_trk * device->bp_block) >> 10), 
+                     blk_per_trk * (block->bp_block >> 9)) >> 1),
+                   ((blk_per_trk * block->bp_block) >> 10),
                    private->uses_cdl ?
                    "compatible disk layout" : "linux disk layout");
 
        return 0;
 }
 
-static int
-dasd_eckd_do_analysis(struct dasd_device *device)
+static int dasd_eckd_do_analysis(struct dasd_block *block)
 {
        struct dasd_eckd_private *private;
 
-       private = (struct dasd_eckd_private *) device->private;
+       private = (struct dasd_eckd_private *) block->base->private;
        if (private->init_cqr_status < 0)
-               return dasd_eckd_start_analysis(device);
+               return dasd_eckd_start_analysis(block);
        else
-               return dasd_eckd_end_analysis(device);
+               return dasd_eckd_end_analysis(block);
 }
 
+static int dasd_eckd_ready_to_online(struct dasd_device *device)
+{
+       return dasd_alias_add_device(device);
+};
+
+static int dasd_eckd_online_to_ready(struct dasd_device *device)
+{
+       return dasd_alias_remove_device(device);
+};
+
 static int
-dasd_eckd_fill_geometry(struct dasd_device *device, struct hd_geometry *geo)
+dasd_eckd_fill_geometry(struct dasd_block *block, struct hd_geometry *geo)
 {
        struct dasd_eckd_private *private;
 
-       private = (struct dasd_eckd_private *) device->private;
-       if (dasd_check_blocksize(device->bp_block) == 0) {
+       private = (struct dasd_eckd_private *) block->base->private;
+       if (dasd_check_blocksize(block->bp_block) == 0) {
                geo->sectors = recs_per_track(&private->rdc_data,
-                                             0, device->bp_block);
+                                             0, block->bp_block);
        }
        geo->cylinders = private->rdc_data.no_cyl;
        geo->heads = private->rdc_data.trk_per_cyl;
@@ -865,7 +1358,7 @@ dasd_eckd_format_device(struct dasd_device * device,
                locate_record(ccw++, (struct LO_eckd_data *) data,
                              fdata->start_unit, 0, rpt + 1,
                              DASD_ECKD_CCW_WRITE_RECORD_ZERO, device,
-                             device->bp_block);
+                             device->block->bp_block);
                data += sizeof(struct LO_eckd_data);
                break;
        case 0x04: /* Invalidate track. */
@@ -923,7 +1416,7 @@ dasd_eckd_format_device(struct dasd_device * device,
                                if (i < 3) {
                                        ect->kl = 4;
                                        ect->dl = sizes_trk0[i] - 4;
-                               } 
+                               }
                        }
                        if ((fdata->intensity & 0x08) &&
                            fdata->start_unit == 1) {
@@ -938,43 +1431,28 @@ dasd_eckd_format_device(struct dasd_device * device,
                        ccw++;
                }
        }
-       fcp->device = device;
-       fcp->retries = 2;       /* set retry counter to enable ERP */
+       fcp->startdev = device;
+       fcp->memdev = device;
+       clear_bit(DASD_CQR_FLAGS_USE_ERP, &fcp->flags);
+       fcp->retries = 5;       /* set retry counter to enable default ERP */
        fcp->buildclk = get_clock();
        fcp->status = DASD_CQR_FILLED;
        return fcp;
 }
 
-static dasd_era_t
-dasd_eckd_examine_error(struct dasd_ccw_req * cqr, struct irb * irb)
+static void dasd_eckd_handle_terminated_request(struct dasd_ccw_req *cqr)
 {
-       struct dasd_device *device = (struct dasd_device *) cqr->device;
-       struct ccw_device *cdev = device->cdev;
-
-       if (irb->scsw.cstat == 0x00 &&
-           irb->scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END))
-               return dasd_era_none;
-
-       switch (cdev->id.cu_type) {
-       case 0x3990:
-       case 0x2105:
-       case 0x2107:
-       case 0x1750:
-               return dasd_3990_erp_examine(cqr, irb);
-       case 0x9343:
-               return dasd_9343_erp_examine(cqr, irb);
-       case 0x3880:
-       default:
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
-                           "default (unknown CU type) - RECOVERABLE return");
-               return dasd_era_recover;
+       cqr->status = DASD_CQR_FILLED;
+       if (cqr->block && (cqr->startdev != cqr->block->base)) {
+               dasd_eckd_reset_ccw_to_base_io(cqr);
+               cqr->startdev = cqr->block->base;
        }
-}
+};
 
 static dasd_erp_fn_t
 dasd_eckd_erp_action(struct dasd_ccw_req * cqr)
 {
-       struct dasd_device *device = (struct dasd_device *) cqr->device;
+       struct dasd_device *device = (struct dasd_device *) cqr->startdev;
        struct ccw_device *cdev = device->cdev;
 
        switch (cdev->id.cu_type) {
@@ -996,15 +1474,69 @@ dasd_eckd_erp_postaction(struct dasd_ccw_req * cqr)
        return dasd_default_erp_postaction;
 }
 
-static struct dasd_ccw_req *
-dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
+
+static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,
+                                                  struct irb *irb)
+{
+       char mask;
+
+       /* first of all check for state change pending interrupt */
+       mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
+       if ((irb->scsw.cmd.dstat & mask) == mask) {
+               dasd_generic_handle_state_change(device);
+               return;
+       }
+
+       /* summary unit check */
+       if ((irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) &&
+           (irb->ecw[7] == 0x0D)) {
+               dasd_alias_handle_summary_unit_check(device, irb);
+               return;
+       }
+
+
+       /* service information message SIM */
+       if (irb->esw.esw0.erw.cons && !(irb->ecw[27] & DASD_SENSE_BIT_0) &&
+           ((irb->ecw[6] & DASD_SIM_SENSE) == DASD_SIM_SENSE)) {
+               dasd_3990_erp_handle_sim(device, irb->ecw);
+               dasd_schedule_device_bh(device);
+               return;
+       }
+
+       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;
+};
+
+static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
+                                              struct dasd_block *block,
+                                              struct request *req)
 {
        struct dasd_eckd_private *private;
        unsigned long *idaws;
        struct LO_eckd_data *LO_data;
        struct dasd_ccw_req *cqr;
        struct ccw1 *ccw;
-       struct bio *bio;
+       struct req_iterator iter;
        struct bio_vec *bv;
        char *dst;
        unsigned int blksize, blk_per_trk, off;
@@ -1013,9 +1545,11 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
        sector_t first_trk, last_trk;
        unsigned int first_offs, last_offs;
        unsigned char cmd, rcmd;
-       int i;
+       int use_prefix;
+       struct dasd_device *basedev;
 
-       private = (struct dasd_eckd_private *) device->private;
+       basedev = block->base;
+       private = (struct dasd_eckd_private *) basedev->private;
        if (rq_data_dir(req) == READ)
                cmd = DASD_ECKD_CCW_READ_MT;
        else if (rq_data_dir(req) == WRITE)
@@ -1023,38 +1557,48 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
        else
                return ERR_PTR(-EINVAL);
        /* Calculate number of blocks/records per track. */
-       blksize = device->bp_block;
+       blksize = block->bp_block;
        blk_per_trk = recs_per_track(&private->rdc_data, 0, blksize);
        /* Calculate record id of first and last block. */
-       first_rec = first_trk = req->sector >> device->s2b_shift;
+       first_rec = first_trk = req->sector >> block->s2b_shift;
        first_offs = sector_div(first_trk, blk_per_trk);
        last_rec = last_trk =
-               (req->sector + req->nr_sectors - 1) >> device->s2b_shift;
+               (req->sector + req->nr_sectors - 1) >> block->s2b_shift;
        last_offs = sector_div(last_trk, blk_per_trk);
        /* Check struct bio and count the number of blocks for the request. */
        count = 0;
        cidaw = 0;
-       rq_for_each_bio(bio, req) {
-               bio_for_each_segment(bv, bio, i) {
-                       if (bv->bv_len & (blksize - 1))
-                               /* Eckd can only do full blocks. */
-                               return ERR_PTR(-EINVAL);
-                       count += bv->bv_len >> (device->s2b_shift + 9);
+       rq_for_each_segment(bv, req, iter) {
+               if (bv->bv_len & (blksize - 1))
+                       /* Eckd can only do full blocks. */
+                       return ERR_PTR(-EINVAL);
+               count += bv->bv_len >> (block->s2b_shift + 9);
 #if defined(CONFIG_64BIT)
-                       if (idal_is_needed (page_address(bv->bv_page),
-                                           bv->bv_len))
-                               cidaw += bv->bv_len >> (device->s2b_shift + 9);
+               if (idal_is_needed (page_address(bv->bv_page), bv->bv_len))
+                       cidaw += bv->bv_len >> (block->s2b_shift + 9);
 #endif
-               }
        }
        /* Paranoia. */
        if (count != last_rec - first_rec + 1)
                return ERR_PTR(-EINVAL);
-       /* 1x define extent + 1x locate record + number of blocks */
-       cplength = 2 + count;
-       /* 1x define extent + 1x locate record + cidaws*sizeof(long) */
-       datasize = sizeof(struct DE_eckd_data) + sizeof(struct LO_eckd_data) +
-               cidaw * sizeof(unsigned long);
+
+       /* use the prefix command if available */
+       use_prefix = private->features.feature[8] & 0x01;
+       if (use_prefix) {
+               /* 1x prefix + number of blocks */
+               cplength = 2 + count;
+               /* 1x prefix + cidaws*sizeof(long) */
+               datasize = sizeof(struct PFX_eckd_data) +
+                       sizeof(struct LO_eckd_data) +
+                       cidaw * sizeof(unsigned long);
+       } else {
+               /* 1x define extent + 1x locate record + number of blocks */
+               cplength = 2 + count;
+               /* 1x define extent + 1x locate record + cidaws*sizeof(long) */
+               datasize = sizeof(struct DE_eckd_data) +
+                       sizeof(struct LO_eckd_data) +
+                       cidaw * sizeof(unsigned long);
+       }
        /* Find out the number of additional locate record ccws for cdl. */
        if (private->uses_cdl && first_rec < 2*blk_per_trk) {
                if (last_rec >= 2*blk_per_trk)
@@ -1064,27 +1608,48 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
        }
        /* Allocate the ccw request. */
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
-                                  cplength, datasize, device);
+                                  cplength, datasize, startdev);
        if (IS_ERR(cqr))
                return cqr;
        ccw = cqr->cpaddr;
-       /* First ccw is define extent. */
-       define_extent(ccw++, cqr->data, first_trk, last_trk, cmd, device);
+       /* First ccw is define extent or prefix. */
+       if (use_prefix) {
+               if (prefix(ccw++, cqr->data, first_trk,
+                          last_trk, cmd, basedev, startdev) == -EAGAIN) {
+                       /* Clock not in sync and XRC is enabled.
+                        * Try again later.
+                        */
+                       dasd_sfree_request(cqr, startdev);
+                       return ERR_PTR(-EAGAIN);
+               }
+               idaws = (unsigned long *) (cqr->data +
+                                          sizeof(struct PFX_eckd_data));
+       } else {
+               if (define_extent(ccw++, cqr->data, first_trk,
+                                 last_trk, cmd, startdev) == -EAGAIN) {
+                       /* Clock not in sync and XRC is enabled.
+                        * Try again later.
+                        */
+                       dasd_sfree_request(cqr, startdev);
+                       return ERR_PTR(-EAGAIN);
+               }
+               idaws = (unsigned long *) (cqr->data +
+                                          sizeof(struct DE_eckd_data));
+       }
        /* Build locate_record+read/write/ccws. */
-       idaws = (unsigned long *) (cqr->data + sizeof(struct DE_eckd_data));
        LO_data = (struct LO_eckd_data *) (idaws + cidaw);
        recid = first_rec;
        if (private->uses_cdl == 0 || recid > 2*blk_per_trk) {
                /* Only standard blocks so there is just one locate record. */
                ccw[-1].flags |= CCW_FLAG_CC;
                locate_record(ccw++, LO_data++, first_trk, first_offs + 1,
-                             last_rec - recid + 1, cmd, device, blksize);
+                             last_rec - recid + 1, cmd, basedev, blksize);
        }
-       rq_for_each_bio(bio, req) bio_for_each_segment(bv, bio, i) {
+       rq_for_each_segment(bv, req, iter) {
                dst = page_address(bv->bv_page) + bv->bv_offset;
                if (dasd_page_cache) {
                        char *copy = kmem_cache_alloc(dasd_page_cache,
-                                                     SLAB_DMA | __GFP_NOWARN);
+                                                     GFP_DMA | __GFP_NOWARN);
                        if (copy && rq_data_dir(req) == WRITE)
                                memcpy(copy + bv->bv_offset, dst, bv->bv_len);
                        if (copy)
@@ -1108,7 +1673,7 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
                                ccw[-1].flags |= CCW_FLAG_CC;
                                locate_record(ccw++, LO_data++,
                                              trkid, recoffs + 1,
-                                             1, rcmd, device, count);
+                                             1, rcmd, basedev, count);
                        }
                        /* Locate record for standard blocks ? */
                        if (private->uses_cdl && recid == 2*blk_per_trk) {
@@ -1116,7 +1681,7 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
                                locate_record(ccw++, LO_data++,
                                              trkid, recoffs + 1,
                                              last_rec - recid + 1,
-                                             cmd, device, count);
+                                             cmd, basedev, count);
                        }
                        /* Read/write ccw. */
                        ccw[-1].flags |= CCW_FLAG_CC;
@@ -1135,9 +1700,11 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
                        recid++;
                }
        }
-       if (req->flags & REQ_FAILFAST)
+       if (blk_noretry_request(req))
                set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
-       cqr->device = device;
+       cqr->startdev = startdev;
+       cqr->memdev = startdev;
+       cqr->block = block;
        cqr->expires = 5 * 60 * HZ;     /* 5 minutes */
        cqr->lpm = private->path_data.ppm;
        cqr->retries = 256;
@@ -1151,25 +1718,25 @@ dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req)
 {
        struct dasd_eckd_private *private;
        struct ccw1 *ccw;
-       struct bio *bio;
+       struct req_iterator iter;
        struct bio_vec *bv;
        char *dst, *cda;
        unsigned int blksize, blk_per_trk, off;
        sector_t recid;
-       int i, status;
+       int status;
 
        if (!dasd_page_cache)
                goto out;
-       private = (struct dasd_eckd_private *) cqr->device->private;
-       blksize = cqr->device->bp_block;
+       private = (struct dasd_eckd_private *) cqr->block->base->private;
+       blksize = cqr->block->bp_block;
        blk_per_trk = recs_per_track(&private->rdc_data, 0, blksize);
-       recid = req->sector >> cqr->device->s2b_shift;
+       recid = req->sector >> cqr->block->s2b_shift;
        ccw = cqr->cpaddr;
        /* Skip over define extent & locate record. */
        ccw++;
        if (private->uses_cdl == 0 || recid > 2*blk_per_trk)
                ccw++;
-       rq_for_each_bio(bio, req) bio_for_each_segment(bv, bio, i) {
+       rq_for_each_segment(bv, req, iter) {
                dst = page_address(bv->bv_page) + bv->bv_offset;
                for (off = 0; off < bv->bv_len; off += blksize) {
                        /* Skip locate record. */
@@ -1194,10 +1761,71 @@ dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req)
        }
 out:
        status = cqr->status == DASD_CQR_DONE;
-       dasd_sfree_request(cqr, cqr->device);
+       dasd_sfree_request(cqr, cqr->memdev);
        return status;
 }
 
+/*
+ * Modify ccw chain in cqr so it can be started on a base device.
+ *
+ * Note that this is not enough to restart the cqr!
+ * Either reset cqr->startdev as well (summary unit check handling)
+ * or restart via separate cqr (as in ERP handling).
+ */
+void dasd_eckd_reset_ccw_to_base_io(struct dasd_ccw_req *cqr)
+{
+       struct ccw1 *ccw;
+       struct PFX_eckd_data *pfxdata;
+
+       ccw = cqr->cpaddr;
+       pfxdata = cqr->data;
+
+       if (ccw->cmd_code == DASD_ECKD_CCW_PFX) {
+               pfxdata->validity.verify_base = 0;
+               pfxdata->validity.hyper_pav = 0;
+       }
+}
+
+#define DASD_ECKD_CHANQ_MAX_SIZE 4
+
+static struct dasd_ccw_req *dasd_eckd_build_alias_cp(struct dasd_device *base,
+                                                    struct dasd_block *block,
+                                                    struct request *req)
+{
+       struct dasd_eckd_private *private;
+       struct dasd_device *startdev;
+       unsigned long flags;
+       struct dasd_ccw_req *cqr;
+
+       startdev = dasd_alias_get_start_dev(base);
+       if (!startdev)
+               startdev = base;
+       private = (struct dasd_eckd_private *) startdev->private;
+       if (private->count >= DASD_ECKD_CHANQ_MAX_SIZE)
+               return ERR_PTR(-EBUSY);
+
+       spin_lock_irqsave(get_ccwdev_lock(startdev->cdev), flags);
+       private->count++;
+       cqr = dasd_eckd_build_cp(startdev, block, req);
+       if (IS_ERR(cqr))
+               private->count--;
+       spin_unlock_irqrestore(get_ccwdev_lock(startdev->cdev), flags);
+       return cqr;
+}
+
+static int dasd_eckd_free_alias_cp(struct dasd_ccw_req *cqr,
+                                  struct request *req)
+{
+       struct dasd_eckd_private *private;
+       unsigned long flags;
+
+       spin_lock_irqsave(get_ccwdev_lock(cqr->memdev->cdev), flags);
+       private = (struct dasd_eckd_private *) cqr->memdev->private;
+       private->count--;
+       spin_unlock_irqrestore(get_ccwdev_lock(cqr->memdev->cdev), flags);
+       return dasd_eckd_free_cp(cqr, req);
+}
+
 static int
 dasd_eckd_fill_info(struct dasd_device * device,
                    struct dasd_information2_t * info)
@@ -1211,9 +1839,10 @@ dasd_eckd_fill_info(struct dasd_device * device,
        info->characteristics_size = sizeof(struct dasd_eckd_characteristics);
        memcpy(info->characteristics, &private->rdc_data,
               sizeof(struct dasd_eckd_characteristics));
-       info->confdata_size = sizeof (struct dasd_eckd_confdata);
-       memcpy(info->configuration_data, &private->conf_data,
-              sizeof (struct dasd_eckd_confdata));
+       info->confdata_size = min((unsigned long)private->conf_len,
+                                 sizeof(info->configuration_data));
+       memcpy(info->configuration_data, private->conf_data,
+              info->confdata_size);
        return 0;
 }
 
@@ -1223,23 +1852,18 @@ dasd_eckd_fill_info(struct dasd_device * device,
 
 /*
  * Release device ioctl.
- * Buils a channel programm to releases a prior reserved 
+ * Buils a channel programm to releases a prior reserved
  * (see dasd_eckd_reserve) device.
  */
 static int
-dasd_eckd_release(struct block_device *bdev, int no, long args)
+dasd_eckd_release(struct dasd_device *device)
 {
-       struct dasd_device *device;
        struct dasd_ccw_req *cqr;
        int rc;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       device = bdev->bd_disk->private_data;
-       if (device == NULL)
-               return -ENODEV;
-
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
                                   1, 32, device);
        if (IS_ERR(cqr)) {
@@ -1251,40 +1875,36 @@ dasd_eckd_release(struct block_device *bdev, int no, long args)
         cqr->cpaddr->flags |= CCW_FLAG_SLI;
         cqr->cpaddr->count = 32;
        cqr->cpaddr->cda = (__u32)(addr_t) cqr->data;
-       cqr->device = device;
+       cqr->startdev = device;
+       cqr->memdev = device;
        clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
        set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
-       cqr->retries = 0;
+       cqr->retries = 2;       /* set retry counter to enable basic ERP */
        cqr->expires = 2 * HZ;
        cqr->buildclk = get_clock();
        cqr->status = DASD_CQR_FILLED;
 
        rc = dasd_sleep_on_immediatly(cqr);
 
-       dasd_sfree_request(cqr, cqr->device);
+       dasd_sfree_request(cqr, cqr->memdev);
        return rc;
 }
 
 /*
  * Reserve device ioctl.
  * Options are set to 'synchronous wait for interrupt' and
- * 'timeout the request'. This leads to a terminate IO if 
- * the interrupt is outstanding for a certain time. 
+ * 'timeout the request'. This leads to a terminate IO if
+ * the interrupt is outstanding for a certain time.
  */
 static int
-dasd_eckd_reserve(struct block_device *bdev, int no, long args)
+dasd_eckd_reserve(struct dasd_device *device)
 {
-       struct dasd_device *device;
        struct dasd_ccw_req *cqr;
        int rc;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       device = bdev->bd_disk->private_data;
-       if (device == NULL)
-               return -ENODEV;
-
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
                                   1, 32, device);
        if (IS_ERR(cqr)) {
@@ -1296,39 +1916,35 @@ dasd_eckd_reserve(struct block_device *bdev, int no, long args)
         cqr->cpaddr->flags |= CCW_FLAG_SLI;
         cqr->cpaddr->count = 32;
        cqr->cpaddr->cda = (__u32)(addr_t) cqr->data;
-       cqr->device = device;
+       cqr->startdev = device;
+       cqr->memdev = device;
        clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
        set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
-       cqr->retries = 0;
+       cqr->retries = 2;       /* set retry counter to enable basic ERP */
        cqr->expires = 2 * HZ;
        cqr->buildclk = get_clock();
        cqr->status = DASD_CQR_FILLED;
 
        rc = dasd_sleep_on_immediatly(cqr);
 
-       dasd_sfree_request(cqr, cqr->device);
+       dasd_sfree_request(cqr, cqr->memdev);
        return rc;
 }
 
 /*
  * Steal lock ioctl - unconditional reserve device.
- * Buils a channel programm to break a device's reservation. 
+ * Buils a channel programm to break a device's reservation.
  * (unconditional reserve)
  */
 static int
-dasd_eckd_steal_lock(struct block_device *bdev, int no, long args)
+dasd_eckd_steal_lock(struct dasd_device *device)
 {
-       struct dasd_device *device;
        struct dasd_ccw_req *cqr;
        int rc;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       device = bdev->bd_disk->private_data;
-       if (device == NULL)
-               return -ENODEV;
-
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
                                   1, 32, device);
        if (IS_ERR(cqr)) {
@@ -1340,17 +1956,18 @@ dasd_eckd_steal_lock(struct block_device *bdev, int no, long args)
         cqr->cpaddr->flags |= CCW_FLAG_SLI;
         cqr->cpaddr->count = 32;
        cqr->cpaddr->cda = (__u32)(addr_t) cqr->data;
-       cqr->device = device;
+       cqr->startdev = device;
+       cqr->memdev = device;
        clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
        set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
-       cqr->retries = 0;
+       cqr->retries = 2;       /* set retry counter to enable basic ERP */
        cqr->expires = 2 * HZ;
        cqr->buildclk = get_clock();
        cqr->status = DASD_CQR_FILLED;
 
        rc = dasd_sleep_on_immediatly(cqr);
 
-       dasd_sfree_request(cqr, cqr->device);
+       dasd_sfree_request(cqr, cqr->memdev);
        return rc;
 }
 
@@ -1358,66 +1975,62 @@ dasd_eckd_steal_lock(struct block_device *bdev, int no, long args)
  * Read performance statistics
  */
 static int
-dasd_eckd_performance(struct block_device *bdev, int no, long args)
+dasd_eckd_performance(struct dasd_device *device, void __user *argp)
 {
-       struct dasd_device *device;
        struct dasd_psf_prssd_data *prssdp;
        struct dasd_rssd_perf_stats_t *stats;
        struct dasd_ccw_req *cqr;
        struct ccw1 *ccw;
        int rc;
 
-       device = bdev->bd_disk->private_data;
-       if (device == NULL)
-               return -ENODEV;
-
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
                                   1 /* PSF */  + 1 /* RSSD */ ,
-                                  (sizeof (struct dasd_psf_prssd_data) +
-                                   sizeof (struct dasd_rssd_perf_stats_t)),
+                                  (sizeof(struct dasd_psf_prssd_data) +
+                                   sizeof(struct dasd_rssd_perf_stats_t)),
                                   device);
        if (IS_ERR(cqr)) {
                DEV_MESSAGE(KERN_WARNING, device, "%s",
                            "Could not allocate initialization request");
                return PTR_ERR(cqr);
        }
-       cqr->device = device;
+       cqr->startdev = device;
+       cqr->memdev = device;
        cqr->retries = 0;
        cqr->expires = 10 * HZ;
 
        /* Prepare for Read Subsystem Data */
        prssdp = (struct dasd_psf_prssd_data *) cqr->data;
-       memset(prssdp, 0, sizeof (struct dasd_psf_prssd_data));
+       memset(prssdp, 0, sizeof(struct dasd_psf_prssd_data));
        prssdp->order = PSF_ORDER_PRSSD;
-       prssdp->suborder = 0x01;        /* Perfomance Statistics */
+       prssdp->suborder = 0x01;        /* Performance Statistics */
        prssdp->varies[1] = 0x01;       /* Perf Statistics for the Subsystem */
 
        ccw = cqr->cpaddr;
        ccw->cmd_code = DASD_ECKD_CCW_PSF;
-       ccw->count = sizeof (struct dasd_psf_prssd_data);
+       ccw->count = sizeof(struct dasd_psf_prssd_data);
        ccw->flags |= CCW_FLAG_CC;
        ccw->cda = (__u32)(addr_t) prssdp;
 
        /* Read Subsystem Data - Performance Statistics */
        stats = (struct dasd_rssd_perf_stats_t *) (prssdp + 1);
-       memset(stats, 0, sizeof (struct dasd_rssd_perf_stats_t));
+       memset(stats, 0, sizeof(struct dasd_rssd_perf_stats_t));
 
        ccw++;
        ccw->cmd_code = DASD_ECKD_CCW_RSSD;
-       ccw->count = sizeof (struct dasd_rssd_perf_stats_t);
+       ccw->count = sizeof(struct dasd_rssd_perf_stats_t);
        ccw->cda = (__u32)(addr_t) stats;
 
        cqr->buildclk = get_clock();
        cqr->status = DASD_CQR_FILLED;
        rc = dasd_sleep_on(cqr);
        if (rc == 0) {
-               /* Prepare for Read Subsystem Data */
                prssdp = (struct dasd_psf_prssd_data *) cqr->data;
                stats = (struct dasd_rssd_perf_stats_t *) (prssdp + 1);
-               rc = copy_to_user((long __user *) args, (long *) stats,
-                                 sizeof(struct dasd_rssd_perf_stats_t));
+               if (copy_to_user(argp, stats,
+                                sizeof(struct dasd_rssd_perf_stats_t)))
+                       rc = -EFAULT;
        }
-       dasd_sfree_request(cqr, cqr->device);
+       dasd_sfree_request(cqr, cqr->memdev);
        return rc;
 }
 
@@ -1426,27 +2039,22 @@ dasd_eckd_performance(struct block_device *bdev, int no, long args)
  * Returnes the cache attributes used in Define Extend (DE).
  */
 static int
-dasd_eckd_get_attrib (struct block_device *bdev, int no, long args)
+dasd_eckd_get_attrib(struct dasd_device *device, void __user *argp)
 {
-       struct dasd_device *device;
-        struct dasd_eckd_private *private;
-        struct attrib_data_t attrib;
+       struct dasd_eckd_private *private =
+               (struct dasd_eckd_private *)device->private;
+       struct attrib_data_t attrib = private->attrib;
        int rc;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
-        if (!args)
+       if (!argp)
                 return -EINVAL;
 
-        device = bdev->bd_disk->private_data;
-        if (device == NULL)
-                return -ENODEV;
-
-        private = (struct dasd_eckd_private *) device->private;
-        attrib = private->attrib;
-
-        rc = copy_to_user((long __user *) args, (long *) &attrib,
-                         sizeof (struct attrib_data_t));
+       rc = 0;
+       if (copy_to_user(argp, (long *) &attrib,
+                        sizeof(struct attrib_data_t)))
+               rc = -EFAULT;
 
        return rc;
 }
@@ -1456,26 +2064,19 @@ dasd_eckd_get_attrib (struct block_device *bdev, int no, long args)
  * Stores the attributes for cache operation to be used in Define Extend (DE).
  */
 static int
-dasd_eckd_set_attrib(struct block_device *bdev, int no, long args)
+dasd_eckd_set_attrib(struct dasd_device *device, void __user *argp)
 {
-       struct dasd_device *device;
-       struct dasd_eckd_private *private;
+       struct dasd_eckd_private *private =
+               (struct dasd_eckd_private *)device->private;
        struct attrib_data_t attrib;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
-       if (!args)
+       if (!argp)
                return -EINVAL;
 
-       device = bdev->bd_disk->private_data;
-       if (device == NULL)
-               return -ENODEV;
-
-       if (copy_from_user(&attrib, (void __user *) args,
-                          sizeof (struct attrib_data_t))) {
+       if (copy_from_user(&attrib, argp, sizeof(struct attrib_data_t)))
                return -EFAULT;
-       }
-       private = (struct dasd_eckd_private *) device->private;
        private->attrib = attrib;
 
        DEV_MESSAGE(KERN_INFO, device,
@@ -1485,16 +2086,171 @@ dasd_eckd_set_attrib(struct block_device *bdev, int no, long args)
 }
 
 /*
+ * 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)
+{
+       struct dasd_device *device = block->base;
+
+       switch (cmd) {
+       case BIODASDGATTR:
+               return dasd_eckd_get_attrib(device, argp);
+       case BIODASDSATTR:
+               return dasd_eckd_set_attrib(device, argp);
+       case BIODASDPSRD:
+               return dasd_eckd_performance(device, argp);
+       case BIODASDRLSE:
+               return dasd_eckd_release(device);
+       case BIODASDRSRV:
+               return dasd_eckd_reserve(device);
+       case BIODASDSLCK:
+               return dasd_eckd_steal_lock(device);
+       case BIODASDSYMMIO:
+               return dasd_symm_io(device, argp);
+       default:
+               return -ENOIOCTLCMD;
+       }
+}
+
+/*
+ * Dump the range of CCWs into 'page' buffer
+ * and return number of printed chars.
+ */
+static int
+dasd_eckd_dump_ccw_range(struct ccw1 *from, struct ccw1 *to, char *page)
+{
+       int len, count;
+       char *datap;
+
+       len = 0;
+       while (from <= to) {
+               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " CCW %p: %08X %08X DAT:",
+                              from, ((int *) from)[0], ((int *) from)[1]);
+
+               /* get pointer to data (consider IDALs) */
+               if (from->flags & CCW_FLAG_IDA)
+                       datap = (char *) *((addr_t *) (addr_t) from->cda);
+               else
+                       datap = (char *) ((addr_t) from->cda);
+
+               /* dump data (max 32 bytes) */
+               for (count = 0; count < from->count && count < 32; count++) {
+                       if (count % 8 == 0) len += sprintf(page + len, " ");
+                       if (count % 4 == 0) len += sprintf(page + len, " ");
+                       len += sprintf(page + len, "%02x", datap[count]);
+               }
+               len += sprintf(page + len, "\n");
+               from++;
+       }
+       return len;
+}
+
+/*
  * Print sense data and related channel program.
  * Parts are printed because printk buffer is only 1024 bytes.
  */
-static void
-dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
-                    struct irb *irb)
+static void dasd_eckd_dump_sense(struct dasd_device *device,
+                                struct dasd_ccw_req *req, struct irb *irb)
 {
        char *page;
-       struct ccw1 *act, *end, *last;
-       int len, sl, sct, count;
+       struct ccw1 *first, *last, *fail, *from, *to;
+       int len, sl, sct;
 
        page = (char *) get_zeroed_page(GFP_ATOMIC);
        if (page == NULL) {
@@ -1502,16 +2258,17 @@ dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                            "No memory to dump sense data");
                return;
        }
-       len = sprintf(page, KERN_ERR PRINTK_HEADER
+       /* 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.cstat, irb->scsw.dstat);
+                      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,
-                      (void *) (addr_t) irb->scsw.cpa);
+                      dev_name(&device->cdev->dev),
+                      (void *) (addr_t) irb->scsw.cmd.cpa);
        if (irb->esw.esw0.erw.cons) {
                for (sl = 0; sl < 4; sl++) {
                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
@@ -1527,87 +2284,59 @@ dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
 
                if (irb->ecw[27] & DASD_SENSE_BIT_0) {
                        /* 24 Byte Sense Data */
-                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
-                                      " 24 Byte: %x MSG %x, "
-                                      "%s MSGb to SYSOP\n",
-                                      irb->ecw[7] >> 4, irb->ecw[7] & 0x0f,
-                                      irb->ecw[1] & 0x10 ? "" : "no");
+                       sprintf(page + len, KERN_ERR PRINTK_HEADER
+                               " 24 Byte: %x MSG %x, "
+                               "%s MSGb to SYSOP\n",
+                               irb->ecw[7] >> 4, irb->ecw[7] & 0x0f,
+                               irb->ecw[1] & 0x10 ? "" : "no");
                } else {
                        /* 32 Byte Sense Data */
-                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
-                                      " 32 Byte: Format: %x "
-                                      "Exception class %x\n",
-                                      irb->ecw[6] & 0x0f, irb->ecw[22] >> 4);
+                       sprintf(page + len, KERN_ERR PRINTK_HEADER
+                               " 32 Byte: Format: %x "
+                               "Exception class %x\n",
+                               irb->ecw[6] & 0x0f, irb->ecw[22] >> 4);
                }
        } else {
-               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
-                              " SORRY - NO VALID SENSE AVAILABLE\n");
-       }
-       MESSAGE_LOG(KERN_ERR, "%s",
-                   page + sizeof(KERN_ERR PRINTK_HEADER));
-
-       /* dump the Channel Program */
-       /* print first CCWs (maximum 8) */
-       act = req->cpaddr;
-        for (last = act; last->flags & (CCW_FLAG_CC | CCW_FLAG_DC); last++);
-       end = min(act + 8, last);
-       len = sprintf(page, KERN_ERR PRINTK_HEADER
-                     " Related CP in req: %p\n", req);
-       while (act <= end) {
-               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
-                              " CCW %p: %08X %08X DAT:",
-                              act, ((int *) act)[0], ((int *) act)[1]);
-               for (count = 0; count < 32 && count < act->count;
-                    count += sizeof(int))
-                       len += sprintf(page + len, " %08X",
-                                      ((int *) (addr_t) act->cda)
-                                      [(count>>2)]);
-               len += sprintf(page + len, "\n");
-               act++;
-       }
-       MESSAGE_LOG(KERN_ERR, "%s",
-                   page + sizeof(KERN_ERR PRINTK_HEADER));
-
-       /* print failing CCW area */
-       len = 0;
-       if (act <  ((struct ccw1 *)(addr_t) irb->scsw.cpa) - 2) {
-               act = ((struct ccw1 *)(addr_t) irb->scsw.cpa) - 2;
-               len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
-       }
-       end = min((struct ccw1 *)(addr_t) irb->scsw.cpa + 2, last);
-       while (act <= end) {
-               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
-                              " CCW %p: %08X %08X DAT:",
-                              act, ((int *) act)[0], ((int *) act)[1]);
-               for (count = 0; count < 32 && count < act->count;
-                    count += sizeof(int))
-                       len += sprintf(page + len, " %08X",
-                                      ((int *) (addr_t) act->cda)
-                                      [(count>>2)]);
-               len += sprintf(page + len, "\n");
-               act++;
-       }
-
-       /* print last CCWs */
-       if (act <  last - 2) {
-               act = last - 2;
-               len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
+               sprintf(page + len, KERN_ERR PRINTK_HEADER
+                       " SORRY - NO VALID SENSE AVAILABLE\n");
        }
-       while (act <= last) {
-               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
-                              " CCW %p: %08X %08X DAT:",
-                              act, ((int *) act)[0], ((int *) act)[1]);
-               for (count = 0; count < 32 && count < act->count;
-                    count += sizeof(int))
-                       len += sprintf(page + len, " %08X",
-                                      ((int *) (addr_t) act->cda)
-                                      [(count>>2)]);
-               len += sprintf(page + len, "\n");
-               act++;
+       printk("%s", page);
+
+       if (req) {
+               /* req == NULL for unsolicited interrupts */
+               /* dump the Channel Program (max 140 Bytes per line) */
+               /* Count CCW and print first CCWs (maximum 1024 % 140 = 7) */
+               first = req->cpaddr;
+               for (last = first; last->flags & (CCW_FLAG_CC | CCW_FLAG_DC); last++);
+               to = min(first + 6, last);
+               len = sprintf(page,  KERN_ERR PRINTK_HEADER
+                             " Related CP in req: %p\n", req);
+               dasd_eckd_dump_ccw_range(first, to, page + len);
+               printk("%s", page);
+
+               /* print failing CCW area (maximum 4) */
+               /* scsw->cda is either valid or zero  */
+               len = 0;
+               from = ++to;
+               fail = (struct ccw1 *)(addr_t)
+                               irb->scsw.cmd.cpa; /* failing CCW */
+               if (from <  fail - 2) {
+                       from = fail - 2;     /* there is a gap - print header */
+                       len += sprintf(page, KERN_ERR PRINTK_HEADER "......\n");
+               }
+               to = min(fail + 1, last);
+               len += dasd_eckd_dump_ccw_range(from, to, page + len);
+
+               /* print last CCWs (maximum 2) */
+               from = max(from, ++to);
+               if (from < last - 1) {
+                       from = last - 1;     /* there is a gap - print header */
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
+               }
+               len += dasd_eckd_dump_ccw_range(from, last, page + len);
+               if (len > 0)
+                       printk("%s", page);
        }
-       if (len > 0)
-               MESSAGE_LOG(KERN_ERR, "%s",
-                           page + sizeof(KERN_ERR PRINTK_HEADER));
        free_page((unsigned long) page);
 }
 
@@ -1630,98 +2359,37 @@ static struct dasd_discipline dasd_eckd_discipline = {
        .ebcname = "ECKD",
        .max_blocks = 240,
        .check_device = dasd_eckd_check_characteristics,
+       .uncheck_device = dasd_eckd_uncheck_device,
        .do_analysis = dasd_eckd_do_analysis,
+       .ready_to_online = dasd_eckd_ready_to_online,
+       .online_to_ready = dasd_eckd_online_to_ready,
        .fill_geometry = dasd_eckd_fill_geometry,
        .start_IO = dasd_start_IO,
        .term_IO = dasd_term_IO,
+       .handle_terminated_request = dasd_eckd_handle_terminated_request,
        .format_device = dasd_eckd_format_device,
-       .examine_error = dasd_eckd_examine_error,
        .erp_action = dasd_eckd_erp_action,
        .erp_postaction = dasd_eckd_erp_postaction,
-       .build_cp = dasd_eckd_build_cp,
-       .free_cp = dasd_eckd_free_cp,
+       .handle_unsolicited_interrupt = dasd_eckd_handle_unsolicited_interrupt,
+       .build_cp = dasd_eckd_build_alias_cp,
+       .free_cp = dasd_eckd_free_alias_cp,
        .dump_sense = dasd_eckd_dump_sense,
        .fill_info = dasd_eckd_fill_info,
+       .ioctl = dasd_eckd_ioctl,
 };
 
 static int __init
 dasd_eckd_init(void)
 {
-       int ret;
-
-       dasd_ioctl_no_register(THIS_MODULE, BIODASDGATTR,
-                              dasd_eckd_get_attrib);
-       dasd_ioctl_no_register(THIS_MODULE, BIODASDSATTR,
-                              dasd_eckd_set_attrib);
-       dasd_ioctl_no_register(THIS_MODULE, BIODASDPSRD,
-                              dasd_eckd_performance);
-       dasd_ioctl_no_register(THIS_MODULE, BIODASDRLSE,
-                              dasd_eckd_release);
-       dasd_ioctl_no_register(THIS_MODULE, BIODASDRSRV,
-                              dasd_eckd_reserve);
-       dasd_ioctl_no_register(THIS_MODULE, BIODASDSLCK,
-                              dasd_eckd_steal_lock);
-
        ASCEBC(dasd_eckd_discipline.ebcname, 4);
-
-       ret = ccw_driver_register(&dasd_eckd_driver);
-       if (ret) {
-               dasd_ioctl_no_unregister(THIS_MODULE, BIODASDGATTR,
-                                        dasd_eckd_get_attrib);
-               dasd_ioctl_no_unregister(THIS_MODULE, BIODASDSATTR,
-                                        dasd_eckd_set_attrib);
-               dasd_ioctl_no_unregister(THIS_MODULE, BIODASDPSRD,
-                                        dasd_eckd_performance);
-               dasd_ioctl_no_unregister(THIS_MODULE, BIODASDRLSE,
-                                        dasd_eckd_release);
-               dasd_ioctl_no_unregister(THIS_MODULE, BIODASDRSRV,
-                                        dasd_eckd_reserve);
-               dasd_ioctl_no_unregister(THIS_MODULE, BIODASDSLCK,
-                                        dasd_eckd_steal_lock);
-               return ret;
-       }
-
-       dasd_generic_auto_online(&dasd_eckd_driver);
-       return 0;
+       return ccw_driver_register(&dasd_eckd_driver);
 }
 
 static void __exit
 dasd_eckd_cleanup(void)
 {
        ccw_driver_unregister(&dasd_eckd_driver);
-
-       dasd_ioctl_no_unregister(THIS_MODULE, BIODASDGATTR,
-                                dasd_eckd_get_attrib);
-       dasd_ioctl_no_unregister(THIS_MODULE, BIODASDSATTR,
-                                dasd_eckd_set_attrib);
-       dasd_ioctl_no_unregister(THIS_MODULE, BIODASDPSRD,
-                                dasd_eckd_performance);
-       dasd_ioctl_no_unregister(THIS_MODULE, BIODASDRLSE,
-                                dasd_eckd_release);
-       dasd_ioctl_no_unregister(THIS_MODULE, BIODASDRSRV,
-                                dasd_eckd_reserve);
-       dasd_ioctl_no_unregister(THIS_MODULE, BIODASDSLCK,
-                                dasd_eckd_steal_lock);
 }
 
 module_init(dasd_eckd_init);
 module_exit(dasd_eckd_cleanup);
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 4 
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * c-continued-statement-offset: 4
- * c-continued-brace-offset: 0
- * indent-tabs-mode: 1
- * tab-width: 8
- * End:
- */