]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/s390/block/dasd_eckd.c
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_eckd.c
index bdb87998f364f276067470e672a0db49bfc21e26..21254793c60416e9f2162e7e962f5741b07d39b3 100644 (file)
@@ -11,6 +11,8 @@
  *
  */
 
+#define KMSG_COMPONENT "dasd"
+
 #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
@@ -84,7 +89,7 @@ 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", dev_name(&cdev->dev));
                return ret;
@@ -159,6 +164,14 @@ recs_per_track(struct dasd_eckd_characteristics * rdc,
        return 0;
 }
 
+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,
@@ -186,11 +199,12 @@ check_XRC (struct ccw1         *de_ccw,
 }
 
 static int
-define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
-             int totrk, int cmd, struct dasd_device * device)
+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;
@@ -236,7 +250,8 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,
                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;
        }
 
@@ -248,27 +263,24 @@ 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
-                       end.cyl = (geo.cyl - 1);
+                       endcyl = (private->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(&data->beg_ext, begcyl, beghead);
+       set_ch_t(&data->end_ext, endcyl, endhead);
        return rc;
 }
 
@@ -283,29 +295,145 @@ static int check_XRC_on_prefix(struct PFX_eckd_data *pfxdata,
                return 0;
 
        /* switch on System Time Stamp - needed for XRC Support */
-       pfxdata->define_extend.ga_extended |= 0x08; /* 'Time Stamp Valid'   */
-       pfxdata->define_extend.ga_extended |= 0x02; /* 'Extended Parameter' */
+       pfxdata->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_extend.ep_sys_time);
+       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 int prefix(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata, int trk,
-                 int totrk, int cmd, struct dasd_device *basedev,
-                 struct dasd_device *startdev)
+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 *data;
-       struct ch_t geo, beg, end;
+       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;
-       data = &pfxdata->define_extend;
+       dedata = &pfxdata->define_extent;
+       lredata = &pfxdata->locate_record;
 
        ccw->cmd_code = DASD_ECKD_CCW_PFX;
        ccw->flags = 0;
@@ -314,10 +442,16 @@ static int prefix(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata, int trk,
 
        memset(pfxdata, 0, sizeof(*pfxdata));
        /* prefix data */
-       pfxdata->format = 0;
+       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_extend = 1;
+       pfxdata->validity.define_extent = 1;
 
        /* private uid is kept up to date, conf_data may be outdated */
        if (startpriv->uid.type != UA_BASE_DEVICE) {
@@ -337,70 +471,94 @@ static int prefix(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata, int trk,
        case DASD_ECKD_CCW_READ_KD:
        case DASD_ECKD_CCW_READ_KD_MT:
        case DASD_ECKD_CCW_READ_COUNT:
-               data->mask.perm = 0x1;
-               data->attributes.operation = basepriv->attrib.operation;
+               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:
-               data->mask.perm = 0x02;
-               data->attributes.operation = basepriv->attrib.operation;
+               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:
-               data->attributes.operation = DASD_BYPASS_CACHE;
+               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:
-               data->mask.perm = 0x3;
-               data->mask.auth = 0x1;
-               data->attributes.operation = DASD_BYPASS_CACHE;
+               dedata->mask.perm = 0x3;
+               dedata->mask.auth = 0x1;
+               dedata->attributes.operation = DASD_BYPASS_CACHE;
                rc = check_XRC_on_prefix(pfxdata, basedev);
                break;
-       default:
-               DEV_MESSAGE(KERN_ERR, basedev, "unknown opcode 0x%x", cmd);
+       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;
        }
 
-       data->attributes.mode = 0x3;    /* ECKD */
+       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))
-               data->ga_extended |= 0x40; /* Regular Data Format Mode */
+               dedata->ga_extended |= 0x40; /* Regular Data Format Mode */
 
-       geo.cyl = basepriv->rdc_data.no_cyl;
-       geo.head = basepriv->rdc_data.trk_per_cyl;
-       beg.cyl = trk / geo.head;
-       beg.head = trk % geo.head;
-       end.cyl = totrk / geo.head;
-       end.head = totrk % geo.head;
+       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 (data->attributes.operation == DASD_SEQ_PRESTAGE ||
-           data->attributes.operation == DASD_SEQ_ACCESS) {
+       if (dedata->attributes.operation == DASD_SEQ_PRESTAGE ||
+           dedata->attributes.operation == DASD_SEQ_ACCESS) {
 
-               if (end.cyl + basepriv->attrib.nr_cyl < geo.cyl)
-                       end.cyl += basepriv->attrib.nr_cyl;
+               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);
+       }
+
+       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);
        }
 
-       data->beg_ext.cyl = beg.cyl;
-       data->beg_ext.head = beg.head;
-       data->end_ext.cyl = end.cyl;
-       data->end_ext.head = end.head;
        return rc;
 }
 
+static 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, int trk,
-             int rec_on_trk, int no_rec, int cmd,
+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;
@@ -491,12 +649,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);
-       }
-       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;
+               DBF_DEV_EVENT(DBF_ERR, device, "unknown locate record "
+                             "opcode 0x%x", cmd);
+       }
+       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;
 }
 
@@ -585,8 +745,8 @@ static struct dasd_ccw_req *dasd_eckd_build_rcd_lpm(struct dasd_device *device,
        cqr = dasd_smalloc_request("ECKD", 1 /* RCD */, ciw->count, device);
 
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
-                           "Could not allocate RCD request");
+               DBF_DEV_EVENT(DBF_WARNING, device, "%s",
+                             "Could not allocate RCD request");
                return cqr;
        }
 
@@ -736,14 +896,16 @@ static int dasd_eckd_read_conf(struct dasd_device *device)
                        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");
+                               DBF_EVENT(DBF_WARNING, "No configuration "
+                                         "data retrieved for device: %s",
+                                         dev_name(&device->cdev->dev));
                                continue;       /* no error */
                        }
                        /* save first valid configuration data */
@@ -790,8 +952,9 @@ static int dasd_eckd_read_features(struct dasd_device *device)
                                    sizeof(struct dasd_rssd_features)),
                                   device);
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
-                           "Could not allocate initialization request");
+               DBF_EVENT(DBF_WARNING, "Could not allocate initialization "
+                         "request for device: %s",
+                         dev_name(&device->cdev->dev));
                return PTR_ERR(cqr);
        }
        cqr->startdev = device;
@@ -840,7 +1003,8 @@ static int dasd_eckd_read_features(struct dasd_device *device)
 /*
  * 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;
@@ -851,15 +1015,17 @@ static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device)
                                  device);
 
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
+               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 = 0x88;
-       psf_ssc_data->reserved[0] = 0x88;
-
+       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;
@@ -880,12 +1046,12 @@ static struct dasd_ccw_req *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;
 
-       cqr = dasd_eckd_build_psf_ssc(device);
+       cqr = dasd_eckd_build_psf_ssc(device, enable_pav);
        if (IS_ERR(cqr))
                return PTR_ERR(cqr);
 
@@ -904,19 +1070,20 @@ 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 */
        private = (struct dasd_eckd_private *) device->private;
-       DEV_MESSAGE(KERN_INFO, device,
-                   "PSF-SSC on storage subsystem %s.%s.%04x returned rc=%d",
-                   private->uid.vendor, private->uid.serial,
-                   private->uid.ssid, rc);
+       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);
 }
@@ -938,9 +1105,9 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                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");
+                       dev_warn(&device->cdev->dev,
+                                "Allocating memory for private DASD data "
+                                "failed\n");
                        return -ENOMEM;
                }
                device->private = (void *) private;
@@ -965,8 +1132,9 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
        if (private->uid.type == UA_BASE_DEVICE) {
                block = dasd_alloc_block();
                if (IS_ERR(block)) {
-                       DEV_MESSAGE(KERN_WARNING, device, "%s",
-                                   "could not allocate dasd block structure");
+                       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;
                }
@@ -997,20 +1165,27 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
        memset(rdc_data, 0, sizeof(rdc_data));
        rc = dasd_generic_read_dev_chars(device, "ECKD", &rdc_data, 64);
        if (rc) {
-               DEV_MESSAGE(KERN_WARNING, device,
-                           "Read device characteristics returned "
-                           "rc=%d", rc);
+               DBF_EVENT(DBF_WARNING,
+                         "Read device characteristics failed, rc=%d for "
+                         "device: %s", rc, dev_name(&device->cdev->dev));
                goto out_err3;
        }
-       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);
+       /* 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:
@@ -1151,14 +1326,12 @@ dasd_eckd_end_analysis(struct dasd_block *block)
        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, block->bp_block);
        /* Check Track 0 for Compatible Disk Layout */
        count_area = NULL;
        for (i = 0; i < 3; i++) {
@@ -1182,8 +1355,8 @@ dasd_eckd_end_analysis(struct dasd_block *block)
                        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 */
@@ -1191,8 +1364,8 @@ dasd_eckd_end_analysis(struct dasd_block *block)
                        block->bp_block = count_area->dl;
        }
        if (block->bp_block == 0) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
-                           "Volume has incompatible disk layout");
+               dev_warn(&device->cdev->dev,
+                        "The disk layout of the DASD is not supported\n");
                return -EMEDIUMTYPE;
        }
        block->s2b_shift = 0;   /* bits to shift 512 to get a block */
@@ -1200,19 +1373,19 @@ dasd_eckd_end_analysis(struct dasd_block *block)
                block->s2b_shift++;
 
        blk_per_trk = recs_per_track(&private->rdc_data, 0, block->bp_block);
-       block->blocks = (private->rdc_data.no_cyl *
+       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",
-                   (block->bp_block >> 10),
-                   ((private->rdc_data.no_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");
+       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;
 }
@@ -1262,31 +1435,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);
        }
 
@@ -1296,9 +1473,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;
@@ -1322,8 +1507,8 @@ 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. */
@@ -1335,11 +1520,14 @@ dasd_eckd_format_device(struct dasd_device * device,
        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,
@@ -1373,11 +1561,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;
@@ -1388,11 +1576,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;
@@ -1405,20 +1593,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;
@@ -1479,57 +1667,69 @@ 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 ((irb->scsw.cmd.dstat & mask) == mask) {
+       if ((scsw_dstat(&irb->scsw) & mask) == mask) {
                dasd_generic_handle_state_change(device);
                return;
        }
 
        /* summary unit check */
-       if ((irb->scsw.cmd.dstat & DEV_STAT_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 (irb->esw.esw0.erw.cons && !(irb->ecw[27] & DASD_SENSE_BIT_0) &&
-           ((irb->ecw[6] & DASD_SIM_SENSE) == DASD_SIM_SENSE)) {
-               dasd_3990_erp_handle_sim(device, irb->ecw);
+       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 ((irb->scsw.cmd.cc == 1) &&
-           (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
-           (irb->scsw.cmd.actl & SCSW_ACTL_START_PEND) &&
-           (irb->scsw.cmd.stctl & SCSW_STCTL_STATUS_PEND)) {
+       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 (!(irb->esw.esw0.erw.cons)) {
+       if (!sense) {
                /* just report other unsolicited interrupts */
-               DEV_MESSAGE(KERN_ERR, device, "%s",
+               DBF_DEV_EVENT(DBF_ERR, device, "%s",
                            "unsolicited interrupt received");
        } else {
-               DEV_MESSAGE(KERN_ERR, device, "%s",
+               DBF_DEV_EVENT(DBF_ERR, device, "%s",
                            "unsolicited interrupt received "
                            "(sense available)");
-               device->discipline->dump_sense(device, NULL, irb);
+               device->discipline->dump_sense_dbf(device, NULL, irb,
+                                                  "unsolicited");
        }
 
        dasd_schedule_device_bh(device);
        return;
 };
 
-static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
+
+static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
+                                              struct dasd_device *startdev,
                                               struct dasd_block *block,
-                                              struct request *req)
+                                              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;
@@ -1539,11 +1739,9 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
        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 use_prefix;
        struct dasd_device *basedev;
@@ -1556,15 +1754,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
                cmd = DASD_ECKD_CCW_WRITE_MT;
        else
                return ERR_PTR(-EINVAL);
-       /* Calculate number of blocks/records per track. */
-       blksize = block->bp_block;
-       blk_per_trk = recs_per_track(&private->rdc_data, 0, blksize);
-       /* Calculate record id of first and last block. */
-       first_rec = first_trk = req->sector >> block->s2b_shift;
-       first_offs = sector_div(first_trk, blk_per_trk);
-       last_rec = last_trk =
-               (req->sector + req->nr_sectors - 1) >> block->s2b_shift;
-       last_offs = sector_div(last_trk, blk_per_trk);
+
        /* Check struct bio and count the number of blocks for the request. */
        count = 0;
        cidaw = 0;
@@ -1714,6 +1904,497 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
        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_discipline.name,
+                                  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;
+                       }
+                       /* If we start a new idaw, everything is fine and the
+                        * start of the new idaw is the start of this segment.
+                        * If we continue an idaw, we must make sure that the
+                        * current segment begins where the so far accumulated
+                        * idaw ends
+                        */
+                       if (!idaw_dst)
+                               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_discipline.name,
+                                  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->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(struct dasd_device *startdev,
+                                              struct dasd_block *block,
+                                              struct request *req)
+{
+       int tpm, cmdrtd, cmdwtd;
+       int use_prefix;
+
+       struct dasd_eckd_private *private;
+       int fcx_in_css, fcx_in_gneq, fcx_in_features;
+       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);
+       /* Calculate record id of first and last block. */
+       first_rec = first_trk = req->sector >> block->s2b_shift;
+       first_offs = sector_div(first_trk, blk_per_trk);
+       last_rec = last_trk =
+               (req->sector + req->nr_sectors - 1) >> 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 ? */
+       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;
+
+       /* 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)
 {
@@ -1767,7 +2448,7 @@ out:
 }
 
 /*
- * Modify ccw chain in cqr so it can be started on a base device.
+ * 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)
@@ -1777,13 +2458,24 @@ void dasd_eckd_reset_ccw_to_base_io(struct dasd_ccw_req *cqr)
 {
        struct ccw1 *ccw;
        struct PFX_eckd_data *pfxdata;
-
-       ccw = cqr->cpaddr;
-       pfxdata = cqr->data;
-
-       if (ccw->cmd_code == DASD_ECKD_CCW_PFX) {
+       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;
+               }
        }
 }
 
@@ -1861,6 +2553,7 @@ dasd_eckd_release(struct dasd_device *device)
 {
        struct dasd_ccw_req *cqr;
        int rc;
+       struct ccw1 *ccw;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
@@ -1868,14 +2561,15 @@ dasd_eckd_release(struct dasd_device *device)
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
                                   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;
+       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);
@@ -1902,6 +2596,7 @@ dasd_eckd_reserve(struct dasd_device *device)
 {
        struct dasd_ccw_req *cqr;
        int rc;
+       struct ccw1 *ccw;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
@@ -1909,14 +2604,15 @@ dasd_eckd_reserve(struct dasd_device *device)
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
                                   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;
+       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);
@@ -1942,6 +2638,7 @@ 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;
@@ -1949,14 +2646,15 @@ dasd_eckd_steal_lock(struct dasd_device *device)
        cqr = dasd_smalloc_request(dasd_eckd_discipline.name,
                                   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;
+       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);
@@ -1990,7 +2688,7 @@ dasd_eckd_performance(struct dasd_device *device, void __user *argp)
                                    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);
        }
@@ -2080,9 +2778,9 @@ 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;
 }
 
@@ -2133,7 +2831,7 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp)
        /* setup CCWs for PSF + RSSD */
        cqr = dasd_smalloc_request("ECKD", 2 , 0, device);
        if (IS_ERR(cqr)) {
-               DEV_MESSAGE(KERN_WARNING, device, "%s",
+               DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                        "Could not allocate initialization request");
                rc = PTR_ERR(cqr);
                goto out_free;
@@ -2242,11 +2940,54 @@ 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 dasd_ccw_req *req,
+                        struct irb *irb, char *reason)
+{
+       u64 *sense;
+       int sl;
+       struct tsb *tsb;
+
+       sense = NULL;
+       tsb = NULL;
+       if (req && scsw_is_tm(&req->irb.scsw)) {
+               if (irb->scsw.tm.tcw)
+                       tsb = tcw_get_tsb(
+                               (struct tcw *)(unsigned long)irb->scsw.tm.tcw);
+               if (tsb && (irb->scsw.tm.fcxs == 0x01)) {
+                       switch (tsb->flags & 0x07) {
+                       case 1: /* tsa_iostat */
+                               sense = (u64 *)tsb->tsa.iostat.sense;
+                       break;
+                       case 2: /* ts_ddpc */
+                               sense = (u64 *)tsb->tsa.ddpc.sense;
+                       break;
+                       case 3: /* tsa_intrg */
+                       break;
+                       }
+               }
+       } else {
+               if (irb->esw.esw0.erw.cons)
+                       sense = (u64 *)irb->ecw;
+       }
+       if (sense) {
+               for (sl = 0; sl < 4; sl++) {
+                       DBF_DEV_EVENT(DBF_EMERG, device,
+                                     "%s: %016llx %016llx %016llx %016llx",
+                                     reason, 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,
+static void dasd_eckd_dump_sense_ccw(struct dasd_device *device,
                                 struct dasd_ccw_req *req, struct irb *irb)
 {
        char *page;
@@ -2255,8 +2996,8 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
 
        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 */
@@ -2265,7 +3006,7 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
                      dev_name(&device->cdev->dev));
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
-                      irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
+                      scsw_cstat(&irb->scsw), scsw_dstat(&irb->scsw));
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " device %s: Failing CCW: %p\n",
                       dev_name(&device->cdev->dev),
@@ -2341,6 +3082,147 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
        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
+                     " 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 "
+                      "fcxs: 0x%02X schxs: 0x%02X\n", req,
+                      scsw_cstat(&irb->scsw), scsw_dstat(&irb->scsw),
+                      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);
+
+       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);
+}
+
+
 /*
  * max_blocks is dependent on the amount of storage that is available
  * in the static io buffer for each device. Currently each device has
@@ -2375,6 +3257,7 @@ static struct dasd_discipline dasd_eckd_discipline = {
        .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,
 };