68 files changed, 1975 insertions, 1574 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index acb78017e7d0..0a225ccda026 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -215,7 +215,7 @@ static int dasd_state_known_to_basic(struct dasd_device *device)
                         return rc;
         }
         /* register 'device' debug area, used for all DBF_DEV_XXX calls */
-        device->debug_area = debug_register(device->cdev->dev.bus_id, 1, 1,
+        device->debug_area = debug_register(dev_name(&device->cdev->dev), 1, 1,
                                             8 * sizeof(long));
         debug_register_view(device->debug_area, &debug_sprintf_view);
         debug_set_level(device->debug_area, DBF_WARNING);
@@ -933,7 +933,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
                 MESSAGE(KERN_DEBUG,
                         "invalid status in handle_killed_request: "
                         "bus_id %s, status %02x",
-                        cdev->dev.bus_id, cqr->status);
+                        dev_name(&cdev->dev), cqr->status);
                 return;
         }
 
@@ -942,7 +942,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
             device != dasd_device_from_cdev_locked(cdev) ||
             strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
                 MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",
-                        cdev->dev.bus_id);
+                        dev_name(&cdev->dev));
                 return;
         }
 
@@ -982,11 +982,11 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
                         break;
                 case -ETIMEDOUT:
                         printk(KERN_WARNING"%s(%s): request timed out\n",
-                               __func__, cdev->dev.bus_id);
+                               __func__, dev_name(&cdev->dev));
                         break;
                 default:
                         printk(KERN_WARNING"%s(%s): unknown error %ld\n",
-                               __func__, cdev->dev.bus_id, PTR_ERR(irb));
+                               __func__, dev_name(&cdev->dev), PTR_ERR(irb));
                 }
                 dasd_handle_killed_request(cdev, intparm);
                 return;
@@ -995,7 +995,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         now = get_clock();
 
         DBF_EVENT(DBF_ERR, "Interrupt: bus_id %s CS/DS %04x ip %08x",
-                  cdev->dev.bus_id, ((irb->scsw.cmd.cstat << 8) |
+                  dev_name(&cdev->dev), ((irb->scsw.cmd.cstat << 8) |
                   irb->scsw.cmd.dstat), (unsigned int) intparm);
 
         /* check for unsolicited interrupts */
@@ -1019,7 +1019,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         if (!device ||
             strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
                 MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",
-                        cdev->dev.bus_id);
+                        dev_name(&cdev->dev));
                 return;
         }
 
@@ -1037,7 +1037,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         if (cqr->status != DASD_CQR_IN_IO) {
                 MESSAGE(KERN_DEBUG,
                         "invalid status: bus_id %s, status %02x",
-                        cdev->dev.bus_id, cqr->status);
+                        dev_name(&cdev->dev), cqr->status);
                 return;
         }
         DBF_DEV_EVENT(DBF_DEBUG, device, "Int: CS/DS 0x%04x for cqr %p",
@@ -2134,14 +2134,14 @@ int dasd_generic_probe(struct ccw_device *cdev,
         if (ret) {
                 printk(KERN_WARNING
                        "dasd_generic_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_add_sysfs_files(cdev);
         if (ret) {
                 printk(KERN_WARNING
                        "dasd_generic_probe: could not add sysfs entries "
-                       "for %s\n", cdev->dev.bus_id);
+                       "for %s\n", dev_name(&cdev->dev));
                 return ret;
         }
         cdev->handler = &dasd_int_handler;
@@ -2152,13 +2152,13 @@ int dasd_generic_probe(struct ccw_device *cdev,
          * initial probe.
          */
         if ((dasd_get_feature(cdev, DASD_FEATURE_INITIAL_ONLINE) > 0 ) ||
-            (dasd_autodetect && dasd_busid_known(cdev->dev.bus_id) != 0))
+            (dasd_autodetect && dasd_busid_known(dev_name(&cdev->dev)) != 0))
                 ret = ccw_device_set_online(cdev);
         if (ret)
                 printk(KERN_WARNING
                        "dasd_generic_probe: could not initially "
                        "online ccw-device %s; return code: %d\n",
-                       cdev->dev.bus_id, ret);
+                       dev_name(&cdev->dev), ret);
         return 0;
 }
 
@@ -2224,7 +2224,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
                         printk (KERN_WARNING
                                 "dasd_generic couldn't online device %s "
                                 "- discipline DIAG not available\n",
-                                cdev->dev.bus_id);
+                                dev_name(&cdev->dev));
                         dasd_delete_device(device);
                         return -ENODEV;
                 }
@@ -2248,7 +2248,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
                 printk (KERN_WARNING
                         "dasd_generic couldn't online device %s "
                         "with discipline %s rc=%i\n",
-                        cdev->dev.bus_id, discipline->name, rc);
+                        dev_name(&cdev->dev), discipline->name, rc);
                 module_put(discipline->owner);
                 module_put(base_discipline->owner);
                 dasd_delete_device(device);
@@ -2259,7 +2259,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
         if (device->state <= DASD_STATE_KNOWN) {
                 printk (KERN_WARNING
                         "dasd_generic discipline not found for %s\n",
-                        cdev->dev.bus_id);
+                        dev_name(&cdev->dev));
                 rc = -ENODEV;
                 dasd_set_target_state(device, DASD_STATE_NEW);
                 if (device->block)
@@ -2267,7 +2267,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
                 dasd_delete_device(device);
         } else
                 pr_debug("dasd_generic device %s found\n",
-                                cdev->dev.bus_id);
+                                dev_name(&cdev->dev));
 
         /* FIXME: we have to wait for the root device but we don't want
          * to wait for each single device but for all at once. */
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 5c6e6f331cb0..b8f9c00633f3 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -1397,7 +1397,7 @@ static struct dasd_ccw_req *dasd_3990_erp_inspect_alias(
                         DEV_MESSAGE(KERN_ERR, cqr->startdev,
                                     "ERP on alias device for request %p,"
                                     " recover on base device %s", cqr,
-                                    cqr->block->base->cdev->dev.bus_id);
+                                    dev_name(&cqr->block->base->cdev->dev));
                 }
                 dasd_eckd_reset_ccw_to_base_io(cqr);
                 erp->startdev = cqr->block->base;
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index cd3335c1c307..921443b01d16 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -515,9 +515,9 @@ dasd_devmap_from_cdev(struct ccw_device *cdev)
 {
         struct dasd_devmap *devmap;
 
-        devmap = dasd_find_busid(cdev->dev.bus_id);
+        devmap = dasd_find_busid(dev_name(&cdev->dev));
         if (IS_ERR(devmap))
-                devmap = dasd_add_busid(cdev->dev.bus_id,
+                devmap = dasd_add_busid(dev_name(&cdev->dev),
                                         DASD_FEATURE_DEFAULT);
         return devmap;
 }
@@ -584,7 +584,7 @@ dasd_delete_device(struct dasd_device *device)
         unsigned long flags;
 
         /* First remove device pointer from devmap. */
-        devmap = dasd_find_busid(device->cdev->dev.bus_id);
+        devmap = dasd_find_busid(dev_name(&device->cdev->dev));
         BUG_ON(IS_ERR(devmap));
         spin_lock(&dasd_devmap_lock);
         if (devmap->device != device) {
@@ -674,7 +674,7 @@ dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf)
         struct dasd_devmap *devmap;
         int ro_flag;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         if (!IS_ERR(devmap))
                 ro_flag = (devmap->features & DASD_FEATURE_READONLY) != 0;
         else
@@ -723,7 +723,7 @@ dasd_erplog_show(struct device *dev, struct device_attribute *attr, char *buf)
         struct dasd_devmap *devmap;
         int erplog;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         if (!IS_ERR(devmap))
                 erplog = (devmap->features & DASD_FEATURE_ERPLOG) != 0;
         else
@@ -770,7 +770,7 @@ dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)
         struct dasd_devmap *devmap;
         int use_diag;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         if (!IS_ERR(devmap))
                 use_diag = (devmap->features & DASD_FEATURE_USEDIAG) != 0;
         else
@@ -876,7 +876,7 @@ dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf)
         struct dasd_devmap *devmap;
         int alias;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         spin_lock(&dasd_devmap_lock);
         if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) {
                 spin_unlock(&dasd_devmap_lock);
@@ -899,7 +899,7 @@ dasd_vendor_show(struct device *dev, struct device_attribute *attr, char *buf)
         struct dasd_devmap *devmap;
         char *vendor;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         spin_lock(&dasd_devmap_lock);
         if (!IS_ERR(devmap) && strlen(devmap->uid.vendor) > 0)
                 vendor = devmap->uid.vendor;
@@ -924,7 +924,7 @@ dasd_uid_show(struct device *dev, struct device_attribute *attr, char *buf)
         char ua_string[3];
         struct dasd_uid *uid;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         spin_lock(&dasd_devmap_lock);
         if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) {
                 spin_unlock(&dasd_devmap_lock);
@@ -972,7 +972,7 @@ dasd_eer_show(struct device *dev, struct device_attribute *attr, char *buf)
         struct dasd_devmap *devmap;
         int eer_flag;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         if (!IS_ERR(devmap) && devmap->device)
                 eer_flag = dasd_eer_enabled(devmap->device);
         else
@@ -1034,7 +1034,7 @@ dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid)
 {
         struct dasd_devmap *devmap;
 
-        devmap = dasd_find_busid(cdev->dev.bus_id);
+        devmap = dasd_find_busid(dev_name(&cdev->dev));
         if (IS_ERR(devmap))
                 return PTR_ERR(devmap);
         spin_lock(&dasd_devmap_lock);
@@ -1057,7 +1057,7 @@ dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)
 {
         struct dasd_devmap *devmap;
 
-        devmap = dasd_find_busid(cdev->dev.bus_id);
+        devmap = dasd_find_busid(dev_name(&cdev->dev));
         if (IS_ERR(devmap))
                 return PTR_ERR(devmap);
 
@@ -1077,7 +1077,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature)
 {
         struct dasd_devmap *devmap;
 
-        devmap = dasd_find_busid(cdev->dev.bus_id);
+        devmap = dasd_find_busid(dev_name(&cdev->dev));
         if (IS_ERR(devmap))
                 return PTR_ERR(devmap);
 
@@ -1093,7 +1093,7 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag)
 {
         struct dasd_devmap *devmap;
 
-        devmap = dasd_find_busid(cdev->dev.bus_id);
+        devmap = dasd_find_busid(dev_name(&cdev->dev));
         if (IS_ERR(devmap))
                 return PTR_ERR(devmap);
 
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 773b3fe275b2..49f9d221e23d 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -6,6 +6,8 @@
  *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
+ * EMC Symmetrix ioctl Copyright EMC Corporation, 2008
+ * Author.........: Nigel Hislop <hislop_nigel@emc.com>
  *
  */
 
@@ -84,7 +86,7 @@ dasd_eckd_probe (struct ccw_device *cdev)
         if (ret) {
                 printk(KERN_WARNING
                        "dasd_eckd_probe: could not set ccw-device options "
-                       "for %s\n", cdev->dev.bus_id);
+                       "for %s\n", dev_name(&cdev->dev));
                 return ret;
         }
         ret = dasd_generic_probe(cdev, &dasd_eckd_discipline);
@@ -1501,12 +1503,27 @@ static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,
                 return;
         }
 
-        /* just report other unsolicited interrupts */
-        DEV_MESSAGE(KERN_DEBUG, device, "%s",
-                    "unsolicited interrupt received");
-        device->discipline->dump_sense(device, NULL, irb);
-        dasd_schedule_device_bh(device);
+        if ((irb->scsw.cmd.cc == 1) &&
+            (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
+            (irb->scsw.cmd.actl & SCSW_ACTL_START_PEND) &&
+            (irb->scsw.cmd.stctl & SCSW_STCTL_STATUS_PEND)) {
+                /* fake irb do nothing, they are handled elsewhere */
+                dasd_schedule_device_bh(device);
+                return;
+        }
+
+        if (!(irb->esw.esw0.erw.cons)) {
+                /* just report other unsolicited interrupts */
+                DEV_MESSAGE(KERN_ERR, device, "%s",
+                            "unsolicited interrupt received");
+        } else {
+                DEV_MESSAGE(KERN_ERR, device, "%s",
+                            "unsolicited interrupt received "
+                            "(sense available)");
+                device->discipline->dump_sense(device, NULL, irb);
+        }
 
+        dasd_schedule_device_bh(device);
         return;
 };
 
@@ -2068,6 +2085,103 @@ dasd_eckd_set_attrib(struct dasd_device *device, void __user *argp)
         return 0;
 }
 
+/*
+ * Issue syscall I/O to EMC Symmetrix array.
+ * CCWs are PSF and RSSD
+ */
+static int dasd_symm_io(struct dasd_device *device, void __user *argp)
+{
+        struct dasd_symmio_parms usrparm;
+        char *psf_data, *rssd_result;
+        struct dasd_ccw_req *cqr;
+        struct ccw1 *ccw;
+        int rc;
+
+        /* Copy parms from caller */
+        rc = -EFAULT;
+        if (copy_from_user(&usrparm, argp, sizeof(usrparm)))
+                goto out;
+#ifndef CONFIG_64BIT
+        /* Make sure pointers are sane even on 31 bit. */
+        if ((usrparm.psf_data >> 32) != 0 || (usrparm.rssd_result >> 32) != 0) {
+                rc = -EINVAL;
+                goto out;
+        }
+#endif
+        /* alloc I/O data area */
+        psf_data = kzalloc(usrparm.psf_data_len, GFP_KERNEL | GFP_DMA);
+        rssd_result = kzalloc(usrparm.rssd_result_len, GFP_KERNEL | GFP_DMA);
+        if (!psf_data || !rssd_result) {
+                rc = -ENOMEM;
+                goto out_free;
+        }
+
+        /* get syscall header from user space */
+        rc = -EFAULT;
+        if (copy_from_user(psf_data,
+                           (void __user *)(unsigned long) usrparm.psf_data,
+                           usrparm.psf_data_len))
+                goto out_free;
+
+        /* sanity check on syscall header */
+        if (psf_data[0] != 0x17 && psf_data[1] != 0xce) {
+                rc = -EINVAL;
+                goto out_free;
+        }
+
+        /* setup CCWs for PSF + RSSD */
+        cqr = dasd_smalloc_request("ECKD", 2 , 0, device);
+        if (IS_ERR(cqr)) {
+                DEV_MESSAGE(KERN_WARNING, device, "%s",
+                        "Could not allocate initialization request");
+                rc = PTR_ERR(cqr);
+                goto out_free;
+        }
+
+        cqr->startdev = device;
+        cqr->memdev = device;
+        cqr->retries = 3;
+        cqr->expires = 10 * HZ;
+        cqr->buildclk = get_clock();
+        cqr->status = DASD_CQR_FILLED;
+
+        /* Build the ccws */
+        ccw = cqr->cpaddr;
+
+        /* PSF ccw */
+        ccw->cmd_code = DASD_ECKD_CCW_PSF;
+        ccw->count = usrparm.psf_data_len;
+        ccw->flags |= CCW_FLAG_CC;
+        ccw->cda = (__u32)(addr_t) psf_data;
+
+        ccw++;
+
+        /* RSSD ccw  */
+        ccw->cmd_code = DASD_ECKD_CCW_RSSD;
+        ccw->count = usrparm.rssd_result_len;
+        ccw->flags = CCW_FLAG_SLI ;
+        ccw->cda = (__u32)(addr_t) rssd_result;
+
+        rc = dasd_sleep_on(cqr);
+        if (rc)
+                goto out_sfree;
+
+        rc = -EFAULT;
+        if (copy_to_user((void __user *)(unsigned long) usrparm.rssd_result,
+                           rssd_result, usrparm.rssd_result_len))
+                goto out_sfree;
+        rc = 0;
+
+out_sfree:
+        dasd_sfree_request(cqr, cqr->memdev);
+out_free:
+        kfree(rssd_result);
+        kfree(psf_data);
+out:
+        DBF_DEV_EVENT(DBF_WARNING, device, "Symmetrix ioctl: rc=%d", rc);
+        return rc;
+}
+
 static int
 dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)
 {
@@ -2086,6 +2200,8 @@ dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)
                 return dasd_eckd_reserve(device);
         case BIODASDSLCK:
                 return dasd_eckd_steal_lock(device);
+        case BIODASDSYMMIO:
+                return dasd_symm_io(device, argp);
         default:
                 return -ENOIOCTLCMD;
         }
@@ -2145,13 +2261,13 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
         /* dump the sense data */
         len = sprintf(page,  KERN_ERR PRINTK_HEADER
                       " I/O status report for device %s:\n",
-                      device->cdev->dev.bus_id);
+                      dev_name(&device->cdev->dev));
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
                        irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
-                       device->cdev->dev.bus_id,
+                       dev_name(&device->cdev->dev),
                        (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index bf512ac75b9e..892e2878d61b 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -309,7 +309,8 @@ static void dasd_eer_write_standard_trigger(struct dasd_device *device,
         do_gettimeofday(&tv);
         header.tv_sec = tv.tv_sec;
         header.tv_usec = tv.tv_usec;
-        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
+        strncpy(header.busid, dev_name(&device->cdev->dev),
+                DASD_EER_BUSID_SIZE);
 
         spin_lock_irqsave(&bufferlock, flags);
         list_for_each_entry(eerb, &bufferlist, list) {
@@ -349,7 +350,8 @@ static void dasd_eer_write_snss_trigger(struct dasd_device *device,
         do_gettimeofday(&tv);
         header.tv_sec = tv.tv_sec;
         header.tv_usec = tv.tv_usec;
-        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
+        strncpy(header.busid, dev_name(&device->cdev->dev),
+                DASD_EER_BUSID_SIZE);
 
         spin_lock_irqsave(&bufferlock, flags);
         list_for_each_entry(eerb, &bufferlist, list) {
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index aa0c533423a5..93d9b6452a94 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -451,13 +451,13 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
         }
         len = sprintf(page, KERN_ERR PRINTK_HEADER
                       " I/O status report for device %s:\n",
-                      device->cdev->dev.bus_id);
+                      dev_name(&device->cdev->dev));
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
                        irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
-                       device->cdev->dev.bus_id,
+                       dev_name(&device->cdev->dev),
                        (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 31ecaa4a40e4..489d5fe488fb 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -126,7 +126,7 @@ do { \
 #define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\
 do { \
         printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \
-               d_device->cdev->dev.bus_id, d_args); \
+               dev_name(&d_device->cdev->dev), d_args); \
         DBF_DEV_EVENT(DBF_ALERT, d_device, d_string, d_args); \
 } while(0)
 
@@ -140,7 +140,7 @@ do { \
 #define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\
 do { \
         printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \
-               d_device->cdev->dev.bus_id, d_args); \
+               dev_name(&d_device->cdev->dev), d_args); \
 } while(0)
 
 #define MESSAGE_LOG(d_loglevel,d_string,d_args...)\
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 03c0e40a92ff..9088de84b45d 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -67,7 +67,7 @@ dasd_devices_show(struct seq_file *m, void *v)
                 return 0;
         }
         /* Print device number. */
-        seq_printf(m, "%s", device->cdev->dev.bus_id);
+        seq_printf(m, "%s", dev_name(&device->cdev->dev));
         /* Print discipline string. */
         if (device != NULL && device->discipline != NULL)
                 seq_printf(m, "(%s)", device->discipline->name);
@@ -76,7 +76,8 @@ dasd_devices_show(struct seq_file *m, void *v)
         /* Print kdev. */
         if (block->gdp)
                 seq_printf(m, " at (%3d:%6d)",
-                           block->gdp->major, block->gdp->first_minor);
+                           MAJOR(disk_devt(block->gdp)),
+                           MINOR(disk_devt(block->gdp)));
         else
                 seq_printf(m, "  at (???:??????)");
         /* Print device name. */
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 711b3004b3e6..a7ff167d5b81 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -31,7 +31,6 @@
 #define PRINT_WARN(x...)  printk(KERN_WARNING DCSSBLK_NAME " warning: " x)
 #define PRINT_ERR(x...)   printk(KERN_ERR DCSSBLK_NAME " error: " x)
 
-
 static int dcssblk_open(struct inode *inode, struct file *filp);
 static int dcssblk_release(struct inode *inode, struct file *filp);
 static int dcssblk_make_request(struct request_queue *q, struct bio *bio);
@@ -48,6 +47,30 @@ static struct block_device_operations dcssblk_devops = {
         .direct_access  = dcssblk_direct_access,
 };
 
+struct dcssblk_dev_info {
+        struct list_head lh;
+        struct device dev;
+        char segment_name[BUS_ID_SIZE];
+        atomic_t use_count;
+        struct gendisk *gd;
+        unsigned long start;
+        unsigned long end;
+        int segment_type;
+        unsigned char save_pending;
+        unsigned char is_shared;
+        struct request_queue *dcssblk_queue;
+        int num_of_segments;
+        struct list_head seg_list;
+};
+
+struct segment_info {
+        struct list_head lh;
+        char segment_name[BUS_ID_SIZE];
+        unsigned long start;
+        unsigned long end;
+        int segment_type;
+};
+
 static ssize_t dcssblk_add_store(struct device * dev, struct device_attribute *attr, const char * buf,
                                   size_t count);
 static ssize_t dcssblk_remove_store(struct device * dev, struct device_attribute *attr, const char * buf,
@@ -58,30 +81,20 @@ static ssize_t dcssblk_save_show(struct device *dev, struct device_attribute *at
 static ssize_t dcssblk_shared_store(struct device * dev, struct device_attribute *attr, const char * buf,
                                   size_t count);
 static ssize_t dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf);
+static ssize_t dcssblk_seglist_show(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf);
 
 static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store);
 static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store);
-static DEVICE_ATTR(save, S_IWUSR | S_IRUGO, dcssblk_save_show,
+static DEVICE_ATTR(save, S_IWUSR | S_IRUSR, dcssblk_save_show,
                    dcssblk_save_store);
-static DEVICE_ATTR(shared, S_IWUSR | S_IRUGO, dcssblk_shared_show,
+static DEVICE_ATTR(shared, S_IWUSR | S_IRUSR, dcssblk_shared_show,
                    dcssblk_shared_store);
+static DEVICE_ATTR(seglist, S_IRUSR, dcssblk_seglist_show, NULL);
 
 static struct device *dcssblk_root_dev;
 
-struct dcssblk_dev_info {
-        struct list_head lh;
-        struct device dev;
-        char segment_name[BUS_ID_SIZE];
-        atomic_t use_count;
-        struct gendisk *gd;
-        unsigned long start;
-        unsigned long end;
-        int segment_type;
-        unsigned char save_pending;
-        unsigned char is_shared;
-        struct request_queue *dcssblk_queue;
-};
-
 static LIST_HEAD(dcssblk_devices);
 static struct rw_semaphore dcssblk_devices_sem;
 
@@ -91,8 +104,15 @@ static struct rw_semaphore dcssblk_devices_sem;
 static void
 dcssblk_release_segment(struct device *dev)
 {
-        PRINT_DEBUG("segment release fn called for %s\n", dev->bus_id);
-        kfree(container_of(dev, struct dcssblk_dev_info, dev));
+        struct dcssblk_dev_info *dev_info;
+        struct segment_info *entry, *temp;
+
+        dev_info = container_of(dev, struct dcssblk_dev_info, dev);
+        list_for_each_entry_safe(entry, temp, &dev_info->seg_list, lh) {
+                list_del(&entry->lh);
+                kfree(entry);
+        }
+        kfree(dev_info);
         module_put(THIS_MODULE);
 }
 
@@ -114,7 +134,7 @@ dcssblk_assign_free_minor(struct dcssblk_dev_info *dev_info)
                 found = 0;
                 // test if minor available
                 list_for_each_entry(entry, &dcssblk_devices, lh)
-                        if (minor == entry->gd->first_minor)
+                        if (minor == MINOR(disk_devt(entry->gd)))
                                 found++;
                 if (!found) break; // got unused minor
         }
@@ -142,6 +162,169 @@ dcssblk_get_device_by_name(char *name)
         return NULL;
 }
 
+/*
+ * get the struct segment_info from seg_list
+ * for the given name.
+ * down_read(&dcssblk_devices_sem) must be held.
+ */
+static struct segment_info *
+dcssblk_get_segment_by_name(char *name)
+{
+        struct dcssblk_dev_info *dev_info;
+        struct segment_info *entry;
+
+        list_for_each_entry(dev_info, &dcssblk_devices, lh) {
+                list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                        if (!strcmp(name, entry->segment_name))
+                                return entry;
+                }
+        }
+        return NULL;
+}
+
+/*
+ * get the highest address of the multi-segment block.
+ */
+static unsigned long
+dcssblk_find_highest_addr(struct dcssblk_dev_info *dev_info)
+{
+        unsigned long highest_addr;
+        struct segment_info *entry;
+
+        highest_addr = 0;
+        list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                if (highest_addr < entry->end)
+                        highest_addr = entry->end;
+        }
+        return highest_addr;
+}
+
+/*
+ * get the lowest address of the multi-segment block.
+ */
+static unsigned long
+dcssblk_find_lowest_addr(struct dcssblk_dev_info *dev_info)
+{
+        int set_first;
+        unsigned long lowest_addr;
+        struct segment_info *entry;
+
+        set_first = 0;
+        lowest_addr = 0;
+        list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                if (set_first == 0) {
+                        lowest_addr = entry->start;
+                        set_first = 1;
+                } else {
+                        if (lowest_addr > entry->start)
+                                lowest_addr = entry->start;
+                }
+        }
+        return lowest_addr;
+}
+
+/*
+ * Check continuity of segments.
+ */
+static int
+dcssblk_is_continuous(struct dcssblk_dev_info *dev_info)
+{
+        int i, j, rc;
+        struct segment_info *sort_list, *entry, temp;
+
+        if (dev_info->num_of_segments <= 1)
+                return 0;
+
+        sort_list = kzalloc(
+                        sizeof(struct segment_info) * dev_info->num_of_segments,
+                        GFP_KERNEL);
+        if (sort_list == NULL)
+                return -ENOMEM;
+        i = 0;
+        list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                memcpy(&sort_list[i], entry, sizeof(struct segment_info));
+                i++;
+        }
+
+        /* sort segments */
+        for (i = 0; i < dev_info->num_of_segments; i++)
+                for (j = 0; j < dev_info->num_of_segments; j++)
+                        if (sort_list[j].start > sort_list[i].start) {
+                                memcpy(&temp, &sort_list[i],
+                                        sizeof(struct segment_info));
+                                memcpy(&sort_list[i], &sort_list[j],
+                                        sizeof(struct segment_info));
+                                memcpy(&sort_list[j], &temp,
+                                        sizeof(struct segment_info));
+                        }
+
+        /* check continuity */
+        for (i = 0; i < dev_info->num_of_segments - 1; i++) {
+                if ((sort_list[i].end + 1) != sort_list[i+1].start) {
+                        PRINT_ERR("Segment %s is not contiguous with "
+                                "segment %s\n",
+                                sort_list[i].segment_name,
+                                sort_list[i+1].segment_name);
+                        rc = -EINVAL;
+                        goto out;
+                }
+                /* EN and EW are allowed in a block device */
+                if (sort_list[i].segment_type != sort_list[i+1].segment_type) {
+                        if (!(sort_list[i].segment_type & SEGMENT_EXCLUSIVE) ||
+                                (sort_list[i].segment_type == SEG_TYPE_ER) ||
+                                !(sort_list[i+1].segment_type &
+                                SEGMENT_EXCLUSIVE) ||
+                                (sort_list[i+1].segment_type == SEG_TYPE_ER)) {
+                                PRINT_ERR("Segment %s has different type from "
+                                        "segment %s\n",
+                                        sort_list[i].segment_name,
+                                        sort_list[i+1].segment_name);
+                                rc = -EINVAL;
+                                goto out;
+                        }
+                }
+        }
+        rc = 0;
+out:
+        kfree(sort_list);
+        return rc;
+}
+
+/*
+ * Load a segment
+ */
+static int
+dcssblk_load_segment(char *name, struct segment_info **seg_info)
+{
+        int rc;
+
+        /* already loaded? */
+        down_read(&dcssblk_devices_sem);
+        *seg_info = dcssblk_get_segment_by_name(name);
+        up_read(&dcssblk_devices_sem);
+        if (*seg_info != NULL)
+                return -EEXIST;
+
+        /* get a struct segment_info */
+        *seg_info = kzalloc(sizeof(struct segment_info), GFP_KERNEL);
+        if (*seg_info == NULL)
+                return -ENOMEM;
+
+        strcpy((*seg_info)->segment_name, name);
+
+        /* load the segment */
+        rc = segment_load(name, SEGMENT_SHARED,
+                        &(*seg_info)->start, &(*seg_info)->end);
+        if (rc < 0) {
+                segment_warning(rc, (*seg_info)->segment_name);
+                kfree(*seg_info);
+        } else {
+                INIT_LIST_HEAD(&(*seg_info)->lh);
+                (*seg_info)->segment_type = rc;
+        }
+        return rc;
+}
+
 static void dcssblk_unregister_callback(struct device *dev)
 {
         device_unregister(dev);
@@ -165,6 +348,7 @@ static ssize_t
 dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)
 {
         struct dcssblk_dev_info *dev_info;
+        struct segment_info *entry, *temp;
         int rc;
 
         if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0'))
@@ -172,46 +356,46 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch
         down_write(&dcssblk_devices_sem);
         dev_info = container_of(dev, struct dcssblk_dev_info, dev);
         if (atomic_read(&dev_info->use_count)) {
-                PRINT_ERR("share: segment %s is busy!\n",
-                          dev_info->segment_name);
                 rc = -EBUSY;
                 goto out;
         }
         if (inbuf[0] == '1') {
-                // reload segment in shared mode
-                rc = segment_modify_shared(dev_info->segment_name,
-                                           SEGMENT_SHARED);
-                if (rc < 0) {
-                        BUG_ON(rc == -EINVAL);
-                        if (rc != -EAGAIN)
-                                goto removeseg;
-                } else {
-                        dev_info->is_shared = 1;
-                        switch (dev_info->segment_type) {
-                                case SEG_TYPE_SR:
-                                case SEG_TYPE_ER:
-                                case SEG_TYPE_SC:
-                                        set_disk_ro(dev_info->gd,1);
+                /* reload segments in shared mode */
+                list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                        rc = segment_modify_shared(entry->segment_name,
+                                                SEGMENT_SHARED);
+                        if (rc < 0) {
+                                BUG_ON(rc == -EINVAL);
+                                if (rc != -EAGAIN)
+                                        goto removeseg;
                         }
                 }
+                dev_info->is_shared = 1;
+                switch (dev_info->segment_type) {
+                case SEG_TYPE_SR:
+                case SEG_TYPE_ER:
+                case SEG_TYPE_SC:
+                        set_disk_ro(dev_info->gd, 1);
+                }
         } else if (inbuf[0] == '0') {
-                // reload segment in exclusive mode
+                /* reload segments in exclusive mode */
                 if (dev_info->segment_type == SEG_TYPE_SC) {
                         PRINT_ERR("Segment type SC (%s) cannot be loaded in "
-                                  "non-shared mode\n", dev_info->segment_name);
+                                "non-shared mode\n", dev_info->segment_name);
                         rc = -EINVAL;
                         goto out;
                 }
-                rc = segment_modify_shared(dev_info->segment_name,
-                                           SEGMENT_EXCLUSIVE);
-                if (rc < 0) {
-                        BUG_ON(rc == -EINVAL);
-                        if (rc != -EAGAIN)
-                                goto removeseg;
-                } else {
-                        dev_info->is_shared = 0;
-                        set_disk_ro(dev_info->gd, 0);
+                list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                        rc = segment_modify_shared(entry->segment_name,
+                                                   SEGMENT_EXCLUSIVE);
+                        if (rc < 0) {
+                                BUG_ON(rc == -EINVAL);
+                                if (rc != -EAGAIN)
+                                        goto removeseg;
+                        }
                 }
+                dev_info->is_shared = 0;
+                set_disk_ro(dev_info->gd, 0);
         } else {
                 rc = -EINVAL;
                 goto out;
@@ -220,8 +404,14 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch
         goto out;
 
 removeseg:
-        PRINT_ERR("Could not reload segment %s, removing it now!\n",
-                        dev_info->segment_name);
+        PRINT_ERR("Could not reload segment(s) of the device %s, removing "
+                "segment(s) now!\n",
+                dev_info->segment_name);
+        temp = entry;
+        list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                if (entry != temp)
+                        segment_unload(entry->segment_name);
+        }
         list_del(&dev_info->lh);
 
         del_gendisk(dev_info->gd);
@@ -254,6 +444,7 @@ static ssize_t
 dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)
 {
         struct dcssblk_dev_info *dev_info;
+        struct segment_info *entry;
 
         if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0'))
                 return -EINVAL;
@@ -263,14 +454,16 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char
         if (inbuf[0] == '1') {
                 if (atomic_read(&dev_info->use_count) == 0) {
                         // device is idle => we save immediately
-                        PRINT_INFO("Saving segment %s\n",
+                        PRINT_INFO("Saving segment(s) of the device %s\n",
                                    dev_info->segment_name);
-                        segment_save(dev_info->segment_name);
+                        list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                                segment_save(entry->segment_name);
+                        }
                 }  else {
                         // device is busy => we save it when it becomes
                         // idle in dcssblk_release
-                        PRINT_INFO("Segment %s is currently busy, it will "
-                                   "be saved when it becomes idle...\n",
+                        PRINT_INFO("Device %s is currently busy, segment(s) "
+                                   "will be saved when it becomes idle...\n",
                                    dev_info->segment_name);
                         dev_info->save_pending = 1;
                 }
@@ -279,7 +472,8 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char
                         // device is busy & the user wants to undo his save
                         // request
                         dev_info->save_pending = 0;
-                        PRINT_INFO("Pending save for segment %s deactivated\n",
+                        PRINT_INFO("Pending save for segment(s) of the device "
+                                        "%s deactivated\n",
                                         dev_info->segment_name);
                 }
         } else {
@@ -291,66 +485,123 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char
 }
 
 /*
+ * device attribute for showing all segments in a device
+ */
+static ssize_t
+dcssblk_seglist_show(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        int i;
+
+        struct dcssblk_dev_info *dev_info;
+        struct segment_info *entry;
+
+        down_read(&dcssblk_devices_sem);
+        dev_info = container_of(dev, struct dcssblk_dev_info, dev);
+        i = 0;
+        buf[0] = '\0';
+        list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                strcpy(&buf[i], entry->segment_name);
+                i += strlen(entry->segment_name);
+                buf[i] = '\n';
+                i++;
+        }
+        up_read(&dcssblk_devices_sem);
+        return i;
+}
+
+/*
  * device attribute for adding devices
  */
 static ssize_t
 dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        int rc, i;
+        int rc, i, j, num_of_segments;
         struct dcssblk_dev_info *dev_info;
+        struct segment_info *seg_info, *temp;
         char *local_buf;
         unsigned long seg_byte_size;
 
         dev_info = NULL;
+        seg_info = NULL;
         if (dev != dcssblk_root_dev) {
                 rc = -EINVAL;
                 goto out_nobuf;
         }
+        if ((count < 1) || (buf[0] == '\0') || (buf[0] == '\n')) {
+                rc = -ENAMETOOLONG;
+                goto out_nobuf;
+        }
+
         local_buf = kmalloc(count + 1, GFP_KERNEL);
         if (local_buf == NULL) {
                 rc = -ENOMEM;
                 goto out_nobuf;
         }
+
         /*
          * parse input
          */
+        num_of_segments = 0;
         for (i = 0; ((buf[i] != '\0') && (buf[i] != '\n') && i < count); i++) {
-                local_buf[i] = toupper(buf[i]);
+                for (j = i; (buf[j] != ':') &&
+                        (buf[j] != '\0') &&
+                        (buf[j] != '\n') &&
+                        j < count; j++) {
+                        local_buf[j-i] = toupper(buf[j]);
+                }
+                local_buf[j-i] = '\0';
+                if (((j - i) == 0) || ((j - i) > 8)) {
+                        rc = -ENAMETOOLONG;
+                        goto seg_list_del;
+                }
+
+                rc = dcssblk_load_segment(local_buf, &seg_info);
+                if (rc < 0)
+                        goto seg_list_del;
+                /*
+                 * get a struct dcssblk_dev_info
+                 */
+                if (num_of_segments == 0) {
+                        dev_info = kzalloc(sizeof(struct dcssblk_dev_info),
+                                        GFP_KERNEL);
+                        if (dev_info == NULL) {
+                                rc = -ENOMEM;
+                                goto out;
+                        }
+                        strcpy(dev_info->segment_name, local_buf);
+                        dev_info->segment_type = seg_info->segment_type;
+                        INIT_LIST_HEAD(&dev_info->seg_list);
+                }
+                list_add_tail(&seg_info->lh, &dev_info->seg_list);
+                num_of_segments++;
+                i = j;
+
+                if ((buf[j] == '\0') || (buf[j] == '\n'))
+                        break;
         }
-        local_buf[i] = '\0';
-        if ((i == 0) || (i > 8)) {
+
+        /* no trailing colon at the end of the input */
+        if ((i > 0) && (buf[i-1] == ':')) {
                 rc = -ENAMETOOLONG;
-                goto out;
-        }
-        /*
-         * already loaded?
-         */
-        down_read(&dcssblk_devices_sem);
-        dev_info = dcssblk_get_device_by_name(local_buf);
-        up_read(&dcssblk_devices_sem);
-        if (dev_info != NULL) {
-                PRINT_WARN("Segment %s already loaded!\n", local_buf);
-                rc = -EEXIST;
-                goto out;
-        }
-        /*
-         * get a struct dcssblk_dev_info
-         */
-        dev_info = kzalloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);
-        if (dev_info == NULL) {
-                rc = -ENOMEM;
-                goto out;
+                goto seg_list_del;
         }
+        strlcpy(local_buf, buf, i + 1);
+        dev_info->num_of_segments = num_of_segments;
+        rc = dcssblk_is_continuous(dev_info);
+        if (rc < 0)
+                goto seg_list_del;
+
+        dev_info->start = dcssblk_find_lowest_addr(dev_info);
+        dev_info->end = dcssblk_find_highest_addr(dev_info);
 
-        strcpy(dev_info->segment_name, local_buf);
-        strlcpy(dev_info->dev.bus_id, local_buf, BUS_ID_SIZE);
+        dev_set_name(&dev_info->dev, dev_info->segment_name);
         dev_info->dev.release = dcssblk_release_segment;
         INIT_LIST_HEAD(&dev_info->lh);
-
         dev_info->gd = alloc_disk(DCSSBLK_MINORS_PER_DISK);
         if (dev_info->gd == NULL) {
                 rc = -ENOMEM;
-                goto free_dev_info;
+                goto seg_list_del;
         }
         dev_info->gd->major = dcssblk_major;
         dev_info->gd->fops = &dcssblk_devops;
@@ -360,59 +611,43 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         dev_info->gd->driverfs_dev = &dev_info->dev;
         blk_queue_make_request(dev_info->dcssblk_queue, dcssblk_make_request);
         blk_queue_hardsect_size(dev_info->dcssblk_queue, 4096);
-        /*
-         * load the segment
-         */
-        rc = segment_load(local_buf, SEGMENT_SHARED,
-                                &dev_info->start, &dev_info->end);
-        if (rc < 0) {
-                segment_warning(rc, dev_info->segment_name);
-                goto dealloc_gendisk;
-        }
+
         seg_byte_size = (dev_info->end - dev_info->start + 1);
         set_capacity(dev_info->gd, seg_byte_size >> 9); // size in sectors
-        PRINT_INFO("Loaded segment %s, size = %lu Byte, "
+        PRINT_INFO("Loaded segment(s) %s, size = %lu Byte, "
                    "capacity = %lu (512 Byte) sectors\n", local_buf,
                    seg_byte_size, seg_byte_size >> 9);
 
-        dev_info->segment_type = rc;
         dev_info->save_pending = 0;
         dev_info->is_shared = 1;
         dev_info->dev.parent = dcssblk_root_dev;
 
         /*
-         * get minor, add to list
+         *get minor, add to list
          */
         down_write(&dcssblk_devices_sem);
-        if (dcssblk_get_device_by_name(local_buf)) {
-                up_write(&dcssblk_devices_sem);
+        if (dcssblk_get_segment_by_name(local_buf)) {
                 rc = -EEXIST;
-                goto unload_seg;
+                goto release_gd;
         }
         rc = dcssblk_assign_free_minor(dev_info);
-        if (rc) {
-                up_write(&dcssblk_devices_sem);
-                PRINT_ERR("No free minor number available! "
-                          "Unloading segment...\n");
-                goto unload_seg;
-        }
+        if (rc)
+                goto release_gd;
         sprintf(dev_info->gd->disk_name, "dcssblk%d",
-                dev_info->gd->first_minor);
+                MINOR(disk_devt(dev_info->gd)));
         list_add_tail(&dev_info->lh, &dcssblk_devices);
 
         if (!try_module_get(THIS_MODULE)) {
                 rc = -ENODEV;
-                goto list_del;
+                goto dev_list_del;
         }
         /*
          * register the device
          */
         rc = device_register(&dev_info->dev);
         if (rc) {
-                PRINT_ERR("Segment %s could not be registered RC=%d\n",
-                                local_buf, rc);
                 module_put(THIS_MODULE);
-                goto list_del;
+                goto dev_list_del;
         }
         get_device(&dev_info->dev);
         rc = device_create_file(&dev_info->dev, &dev_attr_shared);
@@ -421,6 +656,9 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         rc = device_create_file(&dev_info->dev, &dev_attr_save);
         if (rc)
                 goto unregister_dev;
+        rc = device_create_file(&dev_info->dev, &dev_attr_seglist);
+        if (rc)
+                goto unregister_dev;
 
         add_disk(dev_info->gd);
 
@@ -434,7 +672,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
                         set_disk_ro(dev_info->gd,0);
                         break;
         }
-        PRINT_DEBUG("Segment %s loaded successfully\n", local_buf);
         up_write(&dcssblk_devices_sem);
         rc = count;
         goto out;
@@ -445,20 +682,27 @@ unregister_dev:
         dev_info->gd->queue = NULL;
         put_disk(dev_info->gd);
         device_unregister(&dev_info->dev);
-        segment_unload(dev_info->segment_name);
+        list_for_each_entry(seg_info, &dev_info->seg_list, lh) {
+                segment_unload(seg_info->segment_name);
+        }
         put_device(&dev_info->dev);
         up_write(&dcssblk_devices_sem);
         goto out;
-list_del:
+dev_list_del:
         list_del(&dev_info->lh);
-        up_write(&dcssblk_devices_sem);
-unload_seg:
-        segment_unload(local_buf);
-dealloc_gendisk:
+release_gd:
         blk_cleanup_queue(dev_info->dcssblk_queue);
         dev_info->gd->queue = NULL;
         put_disk(dev_info->gd);
-free_dev_info:
+        up_write(&dcssblk_devices_sem);
+seg_list_del:
+        if (dev_info == NULL)
+                goto out;
+        list_for_each_entry_safe(seg_info, temp, &dev_info->seg_list, lh) {
+                list_del(&seg_info->lh);
+                segment_unload(seg_info->segment_name);
+                kfree(seg_info);
+        }
         kfree(dev_info);
 out:
         kfree(local_buf);
@@ -473,6 +717,7 @@ static ssize_t
 dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct dcssblk_dev_info *dev_info;
+        struct segment_info *entry;
         int rc, i;
         char *local_buf;
 
@@ -499,26 +744,28 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch
         dev_info = dcssblk_get_device_by_name(local_buf);
         if (dev_info == NULL) {
                 up_write(&dcssblk_devices_sem);
-                PRINT_WARN("Segment %s is not loaded!\n", local_buf);
+                PRINT_WARN("Device %s is not loaded!\n", local_buf);
                 rc = -ENODEV;
                 goto out_buf;
         }
         if (atomic_read(&dev_info->use_count) != 0) {
                 up_write(&dcssblk_devices_sem);
-                PRINT_WARN("Segment %s is in use!\n", local_buf);
+                PRINT_WARN("Device %s is in use!\n", local_buf);
                 rc = -EBUSY;
                 goto out_buf;
         }
-        list_del(&dev_info->lh);
 
+        list_del(&dev_info->lh);
         del_gendisk(dev_info->gd);
         blk_cleanup_queue(dev_info->dcssblk_queue);
         dev_info->gd->queue = NULL;
         put_disk(dev_info->gd);
         device_unregister(&dev_info->dev);
-        segment_unload(dev_info->segment_name);
-        PRINT_DEBUG("Segment %s unloaded successfully\n",
-                        dev_info->segment_name);
+
+        /* unload all related segments */
+        list_for_each_entry(entry, &dev_info->seg_list, lh)
+                segment_unload(entry->segment_name);
+
         put_device(&dev_info->dev);
         up_write(&dcssblk_devices_sem);
 
@@ -550,6 +797,7 @@ static int
 dcssblk_release(struct inode *inode, struct file *filp)
 {
         struct dcssblk_dev_info *dev_info;
+        struct segment_info *entry;
         int rc;
 
         dev_info = inode->i_bdev->bd_disk->private_data;
@@ -560,9 +808,11 @@ dcssblk_release(struct inode *inode, struct file *filp)
         down_write(&dcssblk_devices_sem);
         if (atomic_dec_and_test(&dev_info->use_count)
             && (dev_info->save_pending)) {
-                PRINT_INFO("Segment %s became idle and is being saved now\n",
+                PRINT_INFO("Device %s became idle and is being saved now\n",
                             dev_info->segment_name);
-                segment_save(dev_info->segment_name);
+                list_for_each_entry(entry, &dev_info->seg_list, lh) {
+                        segment_save(entry->segment_name);
+                }
                 dev_info->save_pending = 0;
         }
         up_write(&dcssblk_devices_sem);
@@ -602,7 +852,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
                 case SEG_TYPE_SC:
                         /* cannot write to these segments */
                         if (bio_data_dir(bio) == WRITE) {
-                                PRINT_WARN("rejecting write to ro segment %s\n", dev_info->dev.bus_id);
+                                PRINT_WARN("rejecting write to ro device %s\n",
+                                           dev_name(&dev_info->dev));
                                 goto fail;
                         }
                 }
@@ -657,7 +908,7 @@ static void
 dcssblk_check_params(void)
 {
         int rc, i, j, k;
-        char buf[9];
+        char buf[DCSSBLK_PARM_LEN + 1];
         struct dcssblk_dev_info *dev_info;
 
         for (i = 0; (i < DCSSBLK_PARM_LEN) && (dcssblk_segments[i] != '\0');
@@ -665,15 +916,16 @@ dcssblk_check_params(void)
                 for (j = i; (dcssblk_segments[j] != ',')  &&
                             (dcssblk_segments[j] != '\0') &&
                             (dcssblk_segments[j] != '(')  &&
-                            (j - i) < 8; j++)
+                            (j < DCSSBLK_PARM_LEN); j++)
                 {
                         buf[j-i] = dcssblk_segments[j];
                 }
                 buf[j-i] = '\0';
                 rc = dcssblk_add_store(dcssblk_root_dev, NULL, buf, j-i);
                 if ((rc >= 0) && (dcssblk_segments[j] == '(')) {
-                        for (k = 0; buf[k] != '\0'; k++)
+                        for (k = 0; (buf[k] != ':') && (buf[k] != '\0'); k++)
                                 buf[k] = toupper(buf[k]);
+                        buf[k] = '\0';
                         if (!strncmp(&dcssblk_segments[j], "(local)", 7)) {
                                 down_read(&dcssblk_devices_sem);
                                 dev_info = dcssblk_get_device_by_name(buf);
@@ -740,10 +992,12 @@ module_exit(dcssblk_exit);
 
 module_param_string(segments, dcssblk_segments, DCSSBLK_PARM_LEN, 0444);
 MODULE_PARM_DESC(segments, "Name of DCSS segment(s) to be loaded, "
-                 "comma-separated list, each name max. 8 chars.\n"
-                 "Adding \"(local)\" to segment name equals echoing 0 to "
-                 "/sys/devices/dcssblk/<segment name>/shared after loading "
-                 "the segment - \n"
-                 "e.g. segments=\"mydcss1,mydcss2,mydcss3(local)\"");
+                 "comma-separated list, names in each set separated "
+                 "by commas are separated by colons, each set contains "
+                 "names of contiguous segments and each name max. 8 chars.\n"
+                 "Adding \"(local)\" to the end of each set equals echoing 0 "
+                 "to /sys/devices/dcssblk/<device name>/shared after loading "
+                 "the contiguous segments - \n"
+                 "e.g. segments=\"mydcss1,mydcss2:mydcss3,mydcss4(local)\"");
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index dd9b986389a2..03916989ed2d 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -56,6 +56,7 @@ typedef struct {
 static xpram_device_t xpram_devices[XPRAM_MAX_DEVS];
 static unsigned int xpram_sizes[XPRAM_MAX_DEVS];
 static struct gendisk *xpram_disks[XPRAM_MAX_DEVS];
+static struct request_queue *xpram_queues[XPRAM_MAX_DEVS];
 static unsigned int xpram_pages;
 static int xpram_devs;
 
@@ -330,18 +331,22 @@ static int __init xpram_setup_sizes(unsigned long pages)
         return 0;
 }
 
-static struct request_queue *xpram_queue;
-
 static int __init xpram_setup_blkdev(void)
 {
         unsigned long offset;
         int i, rc = -ENOMEM;
 
         for (i = 0; i < xpram_devs; i++) {
-                struct gendisk *disk = alloc_disk(1);
-                if (!disk)
+                xpram_disks[i] = alloc_disk(1);
+                if (!xpram_disks[i])
+                        goto out;
+                xpram_queues[i] = blk_alloc_queue(GFP_KERNEL);
+                if (!xpram_queues[i]) {
+                        put_disk(xpram_disks[i]);
                         goto out;
-                xpram_disks[i] = disk;
+                }
+                blk_queue_make_request(xpram_queues[i], xpram_make_request);
+                blk_queue_hardsect_size(xpram_queues[i], 4096);
         }
 
         /*
@@ -352,18 +357,6 @@ static int __init xpram_setup_blkdev(void)
                 goto out;
 
         /*
-         * Assign the other needed values: make request function, sizes and
-         * hardsect size. All the minor devices feature the same value.
-         */
-        xpram_queue = blk_alloc_queue(GFP_KERNEL);
-        if (!xpram_queue) {
-                rc = -ENOMEM;
-                goto out_unreg;
-        }
-        blk_queue_make_request(xpram_queue, xpram_make_request);
-        blk_queue_hardsect_size(xpram_queue, 4096);
-
-        /*
          * Setup device structures.
          */
         offset = 0;
@@ -377,18 +370,18 @@ static int __init xpram_setup_blkdev(void)
                 disk->first_minor = i;
                 disk->fops = &xpram_devops;
                 disk->private_data = &xpram_devices[i];
-                disk->queue = xpram_queue;
+                disk->queue = xpram_queues[i];
                 sprintf(disk->disk_name, "slram%d", i);
                 set_capacity(disk, xpram_sizes[i] << 1);
                 add_disk(disk);
         }
 
         return 0;
-out_unreg:
-        unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);
 out:
-        while (i--)
+        while (i--) {
+                blk_cleanup_queue(xpram_queues[i]);
                 put_disk(xpram_disks[i]);
+        }
         return rc;
 }
 
@@ -400,10 +393,10 @@ static void __exit xpram_exit(void)
         int i;
         for (i = 0; i < xpram_devs; i++) {
                 del_gendisk(xpram_disks[i]);
+                blk_cleanup_queue(xpram_queues[i]);
                 put_disk(xpram_disks[i]);
         }
         unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);
-        blk_cleanup_queue(xpram_queue);
 }
 
 static int __init xpram_init(void)
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index d3ec9b55ab35..9ab06e0dad40 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -21,6 +21,7 @@
 #include <linux/console.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
+#include <linux/reboot.h>
 
 #include <linux/slab.h>
 #include <linux/bootmem.h>
@@ -88,7 +89,6 @@ struct raw3215_info {
         int count;                    /* number of bytes in output buffer */
         int written;                  /* number of bytes in write requests */
         struct tty_struct *tty;       /* pointer to tty structure if present */
-        struct tasklet_struct tasklet;
         struct raw3215_req *queued_read; /* pointer to queued read requests */
         struct raw3215_req *queued_write;/* pointer to queued write requests */
         wait_queue_head_t empty_wait; /* wait queue for flushing */
@@ -341,21 +341,14 @@ raw3215_try_io(struct raw3215_info *raw)
 }
 
 /*
- * The bottom half handler routine for 3215 devices. It tries to start
- * the next IO and wakes up processes waiting on the tty.
+ * Try to start the next IO and wake up processes waiting on the tty.
  */
-static void
-raw3215_tasklet(void *data)
+static void raw3215_next_io(struct raw3215_info *raw)
 {
-        struct raw3215_info *raw;
         struct tty_struct *tty;
-        unsigned long flags;
 
-        raw = (struct raw3215_info *) data;
-        spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
         raw3215_mk_write_req(raw);
         raw3215_try_io(raw);
-        spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
         tty = raw->tty;
         if (tty != NULL &&
             RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
@@ -380,7 +373,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         cstat = irb->scsw.cmd.cstat;
         dstat = irb->scsw.cmd.dstat;
         if (cstat != 0)
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
         if (dstat & 0x01) { /* we got a unit exception */
                 dstat &= ~0x01;  /* we can ignore it */
         }
@@ -390,7 +383,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         break;
                 /* Attention interrupt, someone hit the enter key */
                 raw3215_mk_read_req(raw);
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
                 break;
         case 0x08:
         case 0x0C:
@@ -448,7 +441,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                     raw->queued_read == NULL) {
                         wake_up_interruptible(&raw->empty_wait);
                 }
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
                 break;
         default:
                 /* Strange interrupt, I'll do my best to clean up */
@@ -460,7 +453,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         raw->flags &= ~RAW3215_WORKING;
                         raw3215_free_req(req);
                 }
-                tasklet_schedule(&raw->tasklet);
+                raw3215_next_io(raw);
         }
         return;
 }
@@ -674,9 +667,6 @@ raw3215_probe (struct ccw_device *cdev)
                 kfree(raw);
                 return -ENOMEM;
         }
-        tasklet_init(&raw->tasklet,
-                     (void (*)(unsigned long)) raw3215_tasklet,
-                     (unsigned long) raw);
         init_waitqueue_head(&raw->empty_wait);
 
         cdev->dev.driver_data = raw;
@@ -775,11 +765,11 @@ static struct tty_driver *con3215_device(struct console *c, int *index)
 }
 
 /*
- * panic() calls console_unblank before the system enters a
- * disabled, endless loop.
+ * panic() calls con3215_flush through a panic_notifier
+ * before the system enters a disabled, endless loop.
  */
 static void
-con3215_unblank(void)
+con3215_flush(void)
 {
         struct raw3215_info *raw;
         unsigned long flags;
@@ -790,6 +780,23 @@ con3215_unblank(void)
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
 }
 
+static int con3215_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
+{
+        con3215_flush();
+        return NOTIFY_OK;
+}
+
+static struct notifier_block on_panic_nb = {
+        .notifier_call = con3215_notify,
+        .priority = 0,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = con3215_notify,
+        .priority = 0,
+};
+
 /*
  *  The console structure for the 3215 console
  */
@@ -797,7 +804,6 @@ static struct console con3215 = {
         .name    = "ttyS",
         .write   = con3215_write,
         .device  = con3215_device,
-        .unblank = con3215_unblank,
         .flags   = CON_PRINTBUFFER,
 };
 
@@ -846,9 +852,6 @@ con3215_init(void)
         cdev->handler = raw3215_irq;
 
         raw->flags |= RAW3215_FIXED;
-        tasklet_init(&raw->tasklet,
-                     (void (*)(unsigned long)) raw3215_tasklet,
-                     (unsigned long) raw);
         init_waitqueue_head(&raw->empty_wait);
 
         /* Request the console irq */
@@ -859,6 +862,8 @@ con3215_init(void)
                 raw3215[0] = NULL;
                 return -ENODEV;
         }
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&con3215);
         return 0;
 }
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index 3c07974886ed..d028d2ee83dd 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/types.h>
 #include <linux/err.h>
+#include <linux/reboot.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -528,11 +529,11 @@ con3270_wait_write(struct con3270 *cp)
 }
 
 /*
- * panic() calls console_unblank before the system enters a
- * disabled, endless loop.
+ * panic() calls con3270_flush through a panic_notifier
+ * before the system enters a disabled, endless loop.
  */
 static void
-con3270_unblank(void)
+con3270_flush(void)
 {
         struct con3270 *cp;
         unsigned long flags;
@@ -554,6 +555,23 @@ con3270_unblank(void)
         spin_unlock_irqrestore(&cp->view.lock, flags);
 }
 
+static int con3270_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
+{
+        con3270_flush();
+        return NOTIFY_OK;
+}
+
+static struct notifier_block on_panic_nb = {
+        .notifier_call = con3270_notify,
+        .priority = 0,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = con3270_notify,
+        .priority = 0,
+};
+
 /*
  *  The console structure for the 3270 console
  */
@@ -561,7 +579,6 @@ static struct console con3270 = {
         .name    = "tty3270",
         .write   = con3270_write,
         .device  = con3270_device,
-        .unblank = con3270_unblank,
         .flags   = CON_PRINTBUFFER,
 };
 
@@ -623,6 +640,8 @@ con3270_init(void)
         condev->cline->len = 0;
         con3270_create_status(condev);
         condev->input = alloc_string(&condev->freemem, 80);
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&con3270);
         return 0;
 }
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index d18e6d2e0b49..40759c33477d 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -418,25 +418,22 @@ fs3270_open(struct inode *inode, struct file *filp)
 {
         struct fs3270 *fp;
         struct idal_buffer *ib;
-        int minor, rc;
+        int minor, rc = 0;
 
         if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
                 return -ENODEV;
-        lock_kernel();
         minor = iminor(filp->f_path.dentry->d_inode);
         /* Check for minor 0 multiplexer. */
         if (minor == 0) {
-                struct tty_struct *tty;
-                mutex_lock(&tty_mutex);
-                tty = get_current_tty();
+                struct tty_struct *tty = get_current_tty();
                 if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) {
-                        mutex_unlock(&tty_mutex);
-                        rc = -ENODEV;
-                        goto out;
+                        tty_kref_put(tty);
+                        return -ENODEV;
                 }
                 minor = tty->index + RAW3270_FIRSTMINOR;
-                mutex_unlock(&tty_mutex);
+                tty_kref_put(tty);
         }
+        lock_kernel();
         /* Check if some other program is already using fullscreen mode. */
         fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);
         if (!IS_ERR(fp)) {
@@ -478,7 +475,7 @@ fs3270_open(struct inode *inode, struct file *filp)
         filp->private_data = fp;
 out:
         unlock_kernel();
-        return 0;
+        return rc;
 }
 
 /*
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index c3dee900a5c8..0b15cf107ec9 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1168,19 +1168,17 @@ static int raw3270_create_attributes(struct raw3270 *rp)
         if (rc)
                 goto out;
 
-        rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
-                                             MKDEV(IBM_TTY3270_MAJOR, rp->minor),
-                                             NULL,
-                                             "tty%s", rp->cdev->dev.bus_id);
+        rp->clttydev = device_create(class3270, &rp->cdev->dev,
+                                     MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL,
+                                     "tty%s", dev_name(&rp->cdev->dev));
         if (IS_ERR(rp->clttydev)) {
                 rc = PTR_ERR(rp->clttydev);
                 goto out_ttydev;
         }
 
-        rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
-                                             MKDEV(IBM_FS3270_MAJOR, rp->minor),
-                                             NULL,
-                                             "tub%s", rp->cdev->dev.bus_id);
+        rp->cltubdev = device_create(class3270, &rp->cdev->dev,
+                                     MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL,
+                                     "tub%s", dev_name(&rp->cdev->dev));
         if (!IS_ERR(rp->cltubdev))
                 goto out;
 
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c
index 7e619c534bf4..9a25c4bd1421 100644
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -16,6 +16,7 @@
 #include <linux/bootmem.h>
 #include <linux/termios.h>
 #include <linux/err.h>
+#include <linux/reboot.h>
 
 #include "sclp.h"
 #include "sclp_rw.h"
@@ -172,7 +173,7 @@ sclp_console_device(struct console *c, int *index)
  * will be flushed to the SCLP.
  */
 static void
-sclp_console_unblank(void)
+sclp_console_flush(void)
 {
         unsigned long flags;
 
@@ -188,6 +189,24 @@ sclp_console_unblank(void)
         spin_unlock_irqrestore(&sclp_con_lock, flags);
 }
 
+static int
+sclp_console_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
+{
+        sclp_console_flush();
+        return NOTIFY_OK;
+}
+
+static struct notifier_block on_panic_nb = {
+        .notifier_call = sclp_console_notify,
+        .priority = 1,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = sclp_console_notify,
+        .priority = 1,
+};
+
 /*
  * used to register the SCLP console to the kernel and to
  * give printk necessary information
@@ -197,7 +216,6 @@ static struct console sclp_console =
         .name = sclp_console_name,
         .write = sclp_console_write,
         .device = sclp_console_device,
-        .unblank = sclp_console_unblank,
         .flags = CON_PRINTBUFFER,
         .index = 0 /* ttyS0 */
 };
@@ -241,6 +259,8 @@ sclp_console_init(void)
         sclp_con_width_htab = 8;
 
         /* enable printk-access to this driver */
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&sclp_console);
         return 0;
 }
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index ad51738c4261..9854f19f5e62 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -24,6 +24,8 @@
 #include <linux/bootmem.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/reboot.h>
+
 #include <asm/uaccess.h>
 #include "sclp.h"
 
@@ -743,24 +745,30 @@ sclp_vt220_con_device(struct console *c, int *index)
         return sclp_vt220_driver;
 }
 
-/*
- * This routine is called from panic when the kernel is going to give up.
- * We have to make sure that all buffers will be flushed to the SCLP.
- * Note that this function may be called from within an interrupt context.
- */
-static void
-sclp_vt220_con_unblank(void)
+static int
+sclp_vt220_notify(struct notifier_block *self,
+                          unsigned long event, void *data)
 {
         __sclp_vt220_flush_buffer();
+        return NOTIFY_OK;
 }
 
+static struct notifier_block on_panic_nb = {
+        .notifier_call = sclp_vt220_notify,
+        .priority = 1,
+};
+
+static struct notifier_block on_reboot_nb = {
+        .notifier_call = sclp_vt220_notify,
+        .priority = 1,
+};
+
 /* Structure needed to register with printk */
 static struct console sclp_vt220_console =
 {
         .name = SCLP_VT220_CONSOLE_NAME,
         .write = sclp_vt220_con_write,
         .device = sclp_vt220_con_device,
-        .unblank = sclp_vt220_con_unblank,
         .flags = CON_PRINTBUFFER,
         .index = SCLP_VT220_CONSOLE_INDEX
 };
@@ -776,6 +784,8 @@ sclp_vt220_con_init(void)
         if (rc)
                 return rc;
         /* Attach linux console */
+        atomic_notifier_chain_register(&panic_notifier_list, &on_panic_nb);
+        register_reboot_notifier(&on_reboot_nb);
         register_console(&sclp_vt220_console);
         return 0;
 }
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 839987618ffd..4005c44a404c 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -910,7 +910,7 @@ tape_3590_erp_swap(struct tape_device *device, struct tape_request *request,
          * should proceed with the new tape... this
          * should probably be done in user space!
          */
-        PRINT_WARN("(%s): Swap Tape Device!\n", device->cdev->dev.bus_id);
+        PRINT_WARN("(%s): Swap Tape Device!\n", dev_name(&device->cdev->dev));
         return tape_3590_erp_basic(device, request, irb, -EIO);
 }
 
@@ -1003,40 +1003,43 @@ tape_3590_print_mim_msg_f0(struct tape_device *device, struct irb *irb)
         /* Exception Message */
         switch (sense->fmt.f70.emc) {
         case 0x02:
-                PRINT_WARN("(%s): Data degraded\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Data degraded\n",
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 PRINT_WARN("(%s): Data degraded in partion %i\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.mp);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.mp);
                 break;
         case 0x04:
-                PRINT_WARN("(%s): Medium degraded\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Medium degraded\n",
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x05:
                 PRINT_WARN("(%s): Medium degraded in partition %i\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.mp);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.mp);
                 break;
         case 0x06:
-                PRINT_WARN("(%s): Block 0 Error\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Block 0 Error\n",
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x07:
                 PRINT_WARN("(%s): Medium Exception 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.md);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.md);
                 break;
         default:
                 PRINT_WARN("(%s): MIM ExMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.emc);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.emc);
                 break;
         }
         /* Service Message */
         switch (sense->fmt.f70.smc) {
         case 0x02:
                 PRINT_WARN("(%s): Reference Media maintenance procedure %i\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.md);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.md);
                 break;
         default:
                 PRINT_WARN("(%s): MIM ServiceMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f70.smc);
+                           dev_name(&device->cdev->dev), sense->fmt.f70.smc);
                 break;
         }
 }
@@ -1054,101 +1057,101 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb)
         switch (sense->fmt.f71.emc) {
         case 0x01:
                 PRINT_WARN("(%s): Effect of failure is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): CU Exception - no performance impact\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 PRINT_WARN("(%s): CU Exception on channel interface 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x04:
                 PRINT_WARN("(%s): CU Exception on device path 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x05:
                 PRINT_WARN("(%s): CU Exception on library path 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x06:
                 PRINT_WARN("(%s): CU Exception on node 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x07:
                 PRINT_WARN("(%s): CU Exception on partition 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         default:
                 PRINT_WARN("(%s): SIM ExMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.emc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.emc);
         }
         /* Service Message */
         switch (sense->fmt.f71.smc) {
         case 0x01:
                 PRINT_WARN("(%s): Repair impact is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): Repair will not impact cu performance\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable node "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable nodes "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x04:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable cannel path "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable cannel paths "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x05:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable device path "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable device paths "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x06:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable library path "
                                    "0x%x on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable library paths "
                                    "(0x%x-0x%x) on CU\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x07:
                 PRINT_WARN("(%s): Repair will disable access to CU\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         default:
                 PRINT_WARN("(%s): SIM ServiceMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.smc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.smc);
         }
 }
 
@@ -1165,104 +1168,104 @@ tape_3590_print_dev_sim_msg_f2(struct tape_device *device, struct irb *irb)
         switch (sense->fmt.f71.emc) {
         case 0x01:
                 PRINT_WARN("(%s): Effect of failure is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): DV Exception - no performance impact\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 PRINT_WARN("(%s): DV Exception on channel interface 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x04:
                 PRINT_WARN("(%s): DV Exception on loader 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x05:
                 PRINT_WARN("(%s): DV Exception on message display 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                 break;
         case 0x06:
                 PRINT_WARN("(%s): DV Exception in tape path\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x07:
                 PRINT_WARN("(%s): DV Exception in drive\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         default:
                 PRINT_WARN("(%s): DSIM ExMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.emc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.emc);
         }
         /* Service Message */
         switch (sense->fmt.f71.smc) {
         case 0x01:
                 PRINT_WARN("(%s): Repair impact is unknown\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x02:
                 PRINT_WARN("(%s): Repair will not impact device performance\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x03:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable channel path "
                                    "0x%x on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable channel path "
                                    "(0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x04:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable interface 0x%x "
                                    "on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable interfaces "
                                    "(0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x05:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable loader 0x%x "
                                    "on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable loader "
                                    "(0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x07:
                 PRINT_WARN("(%s): Repair will disable access to DV\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case 0x08:
                 if (sense->fmt.f71.mdf == 0)
                         PRINT_WARN("(%s): Repair will disable message "
                                    "display 0x%x on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1]);
                 else
                         PRINT_WARN("(%s): Repair will disable message "
                                    "displays (0x%x-0x%x) on DV\n",
-                                   device->cdev->dev.bus_id,
+                                   dev_name(&device->cdev->dev),
                                    sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
         case 0x09:
-                PRINT_WARN("(%s): Clean DV\n", device->cdev->dev.bus_id);
+                PRINT_WARN("(%s): Clean DV\n", dev_name(&device->cdev->dev));
                 break;
         default:
                 PRINT_WARN("(%s): DSIM ServiceMsg: 0x%02x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.smc);
+                           dev_name(&device->cdev->dev), sense->fmt.f71.smc);
         }
 }
 
@@ -1279,18 +1282,18 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 return;
         if ((sense->mc > 0) && (sense->mc < TAPE_3590_MAX_MSG)) {
                 if (tape_3590_msg[sense->mc] != NULL)
-                        PRINT_WARN("(%s): %s\n", device->cdev->dev.bus_id,
+                        PRINT_WARN("(%s): %s\n", dev_name(&device->cdev->dev),
                                    tape_3590_msg[sense->mc]);
                 else {
                         PRINT_WARN("(%s): Message Code 0x%x\n",
-                                   device->cdev->dev.bus_id, sense->mc);
+                                   dev_name(&device->cdev->dev), sense->mc);
                 }
                 return;
         }
         if (sense->mc == 0xf0) {
                 /* Standard Media Information Message */
                 PRINT_WARN("(%s): MIM SEV=%i, MC=%02x, ES=%x/%x, "
-                           "RC=%02x-%04x-%02x\n", device->cdev->dev.bus_id,
+                           "RC=%02x-%04x-%02x\n", dev_name(&device->cdev->dev),
                            sense->fmt.f70.sev, sense->mc,
                            sense->fmt.f70.emc, sense->fmt.f70.smc,
                            sense->fmt.f70.refcode, sense->fmt.f70.mid,
@@ -1302,7 +1305,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 /* Standard I/O Subsystem Service Information Message */
                 PRINT_WARN("(%s): IOSIM SEV=%i, DEVTYPE=3590/%02x, "
                            "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.sev,
+                           dev_name(&device->cdev->dev), sense->fmt.f71.sev,
                            device->cdev->id.dev_model,
                            sense->mc, sense->fmt.f71.emc,
                            sense->fmt.f71.smc, sense->fmt.f71.refcode1,
@@ -1314,7 +1317,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 /* Standard Device Service Information Message */
                 PRINT_WARN("(%s): DEVSIM SEV=%i, DEVTYPE=3590/%02x, "
                            "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",
-                           device->cdev->dev.bus_id, sense->fmt.f71.sev,
+                           dev_name(&device->cdev->dev), sense->fmt.f71.sev,
                            device->cdev->id.dev_model,
                            sense->mc, sense->fmt.f71.emc,
                            sense->fmt.f71.smc, sense->fmt.f71.refcode1,
@@ -1327,7 +1330,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                 return;
         }
         PRINT_WARN("(%s): Device Message(%x)\n",
-                   device->cdev->dev.bus_id, sense->mc);
+                   dev_name(&device->cdev->dev), sense->mc);
 }
 
 static int tape_3590_crypt_error(struct tape_device *device,
@@ -1336,10 +1339,11 @@ static int tape_3590_crypt_error(struct tape_device *device,
         u8 cu_rc, ekm_rc1;
         u16 ekm_rc2;
         u32 drv_rc;
-        char *bus_id, *sense;
+        const char *bus_id;
+        char *sense;
 
         sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data;
-        bus_id = device->cdev->dev.bus_id;
+        bus_id = dev_name(&device->cdev->dev);
         cu_rc = sense[0];
         drv_rc = *((u32*) &sense[5]) & 0xffffff;
         ekm_rc1 = sense[9];
@@ -1440,7 +1444,7 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
                  * "device intervention" is not very meaningfull
                  */
                 PRINT_WARN("(%s): Tape operation when medium not loaded\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 tape_med_state_set(device, MS_UNLOADED);
                 tape_3590_schedule_work(device, TO_CRYPT_OFF);
                 return tape_3590_erp_basic(device, request, irb, -ENOMEDIUM);
@@ -1487,18 +1491,18 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
 
         case 0x6020:
                 PRINT_WARN("(%s): Cartridge of wrong type ?\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 return tape_3590_erp_basic(device, request, irb, -EMEDIUMTYPE);
 
         case 0x8011:
                 PRINT_WARN("(%s): Another host has reserved the tape device\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 return tape_3590_erp_basic(device, request, irb, -EPERM);
         case 0x8013:
                 PRINT_WARN("(%s): Another host has privileged access to the "
-                           "tape device\n", device->cdev->dev.bus_id);
+                           "tape device\n", dev_name(&device->cdev->dev));
                 PRINT_WARN("(%s): To solve the problem unload the current "
-                           "cartridge!\n", device->cdev->dev.bus_id);
+                           "cartridge!\n", dev_name(&device->cdev->dev));
                 return tape_3590_erp_basic(device, request, irb, -EPERM);
         default:
                 return tape_3590_erp_basic(device, request, irb, -EIO);
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 95da72bc17e8..a25b8bf54f41 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -278,7 +278,7 @@ tapeblock_cleanup_device(struct tape_device *device)
 
         if (!device->blk_data.disk) {
                 PRINT_ERR("(%s): No gendisk to clean up!\n",
-                        device->cdev->dev.bus_id);
+                        dev_name(&device->cdev->dev));
                 goto cleanup_queue;
         }
 
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 12c2a5aaf31b..ddc914ccea8f 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -69,9 +69,9 @@ struct tape_class_device *register_tape_dev(
         if (rc)
                 goto fail_with_cdev;
 
-        tcd->class_device = device_create_drvdata(tape_class, device,
-                                                  tcd->char_device->dev,
-                                                  NULL, "%s", tcd->device_name);
+        tcd->class_device = device_create(tape_class, device,
+                                          tcd->char_device->dev, NULL,
+                                          "%s", tcd->device_name);
         rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;
         if (rc)
                 goto fail_with_cdev;
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 181a5441af16..d7073dbf825c 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -215,12 +215,12 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate)
         case MS_UNLOADED:
                 device->tape_generic_status |= GMT_DR_OPEN(~0);
                 PRINT_INFO("(%s): Tape is unloaded\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         case MS_LOADED:
                 device->tape_generic_status &= ~GMT_DR_OPEN(~0);
                 PRINT_INFO("(%s): Tape has been mounted\n",
-                           device->cdev->dev.bus_id);
+                           dev_name(&device->cdev->dev));
                 break;
         default:
                 // print nothing
@@ -415,7 +415,7 @@ tape_generic_offline(struct tape_device *device)
                                 device->cdev_id);
                         PRINT_WARN("(%s): Set offline failed "
                                 "- drive in use.\n",
-                                device->cdev->dev.bus_id);
+                                dev_name(&device->cdev->dev));
                         spin_unlock_irq(get_ccwdev_lock(device->cdev));
                         return -EBUSY;
         }
@@ -538,7 +538,8 @@ tape_generic_probe(struct ccw_device *cdev)
         ret = sysfs_create_group(&cdev->dev.kobj, &tape_attr_group);
         if (ret) {
                 tape_put_device(device);
-                PRINT_ERR("probe failed for tape device %s\n", cdev->dev.bus_id);
+                PRINT_ERR("probe failed for tape device %s\n",
+                          dev_name(&cdev->dev));
                 return ret;
         }
         cdev->dev.driver_data = device;
@@ -546,7 +547,7 @@ tape_generic_probe(struct ccw_device *cdev)
         device->cdev = cdev;
         ccw_device_get_id(cdev, &dev_id);
         device->cdev_id = devid_to_int(&dev_id);
-        PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
+        PRINT_INFO("tape device %s found\n", dev_name(&cdev->dev));
         return ret;
 }
 
@@ -616,7 +617,7 @@ tape_generic_remove(struct ccw_device *cdev)
                                 device->cdev_id);
                         PRINT_WARN("(%s): Drive in use vanished - "
                                 "expect trouble!\n",
-                                device->cdev->dev.bus_id);
+                                dev_name(&device->cdev->dev));
                         PRINT_WARN("State was %i\n", device->tape_state);
                         tape_state_set(device, TS_NOT_OPER);
                         __tape_discard_requests(device);
@@ -840,7 +841,7 @@ tape_dump_sense(struct tape_device* device, struct tape_request *request,
         PRINT_INFO("-------------------------------------------------\n");
         PRINT_INFO("DSTAT : %02x  CSTAT: %02x   CPA: %04x\n",
                    irb->scsw.cmd.dstat, irb->scsw.cmd.cstat, irb->scsw.cmd.cpa);
-        PRINT_INFO("DEVICE: %s\n", device->cdev->dev.bus_id);
+        PRINT_INFO("DEVICE: %s\n", dev_name(&device->cdev->dev));
         if (request != NULL)
                 PRINT_INFO("OP    : %s\n", tape_op_verbose[request->op]);
 
@@ -1051,7 +1052,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         device = (struct tape_device *) cdev->dev.driver_data;
         if (device == NULL) {
                 PRINT_ERR("could not get device structure for %s "
-                          "in interrupt\n", cdev->dev.bus_id);
+                          "in interrupt\n", dev_name(&cdev->dev));
                 return;
         }
         request = (struct tape_request *) intparm;
@@ -1064,13 +1065,13 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 switch (PTR_ERR(irb)) {
                         case -ETIMEDOUT:
                                 PRINT_WARN("(%s): Request timed out\n",
-                                        cdev->dev.bus_id);
+                                        dev_name(&cdev->dev));
                         case -EIO:
                                 __tape_end_request(device, request, -EIO);
                                 break;
                         default:
                                 PRINT_ERR("(%s): Unexpected i/o error %li\n",
-                                        cdev->dev.bus_id,
+                                        dev_name(&cdev->dev),
                                         PTR_ERR(irb));
                 }
                 return;
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index e7c888c14e71..8a376af926a7 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -52,7 +52,7 @@ static int tape_proc_show(struct seq_file *m, void *v)
                 return 0;
         spin_lock_irq(get_ccwdev_lock(device->cdev));
         seq_printf(m, "%d\t", (int) n);
-        seq_printf(m, "%-10.10s ", device->cdev->dev.bus_id);
+        seq_printf(m, "%-10.10s ", dev_name(&device->cdev->dev));
         seq_printf(m, "%04X/", device->cdev->id.cu_type);
         seq_printf(m, "%02X\t", device->cdev->id.cu_model);
         seq_printf(m, "%04X/", device->cdev->id.dev_type);
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index cc8fd781ee22..5bd573d144d6 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -47,7 +47,7 @@ tape_std_assign_timeout(unsigned long data)
         rc = tape_cancel_io(device, request);
         if(rc)
                 PRINT_ERR("(%s): Assign timeout: Cancel failed with rc = %i\n",
-                        device->cdev->dev.bus_id, rc);
+                        dev_name(&device->cdev->dev), rc);
 
 }
 
@@ -83,7 +83,7 @@ tape_std_assign(struct tape_device *device)
 
         if (rc != 0) {
                 PRINT_WARN("%s: assign failed - device might be busy\n",
-                        device->cdev->dev.bus_id);
+                        dev_name(&device->cdev->dev));
                 DBF_EVENT(3, "%08x: assign failed - device might be busy\n",
                         device->cdev_id);
         } else {
@@ -106,7 +106,7 @@ tape_std_unassign (struct tape_device *device)
                 DBF_EVENT(3, "(%08x): Can't unassign device\n",
                         device->cdev_id);
                 PRINT_WARN("(%s): Can't unassign device - device gone\n",
-                        device->cdev->dev.bus_id);
+                        dev_name(&device->cdev->dev));
                 return -EIO;
         }
 
@@ -120,7 +120,8 @@ tape_std_unassign (struct tape_device *device)
 
         if ((rc = tape_do_io(device, request)) != 0) {
                 DBF_EVENT(3, "%08x: Unassign failed\n", device->cdev_id);
-                PRINT_WARN("%s: Unassign failed\n", device->cdev->dev.bus_id);
+                PRINT_WARN("%s: Unassign failed\n",
+                           dev_name(&device->cdev->dev));
         } else {
                 DBF_EVENT(3, "%08x: Tape unassigned\n", device->cdev_id);
         }
@@ -634,10 +635,10 @@ tape_std_mtcompression(struct tape_device *device, int mt_count)
                 DBF_EXCEPTION(6, "xcom parm\n");
                 if (*device->modeset_byte & 0x08)
                         PRINT_INFO("(%s) Compression is currently on\n",
-                                   device->cdev->dev.bus_id);
+                                   dev_name(&device->cdev->dev));
                 else
                         PRINT_INFO("(%s) Compression is currently off\n",
-                                   device->cdev->dev.bus_id);
+                                   dev_name(&device->cdev->dev));
                 PRINT_INFO("Use 1 to switch compression on, 0 to "
                            "switch it off\n");
                 return -EINVAL;
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index c31faefa2b3b..24762727bc27 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -724,8 +724,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
 
         dev = kzalloc(sizeof(struct device), GFP_KERNEL);
         if (dev) {
-                snprintf(dev->bus_id, BUS_ID_SIZE, "%s",
-                         priv->internal_name);
+                dev_set_name(dev, priv->internal_name);
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
                 dev->driver = &vmlogrdr_driver;
@@ -748,10 +747,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
                 device_unregister(dev);
                 return ret;
         }
-        priv->class_device = device_create_drvdata(vmlogrdr_class, dev,
-                                                   MKDEV(vmlogrdr_major,
-                                                         priv->minor_num),
-                                                   priv, "%s", dev->bus_id);
+        priv->class_device = device_create(vmlogrdr_class, dev,
+                                           MKDEV(vmlogrdr_major,
+                                                 priv->minor_num),
+                                           priv, "%s", dev_name(dev));
         if (IS_ERR(priv->class_device)) {
                 ret = PTR_ERR(priv->class_device);
                 priv->class_device=NULL;
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index c1f352b84868..9020eba620ee 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -886,19 +886,18 @@ static int ur_set_online(struct ccw_device *cdev)
                 goto fail_free_cdev;
         if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) {
                 if (urd->class == DEV_CLASS_UR_I)
-                        sprintf(node_id, "vmrdr-%s", cdev->dev.bus_id);
+                        sprintf(node_id, "vmrdr-%s", dev_name(&cdev->dev));
                 if (urd->class == DEV_CLASS_UR_O)
-                        sprintf(node_id, "vmpun-%s", cdev->dev.bus_id);
+                        sprintf(node_id, "vmpun-%s", dev_name(&cdev->dev));
         } else if (urd->cdev->id.cu_type == PRINTER_DEVTYPE) {
-                sprintf(node_id, "vmprt-%s", cdev->dev.bus_id);
+                sprintf(node_id, "vmprt-%s", dev_name(&cdev->dev));
         } else {
                 rc = -EOPNOTSUPP;
                 goto fail_free_cdev;
         }
 
-        urd->device = device_create_drvdata(vmur_class, NULL,
-                                            urd->char_device->dev, NULL,
-                                            "%s", node_id);
+        urd->device = device_create(vmur_class, NULL, urd->char_device->dev,
+                                    NULL, "%s", node_id);
         if (IS_ERR(urd->device)) {
                 rc = PTR_ERR(urd->device);
                 TRACE("ur_set_online: device_create rc=%d\n", rc);
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 0bfcbbe375c4..2f547b840ef0 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -24,6 +24,7 @@
 #include "cio.h"
 #include "cio_debug.h"
 #include "css.h"
+#include "device.h"
 
 /*
  * "Blacklisting" of certain devices:
@@ -191,9 +192,9 @@ static int blacklist_parse_parameters(char *str, range_action action,
                         rc = blacklist_range(ra, from_ssid, to_ssid, from, to,
                                              msgtrigger);
                         if (rc)
-                                totalrc = 1;
+                                totalrc = -EINVAL;
                 } else
-                        totalrc = 1;
+                        totalrc = -EINVAL;
         }
 
         return totalrc;
@@ -240,8 +241,10 @@ static int blacklist_parse_proc_parameters(char *buf)
                 rc = blacklist_parse_parameters(buf, free, 0);
         else if (strcmp("add", parm) == 0)
                 rc = blacklist_parse_parameters(buf, add, 0);
+        else if (strcmp("purge", parm) == 0)
+                return ccw_purge_blacklisted();
         else
-                return 1;
+                return -EINVAL;
 
         css_schedule_reprobe();
 
@@ -353,7 +356,7 @@ cio_ignore_write(struct file *file, const char __user *user_buf,
         }
         ret = blacklist_parse_proc_parameters(buf);
         if (ret)
-                rc = -EINVAL;
+                rc = ret;
         else
                 rc = user_len;
 
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index e0ce65fca4e7..3ac2c2019f5e 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -113,7 +113,8 @@ ccwgroup_release (struct device *dev)
 
         for (i = 0; i < gdev->count; i++) {
                 if (gdev->cdev[i]) {
-                        dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
+                        if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev)
+                                dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
                         put_device(&gdev->cdev[i]->dev);
                 }
         }
@@ -268,8 +269,7 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
                 goto error;
         }
 
-        snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s",
-                        gdev->cdev[0]->dev.bus_id);
+        dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev));
 
         rc = device_add(&gdev->dev);
         if (rc)
@@ -296,6 +296,7 @@ error:
                         if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev)
                                 dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
                         put_device(&gdev->cdev[i]->dev);
+                        gdev->cdev[i] = NULL;
                 }
         mutex_unlock(&gdev->reg_mutex);
         put_device(&gdev->dev);
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index db00b0591733..1246f61a5338 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -393,8 +393,7 @@ int chp_new(struct chp_id chpid)
         chp->state = 1;
         chp->dev.parent = &channel_subsystems[chpid.cssid]->device;
         chp->dev.release = chp_release;
-        snprintf(chp->dev.bus_id, BUS_ID_SIZE, "chp%x.%02x", chpid.cssid,
-                 chpid.id);
+        dev_set_name(&chp->dev, "chp%x.%02x", chpid.cssid, chpid.id);
 
         /* Obtain channel path description and fill it in. */
         ret = chsc_determine_base_channel_path_desc(chpid, &chp->desc);
@@ -423,7 +422,7 @@ int chp_new(struct chp_id chpid)
         ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
         if (ret) {
                 device_unregister(&chp->dev);
-                goto out_free;
+                goto out;
         }
         mutex_lock(&channel_subsystems[chpid.cssid]->mutex);
         if (channel_subsystems[chpid.cssid]->cm_enabled) {
@@ -432,14 +431,15 @@ int chp_new(struct chp_id chpid)
                         sysfs_remove_group(&chp->dev.kobj, &chp_attr_group);
                         device_unregister(&chp->dev);
                         mutex_unlock(&channel_subsystems[chpid.cssid]->mutex);
-                        goto out_free;
+                        goto out;
                 }
         }
         channel_subsystems[chpid.cssid]->chps[chpid.id] = chp;
         mutex_unlock(&channel_subsystems[chpid.cssid]->mutex);
-        return ret;
+        goto out;
 out_free:
         kfree(chp);
+out:
         return ret;
 }
 
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index 91ca87aa9f97..f49f0e502b8d 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -261,7 +261,7 @@ static int chsc_examine_irb(struct chsc_request *request)
 {
         int backed_up;
 
-        if (!scsw_stctl(&request->irb.scsw) & SCSW_STCTL_STATUS_PEND)
+        if (!(scsw_stctl(&request->irb.scsw) & SCSW_STCTL_STATUS_PEND))
                 return -EIO;
         backed_up = scsw_cstat(&request->irb.scsw) & SCHN_STAT_CHAIN_CHECK;
         request->irb.scsw.cmd.cstat &= ~SCHN_STAT_CHAIN_CHECK;
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 33bff8fec7d1..3db2c386546f 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -114,6 +114,7 @@ cio_tpi(void)
         struct tpi_info *tpi_info;
         struct subchannel *sch;
         struct irb *irb;
+        int irq_context;
 
         tpi_info = (struct tpi_info *) __LC_SUBCHANNEL_ID;
         if (tpi (NULL) != 1)
@@ -126,7 +127,9 @@ cio_tpi(void)
         sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
         if (!sch)
                 return 1;
-        local_bh_disable();
+        irq_context = in_interrupt();
+        if (!irq_context)
+                local_bh_disable();
         irq_enter ();
         spin_lock(sch->lock);
         memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
@@ -134,7 +137,8 @@ cio_tpi(void)
                 sch->driver->irq(sch);
         spin_unlock(sch->lock);
         irq_exit ();
-        _local_bh_enable();
+        if (!irq_context)
+                _local_bh_enable();
         return 1;
 }
 
@@ -153,7 +157,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)
         CIO_MSG_EVENT(2, "cio_start: 'not oper' status for "
                       "subchannel 0.%x.%04x!\n", sch->schid.ssid,
                       sch->schid.sch_no);
-        sprintf(dbf_text, "no%s", sch->dev.bus_id);
+        sprintf(dbf_text, "no%s", dev_name(&sch->dev));
         CIO_TRACE_EVENT(0, dbf_text);
         CIO_HEX_EVENT(0, &sch->schib, sizeof (struct schib));
 
@@ -171,9 +175,10 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
         union orb *orb;
 
         CIO_TRACE_EVENT(4, "stIO");
-        CIO_TRACE_EVENT(4, sch->dev.bus_id);
+        CIO_TRACE_EVENT(4, dev_name(&sch->dev));
 
         orb = &to_io_private(sch)->orb;
+        memset(orb, 0, sizeof(union orb));
         /* sch is always under 2G. */
         orb->cmd.intparm = (u32)(addr_t)sch;
         orb->cmd.fmt = 1;
@@ -208,8 +213,10 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
         case 1:         /* status pending */
         case 2:         /* busy */
                 return -EBUSY;
-        default:                /* device/path not operational */
+        case 3:         /* device/path not operational */
                 return cio_start_handle_notoper(sch, lpm);
+        default:
+                return ccode;
         }
 }
 
@@ -229,7 +236,7 @@ cio_resume (struct subchannel *sch)
         int ccode;
 
         CIO_TRACE_EVENT (4, "resIO");
-        CIO_TRACE_EVENT (4, sch->dev.bus_id);
+        CIO_TRACE_EVENT(4, dev_name(&sch->dev));
 
         ccode = rsch (sch->schid);
 
@@ -266,7 +273,7 @@ cio_halt(struct subchannel *sch)
                 return -ENODEV;
 
         CIO_TRACE_EVENT (2, "haltIO");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         /*
          * Issue "Halt subchannel" and process condition code
@@ -301,7 +308,7 @@ cio_clear(struct subchannel *sch)
                 return -ENODEV;
 
         CIO_TRACE_EVENT (2, "clearIO");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         /*
          * Issue "Clear subchannel" and process condition code
@@ -337,7 +344,7 @@ cio_cancel (struct subchannel *sch)
                 return -ENODEV;
 
         CIO_TRACE_EVENT (2, "cancelIO");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         ccode = xsch (sch->schid);
 
@@ -401,7 +408,7 @@ int cio_enable_subchannel(struct subchannel *sch, u32 intparm)
         int ret;
 
         CIO_TRACE_EVENT (2, "ensch");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         if (sch_is_pseudo_sch(sch))
                 return -EINVAL;
@@ -451,7 +458,7 @@ int cio_disable_subchannel(struct subchannel *sch)
         int ret;
 
         CIO_TRACE_EVENT (2, "dissch");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         if (sch_is_pseudo_sch(sch))
                 return 0;
@@ -568,8 +575,10 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
         }
         mutex_init(&sch->reg_mutex);
         /* Set a name for the subchannel */
-        snprintf (sch->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x", schid.ssid,
-                  schid.sch_no);
+        if (cio_is_console(schid))
+                sch->dev.init_name = cio_get_console_sch_name(schid);
+        else
+                dev_set_name(&sch->dev, "0.%x.%04x", schid.ssid, schid.sch_no);
 
         /*
          * The first subchannel that is not-operational (ccode==3)
@@ -674,6 +683,7 @@ do_IRQ (struct pt_regs *regs)
 
 #ifdef CONFIG_CCW_CONSOLE
 static struct subchannel console_subchannel;
+static char console_sch_name[10] = "0.x.xxxx";
 static struct io_subchannel_private console_priv;
 static int console_subchannel_in_use;
 
@@ -824,6 +834,12 @@ cio_get_console_subchannel(void)
         return &console_subchannel;
 }
 
+const char *cio_get_console_sch_name(struct subchannel_id schid)
+{
+        snprintf(console_sch_name, 10, "0.%x.%04x", schid.ssid, schid.sch_no);
+        return (const char *)console_sch_name;
+}
+
 #endif
 static int
 __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)
@@ -843,19 +859,6 @@ __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)
         return -EBUSY; /* uhm... */
 }
 
-/* we can't use the normal udelay here, since it enables external interrupts */
-
-static void udelay_reset(unsigned long usecs)
-{
-        uint64_t start_cc, end_cc;
-
-        asm volatile ("STCK %0" : "=m" (start_cc));
-        do {
-                cpu_relax();
-                asm volatile ("STCK %0" : "=m" (end_cc));
-        } while (((end_cc - start_cc)/4096) < usecs);
-}
-
 static int
 __clear_io_subchannel_easy(struct subchannel_id schid)
 {
@@ -871,7 +874,7 @@ __clear_io_subchannel_easy(struct subchannel_id schid)
                         if (schid_equal(&ti.schid, &schid))
                                 return 0;
                 }
-                udelay_reset(100);
+                udelay_simple(100);
         }
         return -EBUSY;
 }
@@ -879,7 +882,7 @@ __clear_io_subchannel_easy(struct subchannel_id schid)
 static void __clear_chsc_subchannel_easy(void)
 {
         /* It seems we can only wait for a bit here :/ */
-        udelay_reset(100);
+        udelay_simple(100);
 }
 
 static int pgm_check_occured;
@@ -889,7 +892,7 @@ static void cio_reset_pgm_check_handler(void)
         pgm_check_occured = 1;
 }
 
-static int stsch_reset(struct subchannel_id schid, volatile struct schib *addr)
+static int stsch_reset(struct subchannel_id schid, struct schib *addr)
 {
         int rc;
 
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 3b236d20e835..0fb24784e925 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -117,11 +117,15 @@ extern int cio_is_console(struct subchannel_id);
 extern struct subchannel *cio_get_console_subchannel(void);
 extern spinlock_t * cio_get_console_lock(void);
 extern void *cio_get_console_priv(void);
+extern const char *cio_get_console_sch_name(struct subchannel_id schid);
+extern const char *cio_get_console_cdev_name(struct subchannel *sch);
 #else
 #define cio_is_console(schid) 0
 #define cio_get_console_subchannel() NULL
 #define cio_get_console_lock() NULL
 #define cio_get_console_priv() NULL
+#define cio_get_console_sch_name(schid) NULL
+#define cio_get_console_cdev_name(sch) NULL
 #endif
 
 #endif
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 51489eff6b0b..76bbb1e74c29 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -633,6 +633,11 @@ channel_subsystem_release(struct device *dev)
 
         css = to_css(dev);
         mutex_destroy(&css->mutex);
+        if (css->pseudo_subchannel) {
+                /* Implies that it has been generated but never registered. */
+                css_subchannel_release(&css->pseudo_subchannel->dev);
+                css->pseudo_subchannel = NULL;
+        }
         kfree(css);
 }
 
@@ -693,7 +698,7 @@ static int __init setup_css(int nr)
                 return -ENOMEM;
         css->pseudo_subchannel->dev.parent = &css->device;
         css->pseudo_subchannel->dev.release = css_subchannel_release;
-        sprintf(css->pseudo_subchannel->dev.bus_id, "defunct");
+        dev_set_name(&css->pseudo_subchannel->dev, "defunct");
         ret = cio_create_sch_lock(css->pseudo_subchannel);
         if (ret) {
                 kfree(css->pseudo_subchannel);
@@ -702,7 +707,7 @@ static int __init setup_css(int nr)
         mutex_init(&css->mutex);
         css->valid = 1;
         css->cssid = nr;
-        sprintf(css->device.bus_id, "css%x", nr);
+        dev_set_name(&css->device, "css%x", nr);
         css->device.release = channel_subsystem_release;
         tod_high = (u32) (get_clock() >> 32);
         css_generate_pgid(css, tod_high);
@@ -785,11 +790,15 @@ init_channel_subsystem (void)
                 }
                 channel_subsystems[i] = css;
                 ret = setup_css(i);
-                if (ret)
-                        goto out_free;
+                if (ret) {
+                        kfree(channel_subsystems[i]);
+                        goto out_unregister;
+                }
                 ret = device_register(&css->device);
-                if (ret)
-                        goto out_free_all;
+                if (ret) {
+                        put_device(&css->device);
+                        goto out_unregister;
+                }
                 if (css_chsc_characteristics.secm) {
                         ret = device_create_file(&css->device,
                                                  &dev_attr_cm_enable);
@@ -802,7 +811,7 @@ init_channel_subsystem (void)
         }
         ret = register_reboot_notifier(&css_reboot_notifier);
         if (ret)
-                goto out_pseudo;
+                goto out_unregister;
         css_init_done = 1;
 
         /* Enable default isc for I/O subchannels. */
@@ -810,18 +819,12 @@ init_channel_subsystem (void)
 
         for_each_subchannel(__init_channel_subsystem, NULL);
         return 0;
-out_pseudo:
-        device_unregister(&channel_subsystems[i]->pseudo_subchannel->dev);
 out_file:
-        device_remove_file(&channel_subsystems[i]->device,
-                           &dev_attr_cm_enable);
+        if (css_chsc_characteristics.secm)
+                device_remove_file(&channel_subsystems[i]->device,
+                                   &dev_attr_cm_enable);
 out_device:
         device_unregister(&channel_subsystems[i]->device);
-out_free_all:
-        kfree(channel_subsystems[i]->pseudo_subchannel->lock);
-        kfree(channel_subsystems[i]->pseudo_subchannel);
-out_free:
-        kfree(channel_subsystems[i]);
 out_unregister:
         while (i > 0) {
                 struct channel_subsystem *css;
@@ -829,6 +832,7 @@ out_unregister:
                 i--;
                 css = channel_subsystems[i];
                 device_unregister(&css->pseudo_subchannel->dev);
+                css->pseudo_subchannel = NULL;
                 if (css_chsc_characteristics.secm)
                         device_remove_file(&css->device,
                                            &dev_attr_cm_enable);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 28221030b886..4e78c82194b4 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -31,6 +31,7 @@
 #include "device.h"
 #include "ioasm.h"
 #include "io_sch.h"
+#include "blacklist.h"
 
 static struct timer_list recovery_timer;
 static DEFINE_SPINLOCK(recovery_lock);
@@ -296,36 +297,33 @@ static void ccw_device_unregister(struct ccw_device *cdev)
                 device_del(&cdev->dev);
 }
 
-static void ccw_device_remove_orphan_cb(struct device *dev)
+static void ccw_device_remove_orphan_cb(struct work_struct *work)
 {
-        struct ccw_device *cdev = to_ccwdev(dev);
+        struct ccw_device_private *priv;
+        struct ccw_device *cdev;
 
+        priv = container_of(work, struct ccw_device_private, kick_work);
+        cdev = priv->cdev;
         ccw_device_unregister(cdev);
         put_device(&cdev->dev);
+        /* Release cdev reference for workqueue processing. */
+        put_device(&cdev->dev);
 }
 
-static void ccw_device_remove_sch_cb(struct device *dev)
-{
-        struct subchannel *sch;
-
-        sch = to_subchannel(dev);
-        css_sch_device_unregister(sch);
-        /* Reset intparm to zeroes. */
-        sch->schib.pmcw.intparm = 0;
-        cio_modify(sch);
-        put_device(&sch->dev);
-}
+static void ccw_device_call_sch_unregister(struct work_struct *work);
 
 static void
 ccw_device_remove_disconnected(struct ccw_device *cdev)
 {
         unsigned long flags;
-        int rc;
 
         /*
          * Forced offline in disconnected state means
          * 'throw away device'.
          */
+        /* Get cdev reference for workqueue processing. */
+        if (!get_device(&cdev->dev))
+                return;
         if (ccw_device_is_orphan(cdev)) {
                 /*
                  * Deregister ccw device.
@@ -335,23 +333,13 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
                 spin_lock_irqsave(cdev->ccwlock, flags);
                 cdev->private->state = DEV_STATE_NOT_OPER;
                 spin_unlock_irqrestore(cdev->ccwlock, flags);
-                rc = device_schedule_callback(&cdev->dev,
-                                              ccw_device_remove_orphan_cb);
-                if (rc)
-                        CIO_MSG_EVENT(0, "Couldn't unregister orphan "
-                                      "0.%x.%04x\n",
-                                      cdev->private->dev_id.ssid,
-                                      cdev->private->dev_id.devno);
-                return;
-        }
-        /* Deregister subchannel, which will kill the ccw device. */
-        rc = device_schedule_callback(cdev->dev.parent,
-                                      ccw_device_remove_sch_cb);
-        if (rc)
-                CIO_MSG_EVENT(0, "Couldn't unregister disconnected device "
-                              "0.%x.%04x\n",
-                              cdev->private->dev_id.ssid,
-                              cdev->private->dev_id.devno);
+                PREPARE_WORK(&cdev->private->kick_work,
+                                ccw_device_remove_orphan_cb);
+        } else
+                /* Deregister subchannel, which will kill the ccw device. */
+                PREPARE_WORK(&cdev->private->kick_work,
+                                ccw_device_call_sch_unregister);
+        queue_work(slow_path_wq, &cdev->private->kick_work);
 }
 
 /**
@@ -970,12 +958,17 @@ static void ccw_device_call_sch_unregister(struct work_struct *work)
 
         priv = container_of(work, struct ccw_device_private, kick_work);
         cdev = priv->cdev;
+        /* Get subchannel reference for local processing. */
+        if (!get_device(cdev->dev.parent))
+                return;
         sch = to_subchannel(cdev->dev.parent);
         css_sch_device_unregister(sch);
         /* Reset intparm to zeroes. */
         sch->schib.pmcw.intparm = 0;
         cio_modify(sch);
+        /* Release cdev reference for workqueue processing.*/
         put_device(&cdev->dev);
+        /* Release subchannel reference for local processing. */
         put_device(&sch->dev);
 }
 
@@ -1001,6 +994,8 @@ io_subchannel_recog_done(struct ccw_device *cdev)
                 PREPARE_WORK(&cdev->private->kick_work,
                              ccw_device_call_sch_unregister);
                 queue_work(slow_path_wq, &cdev->private->kick_work);
+                /* Release subchannel reference for asynchronous recognition. */
+                put_device(&sch->dev);
                 if (atomic_dec_and_test(&ccw_device_init_count))
                         wake_up(&ccw_device_init_wq);
                 break;
@@ -1040,8 +1035,11 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
         init_timer(&priv->timer);
 
         /* Set an initial name for the device. */
-        snprintf (cdev->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x",
-                  sch->schid.ssid, sch->schib.pmcw.dev);
+        if (cio_is_console(sch->schid))
+                cdev->dev.init_name = cio_get_console_cdev_name(sch);
+        else
+                dev_set_name(&cdev->dev, "0.%x.%04x",
+                             sch->schid.ssid, sch->schib.pmcw.dev);
 
         /* Increase counter of devices currently in recognition. */
         atomic_inc(&ccw_device_init_count);
@@ -1106,7 +1104,7 @@ static void io_subchannel_irq(struct subchannel *sch)
         cdev = sch_get_cdev(sch);
 
         CIO_TRACE_EVENT(3, "IRQ");
-        CIO_TRACE_EVENT(3, sch->dev.bus_id);
+        CIO_TRACE_EVENT(3, dev_name(&sch->dev));
         if (cdev)
                 dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
 }
@@ -1476,6 +1474,45 @@ static void ccw_device_schedule_recovery(void)
         spin_unlock_irqrestore(&recovery_lock, flags);
 }
 
+static int purge_fn(struct device *dev, void *data)
+{
+        struct ccw_device *cdev = to_ccwdev(dev);
+        struct ccw_device_private *priv = cdev->private;
+        int unreg;
+
+        spin_lock_irq(cdev->ccwlock);
+        unreg = is_blacklisted(priv->dev_id.ssid, priv->dev_id.devno) &&
+                (priv->state == DEV_STATE_OFFLINE);
+        spin_unlock_irq(cdev->ccwlock);
+        if (!unreg)
+                goto out;
+        if (!get_device(&cdev->dev))
+                goto out;
+        CIO_MSG_EVENT(3, "ccw: purging 0.%x.%04x\n", priv->dev_id.ssid,
+                      priv->dev_id.devno);
+        PREPARE_WORK(&cdev->private->kick_work, ccw_device_call_sch_unregister);
+        queue_work(slow_path_wq, &cdev->private->kick_work);
+
+out:
+        /* Abort loop in case of pending signal. */
+        if (signal_pending(current))
+                return -EINTR;
+
+        return 0;
+}
+
+/**
+ * ccw_purge_blacklisted - purge unused, blacklisted devices
+ *
+ * Unregister all ccw devices that are offline and on the blacklist.
+ */
+int ccw_purge_blacklisted(void)
+{
+        CIO_MSG_EVENT(2, "ccw: purging blacklisted devices\n");
+        bus_for_each_dev(&ccw_bus_type, NULL, NULL, purge_fn);
+        return 0;
+}
+
 static void device_set_disconnected(struct ccw_device *cdev)
 {
         if (!cdev)
@@ -1492,7 +1529,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev)
         struct subchannel *sch = to_subchannel(cdev->dev.parent);
 
         CIO_TRACE_EVENT(2, "notoper");
-        CIO_TRACE_EVENT(2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
         ccw_device_set_timeout(cdev, 0);
         cio_disable_subchannel(sch);
         cdev->private->state = DEV_STATE_NOT_OPER;
@@ -1591,6 +1628,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
 
 #ifdef CONFIG_CCW_CONSOLE
 static struct ccw_device console_cdev;
+static char console_cdev_name[10] = "0.x.xxxx";
 static struct ccw_device_private console_private;
 static int console_cdev_in_use;
 
@@ -1661,6 +1699,14 @@ ccw_device_probe_console(void)
         console_cdev.online = 1;
         return &console_cdev;
 }
+
+
+const char *cio_get_console_cdev_name(struct subchannel *sch)
+{
+        snprintf(console_cdev_name, 10, "0.%x.%04x",
+                 sch->schid.ssid, sch->schib.pmcw.dev);
+        return (const char *)console_cdev_name;
+}
 #endif
 
 /*
@@ -1673,7 +1719,7 @@ __ccwdev_check_busid(struct device *dev, void *id)
 
         bus_id = id;
 
-        return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0);
+        return (strncmp(bus_id, dev_name(dev), BUS_ID_SIZE) == 0);
 }
 
 
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 6f5c3f2b3587..104ed669db43 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -86,6 +86,7 @@ int ccw_device_is_orphan(struct ccw_device *);
 int ccw_device_recognition(struct ccw_device *);
 int ccw_device_online(struct ccw_device *);
 int ccw_device_offline(struct ccw_device *);
+int ccw_purge_blacklisted(void);
 
 /* Function prototypes for device status and basic sense stuff. */
 void ccw_device_accumulate_irb(struct ccw_device *, struct irb *);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 550508df952b..10bc03940fb3 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -52,8 +52,10 @@ static void ccw_timeout_log(struct ccw_device *cdev)
         printk(KERN_WARNING "cio: orb:\n");
         print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,
                        orb, sizeof(*orb), 0);
-        printk(KERN_WARNING "cio: ccw device bus id: %s\n", cdev->dev.bus_id);
-        printk(KERN_WARNING "cio: subchannel bus id: %s\n", sch->dev.bus_id);
+        printk(KERN_WARNING "cio: ccw device bus id: %s\n",
+               dev_name(&cdev->dev));
+        printk(KERN_WARNING "cio: subchannel bus id: %s\n",
+               dev_name(&sch->dev));
         printk(KERN_WARNING "cio: subchannel lpm: %02x, opm: %02x, "
                "vpm: %02x\n", sch->lpm, sch->opm, sch->vpm);
 
@@ -658,6 +660,13 @@ ccw_device_offline(struct ccw_device *cdev)
 {
         struct subchannel *sch;
 
+        /* Allow ccw_device_offline while disconnected. */
+        if (cdev->private->state == DEV_STATE_DISCONNECTED ||
+            cdev->private->state == DEV_STATE_NOT_OPER) {
+                cdev->private->flags.donotify = 0;
+                ccw_device_done(cdev, DEV_STATE_NOT_OPER);
+                return 0;
+        }
         if (ccw_device_is_orphan(cdev)) {
                 ccw_device_done(cdev, DEV_STATE_OFFLINE);
                 return 0;
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index ee1a28310fbb..eabcc42d63df 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -498,7 +498,7 @@ ccw_device_stlck(struct ccw_device *cdev)
         sch = to_subchannel(cdev->dev.parent);
         
         CIO_TRACE_EVENT(2, "stl lock");
-        CIO_TRACE_EVENT(2, cdev->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&cdev->dev));
 
         buf = kmalloc(32*sizeof(char), GFP_DMA|GFP_KERNEL);
         if (!buf)
diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index 3f8f1cf69c76..c4f3e7c9a854 100644
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -123,7 +123,7 @@ struct ccw_device_private {
         void *cmb_wait;                 /* deferred cmb enable/disable */
 };
 
-static inline int ssch(struct subchannel_id schid, volatile union orb *addr)
+static inline int ssch(struct subchannel_id schid, union orb *addr)
 {
         register struct subchannel_id reg1 asm("1") = schid;
         int ccode = -EIO;
@@ -134,7 +134,9 @@ static inline int ssch(struct subchannel_id schid, volatile union orb *addr)
                 "       srl     %0,28\n"
                 "1:\n"
                 EX_TABLE(0b, 1b)
-                : "+d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
+                : "+d" (ccode)
+                : "d" (reg1), "a" (addr), "m" (*addr)
+                : "cc", "memory");
         return ccode;
 }
 
@@ -147,7 +149,9 @@ static inline int rsch(struct subchannel_id schid)
                 "       rsch\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1) : "cc");
+                : "=d" (ccode)
+                : "d" (reg1)
+                : "cc", "memory");
         return ccode;
 }
 
@@ -160,7 +164,9 @@ static inline int csch(struct subchannel_id schid)
                 "       csch\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1) : "cc");
+                : "=d" (ccode)
+                : "d" (reg1)
+                : "cc");
         return ccode;
 }
 
@@ -173,7 +179,9 @@ static inline int hsch(struct subchannel_id schid)
                 "       hsch\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1) : "cc");
+                : "=d" (ccode)
+                : "d" (reg1)
+                : "cc");
         return ccode;
 }
 
@@ -186,7 +194,9 @@ static inline int xsch(struct subchannel_id schid)
                 "       .insn   rre,0xb2760000,%1,0\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1) : "cc");
+                : "=d" (ccode)
+                : "d" (reg1)
+                : "cc");
         return ccode;
 }
 
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index 9fa2ac13ac85..759262792633 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -23,38 +23,39 @@ struct tpi_info {
  * Some S390 specific IO instructions as inline
  */
 
-static inline int stsch(struct subchannel_id schid,
-                            volatile struct schib *addr)
+static inline int stsch(struct subchannel_id schid, struct schib *addr)
 {
         register struct subchannel_id reg1 asm ("1") = schid;
         int ccode;
 
         asm volatile(
-                "       stsch   0(%2)\n"
+                "       stsch   0(%3)\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
+                : "=d" (ccode), "=m" (*addr)
+                : "d" (reg1), "a" (addr)
+                : "cc");
         return ccode;
 }
 
-static inline int stsch_err(struct subchannel_id schid,
-                                volatile struct schib *addr)
+static inline int stsch_err(struct subchannel_id schid, struct schib *addr)
 {
         register struct subchannel_id reg1 asm ("1") = schid;
         int ccode = -EIO;
 
         asm volatile(
-                "       stsch   0(%2)\n"
+                "       stsch   0(%3)\n"
                 "0:     ipm     %0\n"
                 "       srl     %0,28\n"
                 "1:\n"
                 EX_TABLE(0b,1b)
-                : "+d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
+                : "+d" (ccode), "=m" (*addr)
+                : "d" (reg1), "a" (addr)
+                : "cc");
         return ccode;
 }
 
-static inline int msch(struct subchannel_id schid,
-                           volatile struct schib *addr)
+static inline int msch(struct subchannel_id schid, struct schib *addr)
 {
         register struct subchannel_id reg1 asm ("1") = schid;
         int ccode;
@@ -63,12 +64,13 @@ static inline int msch(struct subchannel_id schid,
                 "       msch    0(%2)\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
+                : "=d" (ccode)
+                : "d" (reg1), "a" (addr), "m" (*addr)
+                : "cc");
         return ccode;
 }
 
-static inline int msch_err(struct subchannel_id schid,
-                               volatile struct schib *addr)
+static inline int msch_err(struct subchannel_id schid, struct schib *addr)
 {
         register struct subchannel_id reg1 asm ("1") = schid;
         int ccode = -EIO;
@@ -79,33 +81,38 @@ static inline int msch_err(struct subchannel_id schid,
                 "       srl     %0,28\n"
                 "1:\n"
                 EX_TABLE(0b,1b)
-                : "+d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
+                : "+d" (ccode)
+                : "d" (reg1), "a" (addr), "m" (*addr)
+                : "cc");
         return ccode;
 }
 
-static inline int tsch(struct subchannel_id schid,
-                           volatile struct irb *addr)
+static inline int tsch(struct subchannel_id schid, struct irb *addr)
 {
         register struct subchannel_id reg1 asm ("1") = schid;
         int ccode;
 
         asm volatile(
-                "       tsch    0(%2)\n"
+                "       tsch    0(%3)\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
+                : "=d" (ccode), "=m" (*addr)
+                : "d" (reg1), "a" (addr)
+                : "cc");
         return ccode;
 }
 
-static inline int tpi( volatile struct tpi_info *addr)
+static inline int tpi(struct tpi_info *addr)
 {
         int ccode;
 
         asm volatile(
-                "       tpi     0(%1)\n"
+                "       tpi     0(%2)\n"
                 "       ipm     %0\n"
                 "       srl     %0,28"
-                : "=d" (ccode) : "a" (addr), "m" (*addr) : "cc");
+                : "=d" (ccode), "=m" (*addr)
+                : "a" (addr)
+                : "cc");
         return ccode;
 }
 
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index c1a70985abfa..e3ea1d5f2810 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -16,6 +16,14 @@
 #define QDIO_BUSY_BIT_GIVE_UP           2000000 /* 2 seconds = eternity */
 #define QDIO_INPUT_THRESHOLD            500     /* 500 microseconds */
 
+/*
+ * if an asynchronous HiperSockets queue runs full, the 10 seconds timer wait
+ * till next initiative to give transmitted skbs back to the stack is too long.
+ * Therefore polling is started in case of multicast queue is filled more
+ * than 50 percent.
+ */
+#define QDIO_IQDIO_POLL_LVL             65      /* HS multicast queue */
+
 enum qdio_irq_states {
         QDIO_IRQ_STATE_INACTIVE,
         QDIO_IRQ_STATE_ESTABLISHED,
@@ -195,6 +203,9 @@ struct qdio_output_q {
         /* PCIs are enabled for the queue */
         int pci_out_enabled;
 
+        /* IQDIO: output multiple buffers (enhanced SIGA) */
+        int use_enh_siga;
+
         /* timer to check for more outbound work */
         struct timer_list timer;
 };
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index 337aa3087a78..b5390821434f 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -155,7 +155,7 @@ static int qstat_seq_open(struct inode *inode, struct file *filp)
 static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name)
 {
         memset(name, 0, sizeof(name));
-        sprintf(name, "%s", cdev->dev.bus_id);
+        sprintf(name, "%s", dev_name(&cdev->dev));
         if (q->is_input_q)
                 sprintf(name + strlen(name), "_input");
         else
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index e6eabc853422..a50682d2a0fa 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -316,6 +316,9 @@ static inline int qdio_do_siga_output(struct qdio_q *q, unsigned int *busy_bit)
         unsigned int fc = 0;
         unsigned long schid;
 
+        if (q->u.out.use_enh_siga) {
+                fc = 3;
+        }
         if (!is_qebsm(q))
                 schid = *((u32 *)&q->irq_ptr->schid);
         else {
@@ -851,6 +854,12 @@ static void __qdio_outbound_processing(struct qdio_q *q)
         if (queue_type(q) == QDIO_IQDIO_QFMT && !multicast_outbound(q))
                 return;
 
+        if ((queue_type(q) == QDIO_IQDIO_QFMT) &&
+            (atomic_read(&q->nr_buf_used)) > QDIO_IQDIO_POLL_LVL) {
+                tasklet_schedule(&q->tasklet);
+                return;
+        }
+
         if (q->u.out.pci_out_enabled)
                 return;
 
@@ -956,7 +965,7 @@ static void qdio_handle_activate_check(struct ccw_device *cdev,
         char dbf_text[15];
 
         QDIO_DBF_TEXT2(1, trace, "ick2");
-        sprintf(dbf_text, "%s", cdev->dev.bus_id);
+        sprintf(dbf_text, "%s", dev_name(&cdev->dev));
         QDIO_DBF_TEXT2(1, trace, dbf_text);
         QDIO_DBF_HEX2(0, trace, &intparm, sizeof(int));
         QDIO_DBF_HEX2(0, trace, &dstat, sizeof(int));
@@ -1443,6 +1452,8 @@ int qdio_establish(struct qdio_initialize *init_data)
         }
 
         qdio_setup_ssqd_info(irq_ptr);
+        sprintf(dbf_text, "qDmmwc%2x", irq_ptr->ssqd_desc.mmwc);
+        QDIO_DBF_TEXT2(0, setup, dbf_text);
         sprintf(dbf_text, "qib ac%2x", irq_ptr->qib.ac);
         QDIO_DBF_TEXT2(0, setup, dbf_text);
 
@@ -1615,12 +1626,21 @@ static void handle_outbound(struct qdio_q *q, unsigned int callflags,
                 if (multicast_outbound(q))
                         qdio_kick_outbound_q(q);
                 else
-                        /*
-                         * One siga-w per buffer required for unicast
-                         * HiperSockets.
-                         */
-                        while (count--)
+                        if ((q->irq_ptr->ssqd_desc.mmwc > 1) &&
+                            (count > 1) &&
+                            (count <= q->irq_ptr->ssqd_desc.mmwc)) {
+                                /* exploit enhanced SIGA */
+                                q->u.out.use_enh_siga = 1;
                                 qdio_kick_outbound_q(q);
+                        } else {
+                                /*
+                                * One siga-w per buffer required for unicast
+                                * HiperSockets.
+                                */
+                                q->u.out.use_enh_siga = 0;
+                                while (count--)
+                                        qdio_kick_outbound_q(q);
+                        }
                 goto out;
         }
 
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 1679e2f91c94..a0b6b46e7466 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -447,51 +447,36 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
 {
         char s[80];
 
-        sprintf(s, "%s sc:%x ", cdev->dev.bus_id, irq_ptr->schid.sch_no);
-
+        sprintf(s, "qdio: %s ", dev_name(&cdev->dev));
         switch (irq_ptr->qib.qfmt) {
         case QDIO_QETH_QFMT:
-                sprintf(s + strlen(s), "OSADE ");
+                sprintf(s + strlen(s), "OSA ");
                 break;
         case QDIO_ZFCP_QFMT:
                 sprintf(s + strlen(s), "ZFCP ");
                 break;
         case QDIO_IQDIO_QFMT:
-                sprintf(s + strlen(s), "HiperSockets ");
+                sprintf(s + strlen(s), "HS ");
                 break;
         }
-        sprintf(s + strlen(s), "using: ");
-
-        if (!is_thinint_irq(irq_ptr))
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "AdapterInterrupts ");
-        if (!(irq_ptr->sch_token != 0))
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "QEBSM ");
-        if (!(irq_ptr->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED))
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "OutboundPCI ");
-        if (!css_general_characteristics.aif_tdd)
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "TDD\n");
-        printk(KERN_INFO "qdio: %s", s);
-
-        memset(s, 0, sizeof(s));
-        sprintf(s, "%s SIGA required: ", cdev->dev.bus_id);
-        if (irq_ptr->siga_flag.input)
-                sprintf(s + strlen(s), "Read ");
-        if (irq_ptr->siga_flag.output)
-                sprintf(s + strlen(s), "Write ");
-        if (irq_ptr->siga_flag.sync)
-                sprintf(s + strlen(s), "Sync ");
-        if (!irq_ptr->siga_flag.no_sync_ti)
-                sprintf(s + strlen(s), "SyncAI ");
-        if (!irq_ptr->siga_flag.no_sync_out_ti)
-                sprintf(s + strlen(s), "SyncOutAI ");
-        if (!irq_ptr->siga_flag.no_sync_out_pci)
-                sprintf(s + strlen(s), "SyncOutPCI");
+        sprintf(s + strlen(s), "on SC %x using ", irq_ptr->schid.sch_no);
+        sprintf(s + strlen(s), "AI:%d ", is_thinint_irq(irq_ptr));
+        sprintf(s + strlen(s), "QEBSM:%d ", (irq_ptr->sch_token) ? 1 : 0);
+        sprintf(s + strlen(s), "PCI:%d ",
+                (irq_ptr->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED) ? 1 : 0);
+        sprintf(s + strlen(s), "TDD:%d ", css_general_characteristics.aif_tdd);
+        sprintf(s + strlen(s), "SIGA:");
+        sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.input) ? "R" : " ");
+        sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.output) ? "W" : " ");
+        sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.sync) ? "S" : " ");
+        sprintf(s + strlen(s), "%s",
+                (!irq_ptr->siga_flag.no_sync_ti) ? "A" : " ");
+        sprintf(s + strlen(s), "%s",
+                (!irq_ptr->siga_flag.no_sync_out_ti) ? "O" : " ");
+        sprintf(s + strlen(s), "%s",
+                (!irq_ptr->siga_flag.no_sync_out_pci) ? "P" : " ");
         sprintf(s + strlen(s), "\n");
-        printk(KERN_INFO "qdio: %s", s);
+        printk(KERN_INFO "%s", s);
 }
 
 int __init qdio_setup_init(void)
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 6f02f1e674d4..e3fe6838293a 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -892,8 +892,8 @@ static void ap_scan_bus(struct work_struct *unused)
 
                 ap_dev->device.bus = &ap_bus_type;
                 ap_dev->device.parent = ap_root_device;
-                snprintf(ap_dev->device.bus_id, BUS_ID_SIZE, "card%02x",
-                         AP_QID_DEVICE(ap_dev->qid));
+                dev_set_name(&ap_dev->device, "card%02x",
+                             AP_QID_DEVICE(ap_dev->qid));
                 ap_dev->device.release = ap_device_release;
                 rc = device_register(&ap_dev->device);
                 if (rc) {
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 292b60da6dc7..ff4a6931bb8e 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -24,6 +24,7 @@
 #include <asm/kvm_virtio.h>
 #include <asm/setup.h>
 #include <asm/s390_ext.h>
+#include <asm/s390_rdev.h>
 
 #define VIRTIO_SUBCODE_64 0x0D00
 
@@ -241,10 +242,7 @@ static struct virtio_config_ops kvm_vq_configspace_ops = {
  * The root device for the kvm virtio devices.
  * This makes them appear as /sys/devices/kvm_s390/0,1,2 not /sys/devices/0,1,2.
  */
-static struct device kvm_root = {
-        .parent = NULL,
-        .bus_id = "kvm_s390",
-};
+static struct device *kvm_root;
 
 /*
  * adds a new device and register it with virtio
@@ -261,7 +259,7 @@ static void add_kvm_device(struct kvm_device_desc *d, unsigned int offset)
                 return;
         }
 
-        kdev->vdev.dev.parent = &kvm_root;
+        kdev->vdev.dev.parent = kvm_root;
         kdev->vdev.id.device = d->type;
         kdev->vdev.config = &kvm_vq_configspace_ops;
         kdev->desc = d;
@@ -317,15 +315,16 @@ static int __init kvm_devices_init(void)
         if (!MACHINE_IS_KVM)
                 return -ENODEV;
 
-        rc = device_register(&kvm_root);
-        if (rc) {
+        kvm_root = s390_root_dev_register("kvm_s390");
+        if (IS_ERR(kvm_root)) {
+                rc = PTR_ERR(kvm_root);
                 printk(KERN_ERR "Could not register kvm_s390 root device");
                 return rc;
         }
 
         rc = vmem_add_mapping(PFN_PHYS(max_pfn), PAGE_SIZE);
         if (rc) {
-                device_unregister(&kvm_root);
+                s390_root_dev_unregister(kvm_root);
                 return rc;
         }
 
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index e10ac9ab2d44..f5e618562c5f 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -299,7 +299,7 @@ claw_probe(struct ccwgroup_device *cgdev)
                 probe_error(cgdev);
                 put_device(&cgdev->dev);
                 printk(KERN_WARNING "add_files failed %s %s Exit Line %d \n",
-                        cgdev->cdev[0]->dev.bus_id,__func__,__LINE__);
+                        dev_name(&cgdev->cdev[0]->dev), __func__, __LINE__);
                 CLAW_DBF_TEXT_(2, setup, "probex%d", rc);
                 return rc;
         }
@@ -584,7 +584,7 @@ claw_irq_handler(struct ccw_device *cdev,
         if (!cdev->dev.driver_data) {
                 printk(KERN_WARNING "claw: unsolicited interrupt for device:"
                         "%s received c-%02x d-%02x\n",
-                       cdev->dev.bus_id, irb->scsw.cmd.cstat,
+                       dev_name(&cdev->dev), irb->scsw.cmd.cstat,
                        irb->scsw.cmd.dstat);
                 CLAW_DBF_TEXT(2, trace, "badirq");
                 return;
@@ -598,7 +598,7 @@ claw_irq_handler(struct ccw_device *cdev,
                 p_ch = &privptr->channel[WRITE];
         else {
                 printk(KERN_WARNING "claw: Can't determine channel for "
-                        "interrupt, device %s\n", cdev->dev.bus_id);
+                        "interrupt, device %s\n", dev_name(&cdev->dev));
                 CLAW_DBF_TEXT(2, trace, "badchan");
                 return;
         }
@@ -662,7 +662,7 @@ claw_irq_handler(struct ccw_device *cdev,
                         printk(KERN_WARNING "claw: unsolicited "
                                 "interrupt for device:"
                                 "%s received c-%02x d-%02x\n",
-                                cdev->dev.bus_id,
+                                dev_name(&cdev->dev),
                                 irb->scsw.cmd.cstat,
                                 irb->scsw.cmd.dstat);
                         return;
@@ -1136,19 +1136,20 @@ ccw_check_return_code(struct ccw_device *cdev, int return_code)
                         break;
                 case -ENODEV:
                         printk(KERN_EMERG "%s: Missing device called "
-                                "for IO ENODEV\n", cdev->dev.bus_id);
+                                "for IO ENODEV\n", dev_name(&cdev->dev));
                         break;
                 case -EIO:
                         printk(KERN_EMERG "%s: Status pending... EIO \n",
-                                cdev->dev.bus_id);
+                                dev_name(&cdev->dev));
                         break;
                 case -EINVAL:
                         printk(KERN_EMERG "%s: Invalid Dev State EINVAL \n",
-                                cdev->dev.bus_id);
+                                dev_name(&cdev->dev));
                         break;
                 default:
                         printk(KERN_EMERG "%s: Unknown error in "
-                                 "Do_IO %d\n",cdev->dev.bus_id, return_code);
+                                 "Do_IO %d\n", dev_name(&cdev->dev),
+                               return_code);
                 }
         }
         CLAW_DBF_TEXT(4, trace, "ccwret");
@@ -2848,11 +2849,11 @@ add_channel(struct ccw_device *cdev,int i,struct claw_privbk *privptr)
         struct chbk *p_ch;
         struct ccw_dev_id dev_id;
 
-        CLAW_DBF_TEXT_(2, setup, "%s", cdev->dev.bus_id);
+        CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cdev->dev));
         privptr->channel[i].flag  = i+1;   /* Read is 1 Write is 2 */
         p_ch = &privptr->channel[i];
         p_ch->cdev = cdev;
-        snprintf(p_ch->id, CLAW_ID_SIZE, "cl-%s", cdev->dev.bus_id);
+        snprintf(p_ch->id, CLAW_ID_SIZE, "cl-%s", dev_name(&cdev->dev));
         ccw_device_get_id(cdev, &dev_id);
         p_ch->devno = dev_id.devno;
         if ((p_ch->irb = kzalloc(sizeof (struct irb),GFP_KERNEL)) == NULL) {
@@ -2879,7 +2880,8 @@ claw_new_device(struct ccwgroup_device *cgdev)
         int ret;
         struct ccw_dev_id dev_id;
 
-        printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id);
+        printk(KERN_INFO "claw: add for %s\n",
+               dev_name(&cgdev->cdev[READ]->dev));
         CLAW_DBF_TEXT(2, setup, "new_dev");
         privptr = cgdev->dev.driver_data;
         cgdev->cdev[READ]->dev.driver_data = privptr;
@@ -2903,14 +2905,16 @@ claw_new_device(struct ccwgroup_device *cgdev)
         if (ret != 0) {
                 printk(KERN_WARNING
                         "claw: ccw_device_set_online %s READ failed "
-                        "with ret = %d\n",cgdev->cdev[READ]->dev.bus_id,ret);
+                       "with ret = %d\n", dev_name(&cgdev->cdev[READ]->dev),
+                       ret);
                 goto out;
         }
         ret = ccw_device_set_online(cgdev->cdev[WRITE]);
         if (ret != 0) {
                 printk(KERN_WARNING
                         "claw: ccw_device_set_online %s WRITE failed "
-                        "with ret = %d\n",cgdev->cdev[WRITE]->dev.bus_id, ret);
+                       "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev),
+                       ret);
                 goto out;
         }
         dev = alloc_netdev(0,"claw%d",claw_init_netdevice);
@@ -2986,7 +2990,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
         struct net_device *ndev;
         int     ret;
 
-        CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
+        CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
         priv = cgdev->dev.driver_data;
         if (!priv)
                 return -ENODEV;
@@ -3016,11 +3020,11 @@ claw_remove_device(struct ccwgroup_device *cgdev)
         struct claw_privbk *priv;
 
         BUG_ON(!cgdev);
-        CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
+        CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
         priv = cgdev->dev.driver_data;
         BUG_ON(!priv);
         printk(KERN_INFO "claw: %s() called %s will be removed.\n",
-                        __func__,cgdev->cdev[0]->dev.bus_id);
+                        __func__, dev_name(&cgdev->cdev[0]->dev));
         if (cgdev->state == CCWGROUP_ONLINE)
                 claw_shutdown_device(cgdev);
         claw_remove_files(&cgdev->dev);
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 1a89d989f348..005072c420d3 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -85,7 +85,7 @@
 #define CLAW_MAX_DEV            256        /*      max claw devices          */
 #define MAX_NAME_LEN            8          /* host name, adapter name length */
 #define CLAW_FRAME_SIZE         4096
-#define CLAW_ID_SIZE            BUS_ID_SIZE+3
+#define CLAW_ID_SIZE            20+3
 
 /* state machine codes used in claw_irq_handler */
 
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index b11fec24c7d2..a4e29836a2aa 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -277,18 +277,18 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb)
 
         CTCM_DBF_TEXT_(ERROR, CTC_DBF_WARN,
                         "irb error %ld on device %s\n",
-                                PTR_ERR(irb), cdev->dev.bus_id);
+                                PTR_ERR(irb), dev_name(&cdev->dev));
 
         switch (PTR_ERR(irb)) {
         case -EIO:
-                ctcm_pr_warn("i/o-error on device %s\n", cdev->dev.bus_id);
+                ctcm_pr_warn("i/o-error on device %s\n", dev_name(&cdev->dev));
                 break;
         case -ETIMEDOUT:
-                ctcm_pr_warn("timeout on device %s\n", cdev->dev.bus_id);
+                ctcm_pr_warn("timeout on device %s\n", dev_name(&cdev->dev));
                 break;
         default:
                 ctcm_pr_warn("unknown error %ld on device %s\n",
-                                PTR_ERR(irb), cdev->dev.bus_id);
+                                PTR_ERR(irb), dev_name(&cdev->dev));
         }
         return PTR_ERR(irb);
 }
@@ -1182,7 +1182,7 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
         int dstat;
 
         CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,
-                "Enter %s(%s)", CTCM_FUNTAIL, &cdev->dev.bus_id);
+                "Enter %s(%s)", CTCM_FUNTAIL, dev_name(&cdev->dev));
 
         if (ctcm_check_irb_error(cdev, irb))
                 return;
@@ -1208,14 +1208,14 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
                 ch = priv->channel[WRITE];
         else {
                 ctcm_pr_err("ctcm: Can't determine channel for interrupt, "
-                           "device %s\n", cdev->dev.bus_id);
+                           "device %s\n", dev_name(&cdev->dev));
                 return;
         }
 
         dev = ch->netdev;
         if (dev == NULL) {
                 ctcm_pr_crit("ctcm: %s dev=NULL bus_id=%s, ch=0x%p\n",
-                                __func__, cdev->dev.bus_id, ch);
+                                __func__, dev_name(&cdev->dev), ch);
                 return;
         }
 
@@ -1329,7 +1329,7 @@ static int add_channel(struct ccw_device *cdev, enum channel_types type,
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
                 "%s(%s), type %d, proto %d",
-                        __func__, cdev->dev.bus_id,     type, priv->protocol);
+                        __func__, dev_name(&cdev->dev), type, priv->protocol);
 
         ch = kzalloc(sizeof(struct channel), GFP_KERNEL);
         if (ch == NULL)
@@ -1358,7 +1358,7 @@ static int add_channel(struct ccw_device *cdev, enum channel_types type,
                                         goto nomem_return;
 
         ch->cdev = cdev;
-        snprintf(ch->id, CTCM_ID_SIZE, "ch-%s", cdev->dev.bus_id);
+        snprintf(ch->id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev->dev));
         ch->type = type;
 
         /**
@@ -1518,8 +1518,8 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
 
         type = get_channel_type(&cdev0->id);
 
-        snprintf(read_id, CTCM_ID_SIZE, "ch-%s", cdev0->dev.bus_id);
-        snprintf(write_id, CTCM_ID_SIZE, "ch-%s", cdev1->dev.bus_id);
+        snprintf(read_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev0->dev));
+        snprintf(write_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev1->dev));
 
         ret = add_channel(cdev0, type, priv);
         if (ret)
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index 8e10ee86a5ee..d77cce3fe4d4 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -104,7 +104,7 @@
 #define READ                    0
 #define WRITE                   1
 
-#define CTCM_ID_SIZE            BUS_ID_SIZE+3
+#define CTCM_ID_SIZE            20+3
 
 struct ctcm_profile {
         unsigned long maxmulti;
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index cbe470493bf0..19f5d5ed85e0 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -1673,7 +1673,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
 
 done:
         if (rc) {
-                ctcm_pr_info("ctcmpc       :  %s() failed\n", __FUNCTION__);
+                ctcm_pr_info("ctcmpc       :  %s() failed\n", __func__);
                 priv->xid->xid2_flag2 = 0x40;
                 grp->saved_xid2->xid2_flag2 = 0x40;
         }
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 9bcfa04d863b..0825be87e5a0 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -492,7 +492,7 @@ lcs_start_channel(struct lcs_channel *channel)
         unsigned long flags;
         int rc;
 
-        LCS_DBF_TEXT_(4,trace,"ssch%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(4, trace,"ssch%s", dev_name(&channel->ccwdev->dev));
         spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
         rc = ccw_device_start(channel->ccwdev,
                               channel->ccws + channel->io_idx, 0, 0,
@@ -501,7 +501,8 @@ lcs_start_channel(struct lcs_channel *channel)
                 channel->state = LCS_CH_STATE_RUNNING;
         spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
         if (rc) {
-                LCS_DBF_TEXT_(4,trace,"essh%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4,trace,"essh%s",
+                              dev_name(&channel->ccwdev->dev));
                 PRINT_ERR("Error in starting channel, rc=%d!\n", rc);
         }
         return rc;
@@ -514,12 +515,13 @@ lcs_clear_channel(struct lcs_channel *channel)
         int rc;
 
         LCS_DBF_TEXT(4,trace,"clearch");
-        LCS_DBF_TEXT_(4,trace,"%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(4, trace, "%s", dev_name(&channel->ccwdev->dev));
         spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
         rc = ccw_device_clear(channel->ccwdev, (addr_t) channel);
         spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
         if (rc) {
-                LCS_DBF_TEXT_(4,trace,"ecsc%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4, trace, "ecsc%s",
+                              dev_name(&channel->ccwdev->dev));
                 return rc;
         }
         wait_event(channel->wait_q, (channel->state == LCS_CH_STATE_CLEARED));
@@ -540,13 +542,14 @@ lcs_stop_channel(struct lcs_channel *channel)
         if (channel->state == LCS_CH_STATE_STOPPED)
                 return 0;
         LCS_DBF_TEXT(4,trace,"haltsch");
-        LCS_DBF_TEXT_(4,trace,"%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(4, trace, "%s", dev_name(&channel->ccwdev->dev));
         channel->state = LCS_CH_STATE_INIT;
         spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
         rc = ccw_device_halt(channel->ccwdev, (addr_t) channel);
         spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
         if (rc) {
-                LCS_DBF_TEXT_(4,trace,"ehsc%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4, trace, "ehsc%s",
+                              dev_name(&channel->ccwdev->dev));
                 return rc;
         }
         /* Asynchronous halt initialted. Wait for its completion. */
@@ -632,10 +635,11 @@ __lcs_resume_channel(struct lcs_channel *channel)
                 return 0;
         if (channel->ccws[channel->io_idx].flags & CCW_FLAG_SUSPEND)
                 return 0;
-        LCS_DBF_TEXT_(5, trace, "rsch%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(5, trace, "rsch%s", dev_name(&channel->ccwdev->dev));
         rc = ccw_device_resume(channel->ccwdev);
         if (rc) {
-                LCS_DBF_TEXT_(4, trace, "ersc%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4, trace, "ersc%s",
+                              dev_name(&channel->ccwdev->dev));
                 PRINT_ERR("Error in lcs_resume_channel: rc=%d\n",rc);
         } else
                 channel->state = LCS_CH_STATE_RUNNING;
@@ -1302,18 +1306,18 @@ lcs_check_irb_error(struct ccw_device *cdev, struct irb *irb)
 
         switch (PTR_ERR(irb)) {
         case -EIO:
-                PRINT_WARN("i/o-error on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("i/o-error on device %s\n", dev_name(&cdev->dev));
                 LCS_DBF_TEXT(2, trace, "ckirberr");
                 LCS_DBF_TEXT_(2, trace, "  rc%d", -EIO);
                 break;
         case -ETIMEDOUT:
-                PRINT_WARN("timeout on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("timeout on device %s\n", dev_name(&cdev->dev));
                 LCS_DBF_TEXT(2, trace, "ckirberr");
                 LCS_DBF_TEXT_(2, trace, "  rc%d", -ETIMEDOUT);
                 break;
         default:
                 PRINT_WARN("unknown error %ld on device %s\n", PTR_ERR(irb),
-                           cdev->dev.bus_id);
+                           dev_name(&cdev->dev));
                 LCS_DBF_TEXT(2, trace, "ckirberr");
                 LCS_DBF_TEXT(2, trace, "  rc???");
         }
@@ -1390,7 +1394,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
         cstat = irb->scsw.cmd.cstat;
         dstat = irb->scsw.cmd.dstat;
-        LCS_DBF_TEXT_(5, trace, "Rint%s",cdev->dev.bus_id);
+        LCS_DBF_TEXT_(5, trace, "Rint%s", dev_name(&cdev->dev));
         LCS_DBF_TEXT_(5, trace, "%4x%4x", irb->scsw.cmd.cstat,
                       irb->scsw.cmd.dstat);
         LCS_DBF_TEXT_(5, trace, "%4x%4x", irb->scsw.cmd.fctl,
@@ -1400,7 +1404,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         rc = lcs_get_problem(cdev, irb);
         if (rc || (dstat & DEV_STAT_UNIT_EXCEP)) {
                 PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n",
-                            cdev->dev.bus_id, dstat, cstat);
+                            dev_name(&cdev->dev), dstat, cstat);
                 if (rc) {
                         channel->state = LCS_CH_STATE_ERROR;
                 }
@@ -1463,7 +1467,7 @@ lcs_tasklet(unsigned long data)
         int rc;
 
         channel = (struct lcs_channel *) data;
-        LCS_DBF_TEXT_(5, trace, "tlet%s",channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(5, trace, "tlet%s", dev_name(&channel->ccwdev->dev));
 
         /* Check for processed buffers. */
         iob = channel->iob;
@@ -2244,7 +2248,7 @@ lcs_recovery(void *ptr)
                 return 0;
         LCS_DBF_TEXT(4, trace, "recover2");
         gdev = card->gdev;
-        PRINT_WARN("Recovery of device %s started...\n", gdev->dev.bus_id);
+        PRINT_WARN("Recovery of device %s started...\n", dev_name(&gdev->dev));
         rc = __lcs_shutdown_device(gdev, 1);
         rc = lcs_new_device(gdev);
         if (!rc)
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 9242b5acc66b..0fea51e34b57 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1724,7 +1724,7 @@ static int netiucv_register_device(struct net_device *ndev)
         IUCV_DBF_TEXT(trace, 3, __func__);
 
         if (dev) {
-                snprintf(dev->bus_id, BUS_ID_SIZE, "net%s", ndev->name);
+                dev_set_name(dev, "net%s", ndev->name);
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
                 /*
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index bf8a75c92f28..af6d60458513 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -90,11 +90,11 @@ struct qeth_dbf_info {
 #define CARD_RDEV(card) card->read.ccwdev
 #define CARD_WDEV(card) card->write.ccwdev
 #define CARD_DDEV(card) card->data.ccwdev
-#define CARD_BUS_ID(card) card->gdev->dev.bus_id
-#define CARD_RDEV_ID(card) card->read.ccwdev->dev.bus_id
-#define CARD_WDEV_ID(card) card->write.ccwdev->dev.bus_id
-#define CARD_DDEV_ID(card) card->data.ccwdev->dev.bus_id
-#define CHANNEL_ID(channel) channel->ccwdev->dev.bus_id
+#define CARD_BUS_ID(card) dev_name(&card->gdev->dev)
+#define CARD_RDEV_ID(card) dev_name(&card->read.ccwdev->dev)
+#define CARD_WDEV_ID(card) dev_name(&card->write.ccwdev->dev)
+#define CARD_DDEV_ID(card) dev_name(&card->data.ccwdev->dev)
+#define CHANNEL_ID(channel) dev_name(&channel->ccwdev->dev)
 
 /**
  * card stuff
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c7ab1b864516..7de410d5be4a 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -745,7 +745,7 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
                      SCHN_STAT_PROT_CHECK | SCHN_STAT_PROG_CHECK)) {
                 QETH_DBF_TEXT(TRACE, 2, "CGENCHK");
                 PRINT_WARN("check on device %s, dstat=x%x, cstat=x%x ",
-                           cdev->dev.bus_id, dstat, cstat);
+                           dev_name(&cdev->dev), dstat, cstat);
                 print_hex_dump(KERN_WARNING, "qeth: irb ", DUMP_PREFIX_OFFSET,
                                 16, 1, irb, 64, 1);
                 return 1;
@@ -760,7 +760,7 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
                 if (sense[SENSE_COMMAND_REJECT_BYTE] &
                     SENSE_COMMAND_REJECT_FLAG) {
                         QETH_DBF_TEXT(TRACE, 2, "CMDREJi");
-                        return 0;
+                        return 1;
                 }
                 if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) {
                         QETH_DBF_TEXT(TRACE, 2, "AFFE");
@@ -784,12 +784,12 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,
 
         switch (PTR_ERR(irb)) {
         case -EIO:
-                PRINT_WARN("i/o-error on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("i/o-error on device %s\n", dev_name(&cdev->dev));
                 QETH_DBF_TEXT(TRACE, 2, "ckirberr");
                 QETH_DBF_TEXT_(TRACE, 2, "  rc%d", -EIO);
                 break;
         case -ETIMEDOUT:
-                PRINT_WARN("timeout on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("timeout on device %s\n", dev_name(&cdev->dev));
                 QETH_DBF_TEXT(TRACE, 2, "ckirberr");
                 QETH_DBF_TEXT_(TRACE, 2, "  rc%d", -ETIMEDOUT);
                 if (intparm == QETH_RCD_PARM) {
@@ -803,7 +803,7 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,
                 break;
         default:
                 PRINT_WARN("unknown error %ld on device %s\n", PTR_ERR(irb),
-                           cdev->dev.bus_id);
+                           dev_name(&cdev->dev));
                 QETH_DBF_TEXT(TRACE, 2, "ckirberr");
                 QETH_DBF_TEXT(TRACE, 2, "  rc???");
         }
@@ -884,6 +884,7 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,
                 }
                 rc = qeth_get_problem(cdev, irb);
                 if (rc) {
+                        qeth_clear_ipacmd_list(card);
                         qeth_schedule_recovery(card);
                         goto out;
                 }
@@ -4081,7 +4082,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
         if (!get_device(dev))
                 return -ENODEV;
 
-        QETH_DBF_TEXT_(SETUP, 2, "%s", gdev->dev.bus_id);
+        QETH_DBF_TEXT_(SETUP, 2, "%s", dev_name(&gdev->dev));
 
         card = qeth_alloc_card();
         if (!card) {
@@ -4147,6 +4148,7 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev)
         unsigned long flags;
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
 
+        QETH_DBF_TEXT(SETUP, 2, "removedv");
         if (card->discipline.ccwgdriver) {
                 card->discipline.ccwgdriver->remove(gdev);
                 qeth_core_free_discipline(card);
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 3ac3cc1e03cc..955ba7a31b90 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -395,7 +395,8 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)
         }
         if (card->state == CARD_STATE_SOFTSETUP) {
                 qeth_l2_process_vlans(card, 1);
-                qeth_l2_del_all_mc(card);
+                if (!card->use_hard_stop)
+                        qeth_l2_del_all_mc(card);
                 qeth_clear_ipacmd_list(card);
                 card->state = CARD_STATE_HARDSETUP;
         }
@@ -559,7 +560,8 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
                         "device %s: x%x\n", CARD_BUS_ID(card), rc);
         }
 
-        if (card->info.guestlan) {
+        if ((card->info.type == QETH_CARD_TYPE_IQD) || 
+            (card->info.guestlan)) {
                 rc = qeth_setadpparms_change_macaddr(card);
                 if (rc) {
                         QETH_DBF_MESSAGE(2, "couldn't get MAC address on "
@@ -825,7 +827,6 @@ static int qeth_l2_open(struct net_device *dev)
         }
         card->data.state = CH_STATE_UP;
         card->state = CARD_STATE_UP;
-        card->dev->flags |= IFF_UP;
         netif_start_queue(dev);
 
         if (!card->lan_online && netif_carrier_ok(dev))
@@ -840,7 +841,6 @@ static int qeth_l2_stop(struct net_device *dev)
 
         QETH_DBF_TEXT(TRACE, 4, "qethstop");
         netif_tx_disable(dev);
-        card->dev->flags &= ~IFF_UP;
         if (card->state == CARD_STATE_UP)
                 card->state = CARD_STATE_SOFTSETUP;
         return 0;
@@ -1137,9 +1137,13 @@ static int qeth_l2_recover(void *ptr)
         if (!rc)
                 PRINT_INFO("Device %s successfully recovered!\n",
                            CARD_BUS_ID(card));
-        else
+        else {
+                rtnl_lock();
+                dev_close(card->dev);
+                rtnl_unlock();
                 PRINT_INFO("Device %s could not be recovered!\n",
                            CARD_BUS_ID(card));
+        }
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index dd72c3c20165..99547dea44de 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2795,7 +2795,6 @@ static int qeth_l3_open(struct net_device *dev)
                 return -ENODEV;
         card->data.state = CH_STATE_UP;
         card->state = CARD_STATE_UP;
-        card->dev->flags |= IFF_UP;
         netif_start_queue(dev);
 
         if (!card->lan_online && netif_carrier_ok(dev))
@@ -2809,7 +2808,6 @@ static int qeth_l3_stop(struct net_device *dev)
 
         QETH_DBF_TEXT(TRACE, 4, "qethstop");
         netif_tx_disable(dev);
-        card->dev->flags &= ~IFF_UP;
         if (card->state == CARD_STATE_UP)
                 card->state = CARD_STATE_SOFTSETUP;
         return 0;
@@ -3218,9 +3216,13 @@ static int qeth_l3_recover(void *ptr)
         if (!rc)
                 PRINT_INFO("Device %s successfully recovered!\n",
                            CARD_BUS_ID(card));
-        else
+        else {
+                rtnl_lock();
+                dev_close(card->dev);
+                rtnl_unlock();
                 PRINT_INFO("Device %s could not be recovered!\n",
                            CARD_BUS_ID(card));
+        }
         return 0;
 }
 
diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c
index 3c7145d9f9a1..64371c05a3b3 100644
--- a/drivers/s390/s390_rdev.c
+++ b/drivers/s390/s390_rdev.c
@@ -30,7 +30,7 @@ s390_root_dev_register(const char *name)
         dev = kzalloc(sizeof(struct device), GFP_KERNEL);
         if (!dev)
                 return ERR_PTR(-ENOMEM);
-        strncpy(dev->bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE));
+        dev_set_name(dev, name);
         dev->release = s390_root_dev_release;
         ret = device_register(dev);
         if (ret) {
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 90abfd06ed55..3b56220fb900 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -88,11 +88,13 @@ static int __init zfcp_device_setup(char *devstr)
         strncpy(zfcp_data.init_busid, token, BUS_ID_SIZE);
 
         token = strsep(&str, ",");
-        if (!token || strict_strtoull(token, 0, &zfcp_data.init_wwpn))
+        if (!token || strict_strtoull(token, 0,
+                                (unsigned long long *) &zfcp_data.init_wwpn))
                 goto err_out;
 
         token = strsep(&str, ",");
-        if (!token || strict_strtoull(token, 0, &zfcp_data.init_fcp_lun))
+        if (!token || strict_strtoull(token, 0,
+                                (unsigned long long *) &zfcp_data.init_fcp_lun))
                 goto err_out;
 
         kfree(str);
@@ -100,24 +102,10 @@ static int __init zfcp_device_setup(char *devstr)
 
  err_out:
         kfree(str);
-        pr_err("zfcp: Parse error for device parameter string %s, "
-               "device not attached.\n", devstr);
+        pr_err("zfcp: %s is not a valid SCSI device\n", devstr);
         return 0;
 }
 
-static struct zfcp_adapter *zfcp_get_adapter_by_busid(char *bus_id)
-{
-        struct zfcp_adapter *adapter;
-
-        list_for_each_entry(adapter, &zfcp_data.adapter_list_head, list)
-                if ((strncmp(bus_id, adapter->ccw_device->dev.bus_id,
-                             BUS_ID_SIZE) == 0) &&
-                    !(atomic_read(&adapter->status) &
-                      ZFCP_STATUS_COMMON_REMOVE))
-                    return adapter;
-        return NULL;
-}
-
 static void __init zfcp_init_device_configure(void)
 {
         struct zfcp_adapter *adapter;
@@ -141,7 +129,12 @@ static void __init zfcp_init_device_configure(void)
                 goto out_unit;
         up(&zfcp_data.config_sema);
         ccw_device_set_online(adapter->ccw_device);
+
         zfcp_erp_wait(adapter);
+        wait_event(adapter->erp_done_wqh,
+                   !(atomic_read(&unit->status) &
+                                ZFCP_STATUS_UNIT_SCSI_WORK_PENDING));
+
         down(&zfcp_data.config_sema);
         zfcp_unit_put(unit);
 out_unit:
@@ -180,9 +173,9 @@ static int __init zfcp_module_init(void)
         if (!zfcp_data.gid_pn_cache)
                 goto out_gid_cache;
 
-        INIT_LIST_HEAD(&zfcp_data.adapter_list_head);
-        INIT_LIST_HEAD(&zfcp_data.adapter_remove_lh);
+        zfcp_data.work_queue = create_singlethread_workqueue("zfcp_wq");
 
+        INIT_LIST_HEAD(&zfcp_data.adapter_list_head);
         sema_init(&zfcp_data.config_sema, 1);
         rwlock_init(&zfcp_data.config_lock);
 
@@ -193,13 +186,14 @@ static int __init zfcp_module_init(void)
 
         retval = misc_register(&zfcp_cfdc_misc);
         if (retval) {
-                pr_err("zfcp: registration of misc device zfcp_cfdc failed\n");
+                pr_err("zfcp: Registering the misc device zfcp_cfdc failed\n");
                 goto out_misc;
         }
 
         retval = zfcp_ccw_register();
         if (retval) {
-                pr_err("zfcp: Registration with common I/O layer failed.\n");
+                pr_err("zfcp: The zfcp device driver could not register with "
+                       "the common I/O layer\n");
                 goto out_ccw_register;
         }
 
@@ -231,8 +225,7 @@ module_init(zfcp_module_init);
  *
  * Returns: pointer to zfcp_unit or NULL
  */
-struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port,
-                                       fcp_lun_t fcp_lun)
+struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port, u64 fcp_lun)
 {
         struct zfcp_unit *unit;
 
@@ -251,7 +244,7 @@ struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port,
  * Returns: pointer to zfcp_port or NULL
  */
 struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *adapter,
-                                        wwn_t wwpn)
+                                        u64 wwpn)
 {
         struct zfcp_port *port;
 
@@ -276,7 +269,7 @@ static void zfcp_sysfs_unit_release(struct device *dev)
  *
  * Sets up some unit internal structures and creates sysfs entry.
  */
-struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
+struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)
 {
         struct zfcp_unit *unit;
 
@@ -290,7 +283,8 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
         unit->port = port;
         unit->fcp_lun = fcp_lun;
 
-        snprintf(unit->sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx", fcp_lun);
+        dev_set_name(&unit->sysfs_device, "0x%016llx",
+                     (unsigned long long) fcp_lun);
         unit->sysfs_device.parent = &port->sysfs_device;
         unit->sysfs_device.release = zfcp_sysfs_unit_release;
         dev_set_drvdata(&unit->sysfs_device, unit);
@@ -323,7 +317,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
         }
 
         zfcp_unit_get(unit);
-        unit->scsi_lun = scsilun_to_int((struct scsi_lun *)&unit->fcp_lun);
 
         write_lock_irq(&zfcp_data.config_lock);
         list_add_tail(&unit->list, &port->unit_list_head);
@@ -332,7 +325,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
 
         write_unlock_irq(&zfcp_data.config_lock);
 
-        port->units++;
         zfcp_port_get(port);
 
         return unit;
@@ -351,11 +343,10 @@ err_out_free:
  */
 void zfcp_unit_dequeue(struct zfcp_unit *unit)
 {
-        zfcp_unit_wait(unit);
+        wait_event(unit->remove_wq, atomic_read(&unit->refcount) == 0);
         write_lock_irq(&zfcp_data.config_lock);
         list_del(&unit->list);
         write_unlock_irq(&zfcp_data.config_lock);
-        unit->port->units--;
         zfcp_port_put(unit->port);
         sysfs_remove_group(&unit->sysfs_device.kobj, &zfcp_sysfs_unit_attrs);
         device_unregister(&unit->sysfs_device);
@@ -416,11 +407,6 @@ static void zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter)
                 mempool_destroy(adapter->pool.data_gid_pn);
 }
 
-static void zfcp_dummy_release(struct device *dev)
-{
-        return;
-}
-
 /**
  * zfcp_status_read_refill - refill the long running status_read_requests
  * @adapter: ptr to struct zfcp_adapter for which the buffers should be refilled
@@ -450,19 +436,6 @@ static void _zfcp_status_read_scheduler(struct work_struct *work)
                                              stat_work));
 }
 
-static int zfcp_nameserver_enqueue(struct zfcp_adapter *adapter)
-{
-        struct zfcp_port *port;
-
-        port = zfcp_port_enqueue(adapter, 0, ZFCP_STATUS_PORT_WKA,
-                                 ZFCP_DID_DIRECTORY_SERVICE);
-        if (IS_ERR(port))
-                return PTR_ERR(port);
-        zfcp_port_put(port);
-
-        return 0;
-}
-
 /**
  * zfcp_adapter_enqueue - enqueue a new adapter to the list
  * @ccw_device: pointer to the struct cc_device
@@ -508,7 +481,6 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
         init_waitqueue_head(&adapter->erp_done_wqh);
 
         INIT_LIST_HEAD(&adapter->port_list_head);
-        INIT_LIST_HEAD(&adapter->port_remove_lh);
         INIT_LIST_HEAD(&adapter->erp_ready_head);
         INIT_LIST_HEAD(&adapter->erp_running_head);
 
@@ -518,7 +490,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
         spin_lock_init(&adapter->san_dbf_lock);
         spin_lock_init(&adapter->scsi_dbf_lock);
         spin_lock_init(&adapter->rec_dbf_lock);
-        spin_lock_init(&adapter->req_q.lock);
+        spin_lock_init(&adapter->req_q_lock);
 
         rwlock_init(&adapter->erp_lock);
         rwlock_init(&adapter->abort_lock);
@@ -537,28 +509,15 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
                                &zfcp_sysfs_adapter_attrs))
                 goto sysfs_failed;
 
-        adapter->generic_services.parent = &adapter->ccw_device->dev;
-        adapter->generic_services.release = zfcp_dummy_release;
-        snprintf(adapter->generic_services.bus_id, BUS_ID_SIZE,
-                 "generic_services");
-
-        if (device_register(&adapter->generic_services))
-                goto generic_services_failed;
-
         write_lock_irq(&zfcp_data.config_lock);
         atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);
         list_add_tail(&adapter->list, &zfcp_data.adapter_list_head);
         write_unlock_irq(&zfcp_data.config_lock);
 
-        zfcp_data.adapters++;
-
-        zfcp_nameserver_enqueue(adapter);
+        zfcp_fc_nameserver_init(adapter);
 
         return 0;
 
-generic_services_failed:
-        sysfs_remove_group(&ccw_device->dev.kobj,
-                           &zfcp_sysfs_adapter_attrs);
 sysfs_failed:
         zfcp_adapter_debug_unregister(adapter);
 debug_register_failed:
@@ -585,7 +544,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter)
         cancel_work_sync(&adapter->scan_work);
         cancel_work_sync(&adapter->stat_work);
         zfcp_adapter_scsi_unregister(adapter);
-        device_unregister(&adapter->generic_services);
         sysfs_remove_group(&adapter->ccw_device->dev.kobj,
                            &zfcp_sysfs_adapter_attrs);
         dev_set_drvdata(&adapter->ccw_device->dev, NULL);
@@ -603,9 +561,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter)
         list_del(&adapter->list);
         write_unlock_irq(&zfcp_data.config_lock);
 
-        /* decrease number of adapters in list */
-        zfcp_data.adapters--;
-
         zfcp_qdio_free(adapter);
 
         zfcp_free_low_mem_buffers(adapter);
@@ -633,21 +588,19 @@ static void zfcp_sysfs_port_release(struct device *dev)
  * d_id is used to enqueue ports with a well known address like the Directory
  * Service for nameserver lookup.
  */
-struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,
+struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
                                      u32 status, u32 d_id)
 {
         struct zfcp_port *port;
         int retval;
-        char *bus_id;
 
         port = kzalloc(sizeof(struct zfcp_port), GFP_KERNEL);
         if (!port)
                 return ERR_PTR(-ENOMEM);
 
         init_waitqueue_head(&port->remove_wq);
-
         INIT_LIST_HEAD(&port->unit_list_head);
-        INIT_LIST_HEAD(&port->unit_remove_lh);
+        INIT_WORK(&port->gid_pn_work, zfcp_erp_port_strategy_open_lookup);
 
         port->adapter = adapter;
         port->d_id = d_id;
@@ -657,34 +610,8 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,
         atomic_set_mask(status | ZFCP_STATUS_COMMON_REMOVE, &port->status);
         atomic_set(&port->refcount, 0);
 
-        if (status & ZFCP_STATUS_PORT_WKA) {
-                switch (d_id) {
-                case ZFCP_DID_DIRECTORY_SERVICE:
-                        bus_id = "directory";
-                        break;
-                case ZFCP_DID_MANAGEMENT_SERVICE:
-                        bus_id = "management";
-                        break;
-                case ZFCP_DID_KEY_DISTRIBUTION_SERVICE:
-                        bus_id = "key_distribution";
-                        break;
-                case ZFCP_DID_ALIAS_SERVICE:
-                        bus_id = "alias";
-                        break;
-                case ZFCP_DID_TIME_SERVICE:
-                        bus_id = "time";
-                        break;
-                default:
-                        kfree(port);
-                        return ERR_PTR(-EINVAL);
-                }
-                snprintf(port->sysfs_device.bus_id, BUS_ID_SIZE, "%s", bus_id);
-                port->sysfs_device.parent = &adapter->generic_services;
-        } else {
-                snprintf(port->sysfs_device.bus_id,
-                         BUS_ID_SIZE, "0x%016llx", wwpn);
-                port->sysfs_device.parent = &adapter->ccw_device->dev;
-        }
+        dev_set_name(&port->sysfs_device, "0x%016llx", wwpn);
+        port->sysfs_device.parent = &adapter->ccw_device->dev;
 
         port->sysfs_device.release = zfcp_sysfs_port_release;
         dev_set_drvdata(&port->sysfs_device, port);
@@ -700,12 +627,8 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,
         if (device_register(&port->sysfs_device))
                 goto err_out_free;
 
-        if (status & ZFCP_STATUS_PORT_WKA)
-                retval = sysfs_create_group(&port->sysfs_device.kobj,
-                                            &zfcp_sysfs_ns_port_attrs);
-        else
-                retval = sysfs_create_group(&port->sysfs_device.kobj,
-                                            &zfcp_sysfs_port_attrs);
+        retval = sysfs_create_group(&port->sysfs_device.kobj,
+                                    &zfcp_sysfs_port_attrs);
 
         if (retval) {
                 device_unregister(&port->sysfs_device);
@@ -718,10 +641,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn,
         list_add_tail(&port->list, &adapter->port_list_head);
         atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);
         atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &port->status);
-        if (d_id == ZFCP_DID_DIRECTORY_SERVICE)
-                if (!adapter->nameserver_port)
-                        adapter->nameserver_port = port;
-        adapter->ports++;
 
         write_unlock_irq(&zfcp_data.config_lock);
 
@@ -740,21 +659,15 @@ err_out:
  */
 void zfcp_port_dequeue(struct zfcp_port *port)
 {
-        zfcp_port_wait(port);
+        wait_event(port->remove_wq, atomic_read(&port->refcount) == 0);
         write_lock_irq(&zfcp_data.config_lock);
         list_del(&port->list);
-        port->adapter->ports--;
         write_unlock_irq(&zfcp_data.config_lock);
         if (port->rport)
                 fc_remote_port_delete(port->rport);
         port->rport = NULL;
         zfcp_adapter_put(port->adapter);
-        if (atomic_read(&port->status) & ZFCP_STATUS_PORT_WKA)
-                sysfs_remove_group(&port->sysfs_device.kobj,
-                                   &zfcp_sysfs_ns_port_attrs);
-        else
-                sysfs_remove_group(&port->sysfs_device.kobj,
-                                   &zfcp_sysfs_port_attrs);
+        sysfs_remove_group(&port->sysfs_device.kobj, &zfcp_sysfs_port_attrs);
         device_unregister(&port->sysfs_device);
 }
 
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index 391dd29749f8..b04038c74786 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -25,7 +25,8 @@ static int zfcp_ccw_probe(struct ccw_device *ccw_device)
         down(&zfcp_data.config_sema);
         if (zfcp_adapter_enqueue(ccw_device)) {
                 dev_err(&ccw_device->dev,
-                        "Setup of data structures failed.\n");
+                        "Setting up data structures for the "
+                        "FCP adapter failed\n");
                 retval = -EINVAL;
         }
         up(&zfcp_data.config_sema);
@@ -46,6 +47,8 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device)
         struct zfcp_adapter *adapter;
         struct zfcp_port *port, *p;
         struct zfcp_unit *unit, *u;
+        LIST_HEAD(unit_remove_lh);
+        LIST_HEAD(port_remove_lh);
 
         ccw_device_set_offline(ccw_device);
         down(&zfcp_data.config_sema);
@@ -54,26 +57,26 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device)
         write_lock_irq(&zfcp_data.config_lock);
         list_for_each_entry_safe(port, p, &adapter->port_list_head, list) {
                 list_for_each_entry_safe(unit, u, &port->unit_list_head, list) {
-                        list_move(&unit->list, &port->unit_remove_lh);
+                        list_move(&unit->list, &unit_remove_lh);
                         atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE,
                                         &unit->status);
                 }
-                list_move(&port->list, &adapter->port_remove_lh);
+                list_move(&port->list, &port_remove_lh);
                 atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);
         }
         atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);
         write_unlock_irq(&zfcp_data.config_lock);
 
-        list_for_each_entry_safe(port, p, &adapter->port_remove_lh, list) {
-                list_for_each_entry_safe(unit, u, &port->unit_remove_lh, list) {
-                        if (atomic_test_mask(ZFCP_STATUS_UNIT_REGISTERED,
-                                &unit->status))
+        list_for_each_entry_safe(port, p, &port_remove_lh, list) {
+                list_for_each_entry_safe(unit, u, &unit_remove_lh, list) {
+                        if (atomic_read(&unit->status) &
+                            ZFCP_STATUS_UNIT_REGISTERED)
                                 scsi_remove_device(unit->device);
                         zfcp_unit_dequeue(unit);
                 }
                 zfcp_port_dequeue(port);
         }
-        zfcp_adapter_wait(adapter);
+        wait_event(adapter->remove_wq, atomic_read(&adapter->refcount) == 0);
         zfcp_adapter_dequeue(adapter);
 
         up(&zfcp_data.config_sema);
@@ -152,21 +155,22 @@ static int zfcp_ccw_set_offline(struct ccw_device *ccw_device)
  */
 static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
 {
-        struct zfcp_adapter *adapter;
+        struct zfcp_adapter *adapter = dev_get_drvdata(&ccw_device->dev);
 
-        down(&zfcp_data.config_sema);
-        adapter = dev_get_drvdata(&ccw_device->dev);
         switch (event) {
         case CIO_GONE:
-                dev_warn(&adapter->ccw_device->dev, "device gone\n");
+                dev_warn(&adapter->ccw_device->dev,
+                         "The FCP device has been detached\n");
                 zfcp_erp_adapter_shutdown(adapter, 0, 87, NULL);
                 break;
         case CIO_NO_PATH:
-                dev_warn(&adapter->ccw_device->dev, "no path\n");
+                dev_warn(&adapter->ccw_device->dev,
+                         "The CHPID for the FCP device is offline\n");
                 zfcp_erp_adapter_shutdown(adapter, 0, 88, NULL);
                 break;
         case CIO_OPER:
-                dev_info(&adapter->ccw_device->dev, "operational again\n");
+                dev_info(&adapter->ccw_device->dev,
+                         "The FCP device is operational again\n");
                 zfcp_erp_modify_adapter_status(adapter, 11, NULL,
                                                ZFCP_STATUS_COMMON_RUNNING,
                                                ZFCP_SET);
@@ -174,8 +178,6 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
                                         89, NULL);
                 break;
         }
-        zfcp_erp_wait(adapter);
-        up(&zfcp_data.config_sema);
         return 1;
 }
 
@@ -224,3 +226,20 @@ int __init zfcp_ccw_register(void)
 {
         return ccw_driver_register(&zfcp_ccw_driver);
 }
+
+/**
+ * zfcp_get_adapter_by_busid - find zfcp_adapter struct
+ * @busid: bus id string of zfcp adapter to find
+ */
+struct zfcp_adapter *zfcp_get_adapter_by_busid(char *busid)
+{
+        struct ccw_device *ccw_device;
+        struct zfcp_adapter *adapter = NULL;
+
+        ccw_device = get_ccwdev_by_busid(&zfcp_ccw_driver, busid);
+        if (ccw_device) {
+                adapter = dev_get_drvdata(&ccw_device->dev);
+                put_device(&ccw_device->dev);
+        }
+        return adapter;
+}
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index fca48b88fc53..060f5f2352ec 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -318,6 +318,26 @@ void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *adapter,
         spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);
 }
 
+/**
+ * zfcp_hba_dbf_event_berr - trace event for bit error threshold
+ * @adapter: adapter affected by this QDIO related event
+ * @req: fsf request
+ */
+void zfcp_hba_dbf_event_berr(struct zfcp_adapter *adapter,
+                             struct zfcp_fsf_req *req)
+{
+        struct zfcp_hba_dbf_record *r = &adapter->hba_dbf_buf;
+        struct fsf_status_read_buffer *sr_buf = req->data;
+        struct fsf_bit_error_payload *err = &sr_buf->payload.bit_error;
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->hba_dbf_lock, flags);
+        memset(r, 0, sizeof(*r));
+        strncpy(r->tag, "berr", ZFCP_DBF_TAG_SIZE);
+        memcpy(&r->u.berr, err, sizeof(struct fsf_bit_error_payload));
+        debug_event(adapter->hba_dbf, 0, r, sizeof(*r));
+        spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);
+}
 static void zfcp_hba_dbf_view_response(char **p,
                                        struct zfcp_hba_dbf_record_response *r)
 {
@@ -399,6 +419,30 @@ static void zfcp_hba_dbf_view_qdio(char **p, struct zfcp_hba_dbf_record_qdio *r)
         zfcp_dbf_out(p, "sbal_count", "0x%02x", r->sbal_count);
 }
 
+static void zfcp_hba_dbf_view_berr(char **p, struct fsf_bit_error_payload *r)
+{
+        zfcp_dbf_out(p, "link_failures", "%d", r->link_failure_error_count);
+        zfcp_dbf_out(p, "loss_of_sync_err", "%d", r->loss_of_sync_error_count);
+        zfcp_dbf_out(p, "loss_of_sig_err", "%d", r->loss_of_signal_error_count);
+        zfcp_dbf_out(p, "prim_seq_err", "%d",
+                     r->primitive_sequence_error_count);
+        zfcp_dbf_out(p, "inval_trans_word_err", "%d",
+                     r->invalid_transmission_word_error_count);
+        zfcp_dbf_out(p, "CRC_errors", "%d", r->crc_error_count);
+        zfcp_dbf_out(p, "prim_seq_event_to", "%d",
+                     r->primitive_sequence_event_timeout_count);
+        zfcp_dbf_out(p, "elast_buf_overrun_err", "%d",
+                     r->elastic_buffer_overrun_error_count);
+        zfcp_dbf_out(p, "adv_rec_buf2buf_cred", "%d",
+                     r->advertised_receive_b2b_credit);
+        zfcp_dbf_out(p, "curr_rec_buf2buf_cred", "%d",
+                     r->current_receive_b2b_credit);
+        zfcp_dbf_out(p, "adv_trans_buf2buf_cred", "%d",
+                     r->advertised_transmit_b2b_credit);
+        zfcp_dbf_out(p, "curr_trans_buf2buf_cred", "%d",
+                     r->current_transmit_b2b_credit);
+}
+
 static int zfcp_hba_dbf_view_format(debug_info_t *id, struct debug_view *view,
                                     char *out_buf, const char *in_buf)
 {
@@ -418,6 +462,8 @@ static int zfcp_hba_dbf_view_format(debug_info_t *id, struct debug_view *view,
                 zfcp_hba_dbf_view_status(&p, &r->u.status);
         else if (strncmp(r->tag, "qdio", ZFCP_DBF_TAG_SIZE) == 0)
                 zfcp_hba_dbf_view_qdio(&p, &r->u.qdio);
+        else if (strncmp(r->tag, "berr", ZFCP_DBF_TAG_SIZE) == 0)
+                zfcp_hba_dbf_view_berr(&p, &r->u.berr);
 
         p += sprintf(p, "\n");
         return p - out_buf;
@@ -519,14 +565,14 @@ static const char *zfcp_rec_dbf_ids[] = {
         [75]    = "physical port recovery escalation after failed port "
                   "recovery",
         [76]    = "port recovery escalation after failed unit recovery",
-        [77]    = "recovery opening nameserver port",
+        [77]    = "",
         [78]    = "duplicate request id",
         [79]    = "link down",
         [80]    = "exclusive read-only unit access unsupported",
         [81]    = "shared read-write unit access unsupported",
         [82]    = "incoming rscn",
         [83]    = "incoming wwpn",
-        [84]    = "",
+        [84]    = "wka port handle not valid close port",
         [85]    = "online",
         [86]    = "offline",
         [87]    = "ccw device gone",
@@ -570,7 +616,7 @@ static const char *zfcp_rec_dbf_ids[] = {
         [125]   = "need newer zfcp",
         [126]   = "need newer microcode",
         [127]   = "arbitrated loop not supported",
-        [128]   = "unknown topology",
+        [128]   = "",
         [129]   = "qtcb size mismatch",
         [130]   = "unknown fsf status ecd",
         [131]   = "fcp request too big",
@@ -829,9 +875,9 @@ void zfcp_rec_dbf_event_action(u8 id2, struct zfcp_erp_action *erp_action)
 void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *fsf_req)
 {
         struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req->data;
-        struct zfcp_port *port = ct->port;
-        struct zfcp_adapter *adapter = port->adapter;
-        struct ct_hdr *hdr = zfcp_sg_to_address(ct->req);
+        struct zfcp_wka_port *wka_port = ct->wka_port;
+        struct zfcp_adapter *adapter = wka_port->adapter;
+        struct ct_hdr *hdr = sg_virt(ct->req);
         struct zfcp_san_dbf_record *r = &adapter->san_dbf_buf;
         struct zfcp_san_dbf_record_ct_request *oct = &r->u.ct_req;
         unsigned long flags;
@@ -842,7 +888,7 @@ void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *fsf_req)
         r->fsf_reqid = (unsigned long)fsf_req;
         r->fsf_seqno = fsf_req->seq_no;
         r->s_id = fc_host_port_id(adapter->scsi_host);
-        r->d_id = port->d_id;
+        r->d_id = wka_port->d_id;
         oct->cmd_req_code = hdr->cmd_rsp_code;
         oct->revision = hdr->revision;
         oct->gs_type = hdr->gs_type;
@@ -863,9 +909,9 @@ void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *fsf_req)
 void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *fsf_req)
 {
         struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req->data;
-        struct zfcp_port *port = ct->port;
-        struct zfcp_adapter *adapter = port->adapter;
-        struct ct_hdr *hdr = zfcp_sg_to_address(ct->resp);
+        struct zfcp_wka_port *wka_port = ct->wka_port;
+        struct zfcp_adapter *adapter = wka_port->adapter;
+        struct ct_hdr *hdr = sg_virt(ct->resp);
         struct zfcp_san_dbf_record *r = &adapter->san_dbf_buf;
         struct zfcp_san_dbf_record_ct_response *rct = &r->u.ct_resp;
         unsigned long flags;
@@ -875,7 +921,7 @@ void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *fsf_req)
         strncpy(r->tag, "rctc", ZFCP_DBF_TAG_SIZE);
         r->fsf_reqid = (unsigned long)fsf_req;
         r->fsf_seqno = fsf_req->seq_no;
-        r->s_id = port->d_id;
+        r->s_id = wka_port->d_id;
         r->d_id = fc_host_port_id(adapter->scsi_host);
         rct->cmd_rsp_code = hdr->cmd_rsp_code;
         rct->revision = hdr->revision;
@@ -922,8 +968,8 @@ void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *fsf_req)
 
         zfcp_san_dbf_event_els("oels", 2, fsf_req,
                                fc_host_port_id(els->adapter->scsi_host),
-                               els->d_id, *(u8 *) zfcp_sg_to_address(els->req),
-                               zfcp_sg_to_address(els->req), els->req->length);
+                               els->d_id, *(u8 *) sg_virt(els->req),
+                               sg_virt(els->req), els->req->length);
 }
 
 /**
@@ -936,8 +982,7 @@ void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *fsf_req)
 
         zfcp_san_dbf_event_els("rels", 2, fsf_req, els->d_id,
                                fc_host_port_id(els->adapter->scsi_host),
-                               *(u8 *)zfcp_sg_to_address(els->req),
-                               zfcp_sg_to_address(els->resp),
+                               *(u8 *)sg_virt(els->req), sg_virt(els->resp),
                                els->resp->length);
 }
 
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h
index 0ddb18449d11..e8f450801fea 100644
--- a/drivers/s390/scsi/zfcp_dbf.h
+++ b/drivers/s390/scsi/zfcp_dbf.h
@@ -151,6 +151,7 @@ struct zfcp_hba_dbf_record {
                 struct zfcp_hba_dbf_record_response response;
                 struct zfcp_hba_dbf_record_status status;
                 struct zfcp_hba_dbf_record_qdio qdio;
+                struct fsf_bit_error_payload berr;
         } u;
 } __attribute__ ((packed));
 
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 67f45fc62f53..8a13071c444c 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -39,29 +39,6 @@
 
 /********************* GENERAL DEFINES *********************************/
 
-/**
- * zfcp_sg_to_address - determine kernel address from struct scatterlist
- * @list: struct scatterlist
- * Return: kernel address
- */
-static inline void *
-zfcp_sg_to_address(struct scatterlist *list)
-{
-        return sg_virt(list);
-}
-
-/**
- * zfcp_address_to_sg - set up struct scatterlist from kernel address
- * @address: kernel address
- * @list: struct scatterlist
- * @size: buffer size
- */
-static inline void
-zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size)
-{
-        sg_set_buf(list, address, size);
-}
-
 #define REQUEST_LIST_SIZE 128
 
 /********************* SCSI SPECIFIC DEFINES *********************************/
@@ -101,11 +78,6 @@ zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size)
 
 /*************** FIBRE CHANNEL PROTOCOL SPECIFIC DEFINES ********************/
 
-typedef unsigned long long wwn_t;
-typedef unsigned long long fcp_lun_t;
-/* data length field may be at variable position in FCP-2 FCP_CMND IU */
-typedef unsigned int       fcp_dl_t;
-
 /* timeout for name-server lookup (in seconds) */
 #define ZFCP_NS_GID_PN_TIMEOUT          10
 
@@ -129,7 +101,7 @@ typedef unsigned int       fcp_dl_t;
 
 /* FCP(-2) FCP_CMND IU */
 struct fcp_cmnd_iu {
-        fcp_lun_t fcp_lun;         /* FCP logical unit number */
+        u64 fcp_lun;       /* FCP logical unit number */
         u8  crn;                   /* command reference number */
         u8  reserved0:5;           /* reserved */
         u8  task_attribute:3;      /* task attribute */
@@ -204,7 +176,7 @@ struct fcp_rscn_element {
 struct fcp_logo {
         u32 command;
         u32 nport_did;
-        wwn_t nport_wwpn;
+        u64 nport_wwpn;
 } __attribute__((packed));
 
 /*
@@ -218,13 +190,6 @@ struct fcp_logo {
 #define ZFCP_LS_RSCN                    0x61
 #define ZFCP_LS_RNID                    0x78
 
-struct zfcp_ls_rjt_par {
-        u8 action;
-        u8 reason_code;
-        u8 reason_expl;
-        u8 vendor_unique;
-} __attribute__ ((packed));
-
 struct zfcp_ls_adisc {
         u8              code;
         u8              field[3];
@@ -234,20 +199,6 @@ struct zfcp_ls_adisc {
         u32             nport_id;
 } __attribute__ ((packed));
 
-struct zfcp_ls_adisc_acc {
-        u8              code;
-        u8              field[3];
-        u32             hard_nport_id;
-        u64             wwpn;
-        u64             wwnn;
-        u32             nport_id;
-} __attribute__ ((packed));
-
-struct zfcp_rc_entry {
-        u8 code;
-        const char *description;
-};
-
 /*
  * FC-GS-2 stuff
  */
@@ -281,9 +232,7 @@ struct zfcp_rc_entry {
 #define ZFCP_STATUS_COMMON_RUNNING              0x40000000
 #define ZFCP_STATUS_COMMON_ERP_FAILED           0x20000000
 #define ZFCP_STATUS_COMMON_UNBLOCKED            0x10000000
-#define ZFCP_STATUS_COMMON_OPENING              0x08000000
 #define ZFCP_STATUS_COMMON_OPEN                 0x04000000
-#define ZFCP_STATUS_COMMON_CLOSING              0x02000000
 #define ZFCP_STATUS_COMMON_ERP_INUSE            0x01000000
 #define ZFCP_STATUS_COMMON_ACCESS_DENIED        0x00800000
 #define ZFCP_STATUS_COMMON_ACCESS_BOXED         0x00400000
@@ -291,16 +240,15 @@ struct zfcp_rc_entry {
 
 /* adapter status */
 #define ZFCP_STATUS_ADAPTER_QDIOUP              0x00000002
-#define ZFCP_STATUS_ADAPTER_REGISTERED          0x00000004
 #define ZFCP_STATUS_ADAPTER_XCONFIG_OK          0x00000008
 #define ZFCP_STATUS_ADAPTER_HOST_CON_INIT       0x00000010
 #define ZFCP_STATUS_ADAPTER_ERP_THREAD_UP       0x00000020
 #define ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL     0x00000080
 #define ZFCP_STATUS_ADAPTER_ERP_PENDING         0x00000100
 #define ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED      0x00000200
-#define ZFCP_STATUS_ADAPTER_XPORT_OK            0x00000800
 
 /* FC-PH/FC-GS well-known address identifiers for generic services */
+#define ZFCP_DID_WKA                            0xFFFFF0
 #define ZFCP_DID_MANAGEMENT_SERVICE             0xFFFFFA
 #define ZFCP_DID_TIME_SERVICE                   0xFFFFFB
 #define ZFCP_DID_DIRECTORY_SERVICE              0xFFFFFC
@@ -312,29 +260,27 @@ struct zfcp_rc_entry {
 #define ZFCP_STATUS_PORT_DID_DID                0x00000002
 #define ZFCP_STATUS_PORT_PHYS_CLOSING           0x00000004
 #define ZFCP_STATUS_PORT_NO_WWPN                0x00000008
-#define ZFCP_STATUS_PORT_NO_SCSI_ID             0x00000010
 #define ZFCP_STATUS_PORT_INVALID_WWPN           0x00000020
 
-/* for ports with well known addresses */
-#define ZFCP_STATUS_PORT_WKA \
-                (ZFCP_STATUS_PORT_NO_WWPN | \
-                 ZFCP_STATUS_PORT_NO_SCSI_ID)
+/* well known address (WKA) port status*/
+enum zfcp_wka_status {
+        ZFCP_WKA_PORT_OFFLINE,
+        ZFCP_WKA_PORT_CLOSING,
+        ZFCP_WKA_PORT_OPENING,
+        ZFCP_WKA_PORT_ONLINE,
+};
 
 /* logical unit status */
-#define ZFCP_STATUS_UNIT_TEMPORARY              0x00000002
 #define ZFCP_STATUS_UNIT_SHARED                 0x00000004
 #define ZFCP_STATUS_UNIT_READONLY               0x00000008
 #define ZFCP_STATUS_UNIT_REGISTERED             0x00000010
 #define ZFCP_STATUS_UNIT_SCSI_WORK_PENDING      0x00000020
 
 /* FSF request status (this does not have a common part) */
-#define ZFCP_STATUS_FSFREQ_NOT_INIT             0x00000000
-#define ZFCP_STATUS_FSFREQ_POOL                 0x00000001
 #define ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT      0x00000002
 #define ZFCP_STATUS_FSFREQ_COMPLETED            0x00000004
 #define ZFCP_STATUS_FSFREQ_ERROR                0x00000008
 #define ZFCP_STATUS_FSFREQ_CLEANUP              0x00000010
-#define ZFCP_STATUS_FSFREQ_ABORTING             0x00000020
 #define ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED       0x00000040
 #define ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED       0x00000080
 #define ZFCP_STATUS_FSFREQ_ABORTED              0x00000100
@@ -379,7 +325,7 @@ struct ct_hdr {
  * a port name is required */
 struct ct_iu_gid_pn_req {
         struct ct_hdr header;
-        wwn_t wwpn;
+        u64 wwpn;
 } __attribute__ ((packed));
 
 /* FS_ACC IU and data unit for GID_PN nameserver request */
@@ -388,11 +334,9 @@ struct ct_iu_gid_pn_resp {
         u32 d_id;
 } __attribute__ ((packed));
 
-typedef void (*zfcp_send_ct_handler_t)(unsigned long);
-
 /**
  * struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct
- * @port: port where the request is sent to
+ * @wka_port: port where the request is sent to
  * @req: scatter-gather list for request
  * @resp: scatter-gather list for response
  * @req_count: number of elements in request scatter-gather list
@@ -404,12 +348,12 @@ typedef void (*zfcp_send_ct_handler_t)(unsigned long);
  * @status: used to pass error status to calling function
  */
 struct zfcp_send_ct {
-        struct zfcp_port *port;
+        struct zfcp_wka_port *wka_port;
         struct scatterlist *req;
         struct scatterlist *resp;
         unsigned int req_count;
         unsigned int resp_count;
-        zfcp_send_ct_handler_t handler;
+        void (*handler)(unsigned long);
         unsigned long handler_data;
         int timeout;
         struct completion *completion;
@@ -426,8 +370,6 @@ struct zfcp_gid_pn_data {
         struct zfcp_port *port;
 };
 
-typedef void (*zfcp_send_els_handler_t)(unsigned long);
-
 /**
  * struct zfcp_send_els - used to pass parameters to function zfcp_fsf_send_els
  * @adapter: adapter where request is sent from
@@ -451,22 +393,28 @@ struct zfcp_send_els {
         struct scatterlist *resp;
         unsigned int req_count;
         unsigned int resp_count;
-        zfcp_send_els_handler_t handler;
+        void (*handler)(unsigned long);
         unsigned long handler_data;
         struct completion *completion;
         int ls_code;
         int status;
 };
 
+struct zfcp_wka_port {
+        struct zfcp_adapter     *adapter;
+        wait_queue_head_t       completion_wq;
+        enum zfcp_wka_status    status;
+        atomic_t                refcount;
+        u32                     d_id;
+        u32                     handle;
+        struct mutex            mutex;
+        struct delayed_work     work;
+};
+
 struct zfcp_qdio_queue {
-        struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q]; /* SBALs */
-        u8                 first;             /* index of next free bfr
-                                                 in queue (free_count>0) */
-        atomic_t           count;             /* number of free buffers
-                                                 in queue */
-        spinlock_t         lock;              /* lock for operations on queue */
-        int                pci_batch;         /* SBALs since PCI indication
-                                                 was last set */
+        struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];
+        u8                 first;       /* index of next free bfr in queue */
+        atomic_t           count;       /* number of free buffers in queue */
 };
 
 struct zfcp_erp_action {
@@ -475,7 +423,7 @@ struct zfcp_erp_action {
         struct zfcp_adapter *adapter; /* device which should be recovered */
         struct zfcp_port *port;
         struct zfcp_unit *unit;
-        volatile u32 status;          /* recovery status */
+        u32             status;       /* recovery status */
         u32 step;                     /* active step of this erp action */
         struct zfcp_fsf_req *fsf_req; /* fsf request currently pending
                                          for this action */
@@ -506,8 +454,8 @@ struct zfcp_adapter {
         atomic_t                refcount;          /* reference count */
         wait_queue_head_t       remove_wq;         /* can be used to wait for
                                                       refcount drop to zero */
-        wwn_t                   peer_wwnn;         /* P2P peer WWNN */
-        wwn_t                   peer_wwpn;         /* P2P peer WWPN */
+        u64                     peer_wwnn;         /* P2P peer WWNN */
+        u64                     peer_wwpn;         /* P2P peer WWPN */
         u32                     peer_d_id;         /* P2P peer D_ID */
         struct ccw_device       *ccw_device;       /* S/390 ccw device */
         u32                     hydra_version;     /* Hydra version */
@@ -518,13 +466,13 @@ struct zfcp_adapter {
         u16                     timer_ticks;       /* time int for a tick */
         struct Scsi_Host        *scsi_host;        /* Pointer to mid-layer */
         struct list_head        port_list_head;    /* remote port list */
-        struct list_head        port_remove_lh;    /* head of ports to be
-                                                      removed */
-        u32                     ports;             /* number of remote ports */
         unsigned long           req_no;            /* unique FSF req number */
         struct list_head        *req_list;         /* list of pending reqs */
         spinlock_t              req_list_lock;     /* request list lock */
         struct zfcp_qdio_queue  req_q;             /* request queue */
+        spinlock_t              req_q_lock;        /* for operations on queue */
+        int                     req_q_pci_batch;   /* SBALs since PCI indication
+                                                      was last set */
         u32                     fsf_req_seq_no;    /* FSF cmnd seq number */
         wait_queue_head_t       request_wq;        /* can be used to wait for
                                                       more avaliable SBALs */
@@ -548,7 +496,7 @@ struct zfcp_adapter {
                                                       actions */
         u32                     erp_low_mem_count; /* nr of erp actions waiting
                                                       for memory */
-        struct zfcp_port        *nameserver_port;  /* adapter's nameserver */
+        struct zfcp_wka_port    nsp;               /* adapter's nameserver */
         debug_info_t            *rec_dbf;
         debug_info_t            *hba_dbf;
         debug_info_t            *san_dbf;          /* debug feature areas */
@@ -563,11 +511,11 @@ struct zfcp_adapter {
         struct zfcp_scsi_dbf_record     scsi_dbf_buf;
         struct zfcp_adapter_mempool     pool;      /* Adapter memory pools */
         struct qdio_initialize  qdio_init_data;    /* for qdio_establish */
-        struct device           generic_services;  /* directory for WKA ports */
         struct fc_host_statistics *fc_stats;
         struct fsf_qtcb_bottom_port *stats_reset_data;
         unsigned long           stats_reset;
         struct work_struct      scan_work;
+        atomic_t                qdio_outb_full;    /* queue full incidents */
 };
 
 struct zfcp_port {
@@ -579,18 +527,16 @@ struct zfcp_port {
                                                   refcount drop to zero */
         struct zfcp_adapter    *adapter;       /* adapter used to access port */
         struct list_head       unit_list_head; /* head of logical unit list */
-        struct list_head       unit_remove_lh; /* head of luns to be removed
-                                                  list */
-        u32                    units;          /* # of logical units in list */
         atomic_t               status;         /* status of this remote port */
-        wwn_t                  wwnn;           /* WWNN if known */
-        wwn_t                  wwpn;           /* WWPN */
+        u64                    wwnn;           /* WWNN if known */
+        u64                    wwpn;           /* WWPN */
         u32                    d_id;           /* D_ID */
         u32                    handle;         /* handle assigned by FSF */
         struct zfcp_erp_action erp_action;     /* pending error recovery */
         atomic_t               erp_counter;
         u32                    maxframe_size;
         u32                    supported_classes;
+        struct work_struct     gid_pn_work;
 };
 
 struct zfcp_unit {
@@ -601,8 +547,7 @@ struct zfcp_unit {
                                                   refcount drop to zero */
         struct zfcp_port       *port;          /* remote port of unit */
         atomic_t               status;         /* status of this logical unit */
-        unsigned int           scsi_lun;       /* own SCSI LUN */
-        fcp_lun_t              fcp_lun;        /* own FCP_LUN */
+        u64                    fcp_lun;        /* own FCP_LUN */
         u32                    handle;         /* handle assigned by FSF */
         struct scsi_device     *device;        /* scsi device struct pointer */
         struct zfcp_erp_action erp_action;     /* pending error recovery */
@@ -625,7 +570,7 @@ struct zfcp_fsf_req {
         u8                      sbal_response;  /* SBAL used in interrupt */
         wait_queue_head_t      completion_wq;  /* can be used by a routine
                                                   to wait for completion */
-        volatile u32           status;         /* status of this request */
+        u32                     status;        /* status of this request */
         u32                    fsf_command;    /* FSF Command copy */
         struct fsf_qtcb        *qtcb;          /* address of associated QTCB */
         u32                    seq_no;         /* Sequence number of request */
@@ -644,23 +589,20 @@ struct zfcp_fsf_req {
 struct zfcp_data {
         struct scsi_host_template scsi_host_template;
         struct scsi_transport_template *scsi_transport_template;
-        atomic_t                status;             /* Module status flags */
         struct list_head        adapter_list_head;  /* head of adapter list */
-        struct list_head        adapter_remove_lh;  /* head of adapters to be
-                                                       removed */
-        u32                     adapters;           /* # of adapters in list */
         rwlock_t                config_lock;        /* serialises changes
                                                        to adapter/port/unit
                                                        lists */
         struct semaphore        config_sema;        /* serialises configuration
                                                        changes */
         atomic_t                loglevel;            /* current loglevel */
-        char                    init_busid[BUS_ID_SIZE];
-        wwn_t                   init_wwpn;
-        fcp_lun_t               init_fcp_lun;
-        struct kmem_cache               *fsf_req_qtcb_cache;
-        struct kmem_cache               *sr_buffer_cache;
-        struct kmem_cache               *gid_pn_cache;
+        char                    init_busid[20];
+        u64                     init_wwpn;
+        u64                     init_fcp_lun;
+        struct kmem_cache       *fsf_req_qtcb_cache;
+        struct kmem_cache       *sr_buffer_cache;
+        struct kmem_cache       *gid_pn_cache;
+        struct workqueue_struct *work_queue;
 };
 
 /* struct used by memory pools for fsf_requests */
@@ -677,14 +619,7 @@ struct zfcp_fsf_req_qtcb {
 #define ZFCP_SET                0x00000100
 #define ZFCP_CLEAR              0x00000200
 
-#ifndef atomic_test_mask
-#define atomic_test_mask(mask, target) \
-           ((atomic_read(target) & mask) == mask)
-#endif
-
-#define zfcp_get_busid_by_adapter(adapter) (adapter->ccw_device->dev.bus_id)
-#define zfcp_get_busid_by_port(port) (zfcp_get_busid_by_adapter(port->adapter))
-#define zfcp_get_busid_by_unit(unit) (zfcp_get_busid_by_port(unit->port))
+#define zfcp_get_busid_by_adapter(adapter) (dev_name(&adapter->ccw_device->dev))
 
 /*
  * Helper functions for request ID management.
@@ -745,12 +680,6 @@ zfcp_unit_put(struct zfcp_unit *unit)
 }
 
 static inline void
-zfcp_unit_wait(struct zfcp_unit *unit)
-{
-        wait_event(unit->remove_wq, atomic_read(&unit->refcount) == 0);
-}
-
-static inline void
 zfcp_port_get(struct zfcp_port *port)
 {
         atomic_inc(&port->refcount);
@@ -764,12 +693,6 @@ zfcp_port_put(struct zfcp_port *port)
 }
 
 static inline void
-zfcp_port_wait(struct zfcp_port *port)
-{
-        wait_event(port->remove_wq, atomic_read(&port->refcount) == 0);
-}
-
-static inline void
 zfcp_adapter_get(struct zfcp_adapter *adapter)
 {
         atomic_inc(&adapter->refcount);
@@ -782,10 +705,4 @@ zfcp_adapter_put(struct zfcp_adapter *adapter)
                 wake_up(&adapter->remove_wq);
 }
 
-static inline void
-zfcp_adapter_wait(struct zfcp_adapter *adapter)
-{
-        wait_event(adapter->remove_wq, atomic_read(&adapter->refcount) == 0);
-}
-
 #endif /* ZFCP_DEF_H */
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 643ac4bba5b5..9040f738ff33 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -23,7 +23,6 @@ enum zfcp_erp_steps {
         ZFCP_ERP_STEP_FSF_XCONFIG       = 0x0001,
         ZFCP_ERP_STEP_PHYS_PORT_CLOSING = 0x0010,
         ZFCP_ERP_STEP_PORT_CLOSING      = 0x0100,
-        ZFCP_ERP_STEP_NAMESERVER_OPEN   = 0x0200,
         ZFCP_ERP_STEP_NAMESERVER_LOOKUP = 0x0400,
         ZFCP_ERP_STEP_PORT_OPENING      = 0x0800,
         ZFCP_ERP_STEP_UNIT_CLOSING      = 0x1000,
@@ -532,8 +531,7 @@ static void _zfcp_erp_port_reopen_all(struct zfcp_adapter *adapter,
         struct zfcp_port *port;
 
         list_for_each_entry(port, &adapter->port_list_head, list)
-                if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_WKA))
-                        _zfcp_erp_port_reopen(port, clear, id, ref);
+                _zfcp_erp_port_reopen(port, clear, id, ref);
 }
 
 static void _zfcp_erp_unit_reopen_all(struct zfcp_port *port, int clear, u8 id,
@@ -669,8 +667,6 @@ static int zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *act)
         int ret;
         struct zfcp_adapter *adapter = act->adapter;
 
-        atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status);
-
         write_lock_irq(&adapter->erp_lock);
         zfcp_erp_action_to_running(act);
         write_unlock_irq(&adapter->erp_lock);
@@ -741,8 +737,7 @@ static int zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *act,
                                        ZFCP_STATUS_COMMON_OPEN, ZFCP_CLEAR);
  failed_qdio:
         atomic_clear_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK |
-                          ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
-                          ZFCP_STATUS_ADAPTER_XPORT_OK,
+                          ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED,
                           &act->adapter->status);
         return retval;
 }
@@ -751,15 +746,11 @@ static int zfcp_erp_adapter_strategy(struct zfcp_erp_action *act)
 {
         int retval;
 
-        atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &act->adapter->status);
         zfcp_erp_adapter_strategy_generic(act, 1); /* close */
-        atomic_clear_mask(ZFCP_STATUS_COMMON_CLOSING, &act->adapter->status);
         if (act->status & ZFCP_STATUS_ERP_CLOSE_ONLY)
                 return ZFCP_ERP_EXIT;
 
-        atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &act->adapter->status);
         retval = zfcp_erp_adapter_strategy_generic(act, 0); /* open */
-        atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING, &act->adapter->status);
 
         if (retval == ZFCP_ERP_FAILED)
                 ssleep(8);
@@ -783,10 +774,7 @@ static int zfcp_erp_port_forced_strategy_close(struct zfcp_erp_action *act)
 
 static void zfcp_erp_port_strategy_clearstati(struct zfcp_port *port)
 {
-        atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING |
-                          ZFCP_STATUS_COMMON_CLOSING |
-                          ZFCP_STATUS_COMMON_ACCESS_DENIED |
-                          ZFCP_STATUS_PORT_DID_DID |
+        atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
                           ZFCP_STATUS_PORT_PHYS_CLOSING |
                           ZFCP_STATUS_PORT_INVALID_WWPN,
                           &port->status);
@@ -839,73 +827,12 @@ static int zfcp_erp_port_strategy_open_port(struct zfcp_erp_action *erp_action)
         return ZFCP_ERP_CONTINUES;
 }
 
-static void zfcp_erp_port_strategy_open_ns_wake(struct zfcp_erp_action *ns_act)
-{
-        unsigned long flags;
-        struct zfcp_adapter *adapter = ns_act->adapter;
-        struct zfcp_erp_action *act, *tmp;
-        int status;
-
-        read_lock_irqsave(&adapter->erp_lock, flags);
-        list_for_each_entry_safe(act, tmp, &adapter->erp_running_head, list) {
-                if (act->step == ZFCP_ERP_STEP_NAMESERVER_OPEN) {
-                        status = atomic_read(&adapter->nameserver_port->status);
-                        if (status & ZFCP_STATUS_COMMON_ERP_FAILED)
-                                zfcp_erp_port_failed(act->port, 27, NULL);
-                        zfcp_erp_action_ready(act);
-                }
-        }
-        read_unlock_irqrestore(&adapter->erp_lock, flags);
-}
-
-static int zfcp_erp_port_strategy_open_nameserver(struct zfcp_erp_action *act)
-{
-        int retval;
-
-        switch (act->step) {
-        case ZFCP_ERP_STEP_UNINITIALIZED:
-        case ZFCP_ERP_STEP_PHYS_PORT_CLOSING:
-        case ZFCP_ERP_STEP_PORT_CLOSING:
-                return zfcp_erp_port_strategy_open_port(act);
-
-        case ZFCP_ERP_STEP_PORT_OPENING:
-                if (atomic_read(&act->port->status) & ZFCP_STATUS_COMMON_OPEN)
-                        retval = ZFCP_ERP_SUCCEEDED;
-                else
-                        retval = ZFCP_ERP_FAILED;
-                /* this is needed anyway  */
-                zfcp_erp_port_strategy_open_ns_wake(act);
-                return retval;
-
-        default:
-                return ZFCP_ERP_FAILED;
-        }
-}
-
-static int zfcp_erp_port_strategy_open_lookup(struct zfcp_erp_action *act)
-{
-        int retval;
-
-        retval = zfcp_fc_ns_gid_pn_request(act);
-        if (retval == -ENOMEM)
-                return ZFCP_ERP_NOMEM;
-        act->step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP;
-        if (retval)
-                return ZFCP_ERP_FAILED;
-        return ZFCP_ERP_CONTINUES;
-}
-
 static int zfcp_erp_open_ptp_port(struct zfcp_erp_action *act)
 {
         struct zfcp_adapter *adapter = act->adapter;
         struct zfcp_port *port = act->port;
 
         if (port->wwpn != adapter->peer_wwpn) {
-                dev_err(&adapter->ccw_device->dev,
-                        "Failed to open port 0x%016Lx, "
-                        "Peer WWPN 0x%016Lx does not "
-                        "match.\n", port->wwpn,
-                        adapter->peer_wwpn);
                 zfcp_erp_port_failed(port, 25, NULL);
                 return ZFCP_ERP_FAILED;
         }
@@ -914,11 +841,25 @@ static int zfcp_erp_open_ptp_port(struct zfcp_erp_action *act)
         return zfcp_erp_port_strategy_open_port(act);
 }
 
+void zfcp_erp_port_strategy_open_lookup(struct work_struct *work)
+{
+        int retval;
+        struct zfcp_port *port = container_of(work, struct zfcp_port,
+                                              gid_pn_work);
+
+        retval = zfcp_fc_ns_gid_pn(&port->erp_action);
+        if (retval == -ENOMEM)
+                zfcp_erp_notify(&port->erp_action, ZFCP_ERP_NOMEM);
+        port->erp_action.step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP;
+        if (retval)
+                zfcp_erp_notify(&port->erp_action, ZFCP_ERP_FAILED);
+
+}
+
 static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
 {
         struct zfcp_adapter *adapter = act->adapter;
         struct zfcp_port *port = act->port;
-        struct zfcp_port *ns_port = adapter->nameserver_port;
         int p_status = atomic_read(&port->status);
 
         switch (act->step) {
@@ -927,28 +868,10 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
         case ZFCP_ERP_STEP_PORT_CLOSING:
                 if (fc_host_port_type(adapter->scsi_host) == FC_PORTTYPE_PTP)
                         return zfcp_erp_open_ptp_port(act);
-                if (!ns_port) {
-                        dev_err(&adapter->ccw_device->dev,
-                                "Nameserver port unavailable.\n");
-                        return ZFCP_ERP_FAILED;
-                }
-                if (!(atomic_read(&ns_port->status) &
-                      ZFCP_STATUS_COMMON_UNBLOCKED)) {
-                        /* nameserver port may live again */
-                        atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING,
-                                        &ns_port->status);
-                        if (zfcp_erp_port_reopen(ns_port, 0, 77, act) >= 0) {
-                                act->step = ZFCP_ERP_STEP_NAMESERVER_OPEN;
-                                return ZFCP_ERP_CONTINUES;
-                        }
-                        return ZFCP_ERP_FAILED;
+                if (!(p_status & ZFCP_STATUS_PORT_DID_DID)) {
+                        queue_work(zfcp_data.work_queue, &port->gid_pn_work);
+                        return ZFCP_ERP_CONTINUES;
                 }
-                /* else nameserver port is already open, fall through */
-        case ZFCP_ERP_STEP_NAMESERVER_OPEN:
-                if (!(atomic_read(&ns_port->status) & ZFCP_STATUS_COMMON_OPEN))
-                        return ZFCP_ERP_FAILED;
-                return zfcp_erp_port_strategy_open_lookup(act);
-
         case ZFCP_ERP_STEP_NAMESERVER_LOOKUP:
                 if (!(p_status & ZFCP_STATUS_PORT_DID_DID)) {
                         if (p_status & (ZFCP_STATUS_PORT_INVALID_WWPN)) {
@@ -961,25 +884,26 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
 
         case ZFCP_ERP_STEP_PORT_OPENING:
                 /* D_ID might have changed during open */
-                if ((p_status & ZFCP_STATUS_COMMON_OPEN) &&
-                    (p_status & ZFCP_STATUS_PORT_DID_DID))
-                        return ZFCP_ERP_SUCCEEDED;
+                if (p_status & ZFCP_STATUS_COMMON_OPEN) {
+                        if (p_status & ZFCP_STATUS_PORT_DID_DID)
+                                return ZFCP_ERP_SUCCEEDED;
+                        else {
+                                act->step = ZFCP_ERP_STEP_PORT_CLOSING;
+                                return ZFCP_ERP_CONTINUES;
+                        }
                 /* fall through otherwise */
+                }
         }
         return ZFCP_ERP_FAILED;
 }
 
-static int zfcp_erp_port_strategy_open(struct zfcp_erp_action *act)
-{
-        if (atomic_read(&act->port->status) & (ZFCP_STATUS_PORT_WKA))
-                return zfcp_erp_port_strategy_open_nameserver(act);
-        return zfcp_erp_port_strategy_open_common(act);
-}
-
 static int zfcp_erp_port_strategy(struct zfcp_erp_action *erp_action)
 {
         struct zfcp_port *port = erp_action->port;
 
+        if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_NOESC)
+                goto close_init_done;
+
         switch (erp_action->step) {
         case ZFCP_ERP_STEP_UNINITIALIZED:
                 zfcp_erp_port_strategy_clearstati(port);
@@ -992,19 +916,17 @@ static int zfcp_erp_port_strategy(struct zfcp_erp_action *erp_action)
                         return ZFCP_ERP_FAILED;
                 break;
         }
+
+close_init_done:
         if (erp_action->status & ZFCP_STATUS_ERP_CLOSE_ONLY)
                 return ZFCP_ERP_EXIT;
-        else
-                return zfcp_erp_port_strategy_open(erp_action);
 
-        return ZFCP_ERP_FAILED;
+        return zfcp_erp_port_strategy_open_common(erp_action);
 }
 
 static void zfcp_erp_unit_strategy_clearstati(struct zfcp_unit *unit)
 {
-        atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING |
-                          ZFCP_STATUS_COMMON_CLOSING |
-                          ZFCP_STATUS_COMMON_ACCESS_DENIED |
+        atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
                           ZFCP_STATUS_UNIT_SHARED |
                           ZFCP_STATUS_UNIT_READONLY,
                           &unit->status);
@@ -1065,8 +987,14 @@ static int zfcp_erp_strategy_check_unit(struct zfcp_unit *unit, int result)
                 break;
         case ZFCP_ERP_FAILED :
                 atomic_inc(&unit->erp_counter);
-                if (atomic_read(&unit->erp_counter) > ZFCP_MAX_ERPS)
+                if (atomic_read(&unit->erp_counter) > ZFCP_MAX_ERPS) {
+                        dev_err(&unit->port->adapter->ccw_device->dev,
+                                "ERP failed for unit 0x%016Lx on "
+                                "port 0x%016Lx\n",
+                                (unsigned long long)unit->fcp_lun,
+                                (unsigned long long)unit->port->wwpn);
                         zfcp_erp_unit_failed(unit, 21, NULL);
+                }
                 break;
         }
 
@@ -1091,8 +1019,12 @@ static int zfcp_erp_strategy_check_port(struct zfcp_port *port, int result)
                         result = ZFCP_ERP_EXIT;
                 }
                 atomic_inc(&port->erp_counter);
-                if (atomic_read(&port->erp_counter) > ZFCP_MAX_ERPS)
+                if (atomic_read(&port->erp_counter) > ZFCP_MAX_ERPS) {
+                        dev_err(&port->adapter->ccw_device->dev,
+                                "ERP failed for remote port 0x%016Lx\n",
+                                (unsigned long long)port->wwpn);
                         zfcp_erp_port_failed(port, 22, NULL);
+                }
                 break;
         }
 
@@ -1114,8 +1046,12 @@ static int zfcp_erp_strategy_check_adapter(struct zfcp_adapter *adapter,
 
         case ZFCP_ERP_FAILED :
                 atomic_inc(&adapter->erp_counter);
-                if (atomic_read(&adapter->erp_counter) > ZFCP_MAX_ERPS)
+                if (atomic_read(&adapter->erp_counter) > ZFCP_MAX_ERPS) {
+                        dev_err(&adapter->ccw_device->dev,
+                                "ERP cannot recover an error "
+                                "on the FCP device\n");
                         zfcp_erp_adapter_failed(adapter, 23, NULL);
+                }
                 break;
         }
 
@@ -1250,9 +1186,10 @@ static void zfcp_erp_scsi_scan(struct work_struct *work)
         struct zfcp_unit *unit = p->unit;
         struct fc_rport *rport = unit->port->rport;
         scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,
-                         unit->scsi_lun, 0);
+                         scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0);
         atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
         zfcp_unit_put(unit);
+        wake_up(&unit->port->adapter->erp_done_wqh);
         kfree(p);
 }
 
@@ -1263,9 +1200,9 @@ static void zfcp_erp_schedule_work(struct zfcp_unit *unit)
         p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (!p) {
                 dev_err(&unit->port->adapter->ccw_device->dev,
-                        "Out of resources. Could not register unit "
-                        "0x%016Lx on port 0x%016Lx with SCSI stack.\n",
-                        unit->fcp_lun, unit->port->wwpn);
+                        "Registering unit 0x%016Lx on port 0x%016Lx failed\n",
+                        (unsigned long long)unit->fcp_lun,
+                        (unsigned long long)unit->port->wwpn);
                 return;
         }
 
@@ -1273,7 +1210,7 @@ static void zfcp_erp_schedule_work(struct zfcp_unit *unit)
         atomic_set_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
         INIT_WORK(&p->work, zfcp_erp_scsi_scan);
         p->unit = unit;
-        schedule_work(&p->work);
+        queue_work(zfcp_data.work_queue, &p->work);
 }
 
 static void zfcp_erp_rport_register(struct zfcp_port *port)
@@ -1286,8 +1223,8 @@ static void zfcp_erp_rport_register(struct zfcp_port *port)
         port->rport = fc_remote_port_add(port->adapter->scsi_host, 0, &ids);
         if (!port->rport) {
                 dev_err(&port->adapter->ccw_device->dev,
-                        "Failed registration of rport "
-                        "0x%016Lx.\n", port->wwpn);
+                        "Registering port 0x%016Lx failed\n",
+                        (unsigned long long)port->wwpn);
                 return;
         }
 
@@ -1299,12 +1236,12 @@ static void zfcp_erp_rport_register(struct zfcp_port *port)
 static void zfcp_erp_rports_del(struct zfcp_adapter *adapter)
 {
         struct zfcp_port *port;
-        list_for_each_entry(port, &adapter->port_list_head, list)
-                if (port->rport && !(atomic_read(&port->status) &
-                                        ZFCP_STATUS_PORT_WKA)) {
-                        fc_remote_port_delete(port->rport);
-                        port->rport = NULL;
-                }
+        list_for_each_entry(port, &adapter->port_list_head, list) {
+                if (!port->rport)
+                        continue;
+                fc_remote_port_delete(port->rport);
+                port->rport = NULL;
+        }
 }
 
 static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)
@@ -1439,7 +1376,7 @@ static int zfcp_erp_thread(void *data)
         struct zfcp_erp_action *act;
         unsigned long flags;
 
-        daemonize("zfcperp%s", adapter->ccw_device->dev.bus_id);
+        daemonize("zfcperp%s", dev_name(&adapter->ccw_device->dev));
         /* Block all signals */
         siginitsetinv(&current->blocked, 0);
         atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status);
@@ -1459,9 +1396,9 @@ static int zfcp_erp_thread(void *data)
                                 zfcp_erp_wakeup(adapter);
                 }
 
-                zfcp_rec_dbf_event_thread(4, adapter);
+                zfcp_rec_dbf_event_thread_lock(4, adapter);
                 down_interruptible(&adapter->erp_ready_sem);
-                zfcp_rec_dbf_event_thread(5, adapter);
+                zfcp_rec_dbf_event_thread_lock(5, adapter);
         }
 
         atomic_clear_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status);
@@ -1484,7 +1421,7 @@ int zfcp_erp_thread_setup(struct zfcp_adapter *adapter)
         retval = kernel_thread(zfcp_erp_thread, adapter, SIGCHLD);
         if (retval < 0) {
                 dev_err(&adapter->ccw_device->dev,
-                        "Creation of ERP thread failed.\n");
+                        "Creating an ERP thread for the FCP device failed.\n");
                 return retval;
         }
         wait_event(adapter->erp_thread_wqh,
@@ -1506,7 +1443,7 @@ void zfcp_erp_thread_kill(struct zfcp_adapter *adapter)
 {
         atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL, &adapter->status);
         up(&adapter->erp_ready_sem);
-        zfcp_rec_dbf_event_thread_lock(2, adapter);
+        zfcp_rec_dbf_event_thread_lock(3, adapter);
 
         wait_event(adapter->erp_thread_wqh,
                    !(atomic_read(&adapter->status) &
@@ -1526,7 +1463,6 @@ void zfcp_erp_adapter_failed(struct zfcp_adapter *adapter, u8 id, void *ref)
 {
         zfcp_erp_modify_adapter_status(adapter, id, ref,
                                        ZFCP_STATUS_COMMON_ERP_FAILED, ZFCP_SET);
-        dev_err(&adapter->ccw_device->dev, "Adapter ERP failed.\n");
 }
 
 /**
@@ -1539,15 +1475,6 @@ void zfcp_erp_port_failed(struct zfcp_port *port, u8 id, void *ref)
 {
         zfcp_erp_modify_port_status(port, id, ref,
                                     ZFCP_STATUS_COMMON_ERP_FAILED, ZFCP_SET);
-
-        if (atomic_read(&port->status) & ZFCP_STATUS_PORT_WKA)
-                dev_err(&port->adapter->ccw_device->dev,
-                        "Port ERP failed for WKA port d_id=0x%06x.\n",
-                        port->d_id);
-        else
-                dev_err(&port->adapter->ccw_device->dev,
-                        "Port ERP failed for port wwpn=0x%016Lx.\n",
-                        port->wwpn);
 }
 
 /**
@@ -1560,10 +1487,6 @@ void zfcp_erp_unit_failed(struct zfcp_unit *unit, u8 id, void *ref)
 {
         zfcp_erp_modify_unit_status(unit, id, ref,
                                     ZFCP_STATUS_COMMON_ERP_FAILED, ZFCP_SET);
-
-        dev_err(&unit->port->adapter->ccw_device->dev,
-                "Unit ERP failed for unit 0x%016Lx on port 0x%016Lx.\n",
-                unit->fcp_lun, unit->port->wwpn);
 }
 
 /**
@@ -1754,9 +1677,8 @@ static void zfcp_erp_port_access_changed(struct zfcp_port *port, u8 id,
 
         if (!(status & (ZFCP_STATUS_COMMON_ACCESS_DENIED |
                         ZFCP_STATUS_COMMON_ACCESS_BOXED))) {
-                if (!(status & ZFCP_STATUS_PORT_WKA))
-                        list_for_each_entry(unit, &port->unit_list_head, list)
-                                zfcp_erp_unit_access_changed(unit, id, ref);
+                list_for_each_entry(unit, &port->unit_list_head, list)
+                                    zfcp_erp_unit_access_changed(unit, id, ref);
                 return;
         }
 
@@ -1779,10 +1701,7 @@ void zfcp_erp_adapter_access_changed(struct zfcp_adapter *adapter, u8 id,
                 return;
 
         read_lock_irqsave(&zfcp_data.config_lock, flags);
-        if (adapter->nameserver_port)
-                zfcp_erp_port_access_changed(adapter->nameserver_port, id, ref);
         list_for_each_entry(port, &adapter->port_list_head, list)
-                if (port != adapter->nameserver_port)
-                        zfcp_erp_port_access_changed(port, id, ref);
+                zfcp_erp_port_access_changed(port, id, ref);
         read_unlock_irqrestore(&zfcp_data.config_lock, flags);
 }
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index edfdb21591f3..b5adeda93e1d 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -12,16 +12,14 @@
 #include "zfcp_def.h"
 
 /* zfcp_aux.c */
-extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *,
-                                              fcp_lun_t);
-extern struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *,
-                                               wwn_t);
+extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64);
+extern struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *, u64);
 extern int zfcp_adapter_enqueue(struct ccw_device *);
 extern void zfcp_adapter_dequeue(struct zfcp_adapter *);
-extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, wwn_t, u32,
+extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, u64, u32,
                                            u32);
 extern void zfcp_port_dequeue(struct zfcp_port *);
-extern struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *, fcp_lun_t);
+extern struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *, u64);
 extern void zfcp_unit_dequeue(struct zfcp_unit *);
 extern int zfcp_reqlist_isempty(struct zfcp_adapter *);
 extern void zfcp_sg_free_table(struct scatterlist *, int);
@@ -29,6 +27,7 @@ extern int zfcp_sg_setup_table(struct scatterlist *, int);
 
 /* zfcp_ccw.c */
 extern int zfcp_ccw_register(void);
+extern struct zfcp_adapter *zfcp_get_adapter_by_busid(char *);
 
 /* zfcp_cfdc.c */
 extern struct miscdevice zfcp_cfdc_misc;
@@ -50,6 +49,8 @@ extern void zfcp_hba_dbf_event_fsf_unsol(const char *, struct zfcp_adapter *,
                                          struct fsf_status_read_buffer *);
 extern void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *, unsigned int, int,
                                     int);
+extern void zfcp_hba_dbf_event_berr(struct zfcp_adapter *,
+                                    struct zfcp_fsf_req *);
 extern void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *);
 extern void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *);
 extern void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *);
@@ -91,17 +92,21 @@ extern void zfcp_erp_port_access_denied(struct zfcp_port *, u8, void *);
 extern void zfcp_erp_unit_access_denied(struct zfcp_unit *, u8, void *);
 extern void zfcp_erp_adapter_access_changed(struct zfcp_adapter *, u8, void *);
 extern void zfcp_erp_timeout_handler(unsigned long);
+extern void zfcp_erp_port_strategy_open_lookup(struct work_struct *);
 
 /* zfcp_fc.c */
 extern int zfcp_scan_ports(struct zfcp_adapter *);
 extern void _zfcp_scan_ports_later(struct work_struct *);
 extern void zfcp_fc_incoming_els(struct zfcp_fsf_req *);
-extern int zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *);
+extern int zfcp_fc_ns_gid_pn(struct zfcp_erp_action *);
 extern void zfcp_fc_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *);
 extern void zfcp_test_link(struct zfcp_port *);
+extern void zfcp_fc_nameserver_init(struct zfcp_adapter *);
 
 /* zfcp_fsf.c */
 extern int zfcp_fsf_open_port(struct zfcp_erp_action *);
+extern int zfcp_fsf_open_wka_port(struct zfcp_wka_port *);
+extern int zfcp_fsf_close_wka_port(struct zfcp_wka_port *);
 extern int zfcp_fsf_close_port(struct zfcp_erp_action *);
 extern int zfcp_fsf_close_physical_port(struct zfcp_erp_action *);
 extern int zfcp_fsf_open_unit(struct zfcp_erp_action *);
@@ -135,10 +140,8 @@ extern struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long,
 extern int zfcp_qdio_allocate(struct zfcp_adapter *);
 extern void zfcp_qdio_free(struct zfcp_adapter *);
 extern int zfcp_qdio_send(struct zfcp_fsf_req *);
-extern volatile struct qdio_buffer_element *zfcp_qdio_sbale_req(
-                                                struct zfcp_fsf_req *);
-extern volatile struct qdio_buffer_element *zfcp_qdio_sbale_curr(
-                                                struct zfcp_fsf_req *);
+extern struct qdio_buffer_element *zfcp_qdio_sbale_req(struct zfcp_fsf_req *);
+extern struct qdio_buffer_element *zfcp_qdio_sbale_curr(struct zfcp_fsf_req *);
 extern int zfcp_qdio_sbals_from_sg(struct zfcp_fsf_req *, unsigned long,
                                    struct scatterlist *, int);
 extern int zfcp_qdio_open(struct zfcp_adapter *);
@@ -148,14 +151,12 @@ extern void zfcp_qdio_close(struct zfcp_adapter *);
 extern struct zfcp_data zfcp_data;
 extern int zfcp_adapter_scsi_register(struct zfcp_adapter *);
 extern void zfcp_adapter_scsi_unregister(struct zfcp_adapter *);
-extern void zfcp_set_fcp_dl(struct fcp_cmnd_iu *, fcp_dl_t);
 extern char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *);
 extern struct fc_function_template zfcp_transport_functions;
 
 /* zfcp_sysfs.c */
 extern struct attribute_group zfcp_sysfs_unit_attrs;
 extern struct attribute_group zfcp_sysfs_adapter_attrs;
-extern struct attribute_group zfcp_sysfs_ns_port_attrs;
 extern struct attribute_group zfcp_sysfs_port_attrs;
 extern struct device_attribute *zfcp_sysfs_sdev_attrs[];
 extern struct device_attribute *zfcp_sysfs_shost_attrs[];
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index e984469bb98b..1a7c80a77ff5 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -39,16 +39,82 @@ struct zfcp_gpn_ft {
         struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS];
 };
 
-static struct zfcp_port *zfcp_get_port_by_did(struct zfcp_adapter *adapter,
-                                              u32 d_id)
+struct zfcp_fc_ns_handler_data {
+        struct completion done;
+        void (*handler)(unsigned long);
+        unsigned long handler_data;
+};
+
+static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port)
 {
-        struct zfcp_port *port;
+        if (mutex_lock_interruptible(&wka_port->mutex))
+                return -ERESTARTSYS;
 
-        list_for_each_entry(port, &adapter->port_list_head, list)
-                if ((port->d_id == d_id) &&
-                    !atomic_test_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status))
-                        return port;
-        return NULL;
+        if (wka_port->status != ZFCP_WKA_PORT_ONLINE) {
+                wka_port->status = ZFCP_WKA_PORT_OPENING;
+                if (zfcp_fsf_open_wka_port(wka_port))
+                        wka_port->status = ZFCP_WKA_PORT_OFFLINE;
+        }
+
+        mutex_unlock(&wka_port->mutex);
+
+        wait_event_timeout(
+                wka_port->completion_wq,
+                wka_port->status == ZFCP_WKA_PORT_ONLINE ||
+                wka_port->status == ZFCP_WKA_PORT_OFFLINE,
+                HZ >> 1);
+
+        if (wka_port->status == ZFCP_WKA_PORT_ONLINE) {
+                atomic_inc(&wka_port->refcount);
+                return 0;
+        }
+        return -EIO;
+}
+
+static void zfcp_wka_port_offline(struct work_struct *work)
+{
+        struct delayed_work *dw = container_of(work, struct delayed_work, work);
+        struct zfcp_wka_port *wka_port =
+                        container_of(dw, struct zfcp_wka_port, work);
+
+        wait_event(wka_port->completion_wq,
+                        atomic_read(&wka_port->refcount) == 0);
+
+        mutex_lock(&wka_port->mutex);
+        if ((atomic_read(&wka_port->refcount) != 0) ||
+            (wka_port->status != ZFCP_WKA_PORT_ONLINE))
+                goto out;
+
+        wka_port->status = ZFCP_WKA_PORT_CLOSING;
+        if (zfcp_fsf_close_wka_port(wka_port)) {
+                wka_port->status = ZFCP_WKA_PORT_OFFLINE;
+                wake_up(&wka_port->completion_wq);
+        }
+out:
+        mutex_unlock(&wka_port->mutex);
+}
+
+static void zfcp_wka_port_put(struct zfcp_wka_port *wka_port)
+{
+        if (atomic_dec_return(&wka_port->refcount) != 0)
+                return;
+        /* wait 10 miliseconds, other reqs might pop in */
+        schedule_delayed_work(&wka_port->work, HZ / 100);
+}
+
+void zfcp_fc_nameserver_init(struct zfcp_adapter *adapter)
+{
+        struct zfcp_wka_port *wka_port = &adapter->nsp;
+
+        init_waitqueue_head(&wka_port->completion_wq);
+
+        wka_port->adapter = adapter;
+        wka_port->d_id = ZFCP_DID_DIRECTORY_SERVICE;
+
+        wka_port->status = ZFCP_WKA_PORT_OFFLINE;
+        atomic_set(&wka_port->refcount, 0);
+        mutex_init(&wka_port->mutex);
+        INIT_DELAYED_WORK(&wka_port->work, zfcp_wka_port_offline);
 }
 
 static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
@@ -59,10 +125,8 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
 
         read_lock_irqsave(&zfcp_data.config_lock, flags);
         list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) {
-                if (atomic_test_mask(ZFCP_STATUS_PORT_WKA, &port->status))
-                        continue;
                 /* FIXME: ZFCP_STATUS_PORT_DID_DID check is racy */
-                if (!atomic_test_mask(ZFCP_STATUS_PORT_DID_DID, &port->status))
+                if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_DID_DID))
                         /* Try to connect to unused ports anyway. */
                         zfcp_erp_port_reopen(port,
                                              ZFCP_STATUS_COMMON_ERP_FAILED,
@@ -114,7 +178,7 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)
         schedule_work(&fsf_req->adapter->scan_work);
 }
 
-static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, wwn_t wwpn)
+static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, u64 wwpn)
 {
         struct zfcp_adapter *adapter = req->adapter;
         struct zfcp_port *port;
@@ -169,7 +233,18 @@ void zfcp_fc_incoming_els(struct zfcp_fsf_req *fsf_req)
                 zfcp_fc_incoming_rscn(fsf_req);
 }
 
-static void zfcp_ns_gid_pn_handler(unsigned long data)
+static void zfcp_fc_ns_handler(unsigned long data)
+{
+        struct zfcp_fc_ns_handler_data *compl_rec =
+                        (struct zfcp_fc_ns_handler_data *) data;
+
+        if (compl_rec->handler)
+                compl_rec->handler(compl_rec->handler_data);
+
+        complete(&compl_rec->done);
+}
+
+static void zfcp_fc_ns_gid_pn_eval(unsigned long data)
 {
         struct zfcp_gid_pn_data *gid_pn = (struct zfcp_gid_pn_data *) data;
         struct zfcp_send_ct *ct = &gid_pn->ct;
@@ -178,43 +253,31 @@ static void zfcp_ns_gid_pn_handler(unsigned long data)
         struct zfcp_port *port = gid_pn->port;
 
         if (ct->status)
-                goto out;
+                return;
         if (ct_iu_resp->header.cmd_rsp_code != ZFCP_CT_ACCEPT) {
                 atomic_set_mask(ZFCP_STATUS_PORT_INVALID_WWPN, &port->status);
-                goto out;
+                return;
         }
         /* paranoia */
         if (ct_iu_req->wwpn != port->wwpn)
-                goto out;
+                return;
         /* looks like a valid d_id */
         port->d_id = ct_iu_resp->d_id & ZFCP_DID_MASK;
         atomic_set_mask(ZFCP_STATUS_PORT_DID_DID, &port->status);
-out:
-        mempool_free(gid_pn, port->adapter->pool.data_gid_pn);
 }
 
-/**
- * zfcp_fc_ns_gid_pn_request - initiate GID_PN nameserver request
- * @erp_action: pointer to zfcp_erp_action where GID_PN request is needed
- * return: -ENOMEM on error, 0 otherwise
- */
-int zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action)
+int static zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action,
+                                     struct zfcp_gid_pn_data *gid_pn)
 {
-        int ret;
-        struct zfcp_gid_pn_data *gid_pn;
         struct zfcp_adapter *adapter = erp_action->adapter;
-
-        gid_pn = mempool_alloc(adapter->pool.data_gid_pn, GFP_ATOMIC);
-        if (!gid_pn)
-                return -ENOMEM;
-
-        memset(gid_pn, 0, sizeof(*gid_pn));
+        struct zfcp_fc_ns_handler_data compl_rec;
+        int ret;
 
         /* setup parameters for send generic command */
         gid_pn->port = erp_action->port;
-        gid_pn->ct.port = adapter->nameserver_port;
-        gid_pn->ct.handler = zfcp_ns_gid_pn_handler;
-        gid_pn->ct.handler_data = (unsigned long) gid_pn;
+        gid_pn->ct.wka_port = &adapter->nsp;
+        gid_pn->ct.handler = zfcp_fc_ns_handler;
+        gid_pn->ct.handler_data = (unsigned long) &compl_rec;
         gid_pn->ct.timeout = ZFCP_NS_GID_PN_TIMEOUT;
         gid_pn->ct.req = &gid_pn->req;
         gid_pn->ct.resp = &gid_pn->resp;
@@ -234,10 +297,42 @@ int zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action)
         gid_pn->ct_iu_req.header.max_res_size = ZFCP_CT_MAX_SIZE;
         gid_pn->ct_iu_req.wwpn = erp_action->port->wwpn;
 
+        init_completion(&compl_rec.done);
+        compl_rec.handler = zfcp_fc_ns_gid_pn_eval;
+        compl_rec.handler_data = (unsigned long) gid_pn;
         ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.fsf_req_erp,
                                erp_action);
+        if (!ret)
+                wait_for_completion(&compl_rec.done);
+        return ret;
+}
+
+/**
+ * zfcp_fc_ns_gid_pn_request - initiate GID_PN nameserver request
+ * @erp_action: pointer to zfcp_erp_action where GID_PN request is needed
+ * return: -ENOMEM on error, 0 otherwise
+ */
+int zfcp_fc_ns_gid_pn(struct zfcp_erp_action *erp_action)
+{
+        int ret;
+        struct zfcp_gid_pn_data *gid_pn;
+        struct zfcp_adapter *adapter = erp_action->adapter;
+
+        gid_pn = mempool_alloc(adapter->pool.data_gid_pn, GFP_ATOMIC);
+        if (!gid_pn)
+                return -ENOMEM;
+
+        memset(gid_pn, 0, sizeof(*gid_pn));
+
+        ret = zfcp_wka_port_get(&adapter->nsp);
         if (ret)
-                mempool_free(gid_pn, adapter->pool.data_gid_pn);
+                goto out;
+
+        ret = zfcp_fc_ns_gid_pn_request(erp_action, gid_pn);
+
+        zfcp_wka_port_put(&adapter->nsp);
+out:
+        mempool_free(gid_pn, adapter->pool.data_gid_pn);
         return ret;
 }
 
@@ -267,14 +362,14 @@ struct zfcp_els_adisc {
         struct scatterlist req;
         struct scatterlist resp;
         struct zfcp_ls_adisc ls_adisc;
-        struct zfcp_ls_adisc_acc ls_adisc_acc;
+        struct zfcp_ls_adisc ls_adisc_acc;
 };
 
 static void zfcp_fc_adisc_handler(unsigned long data)
 {
         struct zfcp_els_adisc *adisc = (struct zfcp_els_adisc *) data;
         struct zfcp_port *port = adisc->els.port;
-        struct zfcp_ls_adisc_acc *ls_adisc = &adisc->ls_adisc_acc;
+        struct zfcp_ls_adisc *ls_adisc = &adisc->ls_adisc_acc;
 
         if (adisc->els.status) {
                 /* request rejected or timed out */
@@ -307,7 +402,7 @@ static int zfcp_fc_adisc(struct zfcp_port *port)
         sg_init_one(adisc->els.req, &adisc->ls_adisc,
                     sizeof(struct zfcp_ls_adisc));
         sg_init_one(adisc->els.resp, &adisc->ls_adisc_acc,
-                    sizeof(struct zfcp_ls_adisc_acc));
+                    sizeof(struct zfcp_ls_adisc));
 
         adisc->els.req_count = 1;
         adisc->els.resp_count = 1;
@@ -341,37 +436,13 @@ void zfcp_test_link(struct zfcp_port *port)
 
         zfcp_port_get(port);
         retval = zfcp_fc_adisc(port);
-        if (retval == 0 || retval == -EBUSY)
+        if (retval == 0)
                 return;
 
         /* send of ADISC was not possible */
         zfcp_port_put(port);
-        zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
-}
-
-static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)
-{
-        int ret;
-
-        if (!adapter->nameserver_port)
-                return -EINTR;
-
-        if (!atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED,
-                               &adapter->nameserver_port->status)) {
-                ret = zfcp_erp_port_reopen(adapter->nameserver_port, 0, 148,
-                                           NULL);
-                if (ret)
-                        return ret;
-                zfcp_erp_wait(adapter);
-                zfcp_port_put(adapter->nameserver_port);
-        }
-        return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED,
-                                  &adapter->nameserver_port->status);
-}
-
-static void zfcp_gpn_ft_handler(unsigned long _done)
-{
-        complete((struct completion *)_done);
+        if (retval != -EBUSY)
+                zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
 }
 
 static void zfcp_free_sg_env(struct zfcp_gpn_ft *gpn_ft)
@@ -415,7 +486,7 @@ static int zfcp_scan_issue_gpn_ft(struct zfcp_gpn_ft *gpn_ft,
 {
         struct zfcp_send_ct *ct = &gpn_ft->ct;
         struct ct_iu_gpn_ft_req *req = sg_virt(&gpn_ft->sg_req);
-        struct completion done;
+        struct zfcp_fc_ns_handler_data compl_rec;
         int ret;
 
         /* prepare CT IU for GPN_FT */
@@ -432,19 +503,20 @@ static int zfcp_scan_issue_gpn_ft(struct zfcp_gpn_ft *gpn_ft,
         req->fc4_type = ZFCP_CT_SCSI_FCP;
 
         /* prepare zfcp_send_ct */
-        ct->port = adapter->nameserver_port;
-        ct->handler = zfcp_gpn_ft_handler;
-        ct->handler_data = (unsigned long)&done;
+        ct->wka_port = &adapter->nsp;
+        ct->handler = zfcp_fc_ns_handler;
+        ct->handler_data = (unsigned long)&compl_rec;
         ct->timeout = 10;
         ct->req = &gpn_ft->sg_req;
         ct->resp = gpn_ft->sg_resp;
         ct->req_count = 1;
         ct->resp_count = ZFCP_GPN_FT_BUFFERS;
 
-        init_completion(&done);
+        init_completion(&compl_rec.done);
+        compl_rec.handler = NULL;
         ret = zfcp_fsf_send_ct(ct, NULL, NULL);
         if (!ret)
-                wait_for_completion(&done);
+                wait_for_completion(&compl_rec.done);
         return ret;
 }
 
@@ -454,9 +526,8 @@ static void zfcp_validate_port(struct zfcp_port *port)
 
         atomic_clear_mask(ZFCP_STATUS_COMMON_NOESC, &port->status);
 
-        if (port == adapter->nameserver_port)
-                return;
-        if ((port->supported_classes != 0) || (port->units != 0)) {
+        if ((port->supported_classes != 0) ||
+            !list_empty(&port->unit_list_head)) {
                 zfcp_port_put(port);
                 return;
         }
@@ -472,10 +543,10 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
         struct scatterlist *sg = gpn_ft->sg_resp;
         struct ct_hdr *hdr = sg_virt(sg);
         struct gpn_ft_resp_acc *acc = sg_virt(sg);
-        struct zfcp_adapter *adapter = ct->port->adapter;
+        struct zfcp_adapter *adapter = ct->wka_port->adapter;
         struct zfcp_port *port, *tmp;
         u32 d_id;
-        int ret = 0, x;
+        int ret = 0, x, last = 0;
 
         if (ct->status)
                 return -EIO;
@@ -492,19 +563,27 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
         down(&zfcp_data.config_sema);
 
         /* first entry is the header */
-        for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES; x++) {
+        for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES && !last; x++) {
                 if (x % (ZFCP_GPN_FT_ENTRIES + 1))
                         acc++;
                 else
                         acc = sg_virt(++sg);
 
+                last = acc->control & 0x80;
                 d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 |
                        acc->port_id[2];
 
+                /* don't attach ports with a well known address */
+                if ((d_id & ZFCP_DID_WKA) == ZFCP_DID_WKA)
+                        continue;
                 /* skip the adapter's port and known remote ports */
-                if (acc->wwpn == fc_host_port_name(adapter->scsi_host) ||
-                     zfcp_get_port_by_did(adapter, d_id))
+                if (acc->wwpn == fc_host_port_name(adapter->scsi_host))
                         continue;
+                port = zfcp_get_port_by_wwpn(adapter, acc->wwpn);
+                if (port) {
+                        zfcp_port_get(port);
+                        continue;
+                }
 
                 port = zfcp_port_enqueue(adapter, acc->wwpn,
                                          ZFCP_STATUS_PORT_DID_DID |
@@ -513,8 +592,6 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
                         ret = PTR_ERR(port);
                 else
                         zfcp_erp_port_reopen(port, 0, 149, NULL);
-                if (acc->control & 0x80) /* last entry */
-                        break;
         }
 
         zfcp_erp_wait(adapter);
@@ -537,13 +614,15 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)
         if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT)
                 return 0;
 
-        ret = zfcp_scan_get_nameserver(adapter);
+        ret = zfcp_wka_port_get(&adapter->nsp);
         if (ret)
                 return ret;
 
         gpn_ft = zfcp_alloc_sg_env();
-        if (!gpn_ft)
-                return -ENOMEM;
+        if (!gpn_ft) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
         for (i = 0; i < 3; i++) {
                 ret = zfcp_scan_issue_gpn_ft(gpn_ft, adapter);
@@ -556,7 +635,8 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)
                 }
         }
         zfcp_free_sg_env(gpn_ft);
-
+out:
+        zfcp_wka_port_put(&adapter->nsp);
         return ret;
 }
 
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 19c1ca913874..739356a5c123 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -50,19 +50,16 @@ static u32 fsf_qtcb_type[] = {
         [FSF_QTCB_UPLOAD_CONTROL_FILE] =  FSF_SUPPORT_COMMAND
 };
 
-static const char *zfcp_act_subtable_type[] = {
-        "unknown", "OS", "WWPN", "DID", "LUN"
-};
-
 static void zfcp_act_eval_err(struct zfcp_adapter *adapter, u32 table)
 {
         u16 subtable = table >> 16;
         u16 rule = table & 0xffff;
+        const char *act_type[] = { "unknown", "OS", "WWPN", "DID", "LUN" };
 
-        if (subtable && subtable < ARRAY_SIZE(zfcp_act_subtable_type))
+        if (subtable && subtable < ARRAY_SIZE(act_type))
                 dev_warn(&adapter->ccw_device->dev,
-                         "Access denied in subtable %s, rule %d.\n",
-                         zfcp_act_subtable_type[subtable], rule);
+                         "Access denied according to ACT rule type %s, "
+                         "rule %d\n", act_type[subtable], rule);
 }
 
 static void zfcp_fsf_access_denied_port(struct zfcp_fsf_req *req,
@@ -70,8 +67,8 @@ static void zfcp_fsf_access_denied_port(struct zfcp_fsf_req *req,
 {
         struct fsf_qtcb_header *header = &req->qtcb->header;
         dev_warn(&req->adapter->ccw_device->dev,
-                 "Access denied, cannot send command to port 0x%016Lx.\n",
-                 port->wwpn);
+                 "Access denied to port 0x%016Lx\n",
+                 (unsigned long long)port->wwpn);
         zfcp_act_eval_err(req->adapter, header->fsf_status_qual.halfword[0]);
         zfcp_act_eval_err(req->adapter, header->fsf_status_qual.halfword[1]);
         zfcp_erp_port_access_denied(port, 55, req);
@@ -83,8 +80,9 @@ static void zfcp_fsf_access_denied_unit(struct zfcp_fsf_req *req,
 {
         struct fsf_qtcb_header *header = &req->qtcb->header;
         dev_warn(&req->adapter->ccw_device->dev,
-                 "Access denied for unit 0x%016Lx on port 0x%016Lx.\n",
-                 unit->fcp_lun, unit->port->wwpn);
+                 "Access denied to unit 0x%016Lx on port 0x%016Lx\n",
+                 (unsigned long long)unit->fcp_lun,
+                 (unsigned long long)unit->port->wwpn);
         zfcp_act_eval_err(req->adapter, header->fsf_status_qual.halfword[0]);
         zfcp_act_eval_err(req->adapter, header->fsf_status_qual.halfword[1]);
         zfcp_erp_unit_access_denied(unit, 59, req);
@@ -93,9 +91,8 @@ static void zfcp_fsf_access_denied_unit(struct zfcp_fsf_req *req,
 
 static void zfcp_fsf_class_not_supp(struct zfcp_fsf_req *req)
 {
-        dev_err(&req->adapter->ccw_device->dev,
-                "Required FC class not supported by adapter, "
-                "shutting down adapter.\n");
+        dev_err(&req->adapter->ccw_device->dev, "FCP device not "
+                "operational because of an unsupported FC class\n");
         zfcp_erp_adapter_shutdown(req->adapter, 0, 123, req);
         req->status |= ZFCP_STATUS_FSFREQ_ERROR;
 }
@@ -171,42 +168,6 @@ static void zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *req)
         read_unlock_irqrestore(&zfcp_data.config_lock, flags);
 }
 
-static void zfcp_fsf_bit_error_threshold(struct zfcp_fsf_req *req)
-{
-        struct zfcp_adapter *adapter = req->adapter;
-        struct fsf_status_read_buffer *sr_buf = req->data;
-        struct fsf_bit_error_payload *err = &sr_buf->payload.bit_error;
-
-        dev_warn(&adapter->ccw_device->dev,
-                 "Warning: bit error threshold data "
-                 "received for the adapter: "
-                 "link failures = %i, loss of sync errors = %i, "
-                 "loss of signal errors = %i, "
-                 "primitive sequence errors = %i, "
-                 "invalid transmission word errors = %i, "
-                 "CRC errors = %i).\n",
-                 err->link_failure_error_count,
-                 err->loss_of_sync_error_count,
-                 err->loss_of_signal_error_count,
-                 err->primitive_sequence_error_count,
-                 err->invalid_transmission_word_error_count,
-                 err->crc_error_count);
-        dev_warn(&adapter->ccw_device->dev,
-                 "Additional bit error threshold data of the adapter: "
-                 "primitive sequence event time-outs = %i, "
-                 "elastic buffer overrun errors = %i, "
-                 "advertised receive buffer-to-buffer credit = %i, "
-                 "current receice buffer-to-buffer credit = %i, "
-                 "advertised transmit buffer-to-buffer credit = %i, "
-                 "current transmit buffer-to-buffer credit = %i).\n",
-                 err->primitive_sequence_event_timeout_count,
-                 err->elastic_buffer_overrun_error_count,
-                 err->advertised_receive_b2b_credit,
-                 err->current_receive_b2b_credit,
-                 err->advertised_transmit_b2b_credit,
-                 err->current_transmit_b2b_credit);
-}
-
 static void zfcp_fsf_link_down_info_eval(struct zfcp_fsf_req *req, u8 id,
                                          struct fsf_link_down_info *link_down)
 {
@@ -223,62 +184,66 @@ static void zfcp_fsf_link_down_info_eval(struct zfcp_fsf_req *req, u8 id,
         switch (link_down->error_code) {
         case FSF_PSQ_LINK_NO_LIGHT:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: no light detected.\n");
+                         "There is no light signal from the local "
+                         "fibre channel cable\n");
                 break;
         case FSF_PSQ_LINK_WRAP_PLUG:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: wrap plug detected.\n");
+                         "There is a wrap plug instead of a fibre "
+                         "channel cable\n");
                 break;
         case FSF_PSQ_LINK_NO_FCP:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: "
-                         "adjacent node on link does not support FCP.\n");
+                         "The adjacent fibre channel node does not "
+                         "support FCP\n");
                 break;
         case FSF_PSQ_LINK_FIRMWARE_UPDATE:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: "
-                         "firmware update in progress.\n");
+                         "The FCP device is suspended because of a "
+                         "firmware update\n");
                 break;
         case FSF_PSQ_LINK_INVALID_WWPN:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: "
-                         "duplicate or invalid WWPN detected.\n");
+                         "The FCP device detected a WWPN that is "
+                         "duplicate or not valid\n");
                 break;
         case FSF_PSQ_LINK_NO_NPIV_SUPPORT:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: "
-                         "no support for NPIV by Fabric.\n");
+                         "The fibre channel fabric does not support NPIV\n");
                 break;
         case FSF_PSQ_LINK_NO_FCP_RESOURCES:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: "
-                         "out of resource in FCP daughtercard.\n");
+                         "The FCP adapter cannot support more NPIV ports\n");
                 break;
         case FSF_PSQ_LINK_NO_FABRIC_RESOURCES:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: "
-                         "out of resource in Fabric.\n");
+                         "The adjacent switch cannot support "
+                         "more NPIV ports\n");
                 break;
         case FSF_PSQ_LINK_FABRIC_LOGIN_UNABLE:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link is down: "
-                         "unable to login to Fabric.\n");
+                         "The FCP adapter could not log in to the "
+                         "fibre channel fabric\n");
                 break;
         case FSF_PSQ_LINK_WWPN_ASSIGNMENT_CORRUPTED:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "WWPN assignment file corrupted on adapter.\n");
+                         "The WWPN assignment file on the FCP adapter "
+                         "has been damaged\n");
                 break;
         case FSF_PSQ_LINK_MODE_TABLE_CURRUPTED:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "Mode table corrupted on adapter.\n");
+                         "The mode table on the FCP adapter "
+                         "has been damaged\n");
                 break;
         case FSF_PSQ_LINK_NO_WWPN_ASSIGNMENT:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "No WWPN for assignment table on adapter.\n");
+                         "All NPIV ports on the FCP adapter have "
+                         "been assigned\n");
                 break;
         default:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The local link to adapter is down.\n");
+                         "The link between the FCP adapter and "
+                         "the FC fabric is down\n");
         }
 out:
         zfcp_erp_adapter_failed(adapter, id, req);
@@ -286,27 +251,18 @@ out:
 
 static void zfcp_fsf_status_read_link_down(struct zfcp_fsf_req *req)
 {
-        struct zfcp_adapter *adapter = req->adapter;
         struct fsf_status_read_buffer *sr_buf = req->data;
         struct fsf_link_down_info *ldi =
                 (struct fsf_link_down_info *) &sr_buf->payload;
 
         switch (sr_buf->status_subtype) {
         case FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK:
-                dev_warn(&adapter->ccw_device->dev,
-                         "Physical link is down.\n");
                 zfcp_fsf_link_down_info_eval(req, 38, ldi);
                 break;
         case FSF_STATUS_READ_SUB_FDISC_FAILED:
-                dev_warn(&adapter->ccw_device->dev,
-                         "Local link is down "
-                         "due to failed FDISC login.\n");
                 zfcp_fsf_link_down_info_eval(req, 39, ldi);
                 break;
         case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE:
-                dev_warn(&adapter->ccw_device->dev,
-                         "Local link is down "
-                         "due to firmware update on adapter.\n");
                 zfcp_fsf_link_down_info_eval(req, 40, NULL);
         };
 }
@@ -335,14 +291,17 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)
         case FSF_STATUS_READ_SENSE_DATA_AVAIL:
                 break;
         case FSF_STATUS_READ_BIT_ERROR_THRESHOLD:
-                zfcp_fsf_bit_error_threshold(req);
+                dev_warn(&adapter->ccw_device->dev,
+                         "The error threshold for checksum statistics "
+                         "has been exceeded\n");
+                zfcp_hba_dbf_event_berr(adapter, req);
                 break;
         case FSF_STATUS_READ_LINK_DOWN:
                 zfcp_fsf_status_read_link_down(req);
                 break;
         case FSF_STATUS_READ_LINK_UP:
                 dev_info(&adapter->ccw_device->dev,
-                         "Local link was replugged.\n");
+                         "The local link has been restored\n");
                 /* All ports should be marked as ready to run again */
                 zfcp_erp_modify_adapter_status(adapter, 30, NULL,
                                                ZFCP_STATUS_COMMON_RUNNING,
@@ -370,7 +329,7 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)
         zfcp_fsf_req_free(req);
 
         atomic_inc(&adapter->stat_miss);
-        schedule_work(&adapter->stat_work);
+        queue_work(zfcp_data.work_queue, &adapter->stat_work);
 }
 
 static void zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *req)
@@ -386,8 +345,8 @@ static void zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *req)
                 break;
         case FSF_SQ_NO_RECOM:
                 dev_err(&req->adapter->ccw_device->dev,
-                        "No recommendation could be given for a "
-                        "problem on the adapter.\n");
+                        "The FCP adapter reported a problem "
+                        "that cannot be recovered\n");
                 zfcp_erp_adapter_shutdown(req->adapter, 0, 121, req);
                 break;
         }
@@ -403,8 +362,7 @@ static void zfcp_fsf_fsfstatus_eval(struct zfcp_fsf_req *req)
         switch (req->qtcb->header.fsf_status) {
         case FSF_UNKNOWN_COMMAND:
                 dev_err(&req->adapter->ccw_device->dev,
-                        "Command issued by the device driver (0x%x) is "
-                        "not known by the adapter.\n",
+                        "The FCP adapter does not recognize the command 0x%x\n",
                         req->qtcb->header.fsf_command);
                 zfcp_erp_adapter_shutdown(req->adapter, 0, 120, req);
                 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
@@ -435,11 +393,9 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)
                 return;
         case FSF_PROT_QTCB_VERSION_ERROR:
                 dev_err(&adapter->ccw_device->dev,
-                        "The QTCB version requested by zfcp (0x%x) is not "
-                        "supported by the FCP adapter (lowest supported "
-                        "0x%x, highest supported 0x%x).\n",
-                        FSF_QTCB_CURRENT_VERSION, psq->word[0],
-                        psq->word[1]);
+                        "QTCB version 0x%x not supported by FCP adapter "
+                        "(0x%x to 0x%x)\n", FSF_QTCB_CURRENT_VERSION,
+                        psq->word[0], psq->word[1]);
                 zfcp_erp_adapter_shutdown(adapter, 0, 117, req);
                 break;
         case FSF_PROT_ERROR_STATE:
@@ -449,8 +405,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)
                 break;
         case FSF_PROT_UNSUPP_QTCB_TYPE:
                 dev_err(&adapter->ccw_device->dev,
-                        "Packet header type used by the device driver is "
-                        "incompatible with that used on the adapter.\n");
+                        "The QTCB type is not supported by the FCP adapter\n");
                 zfcp_erp_adapter_shutdown(adapter, 0, 118, req);
                 break;
         case FSF_PROT_HOST_CONNECTION_INITIALIZING:
@@ -459,7 +414,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)
                 break;
         case FSF_PROT_DUPLICATE_REQUEST_ID:
                 dev_err(&adapter->ccw_device->dev,
-                        "The request identifier 0x%Lx is ambiguous.\n",
+                        "0x%Lx is an ambiguous request identifier\n",
                         (unsigned long long)qtcb->bottom.support.req_handle);
                 zfcp_erp_adapter_shutdown(adapter, 0, 78, req);
                 break;
@@ -479,9 +434,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)
                 break;
         default:
                 dev_err(&adapter->ccw_device->dev,
-                        "Transfer protocol status information"
-                        "provided by the adapter (0x%x) "
-                        "is not compatible with the device driver.\n",
+                        "0x%x is not a valid transfer protocol status\n",
                         qtcb->prefix.prot_status);
                 zfcp_erp_adapter_shutdown(adapter, 0, 119, req);
         }
@@ -559,33 +512,17 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
                 adapter->peer_wwpn = bottom->plogi_payload.wwpn;
                 adapter->peer_wwnn = bottom->plogi_payload.wwnn;
                 fc_host_port_type(shost) = FC_PORTTYPE_PTP;
-                if (req->erp_action)
-                        dev_info(&adapter->ccw_device->dev,
-                                 "Point-to-Point fibrechannel "
-                                 "configuration detected.\n");
                 break;
         case FSF_TOPO_FABRIC:
                 fc_host_port_type(shost) = FC_PORTTYPE_NPORT;
-                if (req->erp_action)
-                        dev_info(&adapter->ccw_device->dev,
-                                 "Switched fabric fibrechannel "
-                                 "network detected.\n");
                 break;
         case FSF_TOPO_AL:
                 fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;
-                dev_err(&adapter->ccw_device->dev,
-                        "Unsupported arbitrated loop fibrechannel "
-                        "topology detected, shutting down "
-                        "adapter.\n");
-                zfcp_erp_adapter_shutdown(adapter, 0, 127, req);
-                return -EIO;
         default:
-                fc_host_port_type(shost) = FC_PORTTYPE_UNKNOWN;
                 dev_err(&adapter->ccw_device->dev,
-                        "The fibrechannel topology reported by the"
-                        " adapter is not known by the zfcp driver,"
-                        " shutting down adapter.\n");
-                zfcp_erp_adapter_shutdown(adapter, 0, 128, req);
+                        "Unknown or unsupported arbitrated loop "
+                        "fibre channel topology detected\n");
+                zfcp_erp_adapter_shutdown(adapter, 0, 127, req);
                 return -EIO;
         }
 
@@ -616,11 +553,9 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
 
                 if (bottom->max_qtcb_size < sizeof(struct fsf_qtcb)) {
                         dev_err(&adapter->ccw_device->dev,
-                                "Maximum QTCB size (%d bytes) allowed by "
-                                "the adapter is lower than the minimum "
-                                "required by the driver (%ld bytes).\n",
-                                bottom->max_qtcb_size,
-                                sizeof(struct fsf_qtcb));
+                                "FCP adapter maximum QTCB size (%d bytes) "
+                                "is too small\n",
+                                bottom->max_qtcb_size);
                         zfcp_erp_adapter_shutdown(adapter, 0, 129, req);
                         return;
                 }
@@ -656,15 +591,15 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
 
         if (FSF_QTCB_CURRENT_VERSION < bottom->low_qtcb_version) {
                 dev_err(&adapter->ccw_device->dev,
-                        "The adapter only supports newer control block "
-                        "versions, try updated device driver.\n");
+                        "The FCP adapter only supports newer "
+                        "control block versions\n");
                 zfcp_erp_adapter_shutdown(adapter, 0, 125, req);
                 return;
         }
         if (FSF_QTCB_CURRENT_VERSION > bottom->high_qtcb_version) {
                 dev_err(&adapter->ccw_device->dev,
-                        "The adapter only supports older control block "
-                        "versions, consider a microcode upgrade.\n");
+                        "The FCP adapter only supports older "
+                        "control block versions\n");
                 zfcp_erp_adapter_shutdown(adapter, 0, 126, req);
         }
 }
@@ -688,7 +623,6 @@ static void zfcp_fsf_exchange_port_evaluate(struct zfcp_fsf_req *req)
 
 static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req)
 {
-        struct zfcp_adapter *adapter = req->adapter;
         struct fsf_qtcb *qtcb = req->qtcb;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
@@ -697,38 +631,47 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req)
         switch (qtcb->header.fsf_status) {
         case FSF_GOOD:
                 zfcp_fsf_exchange_port_evaluate(req);
-                atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status);
                 break;
         case FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE:
                 zfcp_fsf_exchange_port_evaluate(req);
-                atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status);
                 zfcp_fsf_link_down_info_eval(req, 43,
                         &qtcb->header.fsf_status_qual.link_down_info);
                 break;
         }
 }
 
-static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue)
+static int zfcp_fsf_sbal_check(struct zfcp_adapter *adapter)
 {
-        spin_lock(&queue->lock);
-        if (atomic_read(&queue->count))
+        struct zfcp_qdio_queue *req_q = &adapter->req_q;
+
+        spin_lock_bh(&adapter->req_q_lock);
+        if (atomic_read(&req_q->count))
                 return 1;
-        spin_unlock(&queue->lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return 0;
 }
 
+static int zfcp_fsf_sbal_available(struct zfcp_adapter *adapter)
+{
+        unsigned int count = atomic_read(&adapter->req_q.count);
+        if (!count)
+                atomic_inc(&adapter->qdio_outb_full);
+        return count > 0;
+}
+
 static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter)
 {
         long ret;
-        struct zfcp_qdio_queue *req_q = &adapter->req_q;
 
-        spin_unlock(&req_q->lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         ret = wait_event_interruptible_timeout(adapter->request_wq,
-                                        zfcp_fsf_sbal_check(req_q), 5 * HZ);
+                                        zfcp_fsf_sbal_check(adapter), 5 * HZ);
         if (ret > 0)
                 return 0;
+        if (!ret)
+                atomic_inc(&adapter->qdio_outb_full);
 
-        spin_lock(&req_q->lock);
+        spin_lock_bh(&adapter->req_q_lock);
         return -EIO;
 }
 
@@ -765,7 +708,7 @@ static struct zfcp_fsf_req *zfcp_fsf_req_create(struct zfcp_adapter *adapter,
                                                 u32 fsf_cmd, int req_flags,
                                                 mempool_t *pool)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
 
         struct zfcp_fsf_req *req;
         struct zfcp_qdio_queue *req_q = &adapter->req_q;
@@ -867,17 +810,17 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter)
 {
         struct zfcp_fsf_req *req;
         struct fsf_status_read_buffer *sr_buf;
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS,
                                   ZFCP_REQ_NO_QTCB,
                                   adapter->pool.fsf_req_status_read);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -910,7 +853,7 @@ failed_buf:
         zfcp_fsf_req_free(req);
         zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
@@ -980,15 +923,15 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
                                                 struct zfcp_unit *unit,
                                                 int req_flags)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_fsf_req *req = NULL;
 
-        spin_lock(&adapter->req_q.lock);
-        if (!atomic_read(&adapter->req_q.count))
+        spin_lock(&adapter->req_q_lock);
+        if (!zfcp_fsf_sbal_available(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,
                                   req_flags, adapter->pool.fsf_req_abort);
-        if (unlikely(IS_ERR(req)))
+        if (IS_ERR(req))
                 goto out;
 
         if (unlikely(!(atomic_read(&unit->status) &
@@ -1013,7 +956,7 @@ out_error_free:
         zfcp_fsf_req_free(req);
         req = NULL;
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock(&adapter->req_q_lock);
         return req;
 }
 
@@ -1021,7 +964,6 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)
 {
         struct zfcp_adapter *adapter = req->adapter;
         struct zfcp_send_ct *send_ct = req->data;
-        struct zfcp_port *port = send_ct->port;
         struct fsf_qtcb_header *header = &req->qtcb->header;
 
         send_ct->status = -EINVAL;
@@ -1040,17 +982,14 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)
         case FSF_ADAPTER_STATUS_AVAILABLE:
                 switch (header->fsf_status_qual.word[0]){
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        zfcp_test_link(port);
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
                         req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 }
                 break;
         case FSF_ACCESS_DENIED:
-                zfcp_fsf_access_denied_port(req, port);
                 break;
         case FSF_PORT_BOXED:
-                zfcp_erp_port_boxed(port, 49, req);
                 req->status |= ZFCP_STATUS_FSFREQ_ERROR |
                                ZFCP_STATUS_FSFREQ_RETRY;
                 break;
@@ -1101,18 +1040,18 @@ static int zfcp_fsf_setup_sbals(struct zfcp_fsf_req *req,
 int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,
                      struct zfcp_erp_action *erp_action)
 {
-        struct zfcp_port *port = ct->port;
-        struct zfcp_adapter *adapter = port->adapter;
+        struct zfcp_wka_port *wka_port = ct->wka_port;
+        struct zfcp_adapter *adapter = wka_port->adapter;
         struct zfcp_fsf_req *req;
         int ret = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC,
                                   ZFCP_REQ_AUTO_CLEANUP, pool);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 ret = PTR_ERR(req);
                 goto out;
         }
@@ -1123,7 +1062,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,
                 goto failed_send;
 
         req->handler = zfcp_fsf_send_ct_handler;
-        req->qtcb->header.port_handle = port->handle;
+        req->qtcb->header.port_handle = wka_port->handle;
         req->qtcb->bottom.support.service_class = FSF_CLASS_3;
         req->qtcb->bottom.support.timeout = ct->timeout;
         req->data = ct;
@@ -1148,7 +1087,7 @@ failed_send:
         if (erp_action)
                 erp_action->fsf_req = NULL;
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return ret;
 }
 
@@ -1218,18 +1157,18 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
                        ZFCP_STATUS_COMMON_UNBLOCKED)))
                 return -EBUSY;
 
-        spin_lock(&adapter->req_q.lock);
-        if (!atomic_read(&adapter->req_q.count))
+        spin_lock(&adapter->req_q_lock);
+        if (!zfcp_fsf_sbal_available(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS,
                                   ZFCP_REQ_AUTO_CLEANUP, NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 ret = PTR_ERR(req);
                 goto out;
         }
 
-        ret = zfcp_fsf_setup_sbals(req, els->req, els->resp,
-                                   FSF_MAX_SBALS_PER_ELS_REQ);
+        ret = zfcp_fsf_setup_sbals(req, els->req, els->resp, 2);
+
         if (ret)
                 goto failed_send;
 
@@ -1252,25 +1191,25 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
 failed_send:
         zfcp_fsf_req_free(req);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock(&adapter->req_q_lock);
         return ret;
 }
 
 int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_fsf_req *req;
         struct zfcp_adapter *adapter = erp_action->adapter;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
-        if (!atomic_read(&adapter->req_q.count))
+        spin_lock_bh(&adapter->req_q_lock);
+        if (!zfcp_fsf_sbal_available(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter,
                                   FSF_QTCB_EXCHANGE_CONFIG_DATA,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1295,24 +1234,24 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
 int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,
                                        struct fsf_qtcb_bottom_config *data)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_fsf_req *req = NULL;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA,
                                   0, NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1334,7 +1273,7 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,
         zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         retval = zfcp_fsf_req_send(req);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         if (!retval)
                 wait_event(req->completion_wq,
                            req->status & ZFCP_STATUS_FSFREQ_COMPLETED);
@@ -1351,7 +1290,7 @@ out:
  */
 int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_fsf_req *req;
         struct zfcp_adapter *adapter = erp_action->adapter;
         int retval = -EIO;
@@ -1359,13 +1298,13 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
         if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT))
                 return -EOPNOTSUPP;
 
-        spin_lock(&adapter->req_q.lock);
-        if (!atomic_read(&adapter->req_q.count))
+        spin_lock_bh(&adapter->req_q_lock);
+        if (!zfcp_fsf_sbal_available(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1385,7 +1324,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
@@ -1398,20 +1337,20 @@ out:
 int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,
                                      struct fsf_qtcb_bottom_port *data)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_fsf_req *req = NULL;
         int retval = -EIO;
 
         if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT))
                 return -EOPNOTSUPP;
 
-        spin_lock(&adapter->req_q.lock);
-        if (!atomic_read(&adapter->req_q.count))
+        spin_lock_bh(&adapter->req_q_lock);
+        if (!zfcp_fsf_sbal_available(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0,
                                   NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1427,7 +1366,7 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,
         zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         retval = zfcp_fsf_req_send(req);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         if (!retval)
                 wait_event(req->completion_wq,
                            req->status & ZFCP_STATUS_FSFREQ_COMPLETED);
@@ -1443,7 +1382,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
         struct fsf_plogi *plogi;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
-                goto skip_fsfstatus;
+                return;
 
         switch (header->fsf_status) {
         case FSF_PORT_ALREADY_OPEN:
@@ -1453,9 +1392,9 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                 break;
         case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:
                 dev_warn(&req->adapter->ccw_device->dev,
-                         "The adapter is out of resources. The remote port "
-                         "0x%016Lx could not be opened, disabling it.\n",
-                         port->wwpn);
+                         "Not enough FCP adapter resources to open "
+                         "remote port 0x%016Lx\n",
+                         (unsigned long long)port->wwpn);
                 zfcp_erp_port_failed(port, 31, req);
                 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
@@ -1467,8 +1406,8 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                         break;
                 case FSF_SQ_NO_RETRY_POSSIBLE:
                         dev_warn(&req->adapter->ccw_device->dev,
-                                 "The remote port 0x%016Lx could not be "
-                                 "opened. Disabling it.\n", port->wwpn);
+                                 "Remote port 0x%016Lx could not be opened\n",
+                                 (unsigned long long)port->wwpn);
                         zfcp_erp_port_failed(port, 32, req);
                         req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
@@ -1496,9 +1435,6 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                  * another GID_PN straight after a port has been opened.
                  * Alternately, an ADISC/PDISC ELS should suffice, as well.
                  */
-                if (atomic_read(&port->status) & ZFCP_STATUS_PORT_NO_WWPN)
-                        break;
-
                 plogi = (struct fsf_plogi *) req->qtcb->bottom.support.els;
                 if (req->qtcb->bottom.support.els1_length >= sizeof(*plogi)) {
                         if (plogi->serv_param.wwpn != port->wwpn)
@@ -1514,9 +1450,6 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         }
-
-skip_fsfstatus:
-        atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING, &port->status);
 }
 
 /**
@@ -1526,12 +1459,12 @@ skip_fsfstatus:
  */
 int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_adapter *adapter = erp_action->adapter;
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
@@ -1539,7 +1472,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
                                   FSF_QTCB_OPEN_PORT_WITH_DID,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1553,7 +1486,6 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
         req->data = erp_action->port;
         req->erp_action = erp_action;
         erp_action->fsf_req = req;
-        atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &erp_action->port->status);
 
         zfcp_fsf_start_erp_timer(req);
         retval = zfcp_fsf_req_send(req);
@@ -1562,7 +1494,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
@@ -1571,7 +1503,7 @@ static void zfcp_fsf_close_port_handler(struct zfcp_fsf_req *req)
         struct zfcp_port *port = req->data;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
-                goto skip_fsfstatus;
+                return;
 
         switch (req->qtcb->header.fsf_status) {
         case FSF_PORT_HANDLE_NOT_VALID:
@@ -1586,9 +1518,6 @@ static void zfcp_fsf_close_port_handler(struct zfcp_fsf_req *req)
                                             ZFCP_CLEAR);
                 break;
         }
-
-skip_fsfstatus:
-        atomic_clear_mask(ZFCP_STATUS_COMMON_CLOSING, &port->status);
 }
 
 /**
@@ -1598,19 +1527,19 @@ skip_fsfstatus:
  */
 int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_adapter *adapter = erp_action->adapter;
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1624,7 +1553,6 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)
         req->erp_action = erp_action;
         req->qtcb->header.port_handle = erp_action->port->handle;
         erp_action->fsf_req = req;
-        atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &erp_action->port->status);
 
         zfcp_fsf_start_erp_timer(req);
         retval = zfcp_fsf_req_send(req);
@@ -1633,7 +1561,131 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
+        return retval;
+}
+
+static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req)
+{
+        struct zfcp_wka_port *wka_port = req->data;
+        struct fsf_qtcb_header *header = &req->qtcb->header;
+
+        if (req->status & ZFCP_STATUS_FSFREQ_ERROR) {
+                wka_port->status = ZFCP_WKA_PORT_OFFLINE;
+                goto out;
+        }
+
+        switch (header->fsf_status) {
+        case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:
+                dev_warn(&req->adapter->ccw_device->dev,
+                         "Opening WKA port 0x%x failed\n", wka_port->d_id);
+        case FSF_ADAPTER_STATUS_AVAILABLE:
+                req->status |= ZFCP_STATUS_FSFREQ_ERROR;
+        case FSF_ACCESS_DENIED:
+                wka_port->status = ZFCP_WKA_PORT_OFFLINE;
+                break;
+        case FSF_PORT_ALREADY_OPEN:
+        case FSF_GOOD:
+                wka_port->handle = header->port_handle;
+                wka_port->status = ZFCP_WKA_PORT_ONLINE;
+        }
+out:
+        wake_up(&wka_port->completion_wq);
+}
+
+/**
+ * zfcp_fsf_open_wka_port - create and send open wka-port request
+ * @wka_port: pointer to struct zfcp_wka_port
+ * Returns: 0 on success, error otherwise
+ */
+int zfcp_fsf_open_wka_port(struct zfcp_wka_port *wka_port)
+{
+        struct qdio_buffer_element *sbale;
+        struct zfcp_adapter *adapter = wka_port->adapter;
+        struct zfcp_fsf_req *req;
+        int retval = -EIO;
+
+        spin_lock_bh(&adapter->req_q_lock);
+        if (zfcp_fsf_req_sbal_get(adapter))
+                goto out;
+
+        req = zfcp_fsf_req_create(adapter,
+                                  FSF_QTCB_OPEN_PORT_WITH_DID,
+                                  ZFCP_REQ_AUTO_CLEANUP,
+                                  adapter->pool.fsf_req_erp);
+        if (unlikely(IS_ERR(req))) {
+                retval = PTR_ERR(req);
+                goto out;
+        }
+
+        sbale = zfcp_qdio_sbale_req(req);
+        sbale[0].flags |= SBAL_FLAGS0_TYPE_READ;
+        sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY;
+
+        req->handler = zfcp_fsf_open_wka_port_handler;
+        req->qtcb->bottom.support.d_id = wka_port->d_id;
+        req->data = wka_port;
+
+        zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
+        retval = zfcp_fsf_req_send(req);
+        if (retval)
+                zfcp_fsf_req_free(req);
+out:
+        spin_unlock_bh(&adapter->req_q_lock);
+        return retval;
+}
+
+static void zfcp_fsf_close_wka_port_handler(struct zfcp_fsf_req *req)
+{
+        struct zfcp_wka_port *wka_port = req->data;
+
+        if (req->qtcb->header.fsf_status == FSF_PORT_HANDLE_NOT_VALID) {
+                req->status |= ZFCP_STATUS_FSFREQ_ERROR;
+                zfcp_erp_adapter_reopen(wka_port->adapter, 0, 84, req);
+        }
+
+        wka_port->status = ZFCP_WKA_PORT_OFFLINE;
+        wake_up(&wka_port->completion_wq);
+}
+
+/**
+ * zfcp_fsf_close_wka_port - create and send close wka port request
+ * @erp_action: pointer to struct zfcp_erp_action
+ * Returns: 0 on success, error otherwise
+ */
+int zfcp_fsf_close_wka_port(struct zfcp_wka_port *wka_port)
+{
+        struct qdio_buffer_element *sbale;
+        struct zfcp_adapter *adapter = wka_port->adapter;
+        struct zfcp_fsf_req *req;
+        int retval = -EIO;
+
+        spin_lock_bh(&adapter->req_q_lock);
+        if (zfcp_fsf_req_sbal_get(adapter))
+                goto out;
+
+        req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT,
+                                  ZFCP_REQ_AUTO_CLEANUP,
+                                  adapter->pool.fsf_req_erp);
+        if (unlikely(IS_ERR(req))) {
+                retval = PTR_ERR(req);
+                goto out;
+        }
+
+        sbale = zfcp_qdio_sbale_req(req);
+        sbale[0].flags |= SBAL_FLAGS0_TYPE_READ;
+        sbale[1].flags |= SBAL_FLAGS_LAST_ENTRY;
+
+        req->handler = zfcp_fsf_close_wka_port_handler;
+        req->data = wka_port;
+        req->qtcb->header.port_handle = wka_port->handle;
+
+        zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
+        retval = zfcp_fsf_req_send(req);
+        if (retval)
+                zfcp_fsf_req_free(req);
+out:
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
@@ -1695,19 +1747,19 @@ skip_fsfstatus:
  */
 int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_adapter *adapter = erp_action->adapter;
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1731,7 +1783,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
@@ -1746,7 +1798,7 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)
         int exclusive, readwrite;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
-                goto skip_fsfstatus;
+                return;
 
         atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
                           ZFCP_STATUS_COMMON_ACCESS_BOXED |
@@ -1774,14 +1826,12 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)
         case FSF_LUN_SHARING_VIOLATION:
                 if (header->fsf_status_qual.word[0])
                         dev_warn(&adapter->ccw_device->dev,
-                                 "FCP-LUN 0x%Lx at the remote port "
-                                 "with WWPN 0x%Lx "
-                                 "connected to the adapter "
-                                 "is already in use in LPAR%d, CSS%d.\n",
-                                 unit->fcp_lun,
-                                 unit->port->wwpn,
-                                 queue_designator->hla,
-                                 queue_designator->cssid);
+                                 "LUN 0x%Lx on port 0x%Lx is already in "
+                                 "use by CSS%d, MIF Image ID %x\n",
+                                 (unsigned long long)unit->fcp_lun,
+                                 (unsigned long long)unit->port->wwpn,
+                                 queue_designator->cssid,
+                                 queue_designator->hla);
                 else
                         zfcp_act_eval_err(adapter,
                                           header->fsf_status_qual.word[2]);
@@ -1792,9 +1842,10 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)
                 break;
         case FSF_MAXIMUM_NUMBER_OF_LUNS_EXCEEDED:
                 dev_warn(&adapter->ccw_device->dev,
-                         "The adapter ran out of resources. There is no "
-                         "handle available for unit 0x%016Lx on port 0x%016Lx.",
-                         unit->fcp_lun, unit->port->wwpn);
+                         "No handle is available for LUN "
+                         "0x%016Lx on port 0x%016Lx\n",
+                         (unsigned long long)unit->fcp_lun,
+                         (unsigned long long)unit->port->wwpn);
                 zfcp_erp_unit_failed(unit, 34, req);
                 /* fall through */
         case FSF_INVALID_COMMAND_OPTION:
@@ -1831,26 +1882,29 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)
                                 atomic_set_mask(ZFCP_STATUS_UNIT_READONLY,
                                                 &unit->status);
                                 dev_info(&adapter->ccw_device->dev,
-                                         "Read-only access for unit 0x%016Lx "
-                                         "on port 0x%016Lx.\n",
-                                         unit->fcp_lun, unit->port->wwpn);
+                                         "SCSI device at LUN 0x%016Lx on port "
+                                         "0x%016Lx opened read-only\n",
+                                         (unsigned long long)unit->fcp_lun,
+                                         (unsigned long long)unit->port->wwpn);
                         }
 
                         if (exclusive && !readwrite) {
                                 dev_err(&adapter->ccw_device->dev,
-                                        "Exclusive access of read-only unit "
-                                        "0x%016Lx on port 0x%016Lx not "
-                                        "supported, disabling unit.\n",
-                                        unit->fcp_lun, unit->port->wwpn);
+                                        "Exclusive read-only access not "
+                                        "supported (unit 0x%016Lx, "
+                                        "port 0x%016Lx)\n",
+                                        (unsigned long long)unit->fcp_lun,
+                                        (unsigned long long)unit->port->wwpn);
                                 zfcp_erp_unit_failed(unit, 35, req);
                                 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                                 zfcp_erp_unit_shutdown(unit, 0, 80, req);
                         } else if (!exclusive && readwrite) {
                                 dev_err(&adapter->ccw_device->dev,
-                                        "Shared access of read-write unit "
-                                        "0x%016Lx on port 0x%016Lx not "
-                                        "supported, disabling unit.\n",
-                                        unit->fcp_lun, unit->port->wwpn);
+                                        "Shared read-write access not "
+                                        "supported (unit 0x%016Lx, port "
+                                        "0x%016Lx\n)",
+                                        (unsigned long long)unit->fcp_lun,
+                                        (unsigned long long)unit->port->wwpn);
                                 zfcp_erp_unit_failed(unit, 36, req);
                                 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                                 zfcp_erp_unit_shutdown(unit, 0, 81, req);
@@ -1858,9 +1912,6 @@ static void zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *req)
                 }
                 break;
         }
-
-skip_fsfstatus:
-        atomic_clear_mask(ZFCP_STATUS_COMMON_OPENING, &unit->status);
 }
 
 /**
@@ -1870,19 +1921,19 @@ skip_fsfstatus:
  */
 int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_adapter *adapter = erp_action->adapter;
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1901,8 +1952,6 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
         if (!(adapter->connection_features & FSF_FEATURE_NPIV_MODE))
                 req->qtcb->bottom.support.option = FSF_OPEN_LUN_SUPPRESS_BOXING;
 
-        atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &erp_action->unit->status);
-
         zfcp_fsf_start_erp_timer(req);
         retval = zfcp_fsf_req_send(req);
         if (retval) {
@@ -1910,7 +1959,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
@@ -1919,7 +1968,7 @@ static void zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *req)
         struct zfcp_unit *unit = req->data;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
-                goto skip_fsfstatus;
+                return;
 
         switch (req->qtcb->header.fsf_status) {
         case FSF_PORT_HANDLE_NOT_VALID:
@@ -1949,8 +1998,6 @@ static void zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *req)
                 atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN, &unit->status);
                 break;
         }
-skip_fsfstatus:
-        atomic_clear_mask(ZFCP_STATUS_COMMON_CLOSING, &unit->status);
 }
 
 /**
@@ -1960,18 +2007,18 @@ skip_fsfstatus:
  */
 int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_adapter *adapter = erp_action->adapter;
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1986,7 +2033,6 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)
         req->data = erp_action->unit;
         req->erp_action = erp_action;
         erp_action->fsf_req = req;
-        atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &erp_action->unit->status);
 
         zfcp_fsf_start_erp_timer(req);
         retval = zfcp_fsf_req_send(req);
@@ -1995,7 +2041,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
         return retval;
 }
 
@@ -2156,21 +2202,21 @@ static void zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *req)
                 break;
         case FSF_DIRECTION_INDICATOR_NOT_VALID:
                 dev_err(&req->adapter->ccw_device->dev,
-                        "Invalid data direction (%d) given for unit "
-                        "0x%016Lx on port 0x%016Lx, shutting down "
-                        "adapter.\n",
+                        "Incorrect direction %d, unit 0x%016Lx on port "
+                        "0x%016Lx closed\n",
                         req->qtcb->bottom.io.data_direction,
-                        unit->fcp_lun, unit->port->wwpn);
+                        (unsigned long long)unit->fcp_lun,
+                        (unsigned long long)unit->port->wwpn);
                 zfcp_erp_adapter_shutdown(unit->port->adapter, 0, 133, req);
                 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         case FSF_CMND_LENGTH_NOT_VALID:
                 dev_err(&req->adapter->ccw_device->dev,
-                        "An invalid control-data-block length field (%d) "
-                        "was found in a command for unit 0x%016Lx on port "
-                        "0x%016Lx. Shutting down adapter.\n",
+                        "Incorrect CDB length %d, unit 0x%016Lx on "
+                        "port 0x%016Lx closed\n",
                         req->qtcb->bottom.io.fcp_cmnd_length,
-                        unit->fcp_lun, unit->port->wwpn);
+                        (unsigned long long)unit->fcp_lun,
+                        (unsigned long long)unit->port->wwpn);
                 zfcp_erp_adapter_shutdown(unit->port->adapter, 0, 134, req);
                 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
@@ -2201,6 +2247,20 @@ skip_fsfstatus:
         }
 }
 
+static void zfcp_set_fcp_dl(struct fcp_cmnd_iu *fcp_cmd, u32 fcp_dl)
+{
+        u32 *fcp_dl_ptr;
+
+        /*
+         * fcp_dl_addr = start address of fcp_cmnd structure +
+         * size of fixed part + size of dynamically sized add_dcp_cdb field
+         * SEE FCP-2 documentation
+         */
+        fcp_dl_ptr = (u32 *) ((unsigned char *) &fcp_cmd[1] +
+                        (fcp_cmd->add_fcp_cdb_length << 2));
+        *fcp_dl_ptr = fcp_dl;
+}
+
 /**
  * zfcp_fsf_send_fcp_command_task - initiate an FCP command (for a SCSI command)
  * @adapter: adapter where scsi command is issued
@@ -2223,12 +2283,12 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,
                        ZFCP_STATUS_COMMON_UNBLOCKED)))
                 return -EBUSY;
 
-        spin_lock(&adapter->req_q.lock);
-        if (!atomic_read(&adapter->req_q.count))
+        spin_lock(&adapter->req_q_lock);
+        if (!zfcp_fsf_sbal_available(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
                                   adapter->pool.fsf_req_scsi);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -2286,7 +2346,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,
         memcpy(fcp_cmnd_iu->fcp_cdb, scsi_cmnd->cmnd, scsi_cmnd->cmd_len);
 
         req->qtcb->bottom.io.fcp_cmnd_length = sizeof(struct fcp_cmnd_iu) +
-                fcp_cmnd_iu->add_fcp_cdb_length + sizeof(fcp_dl_t);
+                fcp_cmnd_iu->add_fcp_cdb_length + sizeof(u32);
 
         real_bytes = zfcp_qdio_sbals_from_sg(req, sbtype,
                                              scsi_sglist(scsi_cmnd),
@@ -2296,10 +2356,10 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,
                         retval = -EIO;
                 else {
                         dev_err(&adapter->ccw_device->dev,
-                                "SCSI request too large. "
-                                "Shutting down unit 0x%016Lx on port "
-                                "0x%016Lx.\n", unit->fcp_lun,
-                                unit->port->wwpn);
+                                "Oversize data package, unit 0x%016Lx "
+                                "on port 0x%016Lx closed\n",
+                                (unsigned long long)unit->fcp_lun,
+                                (unsigned long long)unit->port->wwpn);
                         zfcp_erp_unit_shutdown(unit, 0, 131, req);
                         retval = -EINVAL;
                 }
@@ -2322,7 +2382,7 @@ failed_scsi_cmnd:
         zfcp_fsf_req_free(req);
         scsi_cmnd->host_scribble = NULL;
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock(&adapter->req_q_lock);
         return retval;
 }
 
@@ -2338,7 +2398,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
                                            struct zfcp_unit *unit,
                                            u8 tm_flags, int req_flags)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_fsf_req *req = NULL;
         struct fcp_cmnd_iu *fcp_cmnd_iu;
 
@@ -2346,12 +2406,12 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
                        ZFCP_STATUS_COMMON_UNBLOCKED)))
                 return NULL;
 
-        spin_lock(&adapter->req_q.lock);
-        if (!atomic_read(&adapter->req_q.count))
+        spin_lock(&adapter->req_q_lock);
+        if (!zfcp_fsf_sbal_available(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
                                   adapter->pool.fsf_req_scsi);
-        if (unlikely(IS_ERR(req)))
+        if (IS_ERR(req))
                 goto out;
 
         req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;
@@ -2362,7 +2422,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
         req->qtcb->bottom.io.data_direction = FSF_DATADIR_CMND;
         req->qtcb->bottom.io.service_class = FSF_CLASS_3;
         req->qtcb->bottom.io.fcp_cmnd_length =  sizeof(struct fcp_cmnd_iu) +
-                                                sizeof(fcp_dl_t);
+                                                sizeof(u32);
 
         sbale = zfcp_qdio_sbale_req(req);
         sbale[0].flags |= SBAL_FLAGS0_TYPE_WRITE;
@@ -2379,7 +2439,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
         zfcp_fsf_req_free(req);
         req = NULL;
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock(&adapter->req_q_lock);
         return req;
 }
 
@@ -2398,7 +2458,7 @@ static void zfcp_fsf_control_file_handler(struct zfcp_fsf_req *req)
 struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
                                            struct zfcp_fsf_cfdc *fsf_cfdc)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         struct zfcp_fsf_req *req = NULL;
         struct fsf_qtcb_bottom_support *bottom;
         int direction, retval = -EIO, bytes;
@@ -2417,12 +2477,12 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
                 return ERR_PTR(-EINVAL);
         }
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q_lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = -EPERM;
                 goto out;
         }
@@ -2447,7 +2507,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
         zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         retval = zfcp_fsf_req_send(req);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q_lock);
 
         if (!retval) {
                 wait_event(req->completion_wq,
diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h
index bf94b4da0763..fd3a88777ac8 100644
--- a/drivers/s390/scsi/zfcp_fsf.h
+++ b/drivers/s390/scsi/zfcp_fsf.h
@@ -71,13 +71,6 @@
 #define FSF_MAXIMUM_NUMBER_OF_LUNS_EXCEEDED     0x00000041
 #define FSF_ELS_COMMAND_REJECTED                0x00000050
 #define FSF_GENERIC_COMMAND_REJECTED            0x00000051
-#define FSF_OPERATION_PARTIALLY_SUCCESSFUL      0x00000052
-#define FSF_AUTHORIZATION_FAILURE               0x00000053
-#define FSF_CFDC_ERROR_DETECTED                 0x00000054
-#define FSF_CONTROL_FILE_UPDATE_ERROR           0x00000055
-#define FSF_CONTROL_FILE_TOO_LARGE              0x00000056
-#define FSF_ACCESS_CONFLICT_DETECTED            0x00000057
-#define FSF_CONFLICTS_OVERRULED                 0x00000058
 #define FSF_PORT_BOXED                          0x00000059
 #define FSF_LUN_BOXED                           0x0000005A
 #define FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE     0x0000005B
@@ -85,9 +78,7 @@
 #define FSF_REQUEST_SIZE_TOO_LARGE              0x00000061
 #define FSF_RESPONSE_SIZE_TOO_LARGE             0x00000062
 #define FSF_SBAL_MISMATCH                       0x00000063
-#define FSF_OPEN_PORT_WITHOUT_PRLI              0x00000064
 #define FSF_ADAPTER_STATUS_AVAILABLE            0x000000AD
-#define FSF_FCP_RSP_AVAILABLE                   0x000000AF
 #define FSF_UNKNOWN_COMMAND                     0x000000E2
 #define FSF_UNKNOWN_OP_SUBTYPE                  0x000000E3
 #define FSF_INVALID_COMMAND_OPTION              0x000000E5
@@ -102,20 +93,9 @@
 #define FSF_SQ_RETRY_IF_POSSIBLE                0x02
 #define FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED       0x03
 #define FSF_SQ_INVOKE_LINK_TEST_PROCEDURE       0x04
-#define FSF_SQ_ULP_PROGRAMMING_ERROR            0x05
 #define FSF_SQ_COMMAND_ABORTED                  0x06
 #define FSF_SQ_NO_RETRY_POSSIBLE                0x07
 
-/* FSF status qualifier for CFDC commands */
-#define FSF_SQ_CFDC_HARDENED_ON_SE              0x00000000
-#define FSF_SQ_CFDC_COULD_NOT_HARDEN_ON_SE      0x00000001
-#define FSF_SQ_CFDC_COULD_NOT_HARDEN_ON_SE2     0x00000002
-/* CFDC subtable codes */
-#define FSF_SQ_CFDC_SUBTABLE_OS                 0x0001
-#define FSF_SQ_CFDC_SUBTABLE_PORT_WWPN          0x0002
-#define FSF_SQ_CFDC_SUBTABLE_PORT_DID           0x0003
-#define FSF_SQ_CFDC_SUBTABLE_LUN                0x0004
-
 /* FSF status qualifier (most significant 4 bytes), local link down */
 #define FSF_PSQ_LINK_NO_LIGHT                   0x00000004
 #define FSF_PSQ_LINK_WRAP_PLUG                  0x00000008
@@ -145,7 +125,6 @@
 #define FSF_STATUS_READ_LINK_UP                 0x00000006
 #define FSF_STATUS_READ_NOTIFICATION_LOST       0x00000009
 #define FSF_STATUS_READ_CFDC_UPDATED            0x0000000A
-#define FSF_STATUS_READ_CFDC_HARDENED           0x0000000B
 #define FSF_STATUS_READ_FEATURE_UPDATE_ALERT    0x0000000C
 
 /* status subtypes in status read buffer */
@@ -159,20 +138,9 @@
 
 /* status subtypes for unsolicited status notification lost */
 #define FSF_STATUS_READ_SUB_INCOMING_ELS        0x00000001
-#define FSF_STATUS_READ_SUB_SENSE_DATA          0x00000002
-#define FSF_STATUS_READ_SUB_LINK_STATUS         0x00000004
-#define FSF_STATUS_READ_SUB_PORT_CLOSED         0x00000008
-#define FSF_STATUS_READ_SUB_BIT_ERROR_THRESHOLD 0x00000010
 #define FSF_STATUS_READ_SUB_ACT_UPDATED         0x00000020
-#define FSF_STATUS_READ_SUB_ACT_HARDENED        0x00000040
-#define FSF_STATUS_READ_SUB_FEATURE_UPDATE_ALERT 0x00000080
-
-/* status subtypes for CFDC */
-#define FSF_STATUS_READ_SUB_CFDC_HARDENED_ON_SE 0x00000002
-#define FSF_STATUS_READ_SUB_CFDC_HARDENED_ON_SE2 0x0000000F
 
 /* topologie that is detected by the adapter */
-#define FSF_TOPO_ERROR                          0x00000000
 #define FSF_TOPO_P2P                            0x00000001
 #define FSF_TOPO_FABRIC                         0x00000002
 #define FSF_TOPO_AL                             0x00000003
@@ -180,17 +148,13 @@
 /* data direction for FCP commands */
 #define FSF_DATADIR_WRITE                       0x00000001
 #define FSF_DATADIR_READ                        0x00000002
-#define FSF_DATADIR_READ_WRITE                  0x00000003
 #define FSF_DATADIR_CMND                        0x00000004
 
 /* fc service class */
-#define FSF_CLASS_1                             0x00000001
-#define FSF_CLASS_2                             0x00000002
 #define FSF_CLASS_3                             0x00000003
 
 /* SBAL chaining */
 #define FSF_MAX_SBALS_PER_REQ                   36
-#define FSF_MAX_SBALS_PER_ELS_REQ               2
 
 /* logging space behind QTCB */
 #define FSF_QTCB_LOG_SIZE                       1024
@@ -200,50 +164,16 @@
 #define FSF_FEATURE_LUN_SHARING                 0x00000004
 #define FSF_FEATURE_NOTIFICATION_LOST           0x00000008
 #define FSF_FEATURE_HBAAPI_MANAGEMENT           0x00000010
-#define FSF_FEATURE_ELS_CT_CHAINED_SBALS        0x00000020
 #define FSF_FEATURE_UPDATE_ALERT                0x00000100
 #define FSF_FEATURE_MEASUREMENT_DATA            0x00000200
 
 /* host connection features */
 #define FSF_FEATURE_NPIV_MODE                   0x00000001
-#define FSF_FEATURE_VM_ASSIGNED_WWPN            0x00000002
 
 /* option */
 #define FSF_OPEN_LUN_SUPPRESS_BOXING            0x00000001
-#define FSF_OPEN_LUN_REPLICATE_SENSE            0x00000002
-
-/* adapter types */
-#define FSF_ADAPTER_TYPE_FICON                  0x00000001
-#define FSF_ADAPTER_TYPE_FICON_EXPRESS          0x00000002
-
-/* port types */
-#define FSF_HBA_PORTTYPE_UNKNOWN                0x00000001
-#define FSF_HBA_PORTTYPE_NOTPRESENT             0x00000003
-#define FSF_HBA_PORTTYPE_NPORT                  0x00000005
-#define FSF_HBA_PORTTYPE_PTP                    0x00000021
-/* following are not defined and used by FSF Spec
-   but are additionally defined by FC-HBA */
-#define FSF_HBA_PORTTYPE_OTHER                  0x00000002
-#define FSF_HBA_PORTTYPE_NOTPRESENT             0x00000003
-#define FSF_HBA_PORTTYPE_NLPORT                 0x00000006
-#define FSF_HBA_PORTTYPE_FLPORT                 0x00000007
-#define FSF_HBA_PORTTYPE_FPORT                  0x00000008
-#define FSF_HBA_PORTTYPE_LPORT                  0x00000020
-
-/* port states */
-#define FSF_HBA_PORTSTATE_UNKNOWN               0x00000001
-#define FSF_HBA_PORTSTATE_ONLINE                0x00000002
-#define FSF_HBA_PORTSTATE_OFFLINE               0x00000003
-#define FSF_HBA_PORTSTATE_LINKDOWN              0x00000006
-#define FSF_HBA_PORTSTATE_ERROR                 0x00000007
-
-/* IO states of adapter */
-#define FSF_IOSTAT_NPORT_RJT                    0x00000004
-#define FSF_IOSTAT_FABRIC_RJT                   0x00000005
-#define FSF_IOSTAT_LS_RJT                       0x00000009
 
 /* open LUN access flags*/
-#define FSF_UNIT_ACCESS_OPEN_LUN_ALLOWED        0x01000000
 #define FSF_UNIT_ACCESS_EXCLUSIVE               0x02000000
 #define FSF_UNIT_ACCESS_OUTBOUND_TRANSFER       0x10000000
 
@@ -265,11 +195,6 @@ struct fsf_queue_designator {
         u32 res1;
 } __attribute__ ((packed));
 
-struct fsf_port_closed_payload {
-        struct fsf_queue_designator queue_designator;
-        u32                         port_handle;
-} __attribute__ ((packed));
-
 struct fsf_bit_error_payload {
         u32 res1;
         u32 link_failure_error_count;
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index d6dbd653fde9..3e05080e62d4 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -28,7 +28,7 @@ static int zfcp_qdio_buffers_enqueue(struct qdio_buffer **sbal)
         return 0;
 }
 
-static volatile struct qdio_buffer_element *
+static struct qdio_buffer_element *
 zfcp_qdio_sbale(struct zfcp_qdio_queue *q, int sbal_idx, int sbale_idx)
 {
         return &q->sbal[sbal_idx]->element[sbale_idx];
@@ -57,7 +57,7 @@ void zfcp_qdio_free(struct zfcp_adapter *adapter)
 
 static void zfcp_qdio_handler_error(struct zfcp_adapter *adapter, u8 id)
 {
-        dev_warn(&adapter->ccw_device->dev, "QDIO problem occurred.\n");
+        dev_warn(&adapter->ccw_device->dev, "A QDIO problem occurred\n");
 
         zfcp_erp_adapter_reopen(adapter,
                                 ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
@@ -145,7 +145,7 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,
 {
         struct zfcp_adapter *adapter = (struct zfcp_adapter *) parm;
         struct zfcp_qdio_queue *queue = &adapter->resp_q;
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         int sbal_idx, sbale_idx, sbal_no;
 
         if (unlikely(qdio_err)) {
@@ -174,8 +174,8 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,
 
                 if (unlikely(!(sbale->flags & SBAL_FLAGS_LAST_ENTRY)))
                         dev_warn(&adapter->ccw_device->dev,
-                                 "Protocol violation by adapter. "
-                                 "Continuing operations.\n");
+                                 "A QDIO protocol error occurred, "
+                                 "operations continue\n");
         }
 
         /*
@@ -190,8 +190,7 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,
  * @fsf_req: pointer to struct fsf_req
  * Returns: pointer to qdio_buffer_element (SBALE) structure
  */
-volatile struct qdio_buffer_element *
-zfcp_qdio_sbale_req(struct zfcp_fsf_req *req)
+struct qdio_buffer_element *zfcp_qdio_sbale_req(struct zfcp_fsf_req *req)
 {
         return zfcp_qdio_sbale(&req->adapter->req_q, req->sbal_last, 0);
 }
@@ -201,8 +200,7 @@ zfcp_qdio_sbale_req(struct zfcp_fsf_req *req)
  * @fsf_req: pointer to struct fsf_req
  * Returns: pointer to qdio_buffer_element (SBALE) structure
  */
-volatile struct qdio_buffer_element *
-zfcp_qdio_sbale_curr(struct zfcp_fsf_req *req)
+struct qdio_buffer_element *zfcp_qdio_sbale_curr(struct zfcp_fsf_req *req)
 {
         return zfcp_qdio_sbale(&req->adapter->req_q, req->sbal_last,
                                req->sbale_curr);
@@ -216,10 +214,10 @@ static void zfcp_qdio_sbal_limit(struct zfcp_fsf_req *fsf_req, int max_sbals)
                                         % QDIO_MAX_BUFFERS_PER_Q;
 }
 
-static volatile struct qdio_buffer_element *
+static struct qdio_buffer_element *
 zfcp_qdio_sbal_chain(struct zfcp_fsf_req *fsf_req, unsigned long sbtype)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
 
         /* set last entry flag in current SBALE of current SBAL */
         sbale = zfcp_qdio_sbale_curr(fsf_req);
@@ -250,7 +248,7 @@ zfcp_qdio_sbal_chain(struct zfcp_fsf_req *fsf_req, unsigned long sbtype)
         return sbale;
 }
 
-static volatile struct qdio_buffer_element *
+static struct qdio_buffer_element *
 zfcp_qdio_sbale_next(struct zfcp_fsf_req *fsf_req, unsigned long sbtype)
 {
         if (fsf_req->sbale_curr == ZFCP_LAST_SBALE_PER_SBAL)
@@ -273,7 +271,7 @@ static int zfcp_qdio_fill_sbals(struct zfcp_fsf_req *fsf_req,
                                 unsigned int sbtype, void *start_addr,
                                 unsigned int total_length)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         unsigned long remaining, length;
         void *addr;
 
@@ -282,6 +280,7 @@ static int zfcp_qdio_fill_sbals(struct zfcp_fsf_req *fsf_req,
              addr += length, remaining -= length) {
                 sbale = zfcp_qdio_sbale_next(fsf_req, sbtype);
                 if (!sbale) {
+                        atomic_inc(&fsf_req->adapter->qdio_outb_full);
                         zfcp_qdio_undo_sbals(fsf_req);
                         return -EINVAL;
                 }
@@ -307,7 +306,7 @@ static int zfcp_qdio_fill_sbals(struct zfcp_fsf_req *fsf_req,
 int zfcp_qdio_sbals_from_sg(struct zfcp_fsf_req *fsf_req, unsigned long sbtype,
                             struct scatterlist *sg, int max_sbals)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         int retval, bytes = 0;
 
         /* figure out last allowed SBAL */
@@ -344,10 +343,10 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req)
         int first = fsf_req->sbal_first;
         int count = fsf_req->sbal_number;
         int retval, pci, pci_batch;
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
 
         /* acknowledgements for transferred buffers */
-        pci_batch = req_q->pci_batch + count;
+        pci_batch = adapter->req_q_pci_batch + count;
         if (unlikely(pci_batch >= ZFCP_QDIO_PCI_INTERVAL)) {
                 pci_batch %= ZFCP_QDIO_PCI_INTERVAL;
                 pci = first + count - (pci_batch + 1);
@@ -367,7 +366,7 @@ int zfcp_qdio_send(struct zfcp_fsf_req *fsf_req)
         atomic_sub(count, &req_q->count);
         req_q->first += count;
         req_q->first %= QDIO_MAX_BUFFERS_PER_Q;
-        req_q->pci_batch = pci_batch;
+        adapter->req_q_pci_batch = pci_batch;
         return 0;
 }
 
@@ -418,14 +417,14 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)
         struct zfcp_qdio_queue *req_q;
         int first, count;
 
-        if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status))
+        if (!(atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_QDIOUP))
                 return;
 
         /* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */
         req_q = &adapter->req_q;
-        spin_lock(&req_q->lock);
+        spin_lock_bh(&adapter->req_q_lock);
         atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status);
-        spin_unlock(&req_q->lock);
+        spin_unlock_bh(&adapter->req_q_lock);
 
         qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR);
 
@@ -438,7 +437,7 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)
         }
         req_q->first = 0;
         atomic_set(&req_q->count, 0);
-        req_q->pci_batch = 0;
+        adapter->req_q_pci_batch = 0;
         adapter->resp_q.first = 0;
         atomic_set(&adapter->resp_q.count, 0);
 }
@@ -450,23 +449,17 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)
  */
 int zfcp_qdio_open(struct zfcp_adapter *adapter)
 {
-        volatile struct qdio_buffer_element *sbale;
+        struct qdio_buffer_element *sbale;
         int cc;
 
-        if (atomic_test_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status))
+        if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_QDIOUP)
                 return -EIO;
 
-        if (qdio_establish(&adapter->qdio_init_data)) {
-                dev_err(&adapter->ccw_device->dev,
-                         "Establish of QDIO queues failed.\n");
-                return -EIO;
-        }
+        if (qdio_establish(&adapter->qdio_init_data))
+                goto failed_establish;
 
-        if (qdio_activate(adapter->ccw_device)) {
-                dev_err(&adapter->ccw_device->dev,
-                         "Activate of QDIO queues failed.\n");
+        if (qdio_activate(adapter->ccw_device))
                 goto failed_qdio;
-        }
 
         for (cc = 0; cc < QDIO_MAX_BUFFERS_PER_Q; cc++) {
                 sbale = &(adapter->resp_q.sbal[cc]->element[0]);
@@ -476,20 +469,20 @@ int zfcp_qdio_open(struct zfcp_adapter *adapter)
         }
 
         if (do_QDIO(adapter->ccw_device, QDIO_FLAG_SYNC_INPUT, 0, 0,
-                     QDIO_MAX_BUFFERS_PER_Q)) {
-                dev_err(&adapter->ccw_device->dev,
-                         "Init of QDIO response queue failed.\n");
+                     QDIO_MAX_BUFFERS_PER_Q))
                 goto failed_qdio;
-        }
 
         /* set index of first avalable SBALS / number of available SBALS */
         adapter->req_q.first = 0;
         atomic_set(&adapter->req_q.count, QDIO_MAX_BUFFERS_PER_Q);
-        adapter->req_q.pci_batch = 0;
+        adapter->req_q_pci_batch = 0;
 
         return 0;
 
 failed_qdio:
         qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR);
+failed_establish:
+        dev_err(&adapter->ccw_device->dev,
+                "Setting up the QDIO connection to the FCP adapter failed\n");
         return -EIO;
 }
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index aeae56b00b45..ca8f85f3dad4 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -21,20 +21,6 @@ char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *fcp_rsp_iu)
         return fcp_sns_info_ptr;
 }
 
-void zfcp_set_fcp_dl(struct fcp_cmnd_iu *fcp_cmd, fcp_dl_t fcp_dl)
-{
-        fcp_dl_t *fcp_dl_ptr;
-
-        /*
-         * fcp_dl_addr = start address of fcp_cmnd structure +
-         * size of fixed part + size of dynamically sized add_dcp_cdb field
-         * SEE FCP-2 documentation
-         */
-        fcp_dl_ptr = (fcp_dl_t *) ((unsigned char *) &fcp_cmd[1] +
-                                   (fcp_cmd->add_fcp_cdb_length << 2));
-        *fcp_dl_ptr = fcp_dl;
-}
-
 static void zfcp_scsi_slave_destroy(struct scsi_device *sdpnt)
 {
         struct zfcp_unit *unit = (struct zfcp_unit *) sdpnt->hostdata;
@@ -119,13 +105,17 @@ static struct zfcp_unit *zfcp_unit_lookup(struct zfcp_adapter *adapter,
 {
         struct zfcp_port *port;
         struct zfcp_unit *unit;
+        int scsi_lun;
 
         list_for_each_entry(port, &adapter->port_list_head, list) {
                 if (!port->rport || (id != port->rport->scsi_target_id))
                         continue;
-                list_for_each_entry(unit, &port->unit_list_head, list)
-                        if (lun == unit->scsi_lun)
+                list_for_each_entry(unit, &port->unit_list_head, list) {
+                        scsi_lun = scsilun_to_int(
+                                (struct scsi_lun *)&unit->fcp_lun);
+                        if (lun == scsi_lun)
                                 return unit;
+                }
         }
 
         return NULL;
@@ -183,7 +173,6 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
                 return retval;
         }
         fsf_req->data = NULL;
-        fsf_req->status |= ZFCP_STATUS_FSFREQ_ABORTING;
 
         /* don't access old fsf_req after releasing the abort_lock */
         write_unlock_irqrestore(&adapter->abort_lock, flags);
@@ -294,7 +283,8 @@ int zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)
                                              sizeof (struct zfcp_adapter *));
         if (!adapter->scsi_host) {
                 dev_err(&adapter->ccw_device->dev,
-                        "registration with SCSI stack failed.");
+                        "Registering the FCP device with the "
+                        "SCSI stack failed\n");
                 return -EIO;
         }
 
@@ -312,7 +302,6 @@ int zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)
                 scsi_host_put(adapter->scsi_host);
                 return -EIO;
         }
-        atomic_set_mask(ZFCP_STATUS_ADAPTER_REGISTERED, &adapter->status);
 
         return 0;
 }
@@ -336,7 +325,6 @@ void zfcp_adapter_scsi_unregister(struct zfcp_adapter *adapter)
         scsi_remove_host(shost);
         scsi_host_put(shost);
         adapter->scsi_host = NULL;
-        atomic_clear_mask(ZFCP_STATUS_ADAPTER_REGISTERED, &adapter->status);
 
         return;
 }
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 2e85c6c49e7d..ca9293ba1766 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -26,9 +26,9 @@ static ZFCP_DEV_ATTR(_feat, _name, S_IRUGO,				       \
 ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, status, "0x%08x\n",
                  atomic_read(&adapter->status));
 ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, peer_wwnn, "0x%016llx\n",
-                 adapter->peer_wwnn);
+                 (unsigned long long) adapter->peer_wwnn);
 ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, peer_wwpn, "0x%016llx\n",
-                 adapter->peer_wwpn);
+                 (unsigned long long) adapter->peer_wwpn);
 ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, peer_d_id, "0x%06x\n",
                  adapter->peer_d_id);
 ZFCP_DEFINE_ATTR(zfcp_adapter, adapter, card_version, "0x%04x\n",
@@ -135,8 +135,9 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
 {
         struct zfcp_adapter *adapter = dev_get_drvdata(dev);
         struct zfcp_port *port;
-        wwn_t wwpn;
+        u64 wwpn;
         int retval = 0;
+        LIST_HEAD(port_remove_lh);
 
         down(&zfcp_data.config_sema);
         if (atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_REMOVE) {
@@ -144,7 +145,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
                 goto out;
         }
 
-        if (strict_strtoull(buf, 0, &wwpn)) {
+        if (strict_strtoull(buf, 0, (unsigned long long *) &wwpn)) {
                 retval = -EINVAL;
                 goto out;
         }
@@ -154,7 +155,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
         if (port && (atomic_read(&port->refcount) == 0)) {
                 zfcp_port_get(port);
                 atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);
-                list_move(&port->list, &adapter->port_remove_lh);
+                list_move(&port->list, &port_remove_lh);
         } else
                 port = NULL;
         write_unlock_irq(&zfcp_data.config_lock);
@@ -200,7 +201,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
 {
         struct zfcp_port *port = dev_get_drvdata(dev);
         struct zfcp_unit *unit;
-        fcp_lun_t fcp_lun;
+        u64 fcp_lun;
         int retval = -EINVAL;
 
         down(&zfcp_data.config_sema);
@@ -209,7 +210,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
                 goto out;
         }
 
-        if (strict_strtoull(buf, 0, &fcp_lun))
+        if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))
                 goto out;
 
         unit = zfcp_unit_enqueue(port, fcp_lun);
@@ -233,8 +234,9 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
 {
         struct zfcp_port *port = dev_get_drvdata(dev);
         struct zfcp_unit *unit;
-        fcp_lun_t fcp_lun;
+        u64 fcp_lun;
         int retval = 0;
+        LIST_HEAD(unit_remove_lh);
 
         down(&zfcp_data.config_sema);
         if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_REMOVE) {
@@ -242,7 +244,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
                 goto out;
         }
 
-        if (strict_strtoull(buf, 0, &fcp_lun)) {
+        if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun)) {
                 retval = -EINVAL;
                 goto out;
         }
@@ -252,7 +254,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
         if (unit && (atomic_read(&unit->refcount) == 0)) {
                 zfcp_unit_get(unit);
                 atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &unit->status);
-                list_move(&unit->list, &port->unit_remove_lh);
+                list_move(&unit->list, &unit_remove_lh);
         } else
                 unit = NULL;
 
@@ -273,22 +275,7 @@ out:
 }
 static DEVICE_ATTR(unit_remove, S_IWUSR, NULL, zfcp_sysfs_unit_remove_store);
 
-static struct attribute *zfcp_port_ns_attrs[] = {
-        &dev_attr_port_failed.attr,
-        &dev_attr_port_in_recovery.attr,
-        &dev_attr_port_status.attr,
-        &dev_attr_port_access_denied.attr,
-        NULL
-};
-
-/**
- * zfcp_sysfs_ns_port_attrs - sysfs attributes for nameserver
- */
-struct attribute_group zfcp_sysfs_ns_port_attrs = {
-        .attrs = zfcp_port_ns_attrs,
-};
-
-static struct attribute *zfcp_port_no_ns_attrs[] = {
+static struct attribute *zfcp_port_attrs[] = {
         &dev_attr_unit_add.attr,
         &dev_attr_unit_remove.attr,
         &dev_attr_port_failed.attr,
@@ -302,7 +289,7 @@ static struct attribute *zfcp_port_no_ns_attrs[] = {
  * zfcp_sysfs_port_attrs - sysfs attributes for all other ports
  */
 struct attribute_group zfcp_sysfs_port_attrs = {
-        .attrs = zfcp_port_no_ns_attrs,
+        .attrs = zfcp_port_attrs,
 };
 
 static struct attribute *zfcp_unit_attrs[] = {
@@ -394,9 +381,11 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev,	\
 static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL);
 
 ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n",
-        unit->port->adapter->ccw_device->dev.bus_id);
-ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n", unit->port->wwpn);
-ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n", unit->fcp_lun);
+                      dev_name(&unit->port->adapter->ccw_device->dev));
+ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n",
+                      (unsigned long long) unit->port->wwpn);
+ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n",
+                      (unsigned long long) unit->fcp_lun);
 
 struct device_attribute *zfcp_sysfs_sdev_attrs[] = {
         &dev_attr_fcp_lun,
@@ -487,10 +476,23 @@ ZFCP_SHOST_ATTR(megabytes, "%llu %llu\n",
 ZFCP_SHOST_ATTR(seconds_active, "%llu\n",
                 (unsigned long long) stat_info.seconds_act);
 
+static ssize_t zfcp_sysfs_adapter_q_full_show(struct device *dev,
+                                              struct device_attribute *attr,
+                                              char *buf)
+{
+        struct Scsi_Host *scsi_host = class_to_shost(dev);
+        struct zfcp_adapter *adapter =
+                (struct zfcp_adapter *) scsi_host->hostdata[0];
+
+        return sprintf(buf, "%d\n", atomic_read(&adapter->qdio_outb_full));
+}
+static DEVICE_ATTR(queue_full, S_IRUGO, zfcp_sysfs_adapter_q_full_show, NULL);
+
 struct device_attribute *zfcp_sysfs_shost_attrs[] = {
         &dev_attr_utilization,
         &dev_attr_requests,
         &dev_attr_megabytes,
         &dev_attr_seconds_active,
+        &dev_attr_queue_full,
         NULL
 };