[S390] dasd: fix locking bug
[safe/jmp/linux-2.6] / drivers / s390 / block / dasd_eckd.c
index b126be1..417b97c 100644 (file)
@@ -5,10 +5,13 @@
  *                 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
- *
+ * Copyright IBM Corp. 1999, 2009
+ * EMC Symmetrix ioctl Copyright EMC Corporation, 2008
+ * Author.........: Nigel Hislop <hislop_nigel@emc.com>
  */
 
+#define KMSG_COMPONENT "dasd-eckd"
+
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/cio.h>
 #include <asm/ccwdev.h>
+#include <asm/itcw.h>
 
 #include "dasd_int.h"
 #include "dasd_eckd.h"
+#include "../cio/chsc.h"
+
 
 #ifdef PRINTK_HEADER
 #undef PRINTK_HEADER
@@ -52,16 +58,6 @@ 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[] = {
@@ -92,9 +88,9 @@ dasd_eckd_probe (struct ccw_device *cdev)
        /* set ECKD specific ccw-device options */
        ret = ccw_device_set_options(cdev, CCWDEV_ALLOW_FORCE);
        if (ret) {
-               printk(KERN_WARNING
+               DBF_EVENT(DBF_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);
@@ -107,17 +103,6 @@ dasd_eckd_set_online(struct ccw_device *cdev)
        return dasd_generic_set_online(cdev, &dasd_eckd_discipline);
 }
 
-static struct ccw_driver dasd_eckd_driver = {
-       .name        = "dasd-eckd",
-       .owner       = THIS_MODULE,
-       .ids         = dasd_eckd_ids,
-       .probe       = dasd_eckd_probe,
-       .remove      = dasd_generic_remove,
-       .set_offline = dasd_generic_set_offline,
-       .set_online  = dasd_eckd_set_online,
-       .notify      = dasd_generic_notify,
-};
-
 static const int sizes_trk0[] = { 28, 148, 84 };
 #define LABEL_SIZE 140
 
@@ -134,44 +119,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)
 {
@@ -204,37 +152,48 @@ recs_per_track(struct dasd_eckd_characteristics * rdc,
        return 0;
 }
 
-static inline void
+static void set_ch_t(struct ch_t *geo, __u32 cyl, __u8 head)
+{
+       geo->cyl = (__u16) cyl;
+       geo->head = cyl >> 16;
+       geo->head <<= 4;
+       geo->head |= head;
+}
+
+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 ();
+       data->ga_extended |= 0x08; /* switch on 'Time Stamp Valid'   */
+       data->ga_extended |= 0x02; /* switch on 'Extended Parameter' */
 
-                de_ccw->count = sizeof (struct DE_eckd_data);
-               de_ccw->flags |= CCW_FLAG_SLI;
-        }
+       rc = get_sync_clock(&data->ep_sys_time);
+       /* Ignore return code if sync clock is switched off. */
+       if (rc == -ENOSYS || rc == -EACCES)
+               rc = 0;
 
-        return;
-
-} /* end check_XRC */
+       de_ccw->count = sizeof(struct DE_eckd_data);
+       de_ccw->flags |= CCW_FLAG_SLI;
+       return rc;
+}
 
-static inline void
-define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
-             int totrk, int cmd, struct dasd_device * device)
+static int
+define_extent(struct ccw1 *ccw, struct DE_eckd_data *data, unsigned int trk,
+             unsigned int totrk, int cmd, struct dasd_device *device)
 {
        struct dasd_eckd_private *private;
-       struct ch_t geo, beg, end;
+       u32 begcyl, endcyl;
+       u16 heads, beghead, endhead;
+       int rc = 0;
 
        private = (struct dasd_eckd_private *) device->private;
 
@@ -243,7 +202,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:
@@ -263,12 +222,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:
@@ -276,10 +235,11 @@ 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);
+               dev_err(&device->cdev->dev,
+                       "0x%x is not a known command\n", cmd);
                break;
        }
 
@@ -291,32 +251,302 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
            && !(private->uses_cdl && trk < 2))
                data->ga_extended |= 0x40; /* Regular Data Format Mode */
 
-       geo.cyl = private->rdc_data.no_cyl;
-       geo.head = private->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;
+       heads = private->rdc_data.trk_per_cyl;
+       begcyl = trk / heads;
+       beghead = trk % heads;
+       endcyl = totrk / heads;
+       endhead = totrk % heads;
 
        /* 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)
-                       end.cyl += private->attrib.nr_cyl;
+               if (endcyl + private->attrib.nr_cyl < private->real_cyl)
+                       endcyl += private->attrib.nr_cyl;
+               else
+                       endcyl = (private->real_cyl - 1);
+       }
+
+       set_ch_t(&data->beg_ext, begcyl, beghead);
+       set_ch_t(&data->end_ext, endcyl, endhead);
+       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_extent.ga_extended |= 0x08; /* 'Time Stamp Valid'   */
+       pfxdata->define_extent.ga_extended |= 0x02; /* 'Extended Parameter' */
+       pfxdata->validity.time_stamp = 1;           /* 'Time Stamp Valid'   */
+
+       rc = get_sync_clock(&pfxdata->define_extent.ep_sys_time);
+       /* Ignore return code if sync clock is switched off. */
+       if (rc == -ENOSYS || rc == -EACCES)
+               rc = 0;
+       return rc;
+}
+
+static void fill_LRE_data(struct LRE_eckd_data *data, unsigned int trk,
+                         unsigned int rec_on_trk, int count, int cmd,
+                         struct dasd_device *device, unsigned int reclen,
+                         unsigned int tlf)
+{
+       struct dasd_eckd_private *private;
+       int sector;
+       int dn, d;
+
+       private = (struct dasd_eckd_private *) device->private;
+
+       memset(data, 0, sizeof(*data));
+       sector = 0;
+       if (rec_on_trk) {
+               switch (private->rdc_data.dev_type) {
+               case 0x3390:
+                       dn = ceil_quot(reclen + 6, 232);
+                       d = 9 + ceil_quot(reclen + 6 * (dn + 1), 34);
+                       sector = (49 + (rec_on_trk - 1) * (10 + d)) / 8;
+                       break;
+               case 0x3380:
+                       d = 7 + ceil_quot(reclen + 12, 32);
+                       sector = (39 + (rec_on_trk - 1) * (8 + d)) / 7;
+                       break;
+               }
+       }
+       data->sector = sector;
+       /* note: meaning of count depends on the operation
+        *       for record based I/O it's the number of records, but for
+        *       track based I/O it's the number of tracks
+        */
+       data->count = count;
+       switch (cmd) {
+       case DASD_ECKD_CCW_WRITE_HOME_ADDRESS:
+               data->operation.orientation = 0x3;
+               data->operation.operation = 0x03;
+               break;
+       case DASD_ECKD_CCW_READ_HOME_ADDRESS:
+               data->operation.orientation = 0x3;
+               data->operation.operation = 0x16;
+               break;
+       case DASD_ECKD_CCW_WRITE_RECORD_ZERO:
+               data->operation.orientation = 0x1;
+               data->operation.operation = 0x03;
+               data->count++;
+               break;
+       case DASD_ECKD_CCW_READ_RECORD_ZERO:
+               data->operation.orientation = 0x3;
+               data->operation.operation = 0x16;
+               data->count++;
+               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->auxiliary.length_valid = 0x1;
+               data->length = reclen;
+               data->operation.operation = 0x01;
+               break;
+       case DASD_ECKD_CCW_WRITE_CKD:
+       case DASD_ECKD_CCW_WRITE_CKD_MT:
+               data->auxiliary.length_valid = 0x1;
+               data->length = reclen;
+               data->operation.operation = 0x03;
+               break;
+       case DASD_ECKD_CCW_WRITE_TRACK_DATA:
+               data->auxiliary.length_valid = 0x1;
+               data->length = reclen;  /* not tlf, as one might think */
+               data->operation.operation = 0x3F;
+               data->extended_operation = 0x23;
+               break;
+       case DASD_ECKD_CCW_READ:
+       case DASD_ECKD_CCW_READ_MT:
+       case DASD_ECKD_CCW_READ_KD:
+       case DASD_ECKD_CCW_READ_KD_MT:
+               data->auxiliary.length_valid = 0x1;
+               data->length = reclen;
+               data->operation.operation = 0x06;
+               break;
+       case DASD_ECKD_CCW_READ_CKD:
+       case DASD_ECKD_CCW_READ_CKD_MT:
+               data->auxiliary.length_valid = 0x1;
+               data->length = reclen;
+               data->operation.operation = 0x16;
+               break;
+       case DASD_ECKD_CCW_READ_COUNT:
+               data->operation.operation = 0x06;
+               break;
+       case DASD_ECKD_CCW_READ_TRACK_DATA:
+               data->auxiliary.length_valid = 0x1;
+               data->length = tlf;
+               data->operation.operation = 0x0C;
+               break;
+       case DASD_ECKD_CCW_ERASE:
+               data->length = reclen;
+               data->auxiliary.length_valid = 0x1;
+               data->operation.operation = 0x0b;
+               break;
+       default:
+               DBF_DEV_EVENT(DBF_ERR, device,
+                           "fill LRE unknown opcode 0x%x", cmd);
+               BUG();
+       }
+       set_ch_t(&data->seek_addr,
+                trk / private->rdc_data.trk_per_cyl,
+                trk % private->rdc_data.trk_per_cyl);
+       data->search_arg.cyl = data->seek_addr.cyl;
+       data->search_arg.head = data->seek_addr.head;
+       data->search_arg.record = rec_on_trk;
+}
+
+static int prefix_LRE(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata,
+                     unsigned int trk, unsigned int totrk, int cmd,
+                     struct dasd_device *basedev, struct dasd_device *startdev,
+                     unsigned char format, unsigned int rec_on_trk, int count,
+                     unsigned int blksize, unsigned int tlf)
+{
+       struct dasd_eckd_private *basepriv, *startpriv;
+       struct DE_eckd_data *dedata;
+       struct LRE_eckd_data *lredata;
+       u32 begcyl, endcyl;
+       u16 heads, beghead, endhead;
+       int rc = 0;
+
+       basepriv = (struct dasd_eckd_private *) basedev->private;
+       startpriv = (struct dasd_eckd_private *) startdev->private;
+       dedata = &pfxdata->define_extent;
+       lredata = &pfxdata->locate_record;
+
+       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 */
+       if (format > 1) {
+               DBF_DEV_EVENT(DBF_ERR, basedev,
+                             "PFX LRE unknown format 0x%x", format);
+               BUG();
+               return -EINVAL;
+       }
+       pfxdata->format = format;
+       pfxdata->base_address = basepriv->ned->unit_addr;
+       pfxdata->base_lss = basepriv->ned->ID;
+       pfxdata->validity.define_extent = 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:
+               dedata->mask.perm = 0x1;
+               dedata->attributes.operation = basepriv->attrib.operation;
+               break;
+       case DASD_ECKD_CCW_READ_TRACK_DATA:
+               dedata->mask.perm = 0x1;
+               dedata->attributes.operation = basepriv->attrib.operation;
+               dedata->blk_size = 0;
+               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:
+               dedata->mask.perm = 0x02;
+               dedata->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:
+               dedata->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:
+               dedata->mask.perm = 0x3;
+               dedata->mask.auth = 0x1;
+               dedata->attributes.operation = DASD_BYPASS_CACHE;
+               rc = check_XRC_on_prefix(pfxdata, basedev);
+               break;
+       case DASD_ECKD_CCW_WRITE_TRACK_DATA:
+               dedata->mask.perm = 0x02;
+               dedata->attributes.operation = basepriv->attrib.operation;
+               dedata->blk_size = blksize;
+               rc = check_XRC_on_prefix(pfxdata, basedev);
+               break;
+       default:
+               DBF_DEV_EVENT(DBF_ERR, basedev,
+                           "PFX LRE unknown opcode 0x%x", cmd);
+               BUG();
+               return -EINVAL;
+       }
+
+       dedata->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))
+               dedata->ga_extended |= 0x40; /* Regular Data Format Mode */
+
+       heads = basepriv->rdc_data.trk_per_cyl;
+       begcyl = trk / heads;
+       beghead = trk % heads;
+       endcyl = totrk / heads;
+       endhead = totrk % heads;
+
+       /* check for sequential prestage - enhance cylinder range */
+       if (dedata->attributes.operation == DASD_SEQ_PRESTAGE ||
+           dedata->attributes.operation == DASD_SEQ_ACCESS) {
+
+               if (endcyl + basepriv->attrib.nr_cyl < basepriv->real_cyl)
+                       endcyl += basepriv->attrib.nr_cyl;
                else
-                       end.cyl = (geo.cyl - 1);
+                       endcyl = (basepriv->real_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;
+       set_ch_t(&dedata->beg_ext, begcyl, beghead);
+       set_ch_t(&dedata->end_ext, endcyl, endhead);
+
+       if (format == 1) {
+               fill_LRE_data(lredata, trk, rec_on_trk, count, cmd,
+                             basedev, blksize, tlf);
+       }
+
+       return rc;
 }
 
-static inline void
-locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, int trk,
-             int rec_on_trk, int no_rec, int cmd,
+static int prefix(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata,
+                 unsigned int trk, unsigned int totrk, int cmd,
+                 struct dasd_device *basedev, struct dasd_device *startdev)
+{
+       return prefix_LRE(ccw, pfxdata, trk, totrk, cmd, basedev, startdev,
+                         0, 0, 0, 0, 0);
+}
+
+static void
+locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, unsigned int trk,
+             unsigned int rec_on_trk, int no_rec, int cmd,
              struct dasd_device * device, int reclen)
 {
        struct dasd_eckd_private *private;
@@ -334,7 +564,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) {
@@ -407,12 +637,14 @@ locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, int trk,
                data->operation.operation = 0x0b;
                break;
        default:
-               DEV_MESSAGE(KERN_ERR, device, "unknown opcode 0x%x", cmd);
+               DBF_DEV_EVENT(DBF_ERR, device, "unknown locate record "
+                             "opcode 0x%x", cmd);
        }
-       data->seek_addr.cyl = data->search_arg.cyl =
-               trk / private->rdc_data.trk_per_cyl;
-       data->seek_addr.head = data->search_arg.head =
-               trk % private->rdc_data.trk_per_cyl;
+       set_ch_t(&data->seek_addr,
+                trk / private->rdc_data.trk_per_cyl,
+                trk % private->rdc_data.trk_per_cyl);
+       data->search_arg.cyl = data->seek_addr.cyl;
+       data->search_arg.head = data->seek_addr.head;
        data->search_arg.record = rec_on_trk;
 }
 
@@ -454,38 +686,186 @@ dasd_eckd_cdl_reclen(int recid)
 /*
  * Generate device unique id that specifies the physical device.
  */
-static int
-dasd_eckd_generate_uid(struct dasd_device *device, struct dasd_uid *uid)
+static int dasd_eckd_generate_uid(struct dasd_device *device,
+                                 struct dasd_uid *uid)
 {
        struct dasd_eckd_private *private;
-       struct dasd_eckd_confdata *confdata;
+       int count;
 
        private = (struct dasd_eckd_private *) device->private;
        if (!private)
                return -ENODEV;
-       confdata = &private->conf_data;
-       if (!confdata)
+       if (!private->ned || !private->gneq)
                return -ENODEV;
 
        memset(uid, 0, sizeof(struct dasd_uid));
-       memcpy(uid->vendor, confdata->ned1.HDA_manufacturer,
+       memcpy(uid->vendor, private->ned->HDA_manufacturer,
               sizeof(uid->vendor) - 1);
        EBCASC(uid->vendor, sizeof(uid->vendor) - 1);
-       memcpy(uid->serial, confdata->ned1.HDA_location,
+       memcpy(uid->serial, private->ned->HDA_location,
               sizeof(uid->serial) - 1);
        EBCASC(uid->serial, sizeof(uid->serial) - 1);
-       uid->ssid = confdata->neq.subsystemID;
-       if (confdata->ned2.sneq.flags == 0x40) {
-               uid->alias = 1;
-               uid->unit_addr = confdata->ned2.sneq.base_unit_addr;
-       } else
-               uid->unit_addr = confdata->ned1.unit_addr;
+       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(DASD_ECKD_MAGIC, 1 /* RCD */, ciw->count,
+                                  device);
 
+       if (IS_ERR(cqr)) {
+               DBF_DEV_EVENT(DBF_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_read_conf(struct dasd_device *device)
+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;
@@ -499,39 +879,38 @@ 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 "
-                                       "error %d", rc);
+                               DBF_EVENT(DBF_WARNING,
+                                         "Read configuration data returned "
+                                         "error %d for device: %s", rc,
+                                         dev_name(&device->cdev->dev));
                                return rc;
                        }
                        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 */
+                               DBF_EVENT(DBF_WARNING, "No configuration "
+                                         "data retrieved for device: %s",
+                                         dev_name(&device->cdev->dev));
+                               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;
@@ -539,45 +918,117 @@ 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;
+       memset(&private->features, 0, sizeof(struct dasd_rssd_features));
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
+                                  (sizeof(struct dasd_psf_prssd_data) +
+                                   sizeof(struct dasd_rssd_features)),
+                                  device);
+       if (IS_ERR(cqr)) {
+               DBF_EVENT(DBF_WARNING, "Could not allocate initialization "
+                         "request for device: %s",
+                         dev_name(&device->cdev->dev));
+               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));
+       } else
+               dev_warn(&device->cdev->dev, "Reading device feature codes"
+                        " failed with rc=%d\n", rc);
+       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)
+static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device,
+                                                   int enable_pav)
 {
-       struct dasd_ccw_req *cqr;
-       struct dasd_psf_ssc_data *psf_ssc_data;
-       struct ccw1 *ccw;
+       struct dasd_ccw_req *cqr;
+       struct dasd_psf_ssc_data *psf_ssc_data;
+       struct ccw1 *ccw;
 
-       cqr = dasd_smalloc_request("ECKD", 1 /* PSF */ ,
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ ,
                                  sizeof(struct dasd_psf_ssc_data),
                                  device);
 
-       if (IS_ERR(cqr)) {
-              DEV_MESSAGE(KERN_WARNING, device, "%s",
+       if (IS_ERR(cqr)) {
+               DBF_DEV_EVENT(DBF_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 = 0x08;
-
-       ccw = cqr->cpaddr;
-       ccw->cmd_code = DASD_ECKD_CCW_PSF;
-       ccw->cda = (__u32)(addr_t)psf_ssc_data;
-       ccw->count = 66;
-
-       cqr->device = device;
-       cqr->expires = 10*HZ;
-       cqr->buildclk = get_clock();
-       cqr->status = DASD_CQR_FILLED;
-       return cqr;
+               return cqr;
+       }
+       psf_ssc_data = (struct dasd_psf_ssc_data *)cqr->data;
+       psf_ssc_data->order = PSF_ORDER_SSC;
+       psf_ssc_data->suborder = 0x40;
+       if (enable_pav) {
+               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;
 }
 
 /*
@@ -586,41 +1037,44 @@ dasd_eckd_build_psf_ssc(struct dasd_device *device)
  * call might change behaviour of DASD devices.
  */
 static int
-dasd_eckd_psf_ssc(struct dasd_device *device)
+dasd_eckd_psf_ssc(struct dasd_device *device, int enable_pav)
 {
-       struct dasd_ccw_req *cqr;
-       int rc;
+       struct dasd_ccw_req *cqr;
+       int rc;
 
-       cqr = dasd_eckd_build_psf_ssc(device);
-       if (IS_ERR(cqr))
-              return PTR_ERR(cqr);
+       cqr = dasd_eckd_build_psf_ssc(device, enable_pav);
+       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->device);
-       return rc;
+       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, struct dasd_uid *uid)
+static int dasd_eckd_validate_server(struct dasd_device *device)
 {
        int rc;
+       struct dasd_eckd_private *private;
+       int enable_pav;
 
-       /* 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);
+               enable_pav = 0;
+       else
+               enable_pav = 1;
+       rc = dasd_eckd_psf_ssc(device, enable_pav);
        /* may be requested feature is not available on server,
         * therefore just report error and go ahead */
-       DEV_MESSAGE(KERN_INFO, device,
-                   "PSF-SSC on storage subsystem %s.%s.%04x returned rc=%d",
-                   uid->vendor, uid->serial, uid->ssid, rc);
+       private = (struct dasd_eckd_private *) device->private;
+       DBF_EVENT(DBF_WARNING, "PSF-SSC on storage subsystem %s.%s.%04x "
+                 "returned rc=%d for device: %s",
+                 private->uid.vendor, private->uid.serial,
+                 private->uid.ssid, rc, dev_name(&device->cdev->dev));
        /* RE-Read Configuration Data */
        return dasd_eckd_read_conf(device);
 }
@@ -633,21 +1087,21 @@ static int
 dasd_eckd_check_characteristics(struct dasd_device *device)
 {
        struct dasd_eckd_private *private;
-       struct dasd_uid uid;
-       void *rdc_data;
-       int rc;
+       struct dasd_block *block;
+       int is_known, rc;
 
        private = (struct dasd_eckd_private *) device->private;
-       if (private == NULL) {
-               private = kzalloc(sizeof(struct dasd_eckd_private),
-                                 GFP_KERNEL | GFP_DMA);
-               if (private == NULL) {
-                       DEV_MESSAGE(KERN_WARNING, device, "%s",
-                                   "memory allocation failed for private "
-                                   "data");
+       if (!private) {
+               private = kzalloc(sizeof(*private), GFP_KERNEL | GFP_DMA);
+               if (!private) {
+                       dev_warn(&device->cdev->dev,
+                                "Allocating memory for private DASD data "
+                                "failed\n");
                        return -ENOMEM;
                }
                device->private = (void *) private;
+       } else {
+               memset(private, 0, sizeof(*private));
        }
        /* Invalidate status of initial analysis. */
        private->init_cqr_status = -1;
@@ -658,39 +1112,97 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
        /* Read Configuration Data */
        rc = dasd_eckd_read_conf(device);
        if (rc)
-               return rc;
+               goto out_err1;
 
        /* Generate device unique id and register in devmap */
-       rc = dasd_eckd_generate_uid(device, &uid);
-       if (rc)
-               return rc;
-       rc = dasd_set_uid(device->cdev, &uid);
-       if (rc == 1)    /* new server found */
-               rc = dasd_eckd_validate_server(device, &uid);
+       rc = dasd_eckd_generate_uid(device, &private->uid);
        if (rc)
-               return 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)) {
+                       DBF_EVENT(DBF_WARNING, "could not allocate dasd "
+                                 "block structure for device: %s",
+                                 dev_name(&device->cdev->dev));
+                       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 */
+       dasd_eckd_read_features(device);
 
        /* Read Device Characteristics */
-       rdc_data = (void *) &(private->rdc_data);
-       memset(rdc_data, 0, sizeof(rdc_data));
-       rc = read_dev_chars(device->cdev, &rdc_data, 64);
-       if (rc)
-               DEV_MESSAGE(KERN_WARNING, device,
-                           "Read device characteristics returned "
-                           "rc=%d", rc);
-
-       DEV_MESSAGE(KERN_INFO, device,
-                   "%04X/%02X(CU:%04X/%02X) Cyl:%d Head:%d Sec:%d",
-                   private->rdc_data.dev_type,
-                   private->rdc_data.dev_model,
-                   private->rdc_data.cu_type,
-                   private->rdc_data.cu_model.model,
-                   private->rdc_data.no_cyl,
-                   private->rdc_data.trk_per_cyl,
-                   private->rdc_data.sec_per_trk);
+       rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
+                                        &private->rdc_data, 64);
+       if (rc) {
+               DBF_EVENT(DBF_WARNING,
+                         "Read device characteristics failed, rc=%d for "
+                         "device: %s", rc, dev_name(&device->cdev->dev));
+               goto out_err3;
+       }
+       /* find the vaild cylinder size */
+       if (private->rdc_data.no_cyl == LV_COMPAT_CYL &&
+           private->rdc_data.long_no_cyl)
+               private->real_cyl = private->rdc_data.long_no_cyl;
+       else
+               private->real_cyl = private->rdc_data.no_cyl;
+
+       dev_info(&device->cdev->dev, "New DASD %04X/%02X (CU %04X/%02X) "
+                "with %d cylinders, %d heads, %d sectors\n",
+                private->rdc_data.dev_type,
+                private->rdc_data.dev_model,
+                private->rdc_data.cu_type,
+                private->rdc_data.cu_model.model,
+                private->real_cyl,
+                private->rdc_data.trk_per_cyl,
+                private->rdc_data.sec_per_trk);
+       return 0;
+
+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 *
 dasd_eckd_analysis_ccw(struct dasd_device *device)
 {
@@ -706,15 +1218,14 @@ dasd_eckd_analysis_ccw(struct dasd_device *device)
 
        cplength = 8;
        datasize = sizeof(struct DE_eckd_data) + 2*sizeof(struct LO_eckd_data);
-       cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
-                                  cplength, datasize, device);
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device);
        if (IS_ERR(cqr))
                return cqr;
        ccw = cqr->cpaddr;
        /* 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,
@@ -742,7 +1253,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;
@@ -762,7 +1275,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);
@@ -770,13 +1283,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;
@@ -787,25 +1300,25 @@ 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;
        if (status != DASD_CQR_DONE) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
-                           "volume analysis returned unformatted disk");
+               dev_warn(&device->cdev->dev,
+                           "The DASD is not formatted\n");
                return -EMEDIUMTYPE;
        }
 
        private->uses_cdl = 1;
-       /* Calculate number of blocks/records per track. */
-       blk_per_trk = recs_per_track(&private->rdc_data, 0, device->bp_block);
        /* Check Track 0 for Compatible Disk Layout */
        count_area = NULL;
        for (i = 0; i < 3; i++) {
@@ -829,62 +1342,71 @@ dasd_eckd_end_analysis(struct dasd_device *device)
                        count_area = &private->count_area[0];
        } else {
                if (private->count_area[3].record == 1)
-                       DEV_MESSAGE(KERN_WARNING, device, "%s",
-                                   "Trk 0: no records after VTOC!");
+                       dev_warn(&device->cdev->dev,
+                                "Track 0 has no records following the VTOC\n");
        }
        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) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
-                           "Volume has incompatible disk layout");
+       if (block->bp_block == 0) {
+               dev_warn(&device->cdev->dev,
+                        "The disk layout of the DASD is not supported\n");
                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->real_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),
-                   ((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),
-                   private->uses_cdl ?
-                   "compatible disk layout" : "linux disk layout");
+       dev_info(&device->cdev->dev,
+                "DASD with %d KB/block, %d KB total size, %d KB/track, "
+                "%s\n", (block->bp_block >> 10),
+                ((private->real_cyl *
+                  private->rdc_data.trk_per_cyl *
+                  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;
@@ -900,31 +1422,35 @@ dasd_eckd_format_device(struct dasd_device * device,
        struct eckd_count *ect;
        struct ccw1 *ccw;
        void *data;
-       int rpt, cyl, head;
+       int rpt;
+       struct ch_t address;
        int cplength, datasize;
        int i;
+       int intensity = 0;
+       int r0_perm;
 
        private = (struct dasd_eckd_private *) device->private;
        rpt = recs_per_track(&private->rdc_data, 0, fdata->blksize);
-       cyl = fdata->start_unit / private->rdc_data.trk_per_cyl;
-       head = fdata->start_unit % private->rdc_data.trk_per_cyl;
+       set_ch_t(&address,
+                fdata->start_unit / private->rdc_data.trk_per_cyl,
+                fdata->start_unit % private->rdc_data.trk_per_cyl);
 
        /* Sanity checks. */
        if (fdata->start_unit >=
-           (private->rdc_data.no_cyl * private->rdc_data.trk_per_cyl)) {
-               DEV_MESSAGE(KERN_INFO, device, "Track no %d too big!",
-                           fdata->start_unit);
+           (private->real_cyl * private->rdc_data.trk_per_cyl)) {
+               dev_warn(&device->cdev->dev, "Start track number %d used in "
+                        "formatting is too big\n", fdata->start_unit);
                return ERR_PTR(-EINVAL);
        }
        if (fdata->start_unit > fdata->stop_unit) {
-               DEV_MESSAGE(KERN_INFO, device, "Track %d reached! ending.",
-                           fdata->start_unit);
+               dev_warn(&device->cdev->dev, "Start track %d used in "
+                        "formatting exceeds end track\n", fdata->start_unit);
                return ERR_PTR(-EINVAL);
        }
        if (dasd_check_blocksize(fdata->blksize) != 0) {
-               DEV_MESSAGE(KERN_WARNING, device,
-                           "Invalid blocksize %d...terminating!",
-                           fdata->blksize);
+               dev_warn(&device->cdev->dev,
+                        "The DASD cannot be formatted with block size %d\n",
+                        fdata->blksize);
                return ERR_PTR(-EINVAL);
        }
 
@@ -934,9 +1460,17 @@ dasd_eckd_format_device(struct dasd_device * device,
         *   Bit 1: write home address, currently not supported
         *   Bit 2: invalidate tracks
         *   Bit 3: use OS/390 compatible disk layout (cdl)
+        *   Bit 4: do not allow storage subsystem to modify record zero
         * Only some bit combinations do make sense.
         */
-       switch (fdata->intensity) {
+       if (fdata->intensity & 0x10) {
+               r0_perm = 0;
+               intensity = fdata->intensity & ~0x10;
+       } else {
+               r0_perm = 1;
+               intensity = fdata->intensity;
+       }
+       switch (intensity) {
        case 0x00:      /* Normal format */
        case 0x08:      /* Normal format, use cdl. */
                cplength = 2 + rpt;
@@ -960,24 +1494,26 @@ dasd_eckd_format_device(struct dasd_device * device,
                        sizeof(struct eckd_count);
                break;
        default:
-               DEV_MESSAGE(KERN_WARNING, device, "Invalid flags 0x%x.",
-                           fdata->intensity);
+               dev_warn(&device->cdev->dev, "An I/O control call used "
+                        "incorrect flags 0x%x\n", fdata->intensity);
                return ERR_PTR(-EINVAL);
        }
        /* Allocate the format ccw request. */
-       fcp = dasd_smalloc_request(dasd_eckd_discipline.name,
-                                  cplength, datasize, device);
+       fcp = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device);
        if (IS_ERR(fcp))
                return fcp;
 
        data = fcp->data;
        ccw = fcp->cpaddr;
 
-       switch (fdata->intensity & ~0x08) {
+       switch (intensity & ~0x08) {
        case 0x00: /* Normal format. */
                define_extent(ccw++, (struct DE_eckd_data *) data,
                              fdata->start_unit, fdata->start_unit,
                              DASD_ECKD_CCW_WRITE_CKD, device);
+               /* grant subsystem permission to format R0 */
+               if (r0_perm)
+                       ((struct DE_eckd_data *)data)->ga_extended |= 0x04;
                data += sizeof(struct DE_eckd_data);
                ccw[-1].flags |= CCW_FLAG_CC;
                locate_record(ccw++, (struct LO_eckd_data *) data,
@@ -996,7 +1532,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. */
@@ -1011,11 +1547,11 @@ dasd_eckd_format_device(struct dasd_device * device,
                data += sizeof(struct LO_eckd_data);
                break;
        }
-       if (fdata->intensity & 0x01) {  /* write record zero */
+       if (intensity & 0x01) { /* write record zero */
                ect = (struct eckd_count *) data;
                data += sizeof(struct eckd_count);
-               ect->cyl = cyl;
-               ect->head = head;
+               ect->cyl = address.cyl;
+               ect->head = address.head;
                ect->record = 0;
                ect->kl = 0;
                ect->dl = 8;
@@ -1026,11 +1562,11 @@ dasd_eckd_format_device(struct dasd_device * device,
                ccw->cda = (__u32)(addr_t) ect;
                ccw++;
        }
-       if ((fdata->intensity & ~0x08) & 0x04) {        /* erase track */
+       if ((intensity & ~0x08) & 0x04) {       /* erase track */
                ect = (struct eckd_count *) data;
                data += sizeof(struct eckd_count);
-               ect->cyl = cyl;
-               ect->head = head;
+               ect->cyl = address.cyl;
+               ect->head = address.head;
                ect->record = 1;
                ect->kl = 0;
                ect->dl = 0;
@@ -1043,20 +1579,20 @@ dasd_eckd_format_device(struct dasd_device * device,
                for (i = 0; i < rpt; i++) {
                        ect = (struct eckd_count *) data;
                        data += sizeof(struct eckd_count);
-                       ect->cyl = cyl;
-                       ect->head = head;
+                       ect->cyl = address.cyl;
+                       ect->head = address.head;
                        ect->record = i + 1;
                        ect->kl = 0;
                        ect->dl = fdata->blksize;
                        /* Check for special tracks 0-1 when formatting CDL */
-                       if ((fdata->intensity & 0x08) &&
+                       if ((intensity & 0x08) &&
                            fdata->start_unit == 0) {
                                if (i < 3) {
                                        ect->kl = 4;
                                        ect->dl = sizes_trk0[i] - 4;
                                }
                        }
-                       if ((fdata->intensity & 0x08) &&
+                       if ((intensity & 0x08) &&
                            fdata->start_unit == 1) {
                                ect->kl = 44;
                                ect->dl = LABEL_SIZE - 44;
@@ -1069,43 +1605,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) {
@@ -1127,65 +1648,132 @@ 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;
+       char *sense = NULL;
+
+       /* first of all check for state change pending interrupt */
+       mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
+       if ((scsw_dstat(&irb->scsw) & mask) == mask) {
+               dasd_generic_handle_state_change(device);
+               return;
+       }
+
+       /* summary unit check */
+       if ((scsw_dstat(&irb->scsw) & DEV_STAT_UNIT_CHECK) &&
+           (irb->ecw[7] == 0x0D)) {
+               dasd_alias_handle_summary_unit_check(device, irb);
+               return;
+       }
+
+       sense = dasd_get_sense(irb);
+       /* service information message SIM */
+       if (sense && !(sense[27] & DASD_SENSE_BIT_0) &&
+           ((sense[6] & DASD_SIM_SENSE) == DASD_SIM_SENSE)) {
+               dasd_3990_erp_handle_sim(device, sense);
+               dasd_schedule_device_bh(device);
+               return;
+       }
+
+       if ((scsw_cc(&irb->scsw) == 1) &&
+           (scsw_fctl(&irb->scsw) & SCSW_FCTL_START_FUNC) &&
+           (scsw_actl(&irb->scsw) & SCSW_ACTL_START_PEND) &&
+           (scsw_stctl(&irb->scsw) & SCSW_STCTL_STATUS_PEND)) {
+               /* fake irb do nothing, they are handled elsewhere */
+               dasd_schedule_device_bh(device);
+               return;
+       }
+
+       if (!sense) {
+               /* just report other unsolicited interrupts */
+               DBF_DEV_EVENT(DBF_ERR, device, "%s",
+                           "unsolicited interrupt received");
+       } else {
+               DBF_DEV_EVENT(DBF_ERR, device, "%s",
+                           "unsolicited interrupt received "
+                           "(sense available)");
+               device->discipline->dump_sense_dbf(device, irb, "unsolicited");
+       }
+
+       dasd_schedule_device_bh(device);
+       return;
+};
+
+
+static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
+                                              struct dasd_device *startdev,
+                                              struct dasd_block *block,
+                                              struct request *req,
+                                              sector_t first_rec,
+                                              sector_t last_rec,
+                                              sector_t first_trk,
+                                              sector_t last_trk,
+                                              unsigned int first_offs,
+                                              unsigned int last_offs,
+                                              unsigned int blk_per_trk,
+                                              unsigned int blksize)
 {
        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;
+       unsigned int off;
        int count, cidaw, cplength, datasize;
-       sector_t recid, first_rec, last_rec;
-       sector_t first_trk, last_trk;
-       unsigned int first_offs, last_offs;
+       sector_t recid;
        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)
                cmd = DASD_ECKD_CCW_WRITE_MT;
        else
                return ERR_PTR(-EINVAL);
-       /* Calculate number of blocks/records per track. */
-       blksize = device->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_offs = sector_div(first_trk, blk_per_trk);
-       last_rec = last_trk =
-               (req->sector + req->nr_sectors - 1) >> device->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)
@@ -1194,24 +1782,45 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
                datasize += count*sizeof(struct LO_eckd_data);
        }
        /* Allocate the ccw request. */
-       cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
-                                  cplength, datasize, device);
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 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,
@@ -1239,7 +1848,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) {
@@ -1247,7 +1856,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;
@@ -1266,9 +1875,437 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
                        recid++;
                }
        }
-       if (req->cmd_flags & REQ_FAILFAST)
+       if (blk_noretry_request(req) ||
+           block->base->features & DASD_FEATURE_FAILFAST)
+               set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
+       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;
+       cqr->buildclk = get_clock();
+       cqr->status = DASD_CQR_FILLED;
+       return cqr;
+}
+
+static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
+                                              struct dasd_device *startdev,
+                                              struct dasd_block *block,
+                                              struct request *req,
+                                              sector_t first_rec,
+                                              sector_t last_rec,
+                                              sector_t first_trk,
+                                              sector_t last_trk,
+                                              unsigned int first_offs,
+                                              unsigned int last_offs,
+                                              unsigned int blk_per_trk,
+                                              unsigned int blksize)
+{
+       struct dasd_eckd_private *private;
+       unsigned long *idaws;
+       struct dasd_ccw_req *cqr;
+       struct ccw1 *ccw;
+       struct req_iterator iter;
+       struct bio_vec *bv;
+       char *dst, *idaw_dst;
+       unsigned int cidaw, cplength, datasize;
+       unsigned int tlf;
+       sector_t recid;
+       unsigned char cmd;
+       struct dasd_device *basedev;
+       unsigned int trkcount, count, count_to_trk_end;
+       unsigned int idaw_len, seg_len, part_len, len_to_track_end;
+       unsigned char new_track, end_idaw;
+       sector_t trkid;
+       unsigned int recoffs;
+
+       basedev = block->base;
+       private = (struct dasd_eckd_private *) basedev->private;
+       if (rq_data_dir(req) == READ)
+               cmd = DASD_ECKD_CCW_READ_TRACK_DATA;
+       else if (rq_data_dir(req) == WRITE)
+               cmd = DASD_ECKD_CCW_WRITE_TRACK_DATA;
+       else
+               return ERR_PTR(-EINVAL);
+
+       /* Track based I/O needs IDAWs for each page, and not just for
+        * 64 bit addresses. We need additional idals for pages
+        * that get filled from two tracks, so we use the number
+        * of records as upper limit.
+        */
+       cidaw = last_rec - first_rec + 1;
+       trkcount = last_trk - first_trk + 1;
+
+       /* 1x prefix + one read/write ccw per track */
+       cplength = 1 + trkcount;
+
+       /* on 31-bit we need space for two 32 bit addresses per page
+        * on 64-bit one 64 bit address
+        */
+       datasize = sizeof(struct PFX_eckd_data) +
+               cidaw * sizeof(unsigned long long);
+
+       /* Allocate the ccw request. */
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
+                                  startdev);
+       if (IS_ERR(cqr))
+               return cqr;
+       ccw = cqr->cpaddr;
+       /* transfer length factor: how many bytes to read from the last track */
+       if (first_trk == last_trk)
+               tlf = last_offs - first_offs + 1;
+       else
+               tlf = last_offs + 1;
+       tlf *= blksize;
+
+       if (prefix_LRE(ccw++, cqr->data, first_trk,
+                      last_trk, cmd, basedev, startdev,
+                      1 /* format */, first_offs + 1,
+                      trkcount, blksize,
+                      tlf) == -EAGAIN) {
+               /* Clock not in sync and XRC is enabled.
+                * Try again later.
+                */
+               dasd_sfree_request(cqr, startdev);
+               return ERR_PTR(-EAGAIN);
+       }
+
+       /*
+        * The translation of request into ccw programs must meet the
+        * following conditions:
+        * - all idaws but the first and the last must address full pages
+        *   (or 2K blocks on 31-bit)
+        * - the scope of a ccw and it's idal ends with the track boundaries
+        */
+       idaws = (unsigned long *) (cqr->data + sizeof(struct PFX_eckd_data));
+       recid = first_rec;
+       new_track = 1;
+       end_idaw = 0;
+       len_to_track_end = 0;
+       idaw_dst = 0;
+       idaw_len = 0;
+       rq_for_each_segment(bv, req, iter) {
+               dst = page_address(bv->bv_page) + bv->bv_offset;
+               seg_len = bv->bv_len;
+               while (seg_len) {
+                       if (new_track) {
+                               trkid = recid;
+                               recoffs = sector_div(trkid, blk_per_trk);
+                               count_to_trk_end = blk_per_trk - recoffs;
+                               count = min((last_rec - recid + 1),
+                                           (sector_t)count_to_trk_end);
+                               len_to_track_end = count * blksize;
+                               ccw[-1].flags |= CCW_FLAG_CC;
+                               ccw->cmd_code = cmd;
+                               ccw->count = len_to_track_end;
+                               ccw->cda = (__u32)(addr_t)idaws;
+                               ccw->flags = CCW_FLAG_IDA;
+                               ccw++;
+                               recid += count;
+                               new_track = 0;
+                               /* first idaw for a ccw may start anywhere */
+                               if (!idaw_dst)
+                                       idaw_dst = dst;
+                       }
+                       /* If we start a new idaw, we must make sure that it
+                        * starts on an IDA_BLOCK_SIZE boundary.
+                        * If we continue an idaw, we must make sure that the
+                        * current segment begins where the so far accumulated
+                        * idaw ends
+                        */
+                       if (!idaw_dst) {
+                               if (__pa(dst) & (IDA_BLOCK_SIZE-1)) {
+                                       dasd_sfree_request(cqr, startdev);
+                                       return ERR_PTR(-ERANGE);
+                               } else
+                                       idaw_dst = dst;
+                       }
+                       if ((idaw_dst + idaw_len) != dst) {
+                               dasd_sfree_request(cqr, startdev);
+                               return ERR_PTR(-ERANGE);
+                       }
+                       part_len = min(seg_len, len_to_track_end);
+                       seg_len -= part_len;
+                       dst += part_len;
+                       idaw_len += part_len;
+                       len_to_track_end -= part_len;
+                       /* collected memory area ends on an IDA_BLOCK border,
+                        * -> create an idaw
+                        * idal_create_words will handle cases where idaw_len
+                        * is larger then IDA_BLOCK_SIZE
+                        */
+                       if (!(__pa(idaw_dst + idaw_len) & (IDA_BLOCK_SIZE-1)))
+                               end_idaw = 1;
+                       /* We also need to end the idaw at track end */
+                       if (!len_to_track_end) {
+                               new_track = 1;
+                               end_idaw = 1;
+                       }
+                       if (end_idaw) {
+                               idaws = idal_create_words(idaws, idaw_dst,
+                                                         idaw_len);
+                               idaw_dst = 0;
+                               idaw_len = 0;
+                               end_idaw = 0;
+                       }
+               }
+       }
+
+       if (blk_noretry_request(req) ||
+           block->base->features & DASD_FEATURE_FAILFAST)
+               set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
+       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;
+       cqr->buildclk = get_clock();
+       cqr->status = DASD_CQR_FILLED;
+       return cqr;
+}
+
+static int prepare_itcw(struct itcw *itcw,
+                       unsigned int trk, unsigned int totrk, int cmd,
+                       struct dasd_device *basedev,
+                       struct dasd_device *startdev,
+                       unsigned int rec_on_trk, int count,
+                       unsigned int blksize,
+                       unsigned int total_data_size,
+                       unsigned int tlf,
+                       unsigned int blk_per_trk)
+{
+       struct PFX_eckd_data pfxdata;
+       struct dasd_eckd_private *basepriv, *startpriv;
+       struct DE_eckd_data *dedata;
+       struct LRE_eckd_data *lredata;
+       struct dcw *dcw;
+
+       u32 begcyl, endcyl;
+       u16 heads, beghead, endhead;
+       u8 pfx_cmd;
+
+       int rc = 0;
+       int sector = 0;
+       int dn, d;
+
+
+       /* setup prefix data */
+       basepriv = (struct dasd_eckd_private *) basedev->private;
+       startpriv = (struct dasd_eckd_private *) startdev->private;
+       dedata = &pfxdata.define_extent;
+       lredata = &pfxdata.locate_record;
+
+       memset(&pfxdata, 0, sizeof(pfxdata));
+       pfxdata.format = 1; /* PFX with LRE */
+       pfxdata.base_address = basepriv->ned->unit_addr;
+       pfxdata.base_lss = basepriv->ned->ID;
+       pfxdata.validity.define_extent = 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;
+       }
+
+       switch (cmd) {
+       case DASD_ECKD_CCW_READ_TRACK_DATA:
+               dedata->mask.perm = 0x1;
+               dedata->attributes.operation = basepriv->attrib.operation;
+               dedata->blk_size = blksize;
+               dedata->ga_extended |= 0x42;
+               lredata->operation.orientation = 0x0;
+               lredata->operation.operation = 0x0C;
+               lredata->auxiliary.check_bytes = 0x01;
+               pfx_cmd = DASD_ECKD_CCW_PFX_READ;
+               break;
+       case DASD_ECKD_CCW_WRITE_TRACK_DATA:
+               dedata->mask.perm = 0x02;
+               dedata->attributes.operation = basepriv->attrib.operation;
+               dedata->blk_size = blksize;
+               rc = check_XRC_on_prefix(&pfxdata, basedev);
+               dedata->ga_extended |= 0x42;
+               lredata->operation.orientation = 0x0;
+               lredata->operation.operation = 0x3F;
+               lredata->extended_operation = 0x23;
+               lredata->auxiliary.check_bytes = 0x2;
+               pfx_cmd = DASD_ECKD_CCW_PFX;
+               break;
+       default:
+               DBF_DEV_EVENT(DBF_ERR, basedev,
+                             "prepare itcw, unknown opcode 0x%x", cmd);
+               BUG();
+               break;
+       }
+       if (rc)
+               return rc;
+
+       dedata->attributes.mode = 0x3;  /* ECKD */
+
+       heads = basepriv->rdc_data.trk_per_cyl;
+       begcyl = trk / heads;
+       beghead = trk % heads;
+       endcyl = totrk / heads;
+       endhead = totrk % heads;
+
+       /* check for sequential prestage - enhance cylinder range */
+       if (dedata->attributes.operation == DASD_SEQ_PRESTAGE ||
+           dedata->attributes.operation == DASD_SEQ_ACCESS) {
+
+               if (endcyl + basepriv->attrib.nr_cyl < basepriv->real_cyl)
+                       endcyl += basepriv->attrib.nr_cyl;
+               else
+                       endcyl = (basepriv->real_cyl - 1);
+       }
+
+       set_ch_t(&dedata->beg_ext, begcyl, beghead);
+       set_ch_t(&dedata->end_ext, endcyl, endhead);
+
+       dedata->ep_format = 0x20; /* records per track is valid */
+       dedata->ep_rec_per_track = blk_per_trk;
+
+       if (rec_on_trk) {
+               switch (basepriv->rdc_data.dev_type) {
+               case 0x3390:
+                       dn = ceil_quot(blksize + 6, 232);
+                       d = 9 + ceil_quot(blksize + 6 * (dn + 1), 34);
+                       sector = (49 + (rec_on_trk - 1) * (10 + d)) / 8;
+                       break;
+               case 0x3380:
+                       d = 7 + ceil_quot(blksize + 12, 32);
+                       sector = (39 + (rec_on_trk - 1) * (8 + d)) / 7;
+                       break;
+               }
+       }
+
+       lredata->auxiliary.length_valid = 1;
+       lredata->auxiliary.length_scope = 1;
+       lredata->auxiliary.imbedded_ccw_valid = 1;
+       lredata->length = tlf;
+       lredata->imbedded_ccw = cmd;
+       lredata->count = count;
+       lredata->sector = sector;
+       set_ch_t(&lredata->seek_addr, begcyl, beghead);
+       lredata->search_arg.cyl = lredata->seek_addr.cyl;
+       lredata->search_arg.head = lredata->seek_addr.head;
+       lredata->search_arg.record = rec_on_trk;
+
+       dcw = itcw_add_dcw(itcw, pfx_cmd, 0,
+                    &pfxdata, sizeof(pfxdata), total_data_size);
+
+       return rc;
+}
+
+static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
+                                              struct dasd_device *startdev,
+                                              struct dasd_block *block,
+                                              struct request *req,
+                                              sector_t first_rec,
+                                              sector_t last_rec,
+                                              sector_t first_trk,
+                                              sector_t last_trk,
+                                              unsigned int first_offs,
+                                              unsigned int last_offs,
+                                              unsigned int blk_per_trk,
+                                              unsigned int blksize)
+{
+       struct dasd_eckd_private *private;
+       struct dasd_ccw_req *cqr;
+       struct req_iterator iter;
+       struct bio_vec *bv;
+       char *dst;
+       unsigned int trkcount, ctidaw;
+       unsigned char cmd;
+       struct dasd_device *basedev;
+       unsigned int tlf;
+       struct itcw *itcw;
+       struct tidaw *last_tidaw = NULL;
+       int itcw_op;
+       size_t itcw_size;
+
+       basedev = block->base;
+       private = (struct dasd_eckd_private *) basedev->private;
+       if (rq_data_dir(req) == READ) {
+               cmd = DASD_ECKD_CCW_READ_TRACK_DATA;
+               itcw_op = ITCW_OP_READ;
+       } else if (rq_data_dir(req) == WRITE) {
+               cmd = DASD_ECKD_CCW_WRITE_TRACK_DATA;
+               itcw_op = ITCW_OP_WRITE;
+       } else
+               return ERR_PTR(-EINVAL);
+
+       /* trackbased I/O needs address all memory via TIDAWs,
+        * not just for 64 bit addresses. This allows us to map
+        * each segment directly to one tidaw.
+        */
+       trkcount = last_trk - first_trk + 1;
+       ctidaw = 0;
+       rq_for_each_segment(bv, req, iter) {
+               ++ctidaw;
+       }
+
+       /* Allocate the ccw request. */
+       itcw_size = itcw_calc_size(0, ctidaw, 0);
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev);
+       if (IS_ERR(cqr))
+               return cqr;
+
+       cqr->cpmode = 1;
+       cqr->startdev = startdev;
+       cqr->memdev = startdev;
+       cqr->block = block;
+       cqr->expires = 100*HZ;
+       cqr->buildclk = get_clock();
+       cqr->status = DASD_CQR_FILLED;
+       cqr->retries = 10;
+
+       /* transfer length factor: how many bytes to read from the last track */
+       if (first_trk == last_trk)
+               tlf = last_offs - first_offs + 1;
+       else
+               tlf = last_offs + 1;
+       tlf *= blksize;
+
+       itcw = itcw_init(cqr->data, itcw_size, itcw_op, 0, ctidaw, 0);
+       cqr->cpaddr = itcw_get_tcw(itcw);
+
+       if (prepare_itcw(itcw, first_trk, last_trk,
+                        cmd, basedev, startdev,
+                        first_offs + 1,
+                        trkcount, blksize,
+                        (last_rec - first_rec + 1) * blksize,
+                        tlf, blk_per_trk) == -EAGAIN) {
+               /* Clock not in sync and XRC is enabled.
+                * Try again later.
+                */
+               dasd_sfree_request(cqr, startdev);
+               return ERR_PTR(-EAGAIN);
+       }
+
+       /*
+        * A tidaw can address 4k of memory, but must not cross page boundaries
+        * We can let the block layer handle this by setting
+        * blk_queue_segment_boundary to page boundaries and
+        * blk_max_segment_size to page size when setting up the request queue.
+        */
+       rq_for_each_segment(bv, req, iter) {
+               dst = page_address(bv->bv_page) + bv->bv_offset;
+               last_tidaw = itcw_add_tidaw(itcw, 0x00, dst, bv->bv_len);
+               if (IS_ERR(last_tidaw))
+                       return (struct dasd_ccw_req *)last_tidaw;
+       }
+
+       last_tidaw->flags |= 0x80;
+       itcw_finalize(itcw);
+
+       if (blk_noretry_request(req) ||
+           block->base->features & DASD_FEATURE_FAILFAST)
                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;
@@ -1277,30 +2314,110 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
        return cqr;
 }
 
+static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
+                                              struct dasd_block *block,
+                                              struct request *req)
+{
+       int tpm, cmdrtd, cmdwtd;
+       int use_prefix;
+#if defined(CONFIG_64BIT)
+       int fcx_in_css, fcx_in_gneq, fcx_in_features;
+#endif
+       struct dasd_eckd_private *private;
+       struct dasd_device *basedev;
+       sector_t first_rec, last_rec;
+       sector_t first_trk, last_trk;
+       unsigned int first_offs, last_offs;
+       unsigned int blk_per_trk, blksize;
+       int cdlspecial;
+       struct dasd_ccw_req *cqr;
+
+       basedev = block->base;
+       private = (struct dasd_eckd_private *) basedev->private;
+
+       /* Calculate number of blocks/records per track. */
+       blksize = block->bp_block;
+       blk_per_trk = recs_per_track(&private->rdc_data, 0, blksize);
+       if (blk_per_trk == 0)
+               return ERR_PTR(-EINVAL);
+       /* Calculate record id of first and last block. */
+       first_rec = first_trk = blk_rq_pos(req) >> block->s2b_shift;
+       first_offs = sector_div(first_trk, blk_per_trk);
+       last_rec = last_trk =
+               (blk_rq_pos(req) + blk_rq_sectors(req) - 1) >> block->s2b_shift;
+       last_offs = sector_div(last_trk, blk_per_trk);
+       cdlspecial = (private->uses_cdl && first_rec < 2*blk_per_trk);
+
+       /* is transport mode supported? */
+#if defined(CONFIG_64BIT)
+       fcx_in_css = css_general_characteristics.fcx;
+       fcx_in_gneq = private->gneq->reserved2[7] & 0x04;
+       fcx_in_features = private->features.feature[40] & 0x80;
+       tpm = fcx_in_css && fcx_in_gneq && fcx_in_features;
+#else
+       tpm = 0;
+#endif
+
+       /* is read track data and write track data in command mode supported? */
+       cmdrtd = private->features.feature[9] & 0x20;
+       cmdwtd = private->features.feature[12] & 0x40;
+       use_prefix = private->features.feature[8] & 0x01;
+
+       cqr = NULL;
+       if (cdlspecial || dasd_page_cache) {
+               /* do nothing, just fall through to the cmd mode single case */
+       } else if (!dasd_nofcx && tpm && (first_trk == last_trk)) {
+               cqr = dasd_eckd_build_cp_tpm_track(startdev, block, req,
+                                                   first_rec, last_rec,
+                                                   first_trk, last_trk,
+                                                   first_offs, last_offs,
+                                                   blk_per_trk, blksize);
+               if (IS_ERR(cqr) && PTR_ERR(cqr) != -EAGAIN)
+                       cqr = NULL;
+       } else if (use_prefix &&
+                  (((rq_data_dir(req) == READ) && cmdrtd) ||
+                   ((rq_data_dir(req) == WRITE) && cmdwtd))) {
+               cqr = dasd_eckd_build_cp_cmd_track(startdev, block, req,
+                                                  first_rec, last_rec,
+                                                  first_trk, last_trk,
+                                                  first_offs, last_offs,
+                                                  blk_per_trk, blksize);
+               if (IS_ERR(cqr) && PTR_ERR(cqr) != -EAGAIN)
+                       cqr = NULL;
+       }
+       if (!cqr)
+               cqr = dasd_eckd_build_cp_cmd_single(startdev, block, req,
+                                                   first_rec, last_rec,
+                                                   first_trk, last_trk,
+                                                   first_offs, last_offs,
+                                                   blk_per_trk, blksize);
+       return cqr;
+}
+
 static int
 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 = blk_rq_pos(req) >> 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. */
@@ -1325,10 +2442,82 @@ 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/tcw 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;
+       struct tcw *tcw;
+       struct tccb *tccb;
+       struct dcw *dcw;
+
+       if (cqr->cpmode == 1) {
+               tcw = cqr->cpaddr;
+               tccb = tcw_get_tccb(tcw);
+               dcw = (struct dcw *)&tccb->tca[0];
+               pfxdata = (struct PFX_eckd_data *)&dcw->cd[0];
+               pfxdata->validity.verify_base = 0;
+               pfxdata->validity.hyper_pav = 0;
+       } else {
+               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)
@@ -1342,9 +2531,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;
 }
 
@@ -1362,32 +2552,34 @@ dasd_eckd_release(struct dasd_device *device)
 {
        struct dasd_ccw_req *cqr;
        int rc;
+       struct ccw1 *ccw;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
-                                  1, 32, device);
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
+               DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                            "Could not allocate initialization request");
                return PTR_ERR(cqr);
        }
-       cqr->cpaddr->cmd_code = DASD_ECKD_CCW_RELEASE;
-        cqr->cpaddr->flags |= CCW_FLAG_SLI;
-        cqr->cpaddr->count = 32;
-       cqr->cpaddr->cda = (__u32)(addr_t) cqr->data;
-       cqr->device = device;
+       ccw = cqr->cpaddr;
+       ccw->cmd_code = DASD_ECKD_CCW_RELEASE;
+       ccw->flags |= CCW_FLAG_SLI;
+       ccw->count = 32;
+       ccw->cda = (__u32)(addr_t) cqr->data;
+       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;
 }
 
@@ -1402,32 +2594,34 @@ dasd_eckd_reserve(struct dasd_device *device)
 {
        struct dasd_ccw_req *cqr;
        int rc;
+       struct ccw1 *ccw;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
-                                  1, 32, device);
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
+               DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                            "Could not allocate initialization request");
                return PTR_ERR(cqr);
        }
-       cqr->cpaddr->cmd_code = DASD_ECKD_CCW_RESERVE;
-        cqr->cpaddr->flags |= CCW_FLAG_SLI;
-        cqr->cpaddr->count = 32;
-       cqr->cpaddr->cda = (__u32)(addr_t) cqr->data;
-       cqr->device = device;
+       ccw = cqr->cpaddr;
+       ccw->cmd_code = DASD_ECKD_CCW_RESERVE;
+       ccw->flags |= CCW_FLAG_SLI;
+       ccw->count = 32;
+       ccw->cda = (__u32)(addr_t) cqr->data;
+       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;
 }
 
@@ -1441,32 +2635,34 @@ dasd_eckd_steal_lock(struct dasd_device *device)
 {
        struct dasd_ccw_req *cqr;
        int rc;
+       struct ccw1 *ccw;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
-                                  1, 32, device);
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
+               DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                            "Could not allocate initialization request");
                return PTR_ERR(cqr);
        }
-       cqr->cpaddr->cmd_code = DASD_ECKD_CCW_SLCK;
-        cqr->cpaddr->flags |= CCW_FLAG_SLI;
-        cqr->cpaddr->count = 32;
-       cqr->cpaddr->cda = (__u32)(addr_t) cqr->data;
-       cqr->device = device;
+       ccw = cqr->cpaddr;
+       ccw->cmd_code = DASD_ECKD_CCW_SLCK;
+       ccw->flags |= CCW_FLAG_SLI;
+       ccw->count = 32;
+       ccw->cda = (__u32)(addr_t) cqr->data;
+       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;
 }
 
@@ -1482,54 +2678,53 @@ dasd_eckd_performance(struct dasd_device *device, void __user *argp)
        struct ccw1 *ccw;
        int rc;
 
-       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)),
+       cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */  + 1 /* RSSD */,
+                                  (sizeof(struct dasd_psf_prssd_data) +
+                                   sizeof(struct dasd_rssd_perf_stats_t)),
                                   device);
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
+               DBF_DEV_EVENT(DBF_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);
                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;
 }
 
@@ -1552,7 +2747,7 @@ dasd_eckd_get_attrib(struct dasd_device *device, void __user *argp)
 
        rc = 0;
        if (copy_to_user(argp, (long *) &attrib,
-                        sizeof (struct attrib_data_t)))
+                        sizeof(struct attrib_data_t)))
                rc = -EFAULT;
 
        return rc;
@@ -1578,15 +2773,114 @@ dasd_eckd_set_attrib(struct dasd_device *device, void __user *argp)
                return -EFAULT;
        private->attrib = attrib;
 
-       DEV_MESSAGE(KERN_INFO, device,
-                   "cache operation mode set to %x (%i cylinder prestage)",
-                   private->attrib.operation, private->attrib.nr_cyl);
+       dev_info(&device->cdev->dev,
+                "The DASD cache mode was set to %x (%i cylinder prestage)\n",
+                private->attrib.operation, private->attrib.nr_cyl);
        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(DASD_ECKD_MAGIC, 2 , 0, device);
+       if (IS_ERR(cqr)) {
+               DBF_DEV_EVENT(DBF_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_device *device, unsigned int cmd, void __user *argp)
+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);
@@ -1600,6 +2894,8 @@ dasd_eckd_ioctl(struct dasd_device *device, 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;
        }
@@ -1609,7 +2905,7 @@ dasd_eckd_ioctl(struct dasd_device *device, unsigned int cmd, void __user *argp)
  * Dump the range of CCWs into 'page' buffer
  * and return number of printed chars.
  */
-static inline int
+static int
 dasd_eckd_dump_ccw_range(struct ccw1 *from, struct ccw1 *to, char *page)
 {
        int len, count;
@@ -1639,13 +2935,33 @@ dasd_eckd_dump_ccw_range(struct ccw1 *from, struct ccw1 *to, char *page)
        return len;
 }
 
+static void
+dasd_eckd_dump_sense_dbf(struct dasd_device *device, struct irb *irb,
+                        char *reason)
+{
+       u64 *sense;
+
+       sense = (u64 *) dasd_get_sense(irb);
+       if (sense) {
+               DBF_DEV_EVENT(DBF_EMERG, device,
+                             "%s: %s %02x%02x%02x %016llx %016llx %016llx "
+                             "%016llx", reason,
+                             scsw_is_tm(&irb->scsw) ? "t" : "c",
+                             scsw_cc(&irb->scsw), scsw_cstat(&irb->scsw),
+                             scsw_dstat(&irb->scsw), sense[0], sense[1],
+                             sense[2], sense[3]);
+       } else {
+               DBF_DEV_EVENT(DBF_EMERG, device, "%s",
+                             "SORRY - NO VALID SENSE AVAILABLE\n");
+       }
+}
+
 /*
  * 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_ccw(struct dasd_device *device,
+                                struct dasd_ccw_req *req, struct irb *irb)
 {
        char *page;
        struct ccw1 *first, *last, *fail, *from, *to;
@@ -1653,21 +2969,22 @@ dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
 
        page = (char *) get_zeroed_page(GFP_ATOMIC);
        if (page == NULL) {
-               DEV_MESSAGE(KERN_ERR, device, " %s",
-                           "No memory to dump sense data");
+               DBF_DEV_EVENT(DBF_WARNING, device, "%s",
+                             "No memory to dump sense data\n");
                return;
        }
        /* 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);
+                      " in req: %p CS: 0x%02X DS: 0x%02X CC: 0x%02X RC: %d\n",
+                      req, scsw_cstat(&irb->scsw), scsw_dstat(&irb->scsw),
+                      scsw_cc(&irb->scsw), req->intrc);
        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
@@ -1701,40 +3018,273 @@ dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
        }
        printk("%s", page);
 
-       /* 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);
+       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);
+       }
+       free_page((unsigned long) page);
+}
+
+
+/*
+ * Print sense data from a tcw.
+ */
+static void dasd_eckd_dump_sense_tcw(struct dasd_device *device,
+                                struct dasd_ccw_req *req, struct irb *irb)
+{
+       char *page;
+       int len, sl, sct, residual;
+
+       struct tsb *tsb;
+       u8 *sense;
+
+
+       page = (char *) get_zeroed_page(GFP_ATOMIC);
+       if (page == NULL) {
+               DBF_DEV_EVENT(DBF_WARNING, device, " %s",
+                           "No memory to dump sense data");
+               return;
+       }
+       /* dump the sense data */
        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);
+                     " I/O status report for device %s:\n",
+                     dev_name(&device->cdev->dev));
+       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                      " in req: %p CS: 0x%02X DS: 0x%02X CC: 0x%02X RC: %d "
+                      "fcxs: 0x%02X schxs: 0x%02X\n", req,
+                      scsw_cstat(&irb->scsw), scsw_dstat(&irb->scsw),
+                      scsw_cc(&irb->scsw), req->intrc,
+                      irb->scsw.tm.fcxs, irb->scsw.tm.schxs);
+       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                      " device %s: Failing TCW: %p\n",
+                      dev_name(&device->cdev->dev),
+                      (void *) (addr_t) irb->scsw.tm.tcw);
 
-       /* print failing CCW area (maximum 4) */
-       /* scsw->cda is either valid or zero  */
-       len = 0;
-       from = ++to;
-       fail = (struct ccw1 *)(addr_t) irb->scsw.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);
+       tsb = NULL;
+       sense = NULL;
+       if (irb->scsw.tm.tcw)
+               tsb = tcw_get_tsb(
+                       (struct tcw *)(unsigned long)irb->scsw.tm.tcw);
+
+       if (tsb && (irb->scsw.tm.fcxs == 0x01)) {
+               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->length %d\n", tsb->length);
+               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->flags %x\n", tsb->flags);
+               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->dcw_offset %d\n", tsb->dcw_offset);
+               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->count %d\n", tsb->count);
+               residual = tsb->count - 28;
+               len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " residual %d\n", residual);
+
+               switch (tsb->flags & 0x07) {
+               case 1: /* tsa_iostat */
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->tsa.iostat.dev_time %d\n",
+                                      tsb->tsa.iostat.dev_time);
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->tsa.iostat.def_time %d\n",
+                                      tsb->tsa.iostat.def_time);
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->tsa.iostat.queue_time %d\n",
+                                      tsb->tsa.iostat.queue_time);
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->tsa.iostat.dev_busy_time %d\n",
+                                      tsb->tsa.iostat.dev_busy_time);
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->tsa.iostat.dev_act_time %d\n",
+                                      tsb->tsa.iostat.dev_act_time);
+                       sense = tsb->tsa.iostat.sense;
+                       break;
+               case 2: /* ts_ddpc */
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->tsa.ddpc.rc %d\n", tsb->tsa.ddpc.rc);
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                              " tsb->tsa.ddpc.rcq:  ");
+                       for (sl = 0; sl < 16; sl++) {
+                               for (sct = 0; sct < 8; sct++) {
+                                       len += sprintf(page + len, " %02x",
+                                                      tsb->tsa.ddpc.rcq[sl]);
+                               }
+                               len += sprintf(page + len, "\n");
+                       }
+                       sense = tsb->tsa.ddpc.sense;
+                       break;
+               case 3: /* tsa_intrg */
+                       len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                                     " tsb->tsa.intrg.: not supportet yet \n");
+                       break;
+               }
+
+               if (sense) {
+                       for (sl = 0; sl < 4; sl++) {
+                               len += sprintf(page + len,
+                                              KERN_ERR PRINTK_HEADER
+                                              " Sense(hex) %2d-%2d:",
+                                              (8 * sl), ((8 * sl) + 7));
+                               for (sct = 0; sct < 8; sct++) {
+                                       len += sprintf(page + len, " %02x",
+                                                      sense[8 * sl + sct]);
+                               }
+                               len += sprintf(page + len, "\n");
+                       }
+
+                       if (sense[27] & DASD_SENSE_BIT_0) {
+                               /* 24 Byte Sense Data */
+                               sprintf(page + len, KERN_ERR PRINTK_HEADER
+                                       " 24 Byte: %x MSG %x, "
+                                       "%s MSGb to SYSOP\n",
+                                       sense[7] >> 4, sense[7] & 0x0f,
+                                       sense[1] & 0x10 ? "" : "no");
+                       } else {
+                               /* 32 Byte Sense Data */
+                               sprintf(page + len, KERN_ERR PRINTK_HEADER
+                                       " 32 Byte: Format: %x "
+                                       "Exception class %x\n",
+                                       sense[6] & 0x0f, sense[22] >> 4);
+                       }
+               } else {
+                       sprintf(page + len, KERN_ERR PRINTK_HEADER
+                               " SORRY - NO VALID SENSE AVAILABLE\n");
+               }
+       } else {
+               sprintf(page + len, KERN_ERR PRINTK_HEADER
+                       " SORRY - NO TSB DATA AVAILABLE\n");
+       }
+       printk("%s", page);
        free_page((unsigned long) page);
 }
 
+static void dasd_eckd_dump_sense(struct dasd_device *device,
+                                struct dasd_ccw_req *req, struct irb *irb)
+{
+       if (req && scsw_is_tm(&req->irb.scsw))
+               dasd_eckd_dump_sense_tcw(device, req, irb);
+       else
+               dasd_eckd_dump_sense_ccw(device, req, irb);
+}
+
+int dasd_eckd_pm_freeze(struct dasd_device *device)
+{
+       /*
+        * the device should be disconnected from our LCU structure
+        * on restore we will reconnect it and reread LCU specific
+        * information like PAV support that might have changed
+        */
+       dasd_alias_remove_device(device);
+       dasd_alias_disconnect_device_from_lcu(device);
+
+       return 0;
+}
+
+int dasd_eckd_restore_device(struct dasd_device *device)
+{
+       struct dasd_eckd_private *private;
+       struct dasd_eckd_characteristics temp_rdc_data;
+       int is_known, rc;
+       struct dasd_uid temp_uid;
+       unsigned long flags;
+
+       private = (struct dasd_eckd_private *) device->private;
+
+       /* Read Configuration Data */
+       rc = dasd_eckd_read_conf(device);
+       if (rc)
+               goto out_err;
+
+       /* Generate device unique id and register in devmap */
+       rc = dasd_eckd_generate_uid(device, &private->uid);
+       dasd_get_uid(device->cdev, &temp_uid);
+       if (memcmp(&private->uid, &temp_uid, sizeof(struct dasd_uid)) != 0)
+               dev_err(&device->cdev->dev, "The UID of the DASD has "
+                       "changed\n");
+       if (rc)
+               goto out_err;
+       dasd_set_uid(device->cdev, &private->uid);
+
+       /* 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)
+               return is_known;
+       if (!is_known) {
+               /* new lcu found */
+               rc = dasd_eckd_validate_server(device); /* will switch pav on */
+               if (rc)
+                       goto out_err;
+       }
+
+       /* Read Feature Codes */
+       dasd_eckd_read_features(device);
+
+       /* Read Device Characteristics */
+       rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
+                                        &temp_rdc_data, 64);
+       if (rc) {
+               DBF_EVENT(DBF_WARNING,
+                         "Read device characteristics failed, rc=%d for "
+                         "device: %s", rc, dev_name(&device->cdev->dev));
+               goto out_err;
+       }
+       spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
+       memcpy(&private->rdc_data, &temp_rdc_data, sizeof(temp_rdc_data));
+       spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
+
+       /* add device to alias management */
+       dasd_alias_add_device(device);
+
+       return 0;
+
+out_err:
+       return -1;
+}
+
+static struct ccw_driver dasd_eckd_driver = {
+       .name        = "dasd-eckd",
+       .owner       = THIS_MODULE,
+       .ids         = dasd_eckd_ids,
+       .probe       = dasd_eckd_probe,
+       .remove      = dasd_generic_remove,
+       .set_offline = dasd_generic_set_offline,
+       .set_online  = dasd_eckd_set_online,
+       .notify      = dasd_generic_notify,
+       .freeze      = dasd_generic_pm_freeze,
+       .thaw        = dasd_generic_restore_device,
+       .restore     = dasd_generic_restore_device,
+};
+
 /*
  * max_blocks is dependent on the amount of storage that is available
  * in the static io buffer for each device. Currently each device has
@@ -1754,26 +3304,39 @@ 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,
+       .dump_sense_dbf = dasd_eckd_dump_sense_dbf,
        .fill_info = dasd_eckd_fill_info,
        .ioctl = dasd_eckd_ioctl,
+       .freeze = dasd_eckd_pm_freeze,
+       .restore = dasd_eckd_restore_device,
 };
 
 static int __init
 dasd_eckd_init(void)
 {
+       int ret;
+
        ASCEBC(dasd_eckd_discipline.ebcname, 4);
-       return ccw_driver_register(&dasd_eckd_driver);
+       ret = ccw_driver_register(&dasd_eckd_driver);
+       if (!ret)
+               wait_for_device_probe();
+
+       return ret;
 }
 
 static void __exit