168 files changed, 4269 insertions, 8576 deletions

diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 4a3b6232618..8e477bb1f3f 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -70,21 +70,3 @@ config DASD_EER
           This driver provides a character device interface to the
           DASD extended error reporting. This is only needed if you want to
           use applications written for the EER facility.
-
-config SCM_BLOCK
-        def_tristate m
-        prompt "Support for Storage Class Memory"
-        depends on S390 && BLOCK && EADM_SCH && SCM_BUS
-        help
-          Block device driver for Storage Class Memory (SCM). This driver
-          provides a block device interface for each available SCM increment.
-
-          To compile this driver as a module, choose M here: the
-          module will be called scm_block.
-
-config SCM_BLOCK_CLUSTER_WRITE
-        def_bool y
-        prompt "SCM force cluster writes"
-        depends on SCM_BLOCK
-        help
-          Force writes to Storage Class Memory (SCM) to be in done in clusters.
diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile
index c2f4e673e03..0a89e080b38 100644
--- a/drivers/s390/block/Makefile
+++ b/drivers/s390/block/Makefile
@@ -17,9 +17,3 @@ obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
 obj-$(CONFIG_DASD_FBA)  += dasd_fba_mod.o
 obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
 obj-$(CONFIG_DCSSBLK) += dcssblk.o
-
-scm_block-objs := scm_drv.o scm_blk.o
-ifdef CONFIG_SCM_BLOCK_CLUSTER_WRITE
-scm_block-objs += scm_blk_cluster.o
-endif
-obj-$(CONFIG_SCM_BLOCK) += scm_block.o
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 29225e1c159..a1d3ddba99c 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1,4 +1,5 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Carsten Otte <Cotte@de.ibm.com>
@@ -10,12 +11,14 @@
 #define KMSG_COMPONENT "dasd"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/ctype.h>
 #include <linux/major.h>
 #include <linux/slab.h>
+#include <linux/buffer_head.h>
 #include <linux/hdreg.h>
 #include <linux/async.h>
 #include <linux/mutex.h>
@@ -51,7 +54,7 @@ void dasd_int_handler(struct ccw_device *, unsigned long, struct irb *);
 
 MODULE_AUTHOR("Holger Smolinski <Holger.Smolinski@de.ibm.com>");
 MODULE_DESCRIPTION("Linux on S/390 DASD device driver,"
-                   " Copyright IBM Corp. 2000");
+                   " Copyright 2000 IBM Corporation");
 MODULE_SUPPORTED_DEVICE("dasd");
 MODULE_LICENSE("GPL");
 
@@ -81,7 +84,6 @@ static void dasd_profile_exit(struct dasd_profile *);
 static wait_queue_head_t dasd_init_waitq;
 static wait_queue_head_t dasd_flush_wq;
 static wait_queue_head_t generic_waitq;
-static wait_queue_head_t shutdown_waitq;
 
 /*
  * Allocate memory for a new device structure.
@@ -349,16 +351,6 @@ static int dasd_state_basic_to_ready(struct dasd_device *device)
         return rc;
 }
 
-static inline
-int _wait_for_empty_queues(struct dasd_device *device)
-{
-        if (device->block)
-                return list_empty(&device->ccw_queue) &&
-                        list_empty(&device->block->ccw_queue);
-        else
-                return list_empty(&device->ccw_queue);
-}
-
 /*
  * Remove device from block device layer. Destroy dirty buffers.
  * Forget format information. Check if the target level is basic
@@ -544,11 +536,11 @@ static void dasd_change_state(struct dasd_device *device)
         if (rc)
                 device->target = device->state;
 
-        /* let user-space know that the device status changed */
-        kobject_uevent(&device->cdev->dev.kobj, KOBJ_CHANGE);
-
         if (device->state == device->target)
                 wake_up(&dasd_init_waitq);
+
+        /* let user-space know that the device status changed */
+        kobject_uevent(&device->cdev->dev.kobj, KOBJ_CHANGE);
 }
 
 /*
@@ -650,10 +642,6 @@ void dasd_enable_device(struct dasd_device *device)
                 dasd_set_target_state(device, DASD_STATE_NEW);
         /* Now wait for the devices to come up. */
         wait_event(dasd_init_waitq, _wait_for_device(device));
-
-        dasd_reload_device(device);
-        if (device->discipline->kick_validate)
-                device->discipline->kick_validate(device);
 }
 
 /*
@@ -1086,7 +1074,7 @@ static const struct file_operations dasd_stats_global_fops = {
 static void dasd_profile_init(struct dasd_profile *profile,
                               struct dentry *base_dentry)
 {
-        umode_t mode;
+        mode_t mode;
         struct dentry *pde;
 
         if (!base_dentry)
@@ -1125,7 +1113,7 @@ static void dasd_statistics_removeroot(void)
 
 static void dasd_statistics_createroot(void)
 {
-        umode_t mode;
+        mode_t mode;
         struct dentry *pde;
 
         dasd_debugfs_root_entry = NULL;
@@ -1606,6 +1594,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         unsigned long long now;
         int expires;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_DAS]++;
         if (IS_ERR(irb)) {
                 switch (PTR_ERR(irb)) {
                 case -EIO:
@@ -1851,13 +1840,6 @@ static void __dasd_device_check_expire(struct dasd_device *device)
         cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, devlist);
         if ((cqr->status == DASD_CQR_IN_IO && cqr->expires != 0) &&
             (time_after_eq(jiffies, cqr->expires + cqr->starttime))) {
-                if (test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
-                        /*
-                         * IO in safe offline processing should not
-                         * run out of retries
-                         */
-                        cqr->retries++;
-                }
                 if (device->discipline->term_IO(cqr) != 0) {
                         /* Hmpf, try again in 5 sec */
                         dev_err(&device->cdev->dev,
@@ -2011,8 +1993,6 @@ static void dasd_device_tasklet(struct dasd_device *device)
         /* Now check if the head of the ccw queue needs to be started. */
         __dasd_device_start_head(device);
         spin_unlock_irq(get_ccwdev_lock(device->cdev));
-        if (waitqueue_active(&shutdown_waitq))
-                wake_up(&shutdown_waitq);
         dasd_put_device(device);
 }
 
@@ -2081,14 +2061,13 @@ void dasd_add_request_tail(struct dasd_ccw_req *cqr)
 /*
  * Wakeup helper for the 'sleep_on' functions.
  */
-void dasd_wakeup_cb(struct dasd_ccw_req *cqr, void *data)
+static void dasd_wakeup_cb(struct dasd_ccw_req *cqr, void *data)
 {
         spin_lock_irq(get_ccwdev_lock(cqr->startdev->cdev));
         cqr->callback_data = DASD_SLEEPON_END_TAG;
         spin_unlock_irq(get_ccwdev_lock(cqr->startdev->cdev));
         wake_up(&generic_waitq);
 }
-EXPORT_SYMBOL_GPL(dasd_wakeup_cb);
 
 static inline int _wait_for_wakeup(struct dasd_ccw_req *cqr)
 {
@@ -2174,7 +2153,6 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible)
                     test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags) &&
                     (!dasd_eer_enabled(device))) {
                         cqr->status = DASD_CQR_FAILED;
-                        cqr->intrc = -EAGAIN;
                         continue;
                 }
                 /* Don't try to start requests if device is stopped */
@@ -2189,9 +2167,7 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible)
                 } else
                         wait_event(generic_waitq, !(device->stopped));
 
-                if (!cqr->callback)
-                        cqr->callback = dasd_wakeup_cb;
-
+                cqr->callback = dasd_wakeup_cb;
                 cqr->callback_data = DASD_SLEEPON_START_TAG;
                 dasd_add_request_tail(cqr);
                 if (interruptible) {
@@ -2287,11 +2263,7 @@ int dasd_sleep_on_immediatly(struct dasd_ccw_req *cqr)
         cqr->callback = dasd_wakeup_cb;
         cqr->callback_data = DASD_SLEEPON_START_TAG;
         cqr->status = DASD_CQR_QUEUED;
-        /*
-         * add new request as second
-         * first the terminated cqr needs to be finished
-         */
-        list_add(&cqr->devlist, device->ccw_queue.next);
+        list_add(&cqr->devlist, &device->ccw_queue);
 
         /* let the bh start the request to keep them in order */
         dasd_schedule_device_bh(device);
@@ -2652,8 +2624,6 @@ static void dasd_block_tasklet(struct dasd_block *block)
         __dasd_block_start_head(block);
         spin_unlock(&block->queue_lock);
         spin_unlock_irq(&block->request_queue_lock);
-        if (waitqueue_active(&shutdown_waitq))
-                wake_up(&shutdown_waitq);
         dasd_put_device(block->base);
 }
 
@@ -3041,11 +3011,11 @@ void dasd_generic_remove(struct ccw_device *cdev)
 
         cdev->handler = NULL;
 
+        dasd_remove_sysfs_files(cdev);
         device = dasd_device_from_cdev(cdev);
         if (IS_ERR(device))
                 return;
-        if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags) &&
-            !test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
+        if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags)) {
                 /* Already doing offline processing */
                 dasd_put_device(device);
                 return;
@@ -3065,8 +3035,6 @@ void dasd_generic_remove(struct ccw_device *cdev)
          */
         if (block)
                 dasd_free_block(block);
-
-        dasd_remove_sysfs_files(cdev);
 }
 
 /*
@@ -3145,13 +3113,16 @@ int dasd_generic_set_offline(struct ccw_device *cdev)
 {
         struct dasd_device *device;
         struct dasd_block *block;
-        int max_count, open_count, rc;
+        int max_count, open_count;
 
-        rc = 0;
         device = dasd_device_from_cdev(cdev);
         if (IS_ERR(device))
                 return PTR_ERR(device);
-
+        if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags)) {
+                /* Already doing offline processing */
+                dasd_put_device(device);
+                return 0;
+        }
         /*
          * We must make sure that this device is currently not in use.
          * The open_count is increased for every opener, that includes
@@ -3175,54 +3146,6 @@ int dasd_generic_set_offline(struct ccw_device *cdev)
                         return -EBUSY;
                 }
         }
-
-        if (test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
-                /*
-                 * safe offline allready running
-                 * could only be called by normal offline so safe_offline flag
-                 * needs to be removed to run normal offline and kill all I/O
-                 */
-                if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags)) {
-                        /* Already doing normal offline processing */
-                        dasd_put_device(device);
-                        return -EBUSY;
-                } else
-                        clear_bit(DASD_FLAG_SAFE_OFFLINE, &device->flags);
-
-        } else
-                if (test_bit(DASD_FLAG_OFFLINE, &device->flags)) {
-                        /* Already doing offline processing */
-                        dasd_put_device(device);
-                        return -EBUSY;
-                }
-
-        /*
-         * if safe_offline called set safe_offline_running flag and
-         * clear safe_offline so that a call to normal offline
-         * can overrun safe_offline processing
-         */
-        if (test_and_clear_bit(DASD_FLAG_SAFE_OFFLINE, &device->flags) &&
-            !test_and_set_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
-                /*
-                 * If we want to set the device safe offline all IO operations
-                 * should be finished before continuing the offline process
-                 * so sync bdev first and then wait for our queues to become
-                 * empty
-                 */
-                /* sync blockdev and partitions */
-                rc = fsync_bdev(device->block->bdev);
-                if (rc != 0)
-                        goto interrupted;
-
-                /* schedule device tasklet and wait for completion */
-                dasd_schedule_device_bh(device);
-                rc = wait_event_interruptible(shutdown_waitq,
-                                              _wait_for_empty_queues(device));
-                if (rc != 0)
-                        goto interrupted;
-        }
-
-        set_bit(DASD_FLAG_OFFLINE, &device->flags);
         dasd_set_target_state(device, DASD_STATE_NEW);
         /* dasd_delete_device destroys the device reference. */
         block = device->block;
@@ -3234,14 +3157,6 @@ int dasd_generic_set_offline(struct ccw_device *cdev)
         if (block)
                 dasd_free_block(block);
         return 0;
-
-interrupted:
-        /* interrupted by signal */
-        clear_bit(DASD_FLAG_SAFE_OFFLINE, &device->flags);
-        clear_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags);
-        clear_bit(DASD_FLAG_OFFLINE, &device->flags);
-        dasd_put_device(device);
-        return rc;
 }
 
 int dasd_generic_last_path_gone(struct dasd_device *device)
@@ -3342,22 +3257,6 @@ void dasd_generic_path_event(struct ccw_device *cdev, int *path_event)
                         device->path_data.tbvpm |= eventlpm;
                         dasd_schedule_device_bh(device);
                 }
-                if (path_event[chp] & PE_PATHGROUP_ESTABLISHED) {
-                        if (!(device->path_data.opm & eventlpm) &&
-                            !(device->path_data.tbvpm & eventlpm)) {
-                                /*
-                                 * we can not establish a pathgroup on an
-                                 * unavailable path, so trigger a path
-                                 * verification first
-                                 */
-                                device->path_data.tbvpm |= eventlpm;
-                                dasd_schedule_device_bh(device);
-                        }
-                        DBF_DEV_EVENT(DBF_WARNING, device, "%s",
-                                      "Pathgroup re-established\n");
-                        if (device->discipline->kick_validate)
-                                device->discipline->kick_validate(device);
-                }
         }
         dasd_put_device(device);
 }
@@ -3385,9 +3284,6 @@ int dasd_generic_pm_freeze(struct ccw_device *cdev)
         if (IS_ERR(device))
                 return PTR_ERR(device);
 
-        /* mark device as suspended */
-        set_bit(DASD_FLAG_SUSPENDED, &device->flags);
-
         if (device->discipline->freeze)
                 rc = device->discipline->freeze(device);
 
@@ -3462,7 +3358,6 @@ int dasd_generic_restore_device(struct ccw_device *cdev)
         if (device->block)
                 dasd_schedule_block_bh(device->block);
 
-        clear_bit(DASD_FLAG_SUSPENDED, &device->flags);
         dasd_put_device(device);
         return 0;
 }
@@ -3561,23 +3456,6 @@ char *dasd_get_sense(struct irb *irb)
 }
 EXPORT_SYMBOL_GPL(dasd_get_sense);
 
-void dasd_generic_shutdown(struct ccw_device *cdev)
-{
-        struct dasd_device *device;
-
-        device = dasd_device_from_cdev(cdev);
-        if (IS_ERR(device))
-                return;
-
-        if (device->block)
-                dasd_schedule_block_bh(device->block);
-
-        dasd_schedule_device_bh(device);
-
-        wait_event(shutdown_waitq, _wait_for_empty_queues(device));
-}
-EXPORT_SYMBOL_GPL(dasd_generic_shutdown);
-
 static int __init dasd_init(void)
 {
         int rc;
@@ -3585,7 +3463,6 @@ static int __init dasd_init(void)
         init_waitqueue_head(&dasd_init_waitq);
         init_waitqueue_head(&dasd_flush_wq);
         init_waitqueue_head(&generic_waitq);
-        init_waitqueue_head(&shutdown_waitq);
 
         /* register 'common' DASD debug area, used for all DBF_XXX calls */
         dasd_debug_area = debug_register("dasd", 1, 1, 8 * sizeof(long));
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index f8212d54013..87a0cf160fe 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -1,8 +1,9 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_3990_erp.c
  * Author(s)......: Horst  Hummel    <Horst.Hummel@de.ibm.com>
  *                  Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 2000, 2001
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000, 2001
  *
  */
 
@@ -1717,7 +1718,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
         erp->startdev = device;
         erp->memdev = device;
         erp->magic = default_erp->magic;
-        erp->expires = default_erp->expires;
+        erp->expires = 0;
         erp->retries = 256;
         erp->buildclk = get_clock();
         erp->status = DASD_CQR_FILLED;
@@ -2362,7 +2363,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
         erp->memdev   = device;
         erp->block    = cqr->block;
         erp->magic    = cqr->magic;
-        erp->expires  = cqr->expires;
+        erp->expires  = 0;
         erp->retries  = 256;
         erp->buildclk = get_clock();
         erp->status = DASD_CQR_FILLED;
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 6b556995bb3..c388eda1e2b 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -1,7 +1,7 @@
 /*
  * PAV alias management for the DASD ECKD discipline
  *
- * Copyright IBM Corp. 2007
+ * Copyright IBM Corporation, 2007
  * Author(s): Stefan Weinhuber <wein@de.ibm.com>
  */
 
@@ -189,12 +189,14 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         unsigned long flags;
         struct alias_server *server, *newserver;
         struct alias_lcu *lcu, *newlcu;
+        int is_lcu_known;
         struct dasd_uid uid;
 
         private = (struct dasd_eckd_private *) device->private;
 
         device->discipline->get_uid(device, &uid);
         spin_lock_irqsave(&aliastree.lock, flags);
+        is_lcu_known = 1;
         server = _find_server(&uid);
         if (!server) {
                 spin_unlock_irqrestore(&aliastree.lock, flags);
@@ -206,6 +208,7 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!server) {
                         list_add(&newserver->server, &aliastree.serverlist);
                         server = newserver;
+                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_server(newserver);
@@ -223,10 +226,12 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!lcu) {
                         list_add(&newlcu->lcu, &server->lculist);
                         lcu = newlcu;
+                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_lcu(newlcu);
                 }
+                is_lcu_known = 0;
         }
         spin_lock(&lcu->lock);
         list_add(&device->alias_list, &lcu->inactive_devices);
@@ -234,7 +239,64 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         spin_unlock(&lcu->lock);
         spin_unlock_irqrestore(&aliastree.lock, flags);
 
-        return 0;
+        return is_lcu_known;
+}
+
+/*
+ * The first device to be registered on an LCU will have to do
+ * some additional setup steps to configure that LCU on the
+ * storage server. All further devices should wait with their
+ * initialization until the first device is done.
+ * To synchronize this work, the first device will call
+ * dasd_alias_lcu_setup_complete when it is done, and all
+ * other devices will wait for it with dasd_alias_wait_for_lcu_setup.
+ */
+void dasd_alias_lcu_setup_complete(struct dasd_device *device)
+{
+        unsigned long flags;
+        struct alias_server *server;
+        struct alias_lcu *lcu;
+        struct dasd_uid uid;
+
+        device->discipline->get_uid(device, &uid);
+        lcu = NULL;
+        spin_lock_irqsave(&aliastree.lock, flags);
+        server = _find_server(&uid);
+        if (server)
+                lcu = _find_lcu(server, &uid);
+        spin_unlock_irqrestore(&aliastree.lock, flags);
+        if (!lcu) {
+                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
+                                "could not find lcu for %04x %02x",
+                                uid.ssid, uid.real_unit_addr);
+                WARN_ON(1);
+                return;
+        }
+        complete_all(&lcu->lcu_setup);
+}
+
+void dasd_alias_wait_for_lcu_setup(struct dasd_device *device)
+{
+        unsigned long flags;
+        struct alias_server *server;
+        struct alias_lcu *lcu;
+        struct dasd_uid uid;
+
+        device->discipline->get_uid(device, &uid);
+        lcu = NULL;
+        spin_lock_irqsave(&aliastree.lock, flags);
+        server = _find_server(&uid);
+        if (server)
+                lcu = _find_lcu(server, &uid);
+        spin_unlock_irqrestore(&aliastree.lock, flags);
+        if (!lcu) {
+                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
+                                "could not find lcu for %04x %02x",
+                                uid.ssid, uid.real_unit_addr);
+                WARN_ON(1);
+                return;
+        }
+        wait_for_completion(&lcu->lcu_setup);
 }
 
 /*
@@ -384,29 +446,6 @@ static void _remove_device_from_lcu(struct alias_lcu *lcu,
                 group->next = NULL;
 };
 
-static int
-suborder_not_supported(struct dasd_ccw_req *cqr)
-{
-        char *sense;
-        char reason;
-        char msg_format;
-        char msg_no;
-
-        sense = dasd_get_sense(&cqr->irb);
-        if (!sense)
-                return 0;
-
-        reason = sense[0];
-        msg_format = (sense[7] & 0xF0);
-        msg_no = (sense[7] & 0x0F);
-
-        /* command reject, Format 0 MSG 4 - invalid parameter */
-        if ((reason == 0x80) && (msg_format == 0x00) && (msg_no == 0x04))
-                return 1;
-
-        return 0;
-}
-
 static int read_unit_address_configuration(struct dasd_device *device,
                                            struct alias_lcu *lcu)
 {
@@ -458,8 +497,6 @@ static int read_unit_address_configuration(struct dasd_device *device,
 
         do {
                 rc = dasd_sleep_on(cqr);
-                if (rc && suborder_not_supported(cqr))
-                        return -EOPNOTSUPP;
         } while (rc && (cqr->retries > 0));
         if (rc) {
                 spin_lock_irqsave(&lcu->lock, flags);
@@ -546,7 +583,7 @@ static void lcu_update_work(struct work_struct *work)
          * processing the data
          */
         spin_lock_irqsave(&lcu->lock, flags);
-        if ((rc && (rc != -EOPNOTSUPP)) || (lcu->flags & NEED_UAC_UPDATE)) {
+        if (rc || (lcu->flags & NEED_UAC_UPDATE)) {
                 DBF_DEV_EVENT(DBF_WARNING, device, "could not update"
                             " alias data in lcu (rc = %d), retry later", rc);
                 schedule_delayed_work(&lcu->ruac_data.dwork, 30*HZ);
@@ -668,16 +705,6 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
         if (lcu->pav == NO_PAV ||
             lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING))
                 return NULL;
-        if (unlikely(!(private->features.feature[8] & 0x01))) {
-                /*
-                 * PAV enabled but prefix not, very unlikely
-                 * seems to be a lost pathgroup
-                 * use base device to do IO
-                 */
-                DBF_DEV_EVENT(DBF_ERR, base_device, "%s",
-                              "Prefix not enabled with PAV enabled\n");
-                return NULL;
-        }
 
         spin_lock_irqsave(&lcu->lock, flags);
         alias_device = group->next;
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index c196827c228..d71511c7850 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -1,10 +1,11 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_devmap.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Carsten Otte <Cotte@de.ibm.com>
  *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 1999,2001
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
  * Device mapping and dasd= parameter parsing functions. All devmap
  * functions may not be called from interrupt context. In particular
@@ -952,39 +953,6 @@ static DEVICE_ATTR(raw_track_access, 0644, dasd_use_raw_show,
                    dasd_use_raw_store);
 
 static ssize_t
-dasd_safe_offline_store(struct device *dev, struct device_attribute *attr,
-                        const char *buf, size_t count)
-{
-        struct ccw_device *cdev = to_ccwdev(dev);
-        struct dasd_device *device;
-        int rc;
-
-        device = dasd_device_from_cdev(cdev);
-        if (IS_ERR(device)) {
-                rc = PTR_ERR(device);
-                goto out;
-        }
-
-        if (test_bit(DASD_FLAG_OFFLINE, &device->flags) ||
-            test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
-                /* Already doing offline processing */
-                dasd_put_device(device);
-                rc = -EBUSY;
-                goto out;
-        }
-
-        set_bit(DASD_FLAG_SAFE_OFFLINE, &device->flags);
-        dasd_put_device(device);
-
-        rc = ccw_device_set_offline(cdev);
-
-out:
-        return rc ? rc : count;
-}
-
-static DEVICE_ATTR(safe_offline, 0200, NULL, dasd_safe_offline_store);
-
-static ssize_t
 dasd_discipline_show(struct device *dev, struct device_attribute *attr,
                      char *buf)
 {
@@ -1353,7 +1321,6 @@ static struct attribute * dasd_attrs[] = {
         &dev_attr_expires.attr,
         &dev_attr_reservation_policy.attr,
         &dev_attr_last_known_reservation_state.attr,
-        &dev_attr_safe_offline.attr,
         NULL,
 };
 
@@ -1378,7 +1345,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature)
 
 /*
  * Set / reset given feature.
- * Flag indicates whether to set (!=0) or the reset (=0) the feature.
+ * Flag indicates wether to set (!=0) or the reset (=0) the feature.
  */
 int
 dasd_set_feature(struct ccw_device *cdev, int feature, int flag)
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 704488d0f81..46784b83c5c 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -1,9 +1,10 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_diag.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Based on.......: linux/drivers/s390/block/mdisk.c
  * ...............: by Hartmunt Penner <hpenner@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 1999, 2000
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
  */
 
@@ -228,7 +229,7 @@ dasd_diag_term_IO(struct dasd_ccw_req * cqr)
 }
 
 /* Handle external interruption. */
-static void dasd_ext_handler(struct ext_code ext_code,
+static void dasd_ext_handler(unsigned int ext_int_code,
                              unsigned int param32, unsigned long param64)
 {
         struct dasd_ccw_req *cqr, *next;
@@ -238,7 +239,7 @@ static void dasd_ext_handler(struct ext_code ext_code,
         addr_t ip;
         int rc;
 
-        switch (ext_code.subcode >> 8) {
+        switch (ext_int_code >> 24) {
         case DASD_DIAG_CODE_31BIT:
                 ip = (addr_t) param32;
                 break;
@@ -248,7 +249,7 @@ static void dasd_ext_handler(struct ext_code ext_code,
         default:
                 return;
         }
-        inc_irq_stat(IRQEXT_DSD);
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_DSD]++;
         if (!ip) {              /* no intparm: unsolicited interrupt */
                 DBF_EVENT(DBF_NOTICE, "%s", "caught unsolicited "
                               "interrupt");
@@ -279,7 +280,7 @@ static void dasd_ext_handler(struct ext_code ext_code,
         cqr->stopclk = get_clock();
 
         expires = 0;
-        if ((ext_code.subcode & 0xff) == 0) {
+        if ((ext_int_code & 0xff0000) == 0) {
                 cqr->status = DASD_CQR_SUCCESS;
                 /* Start first request on queue if possible -> fast_io. */
                 if (!list_empty(&device->ccw_queue)) {
@@ -295,7 +296,7 @@ static void dasd_ext_handler(struct ext_code ext_code,
                 cqr->status = DASD_CQR_QUEUED;
                 DBF_DEV_EVENT(DBF_DEBUG, device, "interrupt status for "
                               "request %p was %d (%d retries left)", cqr,
-                              ext_code.subcode & 0xff, cqr->retries);
+                              (ext_int_code >> 16) & 0xff, cqr->retries);
                 dasd_diag_erp(device);
         }
 
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index a803cc73158..4f71fbe60c8 100644
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -1,9 +1,10 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_diag.h
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Based on.......: linux/drivers/s390/block/mdisk.h
  * ...............: by Hartmunt Penner <hpenner@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 1999, 2000
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
  */
 
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index e37bc1620d1..6e835c9fdfc 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1,4 +1,5 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_eckd.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Carsten Otte <Cotte@de.ibm.com>
@@ -17,13 +18,12 @@
 #include <linux/hdreg.h>        /* HDIO_GETGEO                      */
 #include <linux/bio.h>
 #include <linux/module.h>
-#include <linux/compat.h>
 #include <linux/init.h>
 
-#include <asm/css_chars.h>
 #include <asm/debug.h>
 #include <asm/idals.h>
 #include <asm/ebcdic.h>
+#include <asm/compat.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/cio.h>
@@ -32,6 +32,8 @@
 
 #include "dasd_int.h"
 #include "dasd_eckd.h"
+#include "../cio/chsc.h"
+
 
 #ifdef PRINTK_HEADER
 #undef PRINTK_HEADER
@@ -139,10 +141,6 @@ dasd_eckd_set_online(struct ccw_device *cdev)
 static const int sizes_trk0[] = { 28, 148, 84 };
 #define LABEL_SIZE 140
 
-/* head and record addresses of count_area read in analysis ccw */
-static const int count_area_head[] = { 0, 0, 0, 0, 2 };
-static const int count_area_rec[] = { 1, 2, 3, 4, 1 };
-
 static inline unsigned int
 round_up_multiple(unsigned int no, unsigned int mult)
 {
@@ -215,7 +213,7 @@ check_XRC (struct ccw1         *de_ccw,
 
         rc = get_sync_clock(&data->ep_sys_time);
         /* Ignore return code if sync clock is switched off. */
-        if (rc == -EOPNOTSUPP || rc == -EACCES)
+        if (rc == -ENOSYS || rc == -EACCES)
                 rc = 0;
 
         de_ccw->count = sizeof(struct DE_eckd_data);
@@ -326,7 +324,7 @@ static int check_XRC_on_prefix(struct PFX_eckd_data *pfxdata,
 
         rc = get_sync_clock(&pfxdata->define_extent.ep_sys_time);
         /* Ignore return code if sync clock is switched off. */
-        if (rc == -EOPNOTSUPP || rc == -EACCES)
+        if (rc == -ENOSYS || rc == -EACCES)
                 rc = 0;
         return rc;
 }
@@ -754,13 +752,24 @@ dasd_eckd_cdl_reclen(int recid)
                 return sizes_trk0[recid];
         return LABEL_SIZE;
 }
-/* create unique id from private structure. */
-static void create_uid(struct dasd_eckd_private *private)
+
+/*
+ * Generate device unique id that specifies the physical device.
+ */
+static int dasd_eckd_generate_uid(struct dasd_device *device)
 {
-        int count;
+        struct dasd_eckd_private *private;
         struct dasd_uid *uid;
+        int count;
+        unsigned long flags;
 
+        private = (struct dasd_eckd_private *) device->private;
+        if (!private)
+                return -ENODEV;
+        if (!private->ned || !private->gneq)
+                return -ENODEV;
         uid = &private->uid;
+        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
         memset(uid, 0, sizeof(struct dasd_uid));
         memcpy(uid->vendor, private->ned->HDA_manufacturer,
                sizeof(uid->vendor) - 1);
@@ -783,23 +792,6 @@ static void create_uid(struct dasd_eckd_private *private)
                                 private->vdsneq->uit[count]);
                 }
         }
-}
-
-/*
- * Generate device unique id that specifies the physical device.
- */
-static int dasd_eckd_generate_uid(struct dasd_device *device)
-{
-        struct dasd_eckd_private *private;
-        unsigned long flags;
-
-        private = (struct dasd_eckd_private *) device->private;
-        if (!private)
-                return -ENODEV;
-        if (!private->ned || !private->gneq)
-                return -ENODEV;
-        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
-        create_uid(private);
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
         return 0;
 }
@@ -819,21 +811,6 @@ static int dasd_eckd_get_uid(struct dasd_device *device, struct dasd_uid *uid)
         return -EINVAL;
 }
 
-/*
- * compare device UID with data of a given dasd_eckd_private structure
- * return 0 for match
- */
-static int dasd_eckd_compare_path_uid(struct dasd_device *device,
-                                      struct dasd_eckd_private *private)
-{
-        struct dasd_uid device_uid;
-
-        create_uid(private);
-        dasd_eckd_get_uid(device, &device_uid);
-
-        return memcmp(&device_uid, &private->uid, sizeof(struct dasd_uid));
-}
-
 static void dasd_eckd_fill_rcd_cqr(struct dasd_device *device,
                                    struct dasd_ccw_req *cqr,
                                    __u8 *rcd_buffer,
@@ -867,30 +844,6 @@ static void dasd_eckd_fill_rcd_cqr(struct dasd_device *device,
         set_bit(DASD_CQR_VERIFY_PATH, &cqr->flags);
 }
 
-/*
- * Wakeup helper for read_conf
- * if the cqr is not done and needs some error recovery
- * the buffer has to be re-initialized with the EBCDIC "V1.0"
- * to show support for virtual device SNEQ
- */
-static void read_conf_cb(struct dasd_ccw_req *cqr, void *data)
-{
-        struct ccw1 *ccw;
-        __u8 *rcd_buffer;
-
-        if (cqr->status !=  DASD_CQR_DONE) {
-                ccw = cqr->cpaddr;
-                rcd_buffer = (__u8 *)((addr_t) ccw->cda);
-                memset(rcd_buffer, 0, sizeof(*rcd_buffer));
-
-                rcd_buffer[0] = 0xE5;
-                rcd_buffer[1] = 0xF1;
-                rcd_buffer[2] = 0x4B;
-                rcd_buffer[3] = 0xF0;
-        }
-        dasd_wakeup_cb(cqr, data);
-}
-
 static int dasd_eckd_read_conf_immediately(struct dasd_device *device,
                                            struct dasd_ccw_req *cqr,
                                            __u8 *rcd_buffer,
@@ -910,7 +863,6 @@ static int dasd_eckd_read_conf_immediately(struct dasd_device *device,
         clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
         set_bit(DASD_CQR_ALLOW_SLOCK, &cqr->flags);
         cqr->retries = 5;
-        cqr->callback = read_conf_cb;
         rc = dasd_sleep_on_immediatly(cqr);
         return rc;
 }
@@ -948,7 +900,6 @@ static int dasd_eckd_read_conf_lpm(struct dasd_device *device,
                 goto out_error;
         }
         dasd_eckd_fill_rcd_cqr(device, cqr, rcd_buf, lpm);
-        cqr->callback = read_conf_cb;
         ret = dasd_sleep_on(cqr);
         /*
          * on success we update the user input parms
@@ -1026,125 +977,62 @@ static int dasd_eckd_read_conf(struct dasd_device *device)
 {
         void *conf_data;
         int conf_len, conf_data_saved;
-        int rc, path_err;
+        int rc;
         __u8 lpm, opm;
-        struct dasd_eckd_private *private, path_private;
+        struct dasd_eckd_private *private;
         struct dasd_path *path_data;
-        struct dasd_uid *uid;
-        char print_path_uid[60], print_device_uid[60];
 
         private = (struct dasd_eckd_private *) device->private;
         path_data = &device->path_data;
         opm = ccw_device_get_path_mask(device->cdev);
+        lpm = 0x80;
         conf_data_saved = 0;
-        path_err = 0;
         /* get configuration data per operational path */
         for (lpm = 0x80; lpm; lpm>>= 1) {
-                if (!(lpm & opm))
-                        continue;
-                rc = dasd_eckd_read_conf_lpm(device, &conf_data,
-                                             &conf_len, lpm);
-                if (rc && rc != -EOPNOTSUPP) {  /* -EOPNOTSUPP is ok */
-                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
-                                        "Read configuration data returned "
-                                        "error %d", rc);
-                        return rc;
-                }
-                if (conf_data == NULL) {
-                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
-                                        "No configuration data "
-                                        "retrieved");
-                        /* no further analysis possible */
-                        path_data->opm |= lpm;
-                        continue;       /* no error */
-                }
-                /* save first valid configuration data */
-                if (!conf_data_saved) {
-                        kfree(private->conf_data);
-                        private->conf_data = conf_data;
-                        private->conf_len = conf_len;
-                        if (dasd_eckd_identify_conf_parts(private)) {
-                                private->conf_data = NULL;
-                                private->conf_len = 0;
-                                kfree(conf_data);
-                                continue;
+                if (lpm & opm) {
+                        rc = dasd_eckd_read_conf_lpm(device, &conf_data,
+                                                     &conf_len, lpm);
+                        if (rc && rc != -EOPNOTSUPP) {  /* -EOPNOTSUPP is ok */
+                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
+                                          "Read configuration data returned "
+                                          "error %d", rc);
+                                return rc;
                         }
-                        /*
-                         * build device UID that other path data
-                         * can be compared to it
-                         */
-                        dasd_eckd_generate_uid(device);
-                        conf_data_saved++;
-                } else {
-                        path_private.conf_data = conf_data;
-                        path_private.conf_len = DASD_ECKD_RCD_DATA_SIZE;
-                        if (dasd_eckd_identify_conf_parts(
-                                    &path_private)) {
-                                path_private.conf_data = NULL;
-                                path_private.conf_len = 0;
-                                kfree(conf_data);
-                                continue;
+                        if (conf_data == NULL) {
+                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
+                                                "No configuration data "
+                                                "retrieved");
+                                /* no further analysis possible */
+                                path_data->opm |= lpm;
+                                continue;       /* no error */
                         }
-
-                        if (dasd_eckd_compare_path_uid(
-                                    device, &path_private)) {
-                                uid = &path_private.uid;
-                                if (strlen(uid->vduit) > 0)
-                                        snprintf(print_path_uid,
-                                                 sizeof(print_path_uid),
-                                                 "%s.%s.%04x.%02x.%s",
-                                                 uid->vendor, uid->serial,
-                                                 uid->ssid, uid->real_unit_addr,
-                                                 uid->vduit);
-                                else
-                                        snprintf(print_path_uid,
-                                                 sizeof(print_path_uid),
-                                                 "%s.%s.%04x.%02x",
-                                                 uid->vendor, uid->serial,
-                                                 uid->ssid,
-                                                 uid->real_unit_addr);
-                                uid = &private->uid;
-                                if (strlen(uid->vduit) > 0)
-                                        snprintf(print_device_uid,
-                                                 sizeof(print_device_uid),
-                                                 "%s.%s.%04x.%02x.%s",
-                                                 uid->vendor, uid->serial,
-                                                 uid->ssid, uid->real_unit_addr,
-                                                 uid->vduit);
-                                else
-                                        snprintf(print_device_uid,
-                                                 sizeof(print_device_uid),
-                                                 "%s.%s.%04x.%02x",
-                                                 uid->vendor, uid->serial,
-                                                 uid->ssid,
-                                                 uid->real_unit_addr);
-                                dev_err(&device->cdev->dev,
-                                        "Not all channel paths lead to "
-                                        "the same device, path %02X leads to "
-                                        "device %s instead of %s\n", lpm,
-                                        print_path_uid, print_device_uid);
-                                path_err = -EINVAL;
-                                continue;
+                        /* save first valid configuration data */
+                        if (!conf_data_saved) {
+                                kfree(private->conf_data);
+                                private->conf_data = conf_data;
+                                private->conf_len = conf_len;
+                                if (dasd_eckd_identify_conf_parts(private)) {
+                                        private->conf_data = NULL;
+                                        private->conf_len = 0;
+                                        kfree(conf_data);
+                                        continue;
+                                }
+                                conf_data_saved++;
                         }
-
-                        path_private.conf_data = NULL;
-                        path_private.conf_len = 0;
-                }
-                switch (dasd_eckd_path_access(conf_data, conf_len)) {
-                case 0x02:
-                        path_data->npm |= lpm;
-                        break;
-                case 0x03:
-                        path_data->ppm |= lpm;
-                        break;
+                        switch (dasd_eckd_path_access(conf_data, conf_len)) {
+                        case 0x02:
+                                path_data->npm |= lpm;
+                                break;
+                        case 0x03:
+                                path_data->ppm |= lpm;
+                                break;
+                        }
+                        path_data->opm |= lpm;
+                        if (conf_data != private->conf_data)
+                                kfree(conf_data);
                 }
-                path_data->opm |= lpm;
-
-                if (conf_data != private->conf_data)
-                        kfree(conf_data);
         }
-
-        return path_err;
+        return 0;
 }
 
 static int verify_fcx_max_data(struct dasd_device *device, __u8 lpm)
@@ -1176,200 +1064,80 @@ static int verify_fcx_max_data(struct dasd_device *device, __u8 lpm)
         return 0;
 }
 
-static int rebuild_device_uid(struct dasd_device *device,
-                              struct path_verification_work_data *data)
-{
-        struct dasd_eckd_private *private;
-        struct dasd_path *path_data;
-        __u8 lpm, opm;
-        int rc;
-
-        rc = -ENODEV;
-        private = (struct dasd_eckd_private *) device->private;
-        path_data = &device->path_data;
-        opm = device->path_data.opm;
-
-        for (lpm = 0x80; lpm; lpm >>= 1) {
-                if (!(lpm & opm))
-                        continue;
-                memset(&data->rcd_buffer, 0, sizeof(data->rcd_buffer));
-                memset(&data->cqr, 0, sizeof(data->cqr));
-                data->cqr.cpaddr = &data->ccw;
-                rc = dasd_eckd_read_conf_immediately(device, &data->cqr,
-                                                     data->rcd_buffer,
-                                                     lpm);
-
-                if (rc) {
-                        if (rc == -EOPNOTSUPP) /* -EOPNOTSUPP is ok */
-                                continue;
-                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
-                                        "Read configuration data "
-                                        "returned error %d", rc);
-                        break;
-                }
-                memcpy(private->conf_data, data->rcd_buffer,
-                       DASD_ECKD_RCD_DATA_SIZE);
-                if (dasd_eckd_identify_conf_parts(private)) {
-                        rc = -ENODEV;
-                } else /* first valid path is enough */
-                        break;
-        }
-
-        if (!rc)
-                rc = dasd_eckd_generate_uid(device);
-
-        return rc;
-}
-
 static void do_path_verification_work(struct work_struct *work)
 {
         struct path_verification_work_data *data;
         struct dasd_device *device;
-        struct dasd_eckd_private path_private;
-        struct dasd_uid *uid;
-        __u8 path_rcd_buf[DASD_ECKD_RCD_DATA_SIZE];
         __u8 lpm, opm, npm, ppm, epm;
         unsigned long flags;
-        char print_uid[60];
         int rc;
 
         data = container_of(work, struct path_verification_work_data, worker);
         device = data->device;
 
-        /* delay path verification until device was resumed */
-        if (test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
-                schedule_work(work);
-                return;
-        }
-
         opm = 0;
         npm = 0;
         ppm = 0;
         epm = 0;
         for (lpm = 0x80; lpm; lpm >>= 1) {
-                if (!(lpm & data->tbvpm))
-                        continue;
-                memset(&data->rcd_buffer, 0, sizeof(data->rcd_buffer));
-                memset(&data->cqr, 0, sizeof(data->cqr));
-                data->cqr.cpaddr = &data->ccw;
-                rc = dasd_eckd_read_conf_immediately(device, &data->cqr,
-                                                     data->rcd_buffer,
-                                                     lpm);
-                if (!rc) {
-                        switch (dasd_eckd_path_access(data->rcd_buffer,
-                                                      DASD_ECKD_RCD_DATA_SIZE)
-                                ) {
-                        case 0x02:
-                                npm |= lpm;
-                                break;
-                        case 0x03:
-                                ppm |= lpm;
-                                break;
-                        }
-                        opm |= lpm;
-                } else if (rc == -EOPNOTSUPP) {
-                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
-                                        "path verification: No configuration "
-                                        "data retrieved");
-                        opm |= lpm;
-                } else if (rc == -EAGAIN) {
-                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
+                if (lpm & data->tbvpm) {
+                        memset(data->rcd_buffer, 0, sizeof(data->rcd_buffer));
+                        memset(&data->cqr, 0, sizeof(data->cqr));
+                        data->cqr.cpaddr = &data->ccw;
+                        rc = dasd_eckd_read_conf_immediately(device, &data->cqr,
+                                                             data->rcd_buffer,
+                                                             lpm);
+                        if (!rc) {
+                                switch (dasd_eckd_path_access(data->rcd_buffer,
+                                                     DASD_ECKD_RCD_DATA_SIZE)) {
+                                case 0x02:
+                                        npm |= lpm;
+                                        break;
+                                case 0x03:
+                                        ppm |= lpm;
+                                        break;
+                                }
+                                opm |= lpm;
+                        } else if (rc == -EOPNOTSUPP) {
+                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
+                                       "path verification: No configuration "
+                                       "data retrieved");
+                                opm |= lpm;
+                        } else if (rc == -EAGAIN) {
+                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
                                         "path verification: device is stopped,"
                                         " try again later");
-                        epm |= lpm;
-                } else {
-                        dev_warn(&device->cdev->dev,
-                                 "Reading device feature codes failed "
-                                 "(rc=%d) for new path %x\n", rc, lpm);
-                        continue;
-                }
-                if (verify_fcx_max_data(device, lpm)) {
-                        opm &= ~lpm;
-                        npm &= ~lpm;
-                        ppm &= ~lpm;
-                        continue;
-                }
-
-                /*
-                 * save conf_data for comparison after
-                 * rebuild_device_uid may have changed
-                 * the original data
-                 */
-                memcpy(&path_rcd_buf, data->rcd_buffer,
-                       DASD_ECKD_RCD_DATA_SIZE);
-                path_private.conf_data = (void *) &path_rcd_buf;
-                path_private.conf_len = DASD_ECKD_RCD_DATA_SIZE;
-                if (dasd_eckd_identify_conf_parts(&path_private)) {
-                        path_private.conf_data = NULL;
-                        path_private.conf_len = 0;
-                        continue;
-                }
-
-                /*
-                 * compare path UID with device UID only if at least
-                 * one valid path is left
-                 * in other case the device UID may have changed and
-                 * the first working path UID will be used as device UID
-                 */
-                if (device->path_data.opm &&
-                    dasd_eckd_compare_path_uid(device, &path_private)) {
-                        /*
-                         * the comparison was not successful
-                         * rebuild the device UID with at least one
-                         * known path in case a z/VM hyperswap command
-                         * has changed the device
-                         *
-                         * after this compare again
-                         *
-                         * if either the rebuild or the recompare fails
-                         * the path can not be used
-                         */
-                        if (rebuild_device_uid(device, data) ||
-                            dasd_eckd_compare_path_uid(
-                                    device, &path_private)) {
-                                uid = &path_private.uid;
-                                if (strlen(uid->vduit) > 0)
-                                        snprintf(print_uid, sizeof(print_uid),
-                                                 "%s.%s.%04x.%02x.%s",
-                                                 uid->vendor, uid->serial,
-                                                 uid->ssid, uid->real_unit_addr,
-                                                 uid->vduit);
-                                else
-                                        snprintf(print_uid, sizeof(print_uid),
-                                                 "%s.%s.%04x.%02x",
-                                                 uid->vendor, uid->serial,
-                                                 uid->ssid,
-                                                 uid->real_unit_addr);
-                                dev_err(&device->cdev->dev,
-                                        "The newly added channel path %02X "
-                                        "will not be used because it leads "
-                                        "to a different device %s\n",
-                                        lpm, print_uid);
+                                epm |= lpm;
+                        } else {
+                                dev_warn(&device->cdev->dev,
+                                         "Reading device feature codes failed "
+                                         "(rc=%d) for new path %x\n", rc, lpm);
+                                continue;
+                        }
+                        if (verify_fcx_max_data(device, lpm)) {
                                 opm &= ~lpm;
                                 npm &= ~lpm;
                                 ppm &= ~lpm;
-                                continue;
                         }
                 }
-
-                /*
-                 * There is a small chance that a path is lost again between
-                 * above path verification and the following modification of
-                 * the device opm mask. We could avoid that race here by using
-                 * yet another path mask, but we rather deal with this unlikely
-                 * situation in dasd_start_IO.
-                 */
-                spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
-                if (!device->path_data.opm && opm) {
-                        device->path_data.opm = opm;
-                        dasd_generic_path_operational(device);
-                } else
-                        device->path_data.opm |= opm;
-                device->path_data.npm |= npm;
-                device->path_data.ppm |= ppm;
-                device->path_data.tbvpm |= epm;
-                spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
         }
+        /*
+         * There is a small chance that a path is lost again between
+         * above path verification and the following modification of
+         * the device opm mask. We could avoid that race here by using
+         * yet another path mask, but we rather deal with this unlikely
+         * situation in dasd_start_IO.
+         */
+        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
+        if (!device->path_data.opm && opm) {
+                device->path_data.opm = opm;
+                dasd_generic_path_operational(device);
+        } else
+                device->path_data.opm |= opm;
+        device->path_data.npm |= npm;
+        device->path_data.ppm |= ppm;
+        device->path_data.tbvpm |= epm;
+        spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
 
         dasd_put_device(device);
         if (data->isglobal)
@@ -1512,8 +1280,7 @@ static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device,
  * call might change behaviour of DASD devices.
  */
 static int
-dasd_eckd_psf_ssc(struct dasd_device *device, int enable_pav,
-                  unsigned long flags)
+dasd_eckd_psf_ssc(struct dasd_device *device, int enable_pav)
 {
         struct dasd_ccw_req *cqr;
         int rc;
@@ -1522,19 +1289,10 @@ dasd_eckd_psf_ssc(struct dasd_device *device, int enable_pav,
         if (IS_ERR(cqr))
                 return PTR_ERR(cqr);
 
-        /*
-         * set flags e.g. turn on failfast, to prevent blocking
-         * the calling function should handle failed requests
-         */
-        cqr->flags |= flags;
-
         rc = dasd_sleep_on(cqr);
         if (!rc)
                 /* trigger CIO to reprobe devices */
                 css_schedule_reprobe();
-        else if (cqr->intrc == -EAGAIN)
-                rc = -EAGAIN;
-
         dasd_sfree_request(cqr, cqr->memdev);
         return rc;
 }
@@ -1542,58 +1300,23 @@ dasd_eckd_psf_ssc(struct dasd_device *device, int enable_pav,
 /*
  * Valide storage server of current device.
  */
-static int dasd_eckd_validate_server(struct dasd_device *device,
-                                     unsigned long flags)
+static void dasd_eckd_validate_server(struct dasd_device *device)
 {
         int rc;
         struct dasd_eckd_private *private;
         int enable_pav;
 
-        private = (struct dasd_eckd_private *) device->private;
-        if (private->uid.type == UA_BASE_PAV_ALIAS ||
-            private->uid.type == UA_HYPER_PAV_ALIAS)
-                return 0;
         if (dasd_nopav || MACHINE_IS_VM)
                 enable_pav = 0;
         else
                 enable_pav = 1;
-        rc = dasd_eckd_psf_ssc(device, enable_pav, flags);
+        rc = dasd_eckd_psf_ssc(device, enable_pav);
 
         /* may be requested feature is not available on server,
          * therefore just report error and go ahead */
+        private = (struct dasd_eckd_private *) device->private;
         DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "PSF-SSC for SSID %04x "
                         "returned rc=%d", private->uid.ssid, rc);
-        return rc;
-}
-
-/*
- * worker to do a validate server in case of a lost pathgroup
- */
-static void dasd_eckd_do_validate_server(struct work_struct *work)
-{
-        struct dasd_device *device = container_of(work, struct dasd_device,
-                                                  kick_validate);
-        if (dasd_eckd_validate_server(device, DASD_CQR_FLAGS_FAILFAST)
-            == -EAGAIN) {
-                /* schedule worker again if failed */
-                schedule_work(&device->kick_validate);
-                return;
-        }
-
-        dasd_put_device(device);
-}
-
-static void dasd_eckd_kick_validate_server(struct dasd_device *device)
-{
-        dasd_get_device(device);
-        /* exit if device not online or in offline processing */
-        if (test_bit(DASD_FLAG_OFFLINE, &device->flags) ||
-           device->state < DASD_STATE_ONLINE) {
-                dasd_put_device(device);
-                return;
-        }
-        /* queue call to do_validate_server to the kernel event daemon. */
-        schedule_work(&device->kick_validate);
 }
 
 static u32 get_fcx_max_data(struct dasd_device *device)
@@ -1637,13 +1360,10 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
         struct dasd_eckd_private *private;
         struct dasd_block *block;
         struct dasd_uid temp_uid;
-        int rc, i;
+        int is_known, rc, i;
         int readonly;
         unsigned long value;
 
-        /* setup work queue for validate server*/
-        INIT_WORK(&device->kick_validate, dasd_eckd_do_validate_server);
-
         if (!ccw_device_is_pathgroup(device->cdev)) {
                 dev_warn(&device->cdev->dev,
                          "A channel path group could not be established\n");
@@ -1689,6 +1409,11 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                         device->default_expires = value;
         }
 
+        /* Generate device unique id */
+        rc = dasd_eckd_generate_uid(device);
+        if (rc)
+                goto out_err1;
+
         dasd_eckd_get_uid(device, &temp_uid);
         if (temp_uid.type == UA_BASE_DEVICE) {
                 block = dasd_alloc_block();
@@ -1703,12 +1428,22 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                 block->base = device;
         }
 
-        /* register lcu with alias handling, enable PAV */
-        rc = dasd_alias_make_device_known_to_lcu(device);
-        if (rc)
+        /* register lcu with alias handling, enable PAV if this is a new lcu */
+        is_known = dasd_alias_make_device_known_to_lcu(device);
+        if (is_known < 0) {
+                rc = is_known;
                 goto out_err2;
-
-        dasd_eckd_validate_server(device, 0);
+        }
+        /*
+         * dasd_eckd_validate_server is done on the first device that
+         * is found for an LCU. All later other devices have to wait
+         * for it, so they will read the correct feature codes.
+         */
+        if (!is_known) {
+                dasd_eckd_validate_server(device);
+                dasd_alias_lcu_setup_complete(device);
+        } else
+                dasd_alias_wait_for_lcu_setup(device);
 
         /* device may report different configuration data after LCU setup */
         rc = dasd_eckd_read_conf(device);
@@ -1945,10 +1680,7 @@ static int dasd_eckd_end_analysis(struct dasd_block *block)
         count_area = NULL;
         for (i = 0; i < 3; i++) {
                 if (private->count_area[i].kl != 4 ||
-                    private->count_area[i].dl != dasd_eckd_cdl_reclen(i) - 4 ||
-                    private->count_area[i].cyl != 0 ||
-                    private->count_area[i].head != count_area_head[i] ||
-                    private->count_area[i].record != count_area_rec[i]) {
+                    private->count_area[i].dl != dasd_eckd_cdl_reclen(i) - 4) {
                         private->uses_cdl = 0;
                         break;
                 }
@@ -1960,10 +1692,7 @@ static int dasd_eckd_end_analysis(struct dasd_block *block)
                 for (i = 0; i < 5; i++) {
                         if ((private->count_area[i].kl != 0) ||
                             (private->count_area[i].dl !=
-                             private->count_area[0].dl) ||
-                            private->count_area[i].cyl !=  0 ||
-                            private->count_area[i].head != count_area_head[i] ||
-                            private->count_area[i].record != count_area_rec[i])
+                             private->count_area[0].dl))
                                 break;
                 }
                 if (i == 5)
@@ -2027,7 +1756,6 @@ static int dasd_eckd_ready_to_online(struct dasd_device *device)
 static int dasd_eckd_online_to_ready(struct dasd_device *device)
 {
         cancel_work_sync(&device->reload_device);
-        cancel_work_sync(&device->kick_validate);
         return dasd_alias_remove_device(device);
 };
 
@@ -2293,14 +2021,9 @@ static void dasd_eckd_check_for_device_change(struct dasd_device *device,
         /* first of all check for state change pending interrupt */
         mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
         if ((scsw_dstat(&irb->scsw) & mask) == mask) {
-                /*
-                 * for alias only, not in offline processing
-                 * and only if not suspended
-                 */
+                /* for alias only and not in offline processing*/
                 if (!device->block && private->lcu &&
-                    device->state == DASD_STATE_ONLINE &&
-                    !test_bit(DASD_FLAG_OFFLINE, &device->flags) &&
-                    !test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
+                    !test_bit(DASD_FLAG_OFFLINE, &device->flags)) {
                         /*
                          * the state change could be caused by an alias
                          * reassignment remove device from alias handling
@@ -2447,7 +2170,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
                                            sizeof(struct PFX_eckd_data));
         } else {
                 if (define_extent(ccw++, cqr->data, first_trk,
-                                  last_trk, cmd, basedev) == -EAGAIN) {
+                                  last_trk, cmd, startdev) == -EAGAIN) {
                         /* Clock not in sync and XRC is enabled.
                          * Try again later.
                          */
@@ -2627,7 +2350,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
         new_track = 1;
         end_idaw = 0;
         len_to_track_end = 0;
-        idaw_dst = NULL;
+        idaw_dst = 0;
         idaw_len = 0;
         rq_for_each_segment(bv, req, iter) {
                 dst = page_address(bv->bv_page) + bv->bv_offset;
@@ -2689,7 +2412,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
                         if (end_idaw) {
                                 idaws = idal_create_words(idaws, idaw_dst,
                                                           idaw_len);
-                                idaw_dst = NULL;
+                                idaw_dst = 0;
                                 idaw_len = 0;
                                 end_idaw = 0;
                         }
@@ -2872,7 +2595,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
         sector_t recid, trkid;
         unsigned int offs;
         unsigned int count, count_to_trk_end;
-        int ret;
 
         basedev = block->base;
         if (rq_data_dir(req) == READ) {
@@ -2913,8 +2635,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
 
         itcw = itcw_init(cqr->data, itcw_size, itcw_op, 0, ctidaw, 0);
         if (IS_ERR(itcw)) {
-                ret = -EINVAL;
-                goto out_error;
+                dasd_sfree_request(cqr, startdev);
+                return ERR_PTR(-EINVAL);
         }
         cqr->cpaddr = itcw_get_tcw(itcw);
         if (prepare_itcw(itcw, first_trk, last_trk,
@@ -2926,8 +2648,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
                 /* Clock not in sync and XRC is enabled.
                  * Try again later.
                  */
-                ret = -EAGAIN;
-                goto out_error;
+                dasd_sfree_request(cqr, startdev);
+                return ERR_PTR(-EAGAIN);
         }
         len_to_track_end = 0;
         /*
@@ -2966,10 +2688,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
                                         tidaw_flags = 0;
                                 last_tidaw = itcw_add_tidaw(itcw, tidaw_flags,
                                                             dst, part_len);
-                                if (IS_ERR(last_tidaw)) {
-                                        ret = -EINVAL;
-                                        goto out_error;
-                                }
+                                if (IS_ERR(last_tidaw))
+                                        return ERR_PTR(-EINVAL);
                                 dst += part_len;
                         }
                 }
@@ -2978,10 +2698,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
                         dst = page_address(bv->bv_page) + bv->bv_offset;
                         last_tidaw = itcw_add_tidaw(itcw, 0x00,
                                                     dst, bv->bv_len);
-                        if (IS_ERR(last_tidaw)) {
-                                ret = -EINVAL;
-                                goto out_error;
-                        }
+                        if (IS_ERR(last_tidaw))
+                                return ERR_PTR(-EINVAL);
                 }
         }
         last_tidaw->flags |= TIDAW_FLAGS_LAST;
@@ -3001,9 +2719,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
         cqr->buildclk = get_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
-out_error:
-        dasd_sfree_request(cqr, startdev);
-        return ERR_PTR(ret);
 }
 
 static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
@@ -3833,7 +3548,7 @@ dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)
         case BIODASDSYMMIO:
                 return dasd_symm_io(device, argp);
         default:
-                return -ENOTTY;
+                return -ENOIOCTLCMD;
         }
 }
 
@@ -3849,7 +3564,7 @@ dasd_eckd_dump_ccw_range(struct ccw1 *from, struct ccw1 *to, char *page)
 
         len = 0;
         while (from <= to) {
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
                                from, ((int *) from)[0], ((int *) from)[1]);
 
@@ -3910,23 +3625,23 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device,
                 return;
         }
         /* dump the sense data */
-        len = sprintf(page, PRINTK_HEADER
+        len = sprintf(page,  KERN_ERR PRINTK_HEADER
                       " I/O status report for device %s:\n",
                       dev_name(&device->cdev->dev));
-        len += sprintf(page + len, PRINTK_HEADER
+        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CC:%02X FC:%02X AC:%02X SC:%02X DS:%02X "
                        "CS:%02X RC:%d\n",
                        req, scsw_cc(&irb->scsw), scsw_fctl(&irb->scsw),
                        scsw_actl(&irb->scsw), scsw_stctl(&irb->scsw),
                        scsw_dstat(&irb->scsw), scsw_cstat(&irb->scsw),
                        req ? req->intrc : 0);
-        len += sprintf(page + len, PRINTK_HEADER
+        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
                        dev_name(&device->cdev->dev),
                        (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                        " Sense(hex) %2d-%2d:",
                                        (8 * sl), ((8 * sl) + 7));
 
@@ -3939,23 +3654,23 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device,
 
                 if (irb->ecw[27] & DASD_SENSE_BIT_0) {
                         /* 24 Byte Sense Data */
-                        sprintf(page + len, PRINTK_HEADER
+                        sprintf(page + len, KERN_ERR PRINTK_HEADER
                                 " 24 Byte: %x MSG %x, "
                                 "%s MSGb to SYSOP\n",
                                 irb->ecw[7] >> 4, irb->ecw[7] & 0x0f,
                                 irb->ecw[1] & 0x10 ? "" : "no");
                 } else {
                         /* 32 Byte Sense Data */
-                        sprintf(page + len, PRINTK_HEADER
+                        sprintf(page + len, KERN_ERR PRINTK_HEADER
                                 " 32 Byte: Format: %x "
                                 "Exception class %x\n",
                                 irb->ecw[6] & 0x0f, irb->ecw[22] >> 4);
                 }
         } else {
-                sprintf(page + len, PRINTK_HEADER
+                sprintf(page + len, KERN_ERR PRINTK_HEADER
                         " SORRY - NO VALID SENSE AVAILABLE\n");
         }
-        printk(KERN_ERR "%s", page);
+        printk("%s", page);
 
         if (req) {
                 /* req == NULL for unsolicited interrupts */
@@ -3964,10 +3679,10 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device,
                 first = req->cpaddr;
                 for (last = first; last->flags & (CCW_FLAG_CC | CCW_FLAG_DC); last++);
                 to = min(first + 6, last);
-                len = sprintf(page, PRINTK_HEADER
+                len = sprintf(page,  KERN_ERR PRINTK_HEADER
                               " Related CP in req: %p\n", req);
                 dasd_eckd_dump_ccw_range(first, to, page + len);
-                printk(KERN_ERR "%s", page);
+                printk("%s", page);
 
                 /* print failing CCW area (maximum 4) */
                 /* scsw->cda is either valid or zero  */
@@ -3977,7 +3692,7 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device,
                                 irb->scsw.cmd.cpa; /* failing CCW */
                 if (from <  fail - 2) {
                         from = fail - 2;     /* there is a gap - print header */
-                        len += sprintf(page, PRINTK_HEADER "......\n");
+                        len += sprintf(page, KERN_ERR PRINTK_HEADER "......\n");
                 }
                 to = min(fail + 1, last);
                 len += dasd_eckd_dump_ccw_range(from, to, page + len);
@@ -3986,11 +3701,11 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device,
                 from = max(from, ++to);
                 if (from < last - 1) {
                         from = last - 1;     /* there is a gap - print header */
-                        len += sprintf(page + len, PRINTK_HEADER "......\n");
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
                 }
                 len += dasd_eckd_dump_ccw_range(from, last, page + len);
                 if (len > 0)
-                        printk(KERN_ERR "%s", page);
+                        printk("%s", page);
         }
         free_page((unsigned long) page);
 }
@@ -4014,10 +3729,10 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device,
                 return;
         }
         /* dump the sense data */
-        len = sprintf(page, PRINTK_HEADER
+        len = sprintf(page,  KERN_ERR PRINTK_HEADER
                       " I/O status report for device %s:\n",
                       dev_name(&device->cdev->dev));
-        len += sprintf(page + len, PRINTK_HEADER
+        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CC:%02X FC:%02X AC:%02X SC:%02X DS:%02X "
                        "CS:%02X fcxs:%02X schxs:%02X RC:%d\n",
                        req, scsw_cc(&irb->scsw), scsw_fctl(&irb->scsw),
@@ -4025,7 +3740,7 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device,
                        scsw_dstat(&irb->scsw), scsw_cstat(&irb->scsw),
                        irb->scsw.tm.fcxs, irb->scsw.tm.schxs,
                        req ? req->intrc : 0);
-        len += sprintf(page + len, PRINTK_HEADER
+        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing TCW: %p\n",
                        dev_name(&device->cdev->dev),
                        (void *) (addr_t) irb->scsw.tm.tcw);
@@ -4037,42 +3752,43 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device,
                         (struct tcw *)(unsigned long)irb->scsw.tm.tcw);
 
         if (tsb) {
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->length %d\n", tsb->length);
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->flags %x\n", tsb->flags);
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->dcw_offset %d\n", tsb->dcw_offset);
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->count %d\n", tsb->count);
                 residual = tsb->count - 28;
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " residual %d\n", residual);
 
                 switch (tsb->flags & 0x07) {
                 case 1: /* tsa_iostat */
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->tsa.iostat.dev_time %d\n",
                                        tsb->tsa.iostat.dev_time);
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->tsa.iostat.def_time %d\n",
                                        tsb->tsa.iostat.def_time);
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->tsa.iostat.queue_time %d\n",
                                        tsb->tsa.iostat.queue_time);
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->tsa.iostat.dev_busy_time %d\n",
                                        tsb->tsa.iostat.dev_busy_time);
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->tsa.iostat.dev_act_time %d\n",
                                        tsb->tsa.iostat.dev_act_time);
                         sense = tsb->tsa.iostat.sense;
                         break;
                 case 2: /* ts_ddpc */
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " tsb->tsa.ddpc.rc %d\n", tsb->tsa.ddpc.rc);
                         for (sl = 0; sl < 2; sl++) {
-                                len += sprintf(page + len, PRINTK_HEADER
+                                len += sprintf(page + len,
+                                               KERN_ERR PRINTK_HEADER
                                                " tsb->tsa.ddpc.rcq %2d-%2d: ",
                                                (8 * sl), ((8 * sl) + 7));
                                 rcq = tsb->tsa.ddpc.rcq;
@@ -4085,14 +3801,15 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device,
                         sense = tsb->tsa.ddpc.sense;
                         break;
                 case 3: /* tsa_intrg */
-                        len += sprintf(page + len, PRINTK_HEADER
-                                      " tsb->tsa.intrg.: not supportet yet\n");
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+                                      " tsb->tsa.intrg.: not supportet yet \n");
                         break;
                 }
 
                 if (sense) {
                         for (sl = 0; sl < 4; sl++) {
-                                len += sprintf(page + len, PRINTK_HEADER
+                                len += sprintf(page + len,
+                                               KERN_ERR PRINTK_HEADER
                                                " Sense(hex) %2d-%2d:",
                                                (8 * sl), ((8 * sl) + 7));
                                 for (sct = 0; sct < 8; sct++) {
@@ -4104,27 +3821,27 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device,
 
                         if (sense[27] & DASD_SENSE_BIT_0) {
                                 /* 24 Byte Sense Data */
-                                sprintf(page + len, PRINTK_HEADER
+                                sprintf(page + len, KERN_ERR PRINTK_HEADER
                                         " 24 Byte: %x MSG %x, "
                                         "%s MSGb to SYSOP\n",
                                         sense[7] >> 4, sense[7] & 0x0f,
                                         sense[1] & 0x10 ? "" : "no");
                         } else {
                                 /* 32 Byte Sense Data */
-                                sprintf(page + len, PRINTK_HEADER
+                                sprintf(page + len, KERN_ERR PRINTK_HEADER
                                         " 32 Byte: Format: %x "
                                         "Exception class %x\n",
                                         sense[6] & 0x0f, sense[22] >> 4);
                         }
                 } else {
-                        sprintf(page + len, PRINTK_HEADER
+                        sprintf(page + len, KERN_ERR PRINTK_HEADER
                                 " SORRY - NO VALID SENSE AVAILABLE\n");
                 }
         } else {
-                sprintf(page + len, PRINTK_HEADER
+                sprintf(page + len, KERN_ERR PRINTK_HEADER
                         " SORRY - NO TSB DATA AVAILABLE\n");
         }
-        printk(KERN_ERR "%s", page);
+        printk("%s", page);
         free_page((unsigned long) page);
 }
 
@@ -4154,14 +3871,16 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
 {
         struct dasd_eckd_private *private;
         struct dasd_eckd_characteristics temp_rdc_data;
-        int rc;
+        int is_known, rc;
         struct dasd_uid temp_uid;
         unsigned long flags;
 
         private = (struct dasd_eckd_private *) device->private;
 
         /* Read Configuration Data */
-        dasd_eckd_read_conf(device);
+        rc = dasd_eckd_read_conf(device);
+        if (rc)
+                goto out_err;
 
         dasd_eckd_get_uid(device, &temp_uid);
         /* Generate device unique id */
@@ -4175,13 +3894,19 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
                 goto out_err;
 
         /* register lcu with alias handling, enable PAV if this is a new lcu */
-        rc = dasd_alias_make_device_known_to_lcu(device);
-        if (rc)
-                return rc;
-        dasd_eckd_validate_server(device, DASD_CQR_FLAGS_FAILFAST);
+        is_known = dasd_alias_make_device_known_to_lcu(device);
+        if (is_known < 0)
+                return is_known;
+        if (!is_known) {
+                dasd_eckd_validate_server(device);
+                dasd_alias_lcu_setup_complete(device);
+        } else
+                dasd_alias_wait_for_lcu_setup(device);
 
         /* RE-Read Configuration Data */
-        dasd_eckd_read_conf(device);
+        rc = dasd_eckd_read_conf(device);
+        if (rc)
+                goto out_err;
 
         /* Read Feature Codes */
         dasd_eckd_read_features(device);
@@ -4269,12 +3994,10 @@ static struct ccw_driver dasd_eckd_driver = {
         .set_online  = dasd_eckd_set_online,
         .notify      = dasd_generic_notify,
         .path_event  = dasd_generic_path_event,
-        .shutdown    = dasd_generic_shutdown,
         .freeze      = dasd_generic_pm_freeze,
         .thaw        = dasd_generic_restore_device,
         .restore     = dasd_generic_restore_device,
         .uc_handler  = dasd_generic_uc_handler,
-        .int_class   = IRQIO_DAS,
 };
 
 /*
@@ -4319,7 +4042,6 @@ static struct dasd_discipline dasd_eckd_discipline = {
         .restore = dasd_eckd_restore_device,
         .reload = dasd_eckd_reload_device,
         .get_uid = dasd_eckd_get_uid,
-        .kick_validate = dasd_eckd_kick_validate_server,
 };
 
 static int __init
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index 2555e494591..4a688a873a7 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -1,8 +1,9 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_eckd.h
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 1999, 2000
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
  */
 
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index ff901b5509c..16c5208c3dc 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -1,7 +1,7 @@
 /*
  *  Character device driver for extended error reporting.
  *
- *  Copyright IBM Corp. 2005
+ *  Copyright (C) 2005 IBM Corporation
  *  extended error reporting for DASD ECKD devices
  *  Author(s): Stefan Weinhuber <wein@de.ibm.com>
  */
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index d01ef82f875..0eafe2e421e 100644
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -1,10 +1,11 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Carsten Otte <Cotte@de.ibm.com>
  *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 1999, 2001
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
  */
 
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 41469858434..4b71b116486 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -1,4 +1,5 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_fba.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
  * Copyright IBM Corp. 1999, 2009
@@ -78,7 +79,6 @@ static struct ccw_driver dasd_fba_driver = {
         .freeze      = dasd_generic_pm_freeze,
         .thaw        = dasd_generic_restore_device,
         .restore     = dasd_generic_restore_device,
-        .int_class   = IRQIO_DAS,
 };
 
 static void
@@ -479,19 +479,19 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                             "No memory to dump sense data");
                 return;
         }
-        len = sprintf(page, PRINTK_HEADER
+        len = sprintf(page, KERN_ERR PRINTK_HEADER
                       " I/O status report for device %s:\n",
                       dev_name(&device->cdev->dev));
-        len += sprintf(page + len, PRINTK_HEADER
+        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, PRINTK_HEADER
+        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
                        dev_name(&device->cdev->dev),
                        (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
-                        len += sprintf(page + len, PRINTK_HEADER
+                        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                        " Sense(hex) %2d-%2d:",
                                        (8 * sl), ((8 * sl) + 7));
 
@@ -502,7 +502,7 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                         len += sprintf(page + len, "\n");
                 }
         } else {
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " SORRY - NO VALID SENSE AVAILABLE\n");
         }
         printk(KERN_ERR "%s", page);
@@ -512,9 +512,10 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
         act = req->cpaddr;
         for (last = act; last->flags & (CCW_FLAG_CC | CCW_FLAG_DC); last++);
         end = min(act + 8, last);
-        len = sprintf(page, PRINTK_HEADER " Related CP in req: %p\n", req);
+        len = sprintf(page, KERN_ERR PRINTK_HEADER
+                      " Related CP in req: %p\n", req);
         while (act <= end) {
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
                                act, ((int *) act)[0], ((int *) act)[1]);
                 for (count = 0; count < 32 && count < act->count;
@@ -532,11 +533,11 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
         len = 0;
         if (act <  ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2) {
                 act = ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2;
-                len += sprintf(page + len, PRINTK_HEADER "......\n");
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
         }
         end = min((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa + 2, last);
         while (act <= end) {
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
                                act, ((int *) act)[0], ((int *) act)[1]);
                 for (count = 0; count < 32 && count < act->count;
@@ -551,10 +552,10 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
         /* print last CCWs */
         if (act <  last - 2) {
                 act = last - 2;
-                len += sprintf(page + len, PRINTK_HEADER "......\n");
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
         }
         while (act <= last) {
-                len += sprintf(page + len, PRINTK_HEADER
+                len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
                                act, ((int *) act)[0], ((int *) act)[1]);
                 for (count = 0; count < 32 && count < act->count;
diff --git a/drivers/s390/block/dasd_fba.h b/drivers/s390/block/dasd_fba.h
index b5d3db0e5ef..14c910baa5f 100644
--- a/drivers/s390/block/dasd_fba.h
+++ b/drivers/s390/block/dasd_fba.h
@@ -1,7 +1,8 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_fba.h
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Coypright IBM Corp. 1999, 2000
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
  */
 
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index f64921756ad..19a1ff03d65 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -1,10 +1,11 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_genhd.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Carsten Otte <Cotte@de.ibm.com>
  *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 1999, 2001
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
  * gendisk related functions for the dasd driver.
  *
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 899e3f5a56e..1dd12bd85a6 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -1,4 +1,5 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_int.h
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -9,6 +10,8 @@
 #ifndef DASD_INT_H
 #define DASD_INT_H
 
+#ifdef __KERNEL__
+
 /* we keep old device allocation scheme; IOW, minors are still in 0..255 */
 #define DASD_PER_MAJOR (1U << (MINORBITS - DASD_PARTN_BITS))
 #define DASD_PARTN_MASK ((1 << DASD_PARTN_BITS) - 1)
@@ -352,7 +355,6 @@ struct dasd_discipline {
         int (*reload) (struct dasd_device *);
 
         int (*get_uid) (struct dasd_device *, struct dasd_uid *);
-        void (*kick_validate) (struct dasd_device *);
 };
 
 extern struct dasd_discipline *dasd_diag_discipline_pointer;
@@ -453,7 +455,6 @@ struct dasd_device {
         struct work_struct kick_work;
         struct work_struct restore_device;
         struct work_struct reload_device;
-        struct work_struct kick_validate;
         struct timer_list timer;
 
         debug_info_t *debug_area;
@@ -515,9 +516,6 @@ struct dasd_block {
                                          */
 #define DASD_FLAG_IS_RESERVED   7       /* The device is reserved */
 #define DASD_FLAG_LOCK_STOLEN   8       /* The device lock was stolen */
-#define DASD_FLAG_SUSPENDED     9       /* The device was suspended */
-#define DASD_FLAG_SAFE_OFFLINE  10      /* safe offline processing requested*/
-#define DASD_FLAG_SAFE_OFFLINE_RUNNING  11      /* safe offline running */
 
 
 void dasd_put_device_wake(struct dasd_device *);
@@ -645,7 +643,6 @@ struct dasd_ccw_req *
 dasd_smalloc_request(int , int, int, struct dasd_device *);
 void dasd_kfree_request(struct dasd_ccw_req *, struct dasd_device *);
 void dasd_sfree_request(struct dasd_ccw_req *, struct dasd_device *);
-void dasd_wakeup_cb(struct dasd_ccw_req *, void *);
 
 static inline int
 dasd_kmalloc_set_cda(struct ccw1 *ccw, void *cda, struct dasd_device *device)
@@ -687,7 +684,6 @@ int dasd_generic_set_offline (struct ccw_device *cdev);
 int dasd_generic_notify(struct ccw_device *, int);
 int dasd_generic_last_path_gone(struct dasd_device *);
 int dasd_generic_path_operational(struct dasd_device *);
-void dasd_generic_shutdown(struct ccw_device *);
 
 void dasd_generic_handle_state_change(struct dasd_device *);
 int dasd_generic_pm_freeze(struct ccw_device *);
@@ -791,4 +787,6 @@ static inline int dasd_eer_enabled(struct dasd_device *device)
 #define dasd_eer_enabled(d)     (0)
 #endif  /* CONFIG_DASD_ERR */
 
+#endif                          /* __KERNEL__ */
+
 #endif                          /* DASD_H */
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 03c0e044455..f1a2016829f 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -1,10 +1,11 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_ioctl.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Carsten Otte <Cotte@de.ibm.com>
  *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Copyright IBM Corp. 1999, 2001
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
  * i/o controls for the dasd driver.
  */
@@ -12,14 +13,12 @@
 #define KMSG_COMPONENT "dasd"
 
 #include <linux/interrupt.h>
-#include <linux/compat.h>
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/blkpg.h>
 #include <linux/slab.h>
 #include <asm/compat.h>
 #include <asm/ccwdev.h>
-#include <asm/schid.h>
 #include <asm/cmb.h>
 #include <asm/uaccess.h>
 
@@ -293,12 +292,12 @@ out:
 #else
 static int dasd_ioctl_reset_profile(struct dasd_block *block)
 {
-        return -ENOTTY;
+        return -ENOSYS;
 }
 
 static int dasd_ioctl_read_profile(struct dasd_block *block, void __user *argp)
 {
-        return -ENOTTY;
+        return -ENOSYS;
 }
 #endif
 
@@ -309,12 +308,11 @@ static int dasd_ioctl_information(struct dasd_block *block,
                                   unsigned int cmd, void __user *argp)
 {
         struct dasd_information2_t *dasd_info;
-        struct subchannel_id sch_id;
-        struct ccw_dev_id dev_id;
-        struct dasd_device *base;
-        struct ccw_device *cdev;
         unsigned long flags;
         int rc;
+        struct dasd_device *base;
+        struct ccw_device *cdev;
+        struct ccw_dev_id dev_id;
 
         base = block->base;
         if (!base->discipline || !base->discipline->fill_info)
@@ -332,10 +330,9 @@ static int dasd_ioctl_information(struct dasd_block *block,
 
         cdev = base->cdev;
         ccw_device_get_id(cdev, &dev_id);
-        ccw_device_get_schid(cdev, &sch_id);
 
         dasd_info->devno = dev_id.devno;
-        dasd_info->schid = sch_id.sch_no;
+        dasd_info->schid = _ccw_device_get_subchannel_number(base->cdev);
         dasd_info->cu_type = cdev->id.cu_type;
         dasd_info->cu_model = cdev->id.cu_model;
         dasd_info->dev_type = cdev->id.dev_type;
@@ -501,9 +498,12 @@ int dasd_ioctl(struct block_device *bdev, fmode_t mode,
                 break;
         default:
                 /* if the discipline has an ioctl method try it. */
-                rc = -ENOTTY;
-                if (base->discipline->ioctl)
+                if (base->discipline->ioctl) {
                         rc = base->discipline->ioctl(block, cmd, argp);
+                        if (rc == -ENOIOCTLCMD)
+                                rc = -EINVAL;
+                } else
+                        rc = -EINVAL;
         }
         dasd_put_device(base);
         return rc;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 78ac905a5b7..e12989fff4f 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -1,10 +1,11 @@
 /*
+ * File...........: linux/drivers/s390/block/dasd_proc.c
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Horst Hummel <Horst.Hummel@de.ibm.com>
  *                  Carsten Otte <Cotte@de.ibm.com>
  *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
- * Coypright IBM Corp. 1999, 2002
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2002
  *
  * /proc interface for the dasd driver.
  *
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index b6ad0de0793..9b43ae94beb 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -27,7 +27,7 @@
 
 static int dcssblk_open(struct block_device *bdev, fmode_t mode);
 static int dcssblk_release(struct gendisk *disk, fmode_t mode);
-static void dcssblk_make_request(struct request_queue *q, struct bio *bio);
+static int dcssblk_make_request(struct request_queue *q, struct bio *bio);
 static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
                                  void **kaddr, unsigned long *pfn);
 
@@ -69,9 +69,23 @@ static ssize_t dcssblk_add_store(struct device * dev, struct device_attribute *a
                                   size_t count);
 static ssize_t dcssblk_remove_store(struct device * dev, struct device_attribute *attr, const char * buf,
                                   size_t count);
+static ssize_t dcssblk_save_store(struct device * dev, struct device_attribute *attr, const char * buf,
+                                  size_t count);
+static ssize_t dcssblk_save_show(struct device *dev, struct device_attribute *attr, char *buf);
+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_IRUSR, dcssblk_save_show,
+                   dcssblk_save_store);
+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;
 
@@ -402,8 +416,6 @@ out:
         up_write(&dcssblk_devices_sem);
         return rc;
 }
-static DEVICE_ATTR(shared, S_IWUSR | S_IRUSR, dcssblk_shared_show,
-                   dcssblk_shared_store);
 
 /*
  * device attribute for save operation on current copy
@@ -464,8 +476,6 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char
         up_write(&dcssblk_devices_sem);
         return count;
 }
-static DEVICE_ATTR(save, S_IWUSR | S_IRUSR, dcssblk_save_show,
-                   dcssblk_save_store);
 
 /*
  * device attribute for showing all segments in a device
@@ -492,21 +502,6 @@ dcssblk_seglist_show(struct device *dev, struct device_attribute *attr,
         up_read(&dcssblk_devices_sem);
         return i;
 }
-static DEVICE_ATTR(seglist, S_IRUSR, dcssblk_seglist_show, NULL);
-
-static struct attribute *dcssblk_dev_attrs[] = {
-        &dev_attr_shared.attr,
-        &dev_attr_save.attr,
-        &dev_attr_seglist.attr,
-        NULL,
-};
-static struct attribute_group dcssblk_dev_attr_group = {
-        .attrs = dcssblk_dev_attrs,
-};
-static const struct attribute_group *dcssblk_dev_attr_groups[] = {
-        &dcssblk_dev_attr_group,
-        NULL,
-};
 
 /*
  * device attribute for adding devices
@@ -595,7 +590,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
 
         dev_set_name(&dev_info->dev, dev_info->segment_name);
         dev_info->dev.release = dcssblk_release_segment;
-        dev_info->dev.groups = dcssblk_dev_attr_groups;
         INIT_LIST_HEAD(&dev_info->lh);
         dev_info->gd = alloc_disk(DCSSBLK_MINORS_PER_DISK);
         if (dev_info->gd == NULL) {
@@ -643,10 +637,21 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
          * register the device
          */
         rc = device_register(&dev_info->dev);
+        if (rc) {
+                module_put(THIS_MODULE);
+                goto dev_list_del;
+        }
+        get_device(&dev_info->dev);
+        rc = device_create_file(&dev_info->dev, &dev_attr_shared);
+        if (rc)
+                goto unregister_dev;
+        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 put_dev;
+                goto unregister_dev;
 
-        get_device(&dev_info->dev);
         add_disk(dev_info->gd);
 
         switch (dev_info->segment_type) {
@@ -663,11 +668,12 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         rc = count;
         goto out;
 
-put_dev:
+unregister_dev:
         list_del(&dev_info->lh);
         blk_cleanup_queue(dev_info->dcssblk_queue);
         dev_info->gd->queue = NULL;
         put_disk(dev_info->gd);
+        device_unregister(&dev_info->dev);
         list_for_each_entry(seg_info, &dev_info->seg_list, lh) {
                 segment_unload(seg_info->segment_name);
         }
@@ -808,7 +814,7 @@ out:
         return rc;
 }
 
-static void
+static int
 dcssblk_make_request(struct request_queue *q, struct bio *bio)
 {
         struct dcssblk_dev_info *dev_info;
@@ -865,9 +871,10 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
                 bytes_done += bvec->bv_len;
         }
         bio_endio(bio, 0);
-        return;
+        return 0;
 fail:
         bio_io_error(bio);
+        return 0;
 }
 
 static int
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
deleted file mode 100644
index 9978ad4433c..00000000000
--- a/drivers/s390/block/scm_blk.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * Block driver for s390 storage class memory.
- *
- * Copyright IBM Corp. 2012
- * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
- */
-
-#define KMSG_COMPONENT "scm_block"
-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/module.h>
-#include <linux/blkdev.h>
-#include <linux/genhd.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <asm/eadm.h>
-#include "scm_blk.h"
-
-debug_info_t *scm_debug;
-static int scm_major;
-static DEFINE_SPINLOCK(list_lock);
-static LIST_HEAD(inactive_requests);
-static unsigned int nr_requests = 64;
-static atomic_t nr_devices = ATOMIC_INIT(0);
-module_param(nr_requests, uint, S_IRUGO);
-MODULE_PARM_DESC(nr_requests, "Number of parallel requests.");
-
-MODULE_DESCRIPTION("Block driver for s390 storage class memory.");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("scm:scmdev*");
-
-static void __scm_free_rq(struct scm_request *scmrq)
-{
-        struct aob_rq_header *aobrq = to_aobrq(scmrq);
-
-        free_page((unsigned long) scmrq->aob);
-        free_page((unsigned long) scmrq->aidaw);
-        __scm_free_rq_cluster(scmrq);
-        kfree(aobrq);
-}
-
-static void scm_free_rqs(void)
-{
-        struct list_head *iter, *safe;
-        struct scm_request *scmrq;
-
-        spin_lock_irq(&list_lock);
-        list_for_each_safe(iter, safe, &inactive_requests) {
-                scmrq = list_entry(iter, struct scm_request, list);
-                list_del(&scmrq->list);
-                __scm_free_rq(scmrq);
-        }
-        spin_unlock_irq(&list_lock);
-}
-
-static int __scm_alloc_rq(void)
-{
-        struct aob_rq_header *aobrq;
-        struct scm_request *scmrq;
-
-        aobrq = kzalloc(sizeof(*aobrq) + sizeof(*scmrq), GFP_KERNEL);
-        if (!aobrq)
-                return -ENOMEM;
-
-        scmrq = (void *) aobrq->data;
-        scmrq->aidaw = (void *) get_zeroed_page(GFP_DMA);
-        scmrq->aob = (void *) get_zeroed_page(GFP_DMA);
-        if (!scmrq->aob || !scmrq->aidaw) {
-                __scm_free_rq(scmrq);
-                return -ENOMEM;
-        }
-
-        if (__scm_alloc_rq_cluster(scmrq)) {
-                __scm_free_rq(scmrq);
-                return -ENOMEM;
-        }
-
-        INIT_LIST_HEAD(&scmrq->list);
-        spin_lock_irq(&list_lock);
-        list_add(&scmrq->list, &inactive_requests);
-        spin_unlock_irq(&list_lock);
-
-        return 0;
-}
-
-static int scm_alloc_rqs(unsigned int nrqs)
-{
-        int ret = 0;
-
-        while (nrqs-- && !ret)
-                ret = __scm_alloc_rq();
-
-        return ret;
-}
-
-static struct scm_request *scm_request_fetch(void)
-{
-        struct scm_request *scmrq = NULL;
-
-        spin_lock(&list_lock);
-        if (list_empty(&inactive_requests))
-                goto out;
-        scmrq = list_first_entry(&inactive_requests, struct scm_request, list);
-        list_del(&scmrq->list);
-out:
-        spin_unlock(&list_lock);
-        return scmrq;
-}
-
-static void scm_request_done(struct scm_request *scmrq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&list_lock, flags);
-        list_add(&scmrq->list, &inactive_requests);
-        spin_unlock_irqrestore(&list_lock, flags);
-}
-
-static int scm_open(struct block_device *blkdev, fmode_t mode)
-{
-        return scm_get_ref();
-}
-
-static int scm_release(struct gendisk *gendisk, fmode_t mode)
-{
-        scm_put_ref();
-        return 0;
-}
-
-static const struct block_device_operations scm_blk_devops = {
-        .owner = THIS_MODULE,
-        .open = scm_open,
-        .release = scm_release,
-};
-
-static void scm_request_prepare(struct scm_request *scmrq)
-{
-        struct scm_blk_dev *bdev = scmrq->bdev;
-        struct scm_device *scmdev = bdev->gendisk->private_data;
-        struct aidaw *aidaw = scmrq->aidaw;
-        struct msb *msb = &scmrq->aob->msb[0];
-        struct req_iterator iter;
-        struct bio_vec *bv;
-
-        msb->bs = MSB_BS_4K;
-        scmrq->aob->request.msb_count = 1;
-        msb->scm_addr = scmdev->address +
-                ((u64) blk_rq_pos(scmrq->request) << 9);
-        msb->oc = (rq_data_dir(scmrq->request) == READ) ?
-                MSB_OC_READ : MSB_OC_WRITE;
-        msb->flags |= MSB_FLAG_IDA;
-        msb->data_addr = (u64) aidaw;
-
-        rq_for_each_segment(bv, scmrq->request, iter) {
-                WARN_ON(bv->bv_offset);
-                msb->blk_count += bv->bv_len >> 12;
-                aidaw->data_addr = (u64) page_address(bv->bv_page);
-                aidaw++;
-        }
-}
-
-static inline void scm_request_init(struct scm_blk_dev *bdev,
-                                    struct scm_request *scmrq,
-                                    struct request *req)
-{
-        struct aob_rq_header *aobrq = to_aobrq(scmrq);
-        struct aob *aob = scmrq->aob;
-
-        memset(aob, 0, sizeof(*aob));
-        memset(scmrq->aidaw, 0, PAGE_SIZE);
-        aobrq->scmdev = bdev->scmdev;
-        aob->request.cmd_code = ARQB_CMD_MOVE;
-        aob->request.data = (u64) aobrq;
-        scmrq->request = req;
-        scmrq->bdev = bdev;
-        scmrq->retries = 4;
-        scmrq->error = 0;
-        scm_request_cluster_init(scmrq);
-}
-
-static void scm_ensure_queue_restart(struct scm_blk_dev *bdev)
-{
-        if (atomic_read(&bdev->queued_reqs)) {
-                /* Queue restart is triggered by the next interrupt. */
-                return;
-        }
-        blk_delay_queue(bdev->rq, SCM_QUEUE_DELAY);
-}
-
-void scm_request_requeue(struct scm_request *scmrq)
-{
-        struct scm_blk_dev *bdev = scmrq->bdev;
-
-        scm_release_cluster(scmrq);
-        blk_requeue_request(bdev->rq, scmrq->request);
-        scm_request_done(scmrq);
-        scm_ensure_queue_restart(bdev);
-}
-
-void scm_request_finish(struct scm_request *scmrq)
-{
-        scm_release_cluster(scmrq);
-        blk_end_request_all(scmrq->request, scmrq->error);
-        scm_request_done(scmrq);
-}
-
-static void scm_blk_request(struct request_queue *rq)
-{
-        struct scm_device *scmdev = rq->queuedata;
-        struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);
-        struct scm_request *scmrq;
-        struct request *req;
-        int ret;
-
-        while ((req = blk_peek_request(rq))) {
-                if (req->cmd_type != REQ_TYPE_FS)
-                        continue;
-
-                scmrq = scm_request_fetch();
-                if (!scmrq) {
-                        SCM_LOG(5, "no request");
-                        scm_ensure_queue_restart(bdev);
-                        return;
-                }
-                scm_request_init(bdev, scmrq, req);
-                if (!scm_reserve_cluster(scmrq)) {
-                        SCM_LOG(5, "cluster busy");
-                        scm_request_done(scmrq);
-                        return;
-                }
-                if (scm_need_cluster_request(scmrq)) {
-                        blk_start_request(req);
-                        scm_initiate_cluster_request(scmrq);
-                        return;
-                }
-                scm_request_prepare(scmrq);
-                blk_start_request(req);
-
-                ret = scm_start_aob(scmrq->aob);
-                if (ret) {
-                        SCM_LOG(5, "no subchannel");
-                        scm_request_requeue(scmrq);
-                        return;
-                }
-                atomic_inc(&bdev->queued_reqs);
-        }
-}
-
-static void __scmrq_log_error(struct scm_request *scmrq)
-{
-        struct aob *aob = scmrq->aob;
-
-        if (scmrq->error == -ETIMEDOUT)
-                SCM_LOG(1, "Request timeout");
-        else {
-                SCM_LOG(1, "Request error");
-                SCM_LOG_HEX(1, &aob->response, sizeof(aob->response));
-        }
-        if (scmrq->retries)
-                SCM_LOG(1, "Retry request");
-        else
-                pr_err("An I/O operation to SCM failed with rc=%d\n",
-                       scmrq->error);
-}
-
-void scm_blk_irq(struct scm_device *scmdev, void *data, int error)
-{
-        struct scm_request *scmrq = data;
-        struct scm_blk_dev *bdev = scmrq->bdev;
-
-        scmrq->error = error;
-        if (error)
-                __scmrq_log_error(scmrq);
-
-        spin_lock(&bdev->lock);
-        list_add_tail(&scmrq->list, &bdev->finished_requests);
-        spin_unlock(&bdev->lock);
-        tasklet_hi_schedule(&bdev->tasklet);
-}
-
-static void scm_blk_tasklet(struct scm_blk_dev *bdev)
-{
-        struct scm_request *scmrq;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bdev->lock, flags);
-        while (!list_empty(&bdev->finished_requests)) {
-                scmrq = list_first_entry(&bdev->finished_requests,
-                                         struct scm_request, list);
-                list_del(&scmrq->list);
-                spin_unlock_irqrestore(&bdev->lock, flags);
-
-                if (scmrq->error && scmrq->retries-- > 0) {
-                        if (scm_start_aob(scmrq->aob)) {
-                                spin_lock_irqsave(&bdev->rq_lock, flags);
-                                scm_request_requeue(scmrq);
-                                spin_unlock_irqrestore(&bdev->rq_lock, flags);
-                        }
-                        /* Request restarted or requeued, handle next. */
-                        spin_lock_irqsave(&bdev->lock, flags);
-                        continue;
-                }
-
-                if (scm_test_cluster_request(scmrq)) {
-                        scm_cluster_request_irq(scmrq);
-                        spin_lock_irqsave(&bdev->lock, flags);
-                        continue;
-                }
-
-                scm_request_finish(scmrq);
-                atomic_dec(&bdev->queued_reqs);
-                spin_lock_irqsave(&bdev->lock, flags);
-        }
-        spin_unlock_irqrestore(&bdev->lock, flags);
-        /* Look out for more requests. */
-        blk_run_queue(bdev->rq);
-}
-
-int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)
-{
-        struct request_queue *rq;
-        int len, ret = -ENOMEM;
-        unsigned int devindex, nr_max_blk;
-
-        devindex = atomic_inc_return(&nr_devices) - 1;
-        /* scma..scmz + scmaa..scmzz */
-        if (devindex > 701) {
-                ret = -ENODEV;
-                goto out;
-        }
-
-        bdev->scmdev = scmdev;
-        spin_lock_init(&bdev->rq_lock);
-        spin_lock_init(&bdev->lock);
-        INIT_LIST_HEAD(&bdev->finished_requests);
-        atomic_set(&bdev->queued_reqs, 0);
-        tasklet_init(&bdev->tasklet,
-                     (void (*)(unsigned long)) scm_blk_tasklet,
-                     (unsigned long) bdev);
-
-        rq = blk_init_queue(scm_blk_request, &bdev->rq_lock);
-        if (!rq)
-                goto out;
-
-        bdev->rq = rq;
-        nr_max_blk = min(scmdev->nr_max_block,
-                         (unsigned int) (PAGE_SIZE / sizeof(struct aidaw)));
-
-        blk_queue_logical_block_size(rq, 1 << 12);
-        blk_queue_max_hw_sectors(rq, nr_max_blk << 3); /* 8 * 512 = blk_size */
-        blk_queue_max_segments(rq, nr_max_blk);
-        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, rq);
-        scm_blk_dev_cluster_setup(bdev);
-
-        bdev->gendisk = alloc_disk(SCM_NR_PARTS);
-        if (!bdev->gendisk)
-                goto out_queue;
-
-        rq->queuedata = scmdev;
-        bdev->gendisk->driverfs_dev = &scmdev->dev;
-        bdev->gendisk->private_data = scmdev;
-        bdev->gendisk->fops = &scm_blk_devops;
-        bdev->gendisk->queue = rq;
-        bdev->gendisk->major = scm_major;
-        bdev->gendisk->first_minor = devindex * SCM_NR_PARTS;
-
-        len = snprintf(bdev->gendisk->disk_name, DISK_NAME_LEN, "scm");
-        if (devindex > 25) {
-                len += snprintf(bdev->gendisk->disk_name + len,
-                                DISK_NAME_LEN - len, "%c",
-                                'a' + (devindex / 26) - 1);
-                devindex = devindex % 26;
-        }
-        snprintf(bdev->gendisk->disk_name + len, DISK_NAME_LEN - len, "%c",
-                 'a' + devindex);
-
-        /* 512 byte sectors */
-        set_capacity(bdev->gendisk, scmdev->size >> 9);
-        add_disk(bdev->gendisk);
-        return 0;
-
-out_queue:
-        blk_cleanup_queue(rq);
-out:
-        atomic_dec(&nr_devices);
-        return ret;
-}
-
-void scm_blk_dev_cleanup(struct scm_blk_dev *bdev)
-{
-        tasklet_kill(&bdev->tasklet);
-        del_gendisk(bdev->gendisk);
-        blk_cleanup_queue(bdev->gendisk->queue);
-        put_disk(bdev->gendisk);
-}
-
-static int __init scm_blk_init(void)
-{
-        int ret = -EINVAL;
-
-        if (!scm_cluster_size_valid())
-                goto out;
-
-        ret = register_blkdev(0, "scm");
-        if (ret < 0)
-                goto out;
-
-        scm_major = ret;
-        if (scm_alloc_rqs(nr_requests))
-                goto out_unreg;
-
-        scm_debug = debug_register("scm_log", 16, 1, 16);
-        if (!scm_debug)
-                goto out_free;
-
-        debug_register_view(scm_debug, &debug_hex_ascii_view);
-        debug_set_level(scm_debug, 2);
-
-        ret = scm_drv_init();
-        if (ret)
-                goto out_dbf;
-
-        return ret;
-
-out_dbf:
-        debug_unregister(scm_debug);
-out_free:
-        scm_free_rqs();
-out_unreg:
-        unregister_blkdev(scm_major, "scm");
-out:
-        return ret;
-}
-module_init(scm_blk_init);
-
-static void __exit scm_blk_cleanup(void)
-{
-        scm_drv_cleanup();
-        debug_unregister(scm_debug);
-        scm_free_rqs();
-        unregister_blkdev(scm_major, "scm");
-}
-module_exit(scm_blk_cleanup);
diff --git a/drivers/s390/block/scm_blk.h b/drivers/s390/block/scm_blk.h
deleted file mode 100644
index 7ac6bad919e..00000000000
--- a/drivers/s390/block/scm_blk.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef SCM_BLK_H
-#define SCM_BLK_H
-
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/blkdev.h>
-#include <linux/genhd.h>
-#include <linux/list.h>
-
-#include <asm/debug.h>
-#include <asm/eadm.h>
-
-#define SCM_NR_PARTS 8
-#define SCM_QUEUE_DELAY 5
-
-struct scm_blk_dev {
-        struct tasklet_struct tasklet;
-        struct request_queue *rq;
-        struct gendisk *gendisk;
-        struct scm_device *scmdev;
-        spinlock_t rq_lock;     /* guard the request queue */
-        spinlock_t lock;        /* guard the rest of the blockdev */
-        atomic_t queued_reqs;
-        struct list_head finished_requests;
-#ifdef CONFIG_SCM_BLOCK_CLUSTER_WRITE
-        struct list_head cluster_list;
-#endif
-};
-
-struct scm_request {
-        struct scm_blk_dev *bdev;
-        struct request *request;
-        struct aidaw *aidaw;
-        struct aob *aob;
-        struct list_head list;
-        u8 retries;
-        int error;
-#ifdef CONFIG_SCM_BLOCK_CLUSTER_WRITE
-        struct {
-                enum {CLUSTER_NONE, CLUSTER_READ, CLUSTER_WRITE} state;
-                struct list_head list;
-                void **buf;
-        } cluster;
-#endif
-};
-
-#define to_aobrq(rq) container_of((void *) rq, struct aob_rq_header, data)
-
-int scm_blk_dev_setup(struct scm_blk_dev *, struct scm_device *);
-void scm_blk_dev_cleanup(struct scm_blk_dev *);
-void scm_blk_irq(struct scm_device *, void *, int);
-
-void scm_request_finish(struct scm_request *);
-void scm_request_requeue(struct scm_request *);
-
-int scm_drv_init(void);
-void scm_drv_cleanup(void);
-
-#ifdef CONFIG_SCM_BLOCK_CLUSTER_WRITE
-void __scm_free_rq_cluster(struct scm_request *);
-int __scm_alloc_rq_cluster(struct scm_request *);
-void scm_request_cluster_init(struct scm_request *);
-bool scm_reserve_cluster(struct scm_request *);
-void scm_release_cluster(struct scm_request *);
-void scm_blk_dev_cluster_setup(struct scm_blk_dev *);
-bool scm_need_cluster_request(struct scm_request *);
-void scm_initiate_cluster_request(struct scm_request *);
-void scm_cluster_request_irq(struct scm_request *);
-bool scm_test_cluster_request(struct scm_request *);
-bool scm_cluster_size_valid(void);
-#else
-#define __scm_free_rq_cluster(scmrq) {}
-#define __scm_alloc_rq_cluster(scmrq) 0
-#define scm_request_cluster_init(scmrq) {}
-#define scm_reserve_cluster(scmrq) true
-#define scm_release_cluster(scmrq) {}
-#define scm_blk_dev_cluster_setup(bdev) {}
-#define scm_need_cluster_request(scmrq) false
-#define scm_initiate_cluster_request(scmrq) {}
-#define scm_cluster_request_irq(scmrq) {}
-#define scm_test_cluster_request(scmrq) false
-#define scm_cluster_size_valid() true
-#endif
-
-extern debug_info_t *scm_debug;
-
-#define SCM_LOG(imp, txt) do {                                  \
-                debug_text_event(scm_debug, imp, txt);          \
-        } while (0)
-
-static inline void SCM_LOG_HEX(int level, void *data, int length)
-{
-        if (level > scm_debug->level)
-                return;
-        while (length > 0) {
-                debug_event(scm_debug, level, data, length);
-                length -= scm_debug->buf_size;
-                data += scm_debug->buf_size;
-        }
-}
-
-static inline void SCM_LOG_STATE(int level, struct scm_device *scmdev)
-{
-        struct {
-                u64 address;
-                u8 oper_state;
-                u8 rank;
-        } __packed data = {
-                .address = scmdev->address,
-                .oper_state = scmdev->attrs.oper_state,
-                .rank = scmdev->attrs.rank,
-        };
-
-        SCM_LOG_HEX(level, &data, sizeof(data));
-}
-
-#endif /* SCM_BLK_H */
diff --git a/drivers/s390/block/scm_blk_cluster.c b/drivers/s390/block/scm_blk_cluster.c
deleted file mode 100644
index f4bb61b0cea..00000000000
--- a/drivers/s390/block/scm_blk_cluster.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Block driver for s390 storage class memory.
- *
- * Copyright IBM Corp. 2012
- * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
- */
-
-#include <linux/spinlock.h>
-#include <linux/module.h>
-#include <linux/blkdev.h>
-#include <linux/genhd.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <asm/eadm.h>
-#include "scm_blk.h"
-
-static unsigned int write_cluster_size = 64;
-module_param(write_cluster_size, uint, S_IRUGO);
-MODULE_PARM_DESC(write_cluster_size,
-                 "Number of pages used for contiguous writes.");
-
-#define CLUSTER_SIZE (write_cluster_size * PAGE_SIZE)
-
-void __scm_free_rq_cluster(struct scm_request *scmrq)
-{
-        int i;
-
-        if (!scmrq->cluster.buf)
-                return;
-
-        for (i = 0; i < 2 * write_cluster_size; i++)
-                free_page((unsigned long) scmrq->cluster.buf[i]);
-
-        kfree(scmrq->cluster.buf);
-}
-
-int __scm_alloc_rq_cluster(struct scm_request *scmrq)
-{
-        int i;
-
-        scmrq->cluster.buf = kzalloc(sizeof(void *) * 2 * write_cluster_size,
-                                 GFP_KERNEL);
-        if (!scmrq->cluster.buf)
-                return -ENOMEM;
-
-        for (i = 0; i < 2 * write_cluster_size; i++) {
-                scmrq->cluster.buf[i] = (void *) get_zeroed_page(GFP_DMA);
-                if (!scmrq->cluster.buf[i])
-                        return -ENOMEM;
-        }
-        INIT_LIST_HEAD(&scmrq->cluster.list);
-        return 0;
-}
-
-void scm_request_cluster_init(struct scm_request *scmrq)
-{
-        scmrq->cluster.state = CLUSTER_NONE;
-}
-
-static bool clusters_intersect(struct scm_request *A, struct scm_request *B)
-{
-        unsigned long firstA, lastA, firstB, lastB;
-
-        firstA = ((u64) blk_rq_pos(A->request) << 9) / CLUSTER_SIZE;
-        lastA = (((u64) blk_rq_pos(A->request) << 9) +
-                    blk_rq_bytes(A->request) - 1) / CLUSTER_SIZE;
-
-        firstB = ((u64) blk_rq_pos(B->request) << 9) / CLUSTER_SIZE;
-        lastB = (((u64) blk_rq_pos(B->request) << 9) +
-                    blk_rq_bytes(B->request) - 1) / CLUSTER_SIZE;
-
-        return (firstB <= lastA && firstA <= lastB);
-}
-
-bool scm_reserve_cluster(struct scm_request *scmrq)
-{
-        struct scm_blk_dev *bdev = scmrq->bdev;
-        struct scm_request *iter;
-
-        if (write_cluster_size == 0)
-                return true;
-
-        spin_lock(&bdev->lock);
-        list_for_each_entry(iter, &bdev->cluster_list, cluster.list) {
-                if (clusters_intersect(scmrq, iter) &&
-                    (rq_data_dir(scmrq->request) == WRITE ||
-                     rq_data_dir(iter->request) == WRITE)) {
-                        spin_unlock(&bdev->lock);
-                        return false;
-                }
-        }
-        list_add(&scmrq->cluster.list, &bdev->cluster_list);
-        spin_unlock(&bdev->lock);
-
-        return true;
-}
-
-void scm_release_cluster(struct scm_request *scmrq)
-{
-        struct scm_blk_dev *bdev = scmrq->bdev;
-        unsigned long flags;
-
-        if (write_cluster_size == 0)
-                return;
-
-        spin_lock_irqsave(&bdev->lock, flags);
-        list_del(&scmrq->cluster.list);
-        spin_unlock_irqrestore(&bdev->lock, flags);
-}
-
-void scm_blk_dev_cluster_setup(struct scm_blk_dev *bdev)
-{
-        INIT_LIST_HEAD(&bdev->cluster_list);
-        blk_queue_io_opt(bdev->rq, CLUSTER_SIZE);
-}
-
-static void scm_prepare_cluster_request(struct scm_request *scmrq)
-{
-        struct scm_blk_dev *bdev = scmrq->bdev;
-        struct scm_device *scmdev = bdev->gendisk->private_data;
-        struct request *req = scmrq->request;
-        struct aidaw *aidaw = scmrq->aidaw;
-        struct msb *msb = &scmrq->aob->msb[0];
-        struct req_iterator iter;
-        struct bio_vec *bv;
-        int i = 0;
-        u64 addr;
-
-        switch (scmrq->cluster.state) {
-        case CLUSTER_NONE:
-                scmrq->cluster.state = CLUSTER_READ;
-                /* fall through */
-        case CLUSTER_READ:
-                scmrq->aob->request.msb_count = 1;
-                msb->bs = MSB_BS_4K;
-                msb->oc = MSB_OC_READ;
-                msb->flags = MSB_FLAG_IDA;
-                msb->data_addr = (u64) aidaw;
-                msb->blk_count = write_cluster_size;
-
-                addr = scmdev->address + ((u64) blk_rq_pos(req) << 9);
-                msb->scm_addr = round_down(addr, CLUSTER_SIZE);
-
-                if (msb->scm_addr !=
-                    round_down(addr + (u64) blk_rq_bytes(req) - 1,
-                               CLUSTER_SIZE))
-                        msb->blk_count = 2 * write_cluster_size;
-
-                for (i = 0; i < msb->blk_count; i++) {
-                        aidaw->data_addr = (u64) scmrq->cluster.buf[i];
-                        aidaw++;
-                }
-
-                break;
-        case CLUSTER_WRITE:
-                msb->oc = MSB_OC_WRITE;
-
-                for (addr = msb->scm_addr;
-                     addr < scmdev->address + ((u64) blk_rq_pos(req) << 9);
-                     addr += PAGE_SIZE) {
-                        aidaw->data_addr = (u64) scmrq->cluster.buf[i];
-                        aidaw++;
-                        i++;
-                }
-                rq_for_each_segment(bv, req, iter) {
-                        aidaw->data_addr = (u64) page_address(bv->bv_page);
-                        aidaw++;
-                        i++;
-                }
-                for (; i < msb->blk_count; i++) {
-                        aidaw->data_addr = (u64) scmrq->cluster.buf[i];
-                        aidaw++;
-                }
-                break;
-        }
-}
-
-bool scm_need_cluster_request(struct scm_request *scmrq)
-{
-        if (rq_data_dir(scmrq->request) == READ)
-                return false;
-
-        return blk_rq_bytes(scmrq->request) < CLUSTER_SIZE;
-}
-
-/* Called with queue lock held. */
-void scm_initiate_cluster_request(struct scm_request *scmrq)
-{
-        scm_prepare_cluster_request(scmrq);
-        if (scm_start_aob(scmrq->aob))
-                scm_request_requeue(scmrq);
-}
-
-bool scm_test_cluster_request(struct scm_request *scmrq)
-{
-        return scmrq->cluster.state != CLUSTER_NONE;
-}
-
-void scm_cluster_request_irq(struct scm_request *scmrq)
-{
-        struct scm_blk_dev *bdev = scmrq->bdev;
-        unsigned long flags;
-
-        switch (scmrq->cluster.state) {
-        case CLUSTER_NONE:
-                BUG();
-                break;
-        case CLUSTER_READ:
-                if (scmrq->error) {
-                        scm_request_finish(scmrq);
-                        break;
-                }
-                scmrq->cluster.state = CLUSTER_WRITE;
-                spin_lock_irqsave(&bdev->rq_lock, flags);
-                scm_initiate_cluster_request(scmrq);
-                spin_unlock_irqrestore(&bdev->rq_lock, flags);
-                break;
-        case CLUSTER_WRITE:
-                scm_request_finish(scmrq);
-                break;
-        }
-}
-
-bool scm_cluster_size_valid(void)
-{
-        return write_cluster_size == 0 || write_cluster_size == 32 ||
-                write_cluster_size == 64 || write_cluster_size == 128;
-}
diff --git a/drivers/s390/block/scm_drv.c b/drivers/s390/block/scm_drv.c
deleted file mode 100644
index 9fa0a908607..00000000000
--- a/drivers/s390/block/scm_drv.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Device driver for s390 storage class memory.
- *
- * Copyright IBM Corp. 2012
- * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
- */
-
-#define KMSG_COMPONENT "scm_block"
-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <asm/eadm.h>
-#include "scm_blk.h"
-
-static void notify(struct scm_device *scmdev)
-{
-        pr_info("%lu: The capabilities of the SCM increment changed\n",
-                (unsigned long) scmdev->address);
-        SCM_LOG(2, "State changed");
-        SCM_LOG_STATE(2, scmdev);
-}
-
-static int scm_probe(struct scm_device *scmdev)
-{
-        struct scm_blk_dev *bdev;
-        int ret;
-
-        SCM_LOG(2, "probe");
-        SCM_LOG_STATE(2, scmdev);
-
-        if (scmdev->attrs.oper_state != OP_STATE_GOOD)
-                return -EINVAL;
-
-        bdev = kzalloc(sizeof(*bdev), GFP_KERNEL);
-        if (!bdev)
-                return -ENOMEM;
-
-        dev_set_drvdata(&scmdev->dev, bdev);
-        ret = scm_blk_dev_setup(bdev, scmdev);
-        if (ret) {
-                dev_set_drvdata(&scmdev->dev, NULL);
-                kfree(bdev);
-                goto out;
-        }
-
-out:
-        return ret;
-}
-
-static int scm_remove(struct scm_device *scmdev)
-{
-        struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);
-
-        scm_blk_dev_cleanup(bdev);
-        dev_set_drvdata(&scmdev->dev, NULL);
-        kfree(bdev);
-
-        return 0;
-}
-
-static struct scm_driver scm_drv = {
-        .drv = {
-                .name = "scm_block",
-                .owner = THIS_MODULE,
-        },
-        .notify = notify,
-        .probe = scm_probe,
-        .remove = scm_remove,
-        .handler = scm_blk_irq,
-};
-
-int __init scm_drv_init(void)
-{
-        return scm_driver_register(&scm_drv);
-}
-
-void scm_drv_cleanup(void)
-{
-        scm_driver_unregister(&scm_drv);
-}
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 690c3338a8a..1f6a4d894e7 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -36,7 +36,7 @@
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
-#include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/bio.h>
 #include <linux/suspend.h>
 #include <linux/platform_device.h>
@@ -181,7 +181,7 @@ static unsigned long xpram_highest_page_index(void)
 /*
  * Block device make request function.
  */
-static void xpram_make_request(struct request_queue *q, struct bio *bio)
+static int xpram_make_request(struct request_queue *q, struct bio *bio)
 {
         xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data;
         struct bio_vec *bvec;
@@ -221,9 +221,10 @@ static void xpram_make_request(struct request_queue *q, struct bio *bio)
         }
         set_bit(BIO_UPTODATE, &bio->bi_flags);
         bio_endio(bio, 0);
-        return;
+        return 0;
 fail:
         bio_io_error(bio);
+        return 0;
 }
 
 static int xpram_getgeo(struct block_device *bdev, struct hd_geometry *geo)
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 33b7141a182..694464c65fc 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -9,6 +9,7 @@
  *            Dan Morrison, IBM Corporation <dmorriso@cse.buffalo.edu>
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kdev_t.h>
@@ -20,7 +21,6 @@
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/reboot.h>
-#include <linux/serial.h> /* ASYNC_* flags */
 #include <linux/slab.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -45,11 +45,14 @@
 #define RAW3215_TIMEOUT     HZ/10     /* time for delayed output */
 
 #define RAW3215_FIXED       1         /* 3215 console device is not be freed */
+#define RAW3215_ACTIVE      2         /* set if the device is in use */
 #define RAW3215_WORKING     4         /* set if a request is being worked on */
 #define RAW3215_THROTTLED   8         /* set if reading is disabled */
 #define RAW3215_STOPPED     16        /* set if writing is disabled */
+#define RAW3215_CLOSING     32        /* set while in close process */
 #define RAW3215_TIMER_RUNS  64        /* set if the output delay timer is on */
 #define RAW3215_FLUSHING    128       /* set to flush buffer (no delay) */
+#define RAW3215_FROZEN      256       /* set if 3215 is frozen for suspend */
 
 #define TAB_STOP_SIZE       8         /* tab stop size */
 
@@ -74,7 +77,6 @@ struct raw3215_req {
 } __attribute__ ((aligned(8)));
 
 struct raw3215_info {
-        struct tty_port port;
         struct ccw_device *cdev;      /* device for tty driver */
         spinlock_t *lock;             /* pointer to irq lock */
         int flags;                    /* state flags */
@@ -83,9 +85,9 @@ struct raw3215_info {
         int head;                     /* first free byte in output buffer */
         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 raw3215_req *queued_read; /* pointer to queued read requests */
         struct raw3215_req *queued_write;/* pointer to queued write requests */
-        struct tasklet_struct tlet;   /* tasklet to invoke tty_wakeup */
         wait_queue_head_t empty_wait; /* wait queue for flushing */
         struct timer_list timer;      /* timer for delayed output */
         int line_pos;                 /* position on the line (for tabs) */
@@ -291,7 +293,7 @@ static void raw3215_timeout(unsigned long __data)
         if (raw->flags & RAW3215_TIMER_RUNS) {
                 del_timer(&raw->timer);
                 raw->flags &= ~RAW3215_TIMER_RUNS;
-                if (!(raw->port.flags & ASYNC_SUSPENDED)) {
+                if (!(raw->flags & RAW3215_FROZEN)) {
                         raw3215_mk_write_req(raw);
                         raw3215_start_io(raw);
                 }
@@ -307,8 +309,7 @@ static void raw3215_timeout(unsigned long __data)
  */
 static inline void raw3215_try_io(struct raw3215_info *raw)
 {
-        if (!(raw->port.flags & ASYNC_INITIALIZED) ||
-                        (raw->port.flags & ASYNC_SUSPENDED))
+        if (!(raw->flags & RAW3215_ACTIVE) || (raw->flags & RAW3215_FROZEN))
                 return;
         if (raw->queued_read != NULL)
                 raw3215_start_io(raw);
@@ -323,7 +324,10 @@ static inline void raw3215_try_io(struct raw3215_info *raw)
                         }
                 } else if (!(raw->flags & RAW3215_TIMER_RUNS)) {
                         /* delay small writes */
+                        init_timer(&raw->timer);
                         raw->timer.expires = RAW3215_TIMEOUT + jiffies;
+                        raw->timer.data = (unsigned long) raw;
+                        raw->timer.function = raw3215_timeout;
                         add_timer(&raw->timer);
                         raw->flags |= RAW3215_TIMER_RUNS;
                 }
@@ -331,29 +335,19 @@ static inline void raw3215_try_io(struct raw3215_info *raw)
 }
 
 /*
- * Call tty_wakeup from tasklet context
+ * Try to start the next IO and wake up processes waiting on the tty.
  */
-static void raw3215_wakeup(unsigned long data)
+static void raw3215_next_io(struct raw3215_info *raw)
 {
-        struct raw3215_info *raw = (struct raw3215_info *) data;
         struct tty_struct *tty;
 
-        tty = tty_port_tty_get(&raw->port);
-        if (tty) {
-                tty_wakeup(tty);
-                tty_kref_put(tty);
-        }
-}
-
-/*
- * Try to start the next IO and wake up processes waiting on the tty.
- */
-static void raw3215_next_io(struct raw3215_info *raw, struct tty_struct *tty)
-{
         raw3215_mk_write_req(raw);
         raw3215_try_io(raw);
-        if (tty && RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE)
-                tasklet_schedule(&raw->tlet);
+        tty = raw->tty;
+        if (tty != NULL &&
+            RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
+                tty_wakeup(tty);
+        }
 }
 
 /*
@@ -368,13 +362,13 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
         int cstat, dstat;
         int count;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_C15]++;
         raw = dev_get_drvdata(&cdev->dev);
         req = (struct raw3215_req *) intparm;
-        tty = tty_port_tty_get(&raw->port);
         cstat = irb->scsw.cmd.cstat;
         dstat = irb->scsw.cmd.dstat;
         if (cstat != 0)
-                raw3215_next_io(raw, tty);
+                raw3215_next_io(raw);
         if (dstat & 0x01) { /* we got a unit exception */
                 dstat &= ~0x01;  /* we can ignore it */
         }
@@ -384,13 +378,13 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                         break;
                 /* Attention interrupt, someone hit the enter key */
                 raw3215_mk_read_req(raw);
-                raw3215_next_io(raw, tty);
+                raw3215_next_io(raw);
                 break;
         case 0x08:
         case 0x0C:
                 /* Channel end interrupt. */
                 if ((raw = req->info) == NULL)
-                        goto put_tty;        /* That shouldn't happen ... */
+                        return;              /* That shouldn't happen ... */
                 if (req->type == RAW3215_READ) {
                         /* store residual count, then wait for device end */
                         req->residual = irb->scsw.cmd.count;
@@ -400,10 +394,11 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
         case 0x04:
                 /* Device end interrupt. */
                 if ((raw = req->info) == NULL)
-                        goto put_tty;        /* That shouldn't happen ... */
-                if (req->type == RAW3215_READ && tty != NULL) {
+                        return;              /* That shouldn't happen ... */
+                if (req->type == RAW3215_READ && raw->tty != NULL) {
                         unsigned int cchar;
 
+                        tty = raw->tty;
                         count = 160 - req->residual;
                         EBCASC(raw->inbuf, count);
                         cchar = ctrlchar_handle(raw->inbuf, count, tty);
@@ -413,7 +408,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
 
                         case CTRLCHAR_CTRL:
                                 tty_insert_flip_char(tty, cchar, TTY_NORMAL);
-                                tty_flip_buffer_push(tty);
+                                tty_flip_buffer_push(raw->tty);
                                 break;
 
                         case CTRLCHAR_NONE:
@@ -426,7 +421,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                                 } else
                                         count -= 2;
                                 tty_insert_flip_string(tty, raw->inbuf, count);
-                                tty_flip_buffer_push(tty);
+                                tty_flip_buffer_push(raw->tty);
                                 break;
                         }
                 } else if (req->type == RAW3215_WRITE) {
@@ -441,7 +436,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                     raw->queued_read == NULL) {
                         wake_up_interruptible(&raw->empty_wait);
                 }
-                raw3215_next_io(raw, tty);
+                raw3215_next_io(raw);
                 break;
         default:
                 /* Strange interrupt, I'll do my best to clean up */
@@ -453,10 +448,9 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                         raw->flags &= ~RAW3215_WORKING;
                         raw3215_free_req(req);
                 }
-                raw3215_next_io(raw, tty);
+                raw3215_next_io(raw);
         }
-put_tty:
-        tty_kref_put(tty);
+        return;
 }
 
 /*
@@ -490,7 +484,7 @@ static void raw3215_make_room(struct raw3215_info *raw, unsigned int length)
                 /* While console is frozen for suspend we have no other
                  * choice but to drop message from the buffer to make
                  * room for even more messages. */
-                if (raw->port.flags & ASYNC_SUSPENDED) {
+                if (raw->flags & RAW3215_FROZEN) {
                         raw3215_drop_line(raw);
                         continue;
                 }
@@ -612,10 +606,10 @@ static int raw3215_startup(struct raw3215_info *raw)
 {
         unsigned long flags;
 
-        if (raw->port.flags & ASYNC_INITIALIZED)
+        if (raw->flags & RAW3215_ACTIVE)
                 return 0;
         raw->line_pos = 0;
-        raw->port.flags |= ASYNC_INITIALIZED;
+        raw->flags |= RAW3215_ACTIVE;
         spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
         raw3215_try_io(raw);
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
@@ -631,15 +625,14 @@ static void raw3215_shutdown(struct raw3215_info *raw)
         DECLARE_WAITQUEUE(wait, current);
         unsigned long flags;
 
-        if (!(raw->port.flags & ASYNC_INITIALIZED) ||
-            (raw->flags & RAW3215_FIXED))
+        if (!(raw->flags & RAW3215_ACTIVE) || (raw->flags & RAW3215_FIXED))
                 return;
         /* Wait for outstanding requests, then free irq */
         spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
         if ((raw->flags & RAW3215_WORKING) ||
             raw->queued_write != NULL ||
             raw->queued_read != NULL) {
-                raw->port.flags |= ASYNC_CLOSING;
+                raw->flags |= RAW3215_CLOSING;
                 add_wait_queue(&raw->empty_wait, &wait);
                 set_current_state(TASK_INTERRUPTIBLE);
                 spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
@@ -647,42 +640,11 @@ static void raw3215_shutdown(struct raw3215_info *raw)
                 spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
                 remove_wait_queue(&raw->empty_wait, &wait);
                 set_current_state(TASK_RUNNING);
-                raw->port.flags &= ~(ASYNC_INITIALIZED | ASYNC_CLOSING);
+                raw->flags &= ~(RAW3215_ACTIVE | RAW3215_CLOSING);
         }
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
 }
 
-static struct raw3215_info *raw3215_alloc_info(void)
-{
-        struct raw3215_info *info;
-
-        info = kzalloc(sizeof(struct raw3215_info), GFP_KERNEL | GFP_DMA);
-        if (!info)
-                return NULL;
-
-        info->buffer = kzalloc(RAW3215_BUFFER_SIZE, GFP_KERNEL | GFP_DMA);
-        info->inbuf = kzalloc(RAW3215_INBUF_SIZE, GFP_KERNEL | GFP_DMA);
-        if (!info->buffer || !info->inbuf) {
-                kfree(info);
-                return NULL;
-        }
-
-        setup_timer(&info->timer, raw3215_timeout, (unsigned long)info);
-        init_waitqueue_head(&info->empty_wait);
-        tasklet_init(&info->tlet, raw3215_wakeup, (unsigned long)info);
-        tty_port_init(&info->port);
-
-        return info;
-}
-
-static void raw3215_free_info(struct raw3215_info *raw)
-{
-        kfree(raw->inbuf);
-        kfree(raw->buffer);
-        tty_port_destroy(&raw->port);
-        kfree(raw);
-}
-
 static int raw3215_probe (struct ccw_device *cdev)
 {
         struct raw3215_info *raw;
@@ -691,15 +653,11 @@ static int raw3215_probe (struct ccw_device *cdev)
         /* Console is special. */
         if (raw3215[0] && (raw3215[0] == dev_get_drvdata(&cdev->dev)))
                 return 0;
-
-        raw = raw3215_alloc_info();
+        raw = kmalloc(sizeof(struct raw3215_info) +
+                      RAW3215_INBUF_SIZE, GFP_KERNEL|GFP_DMA);
         if (raw == NULL)
                 return -ENOMEM;
 
-        raw->cdev = cdev;
-        dev_set_drvdata(&cdev->dev, raw);
-        cdev->handler = raw3215_irq;
-
         spin_lock(&raw3215_device_lock);
         for (line = 0; line < NR_3215; line++) {
                 if (!raw3215[line]) {
@@ -709,29 +667,40 @@ static int raw3215_probe (struct ccw_device *cdev)
         }
         spin_unlock(&raw3215_device_lock);
         if (line == NR_3215) {
-                raw3215_free_info(raw);
+                kfree(raw);
                 return -ENODEV;
         }
 
+        raw->cdev = cdev;
+        raw->inbuf = (char *) raw + sizeof(struct raw3215_info);
+        memset(raw, 0, sizeof(struct raw3215_info));
+        raw->buffer = kmalloc(RAW3215_BUFFER_SIZE,
+                                       GFP_KERNEL|GFP_DMA);
+        if (raw->buffer == NULL) {
+                spin_lock(&raw3215_device_lock);
+                raw3215[line] = NULL;
+                spin_unlock(&raw3215_device_lock);
+                kfree(raw);
+                return -ENOMEM;
+        }
+        init_waitqueue_head(&raw->empty_wait);
+
+        dev_set_drvdata(&cdev->dev, raw);
+        cdev->handler = raw3215_irq;
+
         return 0;
 }
 
 static void raw3215_remove (struct ccw_device *cdev)
 {
         struct raw3215_info *raw;
-        unsigned int line;
 
         ccw_device_set_offline(cdev);
         raw = dev_get_drvdata(&cdev->dev);
         if (raw) {
-                spin_lock(&raw3215_device_lock);
-                for (line = 0; line < NR_3215; line++)
-                        if (raw3215[line] == raw)
-                                break;
-                raw3215[line] = NULL;
-                spin_unlock(&raw3215_device_lock);
                 dev_set_drvdata(&cdev->dev, NULL);
-                raw3215_free_info(raw);
+                kfree(raw->buffer);
+                kfree(raw);
         }
 }
 
@@ -768,7 +737,7 @@ static int raw3215_pm_stop(struct ccw_device *cdev)
         raw = dev_get_drvdata(&cdev->dev);
         spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
         raw3215_make_room(raw, RAW3215_BUFFER_SIZE);
-        raw->port.flags |= ASYNC_SUSPENDED;
+        raw->flags |= RAW3215_FROZEN;
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
         return 0;
 }
@@ -781,7 +750,7 @@ static int raw3215_pm_start(struct ccw_device *cdev)
         /* Allow I/O again and flush output buffer. */
         raw = dev_get_drvdata(&cdev->dev);
         spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
-        raw->port.flags &= ~ASYNC_SUSPENDED;
+        raw->flags &= ~RAW3215_FROZEN;
         raw->flags |= RAW3215_FLUSHING;
         raw3215_try_io(raw);
         raw->flags &= ~RAW3215_FLUSHING;
@@ -807,7 +776,6 @@ static struct ccw_driver raw3215_ccw_driver = {
         .freeze         = &raw3215_pm_stop,
         .thaw           = &raw3215_pm_start,
         .restore        = &raw3215_pm_start,
-        .int_class      = IRQIO_C15,
 };
 
 #ifdef CONFIG_TN3215_CONSOLE
@@ -854,7 +822,7 @@ static void con3215_flush(void)
         unsigned long flags;
 
         raw = raw3215[0];  /* console 3215 is the first one */
-        if (raw->port.flags & ASYNC_SUSPENDED)
+        if (raw->flags & RAW3215_FROZEN)
                 /* The console is still frozen for suspend. */
                 if (ccw_device_force_console())
                         /* Forcing didn't work, no panic message .. */
@@ -924,16 +892,22 @@ static int __init con3215_init(void)
         if (IS_ERR(cdev))
                 return -ENODEV;
 
-        raw3215[0] = raw = raw3215_alloc_info();
+        raw3215[0] = raw = (struct raw3215_info *)
+                kzalloc(sizeof(struct raw3215_info), GFP_KERNEL | GFP_DMA);
+        raw->buffer = kzalloc(RAW3215_BUFFER_SIZE, GFP_KERNEL | GFP_DMA);
+        raw->inbuf = kzalloc(RAW3215_INBUF_SIZE, GFP_KERNEL | GFP_DMA);
         raw->cdev = cdev;
         dev_set_drvdata(&cdev->dev, raw);
         cdev->handler = raw3215_irq;
 
         raw->flags |= RAW3215_FIXED;
+        init_waitqueue_head(&raw->empty_wait);
 
         /* Request the console irq */
         if (raw3215_startup(raw) != 0) {
-                raw3215_free_info(raw);
+                kfree(raw->inbuf);
+                kfree(raw->buffer);
+                kfree(raw);
                 raw3215[0] = NULL;
                 return -ENODEV;
         }
@@ -945,19 +919,6 @@ static int __init con3215_init(void)
 console_initcall(con3215_init);
 #endif
 
-static int tty3215_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        struct raw3215_info *raw;
-
-        raw = raw3215[tty->index];
-        if (raw == NULL)
-                return -ENODEV;
-
-        tty->driver_data = raw;
-
-        return tty_port_install(&raw->port, driver, tty);
-}
-
 /*
  * tty3215_open
  *
@@ -965,10 +926,19 @@ static int tty3215_install(struct tty_driver *driver, struct tty_struct *tty)
  */
 static int tty3215_open(struct tty_struct *tty, struct file * filp)
 {
-        struct raw3215_info *raw = tty->driver_data;
-        int retval;
+        struct raw3215_info *raw;
+        int retval, line;
+
+        line = tty->index;
+        if ((line < 0) || (line >= NR_3215))
+                return -ENODEV;
 
-        tty_port_tty_set(&raw->port, tty);
+        raw = raw3215[line];
+        if (raw == NULL)
+                return -ENODEV;
+
+        tty->driver_data = raw;
+        raw->tty = tty;
 
         tty->low_latency = 0;  /* don't use bottom half for pushing chars */
         /*
@@ -997,9 +967,8 @@ static void tty3215_close(struct tty_struct *tty, struct file * filp)
         tty->closing = 1;
         /* Shutdown the terminal */
         raw3215_shutdown(raw);
-        tasklet_kill(&raw->tlet);
         tty->closing = 0;
-        tty_port_tty_set(&raw->port, NULL);
+        raw->tty = NULL;
 }
 
 /*
@@ -1128,7 +1097,6 @@ static void tty3215_start(struct tty_struct *tty)
 }
 
 static const struct tty_operations tty3215_ops = {
-        .install = tty3215_install,
         .open = tty3215_open,
         .close = tty3215_close,
         .write = tty3215_write,
@@ -1170,6 +1138,7 @@ static int __init tty3215_init(void)
          * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc
          */
 
+        driver->owner = THIS_MODULE;
         driver->driver_name = "tty3215";
         driver->name = "ttyS";
         driver->major = TTY_MAJOR;
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index 699fd3e363d..bb07577e8fd 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -35,6 +35,7 @@ static struct raw3270_fn con3270_fn;
  */
 struct con3270 {
         struct raw3270_view view;
+        spinlock_t lock;
         struct list_head freemem;       /* list of free memory for strings. */
 
         /* Output stuff. */
diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c
index 8de2deb176d..0e9a309b966 100644
--- a/drivers/s390/char/ctrlchar.c
+++ b/drivers/s390/char/ctrlchar.c
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/char/ctrlchar.c
  *  Unified handling of special chars.
  *
- *    Copyright IBM Corp. 2001
+ *    Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Fritz Elfert <felfert@millenux.com> <elfert@de.ibm.com>
  *
  */
diff --git a/drivers/s390/char/ctrlchar.h b/drivers/s390/char/ctrlchar.h
index 1a53552f498..935ffa0ea7c 100644
--- a/drivers/s390/char/ctrlchar.h
+++ b/drivers/s390/char/ctrlchar.h
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/char/ctrlchar.c
  *  Unified handling of special chars.
  *
- *    Copyright IBM Corp. 2001
+ *    Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Fritz Elfert <felfert@millenux.com> <elfert@de.ibm.com>
  *
  */
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 911704571b9..f6489eb7e97 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -11,8 +11,6 @@
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/compat.h>
-#include <linux/module.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/types.h>
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 01463b052ae..80658819248 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -1,8 +1,9 @@
 /*
+ *  drivers/s390/char/keyboard.c
  *    ebcdic keycode functions for s390 console drivers
  *
  *  S390 version
- *    Copyright IBM Corp. 2003
+ *    Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  */
 
@@ -198,7 +199,7 @@ handle_diacr(struct kbd_data *kbd, unsigned int ch)
         if (ch == ' ' || ch == d)
                 return d;
 
-        kbd_put_queue(kbd->port, d);
+        kbd_put_queue(kbd->tty, d);
         return ch;
 }
 
@@ -220,7 +221,7 @@ k_self(struct kbd_data *kbd, unsigned char value)
 {
         if (kbd->diacr)
                 value = handle_diacr(kbd, value);
-        kbd_put_queue(kbd->port, value);
+        kbd_put_queue(kbd->tty, value);
 }
 
 /*
@@ -238,7 +239,7 @@ static void
 k_fn(struct kbd_data *kbd, unsigned char value)
 {
         if (kbd->func_table[value])
-                kbd_puts_queue(kbd->port, kbd->func_table[value]);
+                kbd_puts_queue(kbd->tty, kbd->func_table[value]);
 }
 
 static void
@@ -256,20 +257,20 @@ k_spec(struct kbd_data *kbd, unsigned char value)
  * but we need only 16 bits here
  */
 static void
-to_utf8(struct tty_port *port, ushort c)
+to_utf8(struct tty_struct *tty, ushort c) 
 {
         if (c < 0x80)
                 /*  0******* */
-                kbd_put_queue(port, c);
+                kbd_put_queue(tty, c);
         else if (c < 0x800) {
                 /* 110***** 10****** */
-                kbd_put_queue(port, 0xc0 | (c >> 6));
-                kbd_put_queue(port, 0x80 | (c & 0x3f));
+                kbd_put_queue(tty, 0xc0 | (c >> 6));
+                kbd_put_queue(tty, 0x80 | (c & 0x3f));
         } else {
                 /* 1110**** 10****** 10****** */
-                kbd_put_queue(port, 0xe0 | (c >> 12));
-                kbd_put_queue(port, 0x80 | ((c >> 6) & 0x3f));
-                kbd_put_queue(port, 0x80 | (c & 0x3f));
+                kbd_put_queue(tty, 0xe0 | (c >> 12));
+                kbd_put_queue(tty, 0x80 | ((c >> 6) & 0x3f));
+                kbd_put_queue(tty, 0x80 | (c & 0x3f));
         }
 }
 
@@ -282,7 +283,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)
         unsigned short keysym;
         unsigned char type, value;
 
-        if (!kbd)
+        if (!kbd || !kbd->tty)
                 return;
 
         if (keycode >= 384)
@@ -322,7 +323,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)
 #endif
                 (*k_handler[type])(kbd, value);
         } else
-                to_utf8(kbd->port, keysym);
+                to_utf8(kbd->tty, keysym);
 }
 
 /*
@@ -456,7 +457,6 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,
 
 int kbd_ioctl(struct kbd_data *kbd, unsigned int cmd, unsigned long arg)
 {
-        struct tty_struct *tty;
         void __user *argp;
         unsigned int ct;
         int perm;
@@ -467,10 +467,7 @@ int kbd_ioctl(struct kbd_data *kbd, unsigned int cmd, unsigned long arg)
          * To have permissions to do most of the vt ioctls, we either have
          * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
          */
-        tty = tty_port_tty_get(kbd->port);
-        /* FIXME this test is pretty racy */
-        perm = current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG);
-        tty_kref_put(tty);
+        perm = current->signal->tty == kbd->tty || capable(CAP_SYS_TTY_CONFIG);
         switch (cmd) {
         case KDGKBTYPE:
                 return put_user(KB_101, (char __user *)argp);
diff --git a/drivers/s390/char/keyboard.h b/drivers/s390/char/keyboard.h
index d0ae2be5819..7e736aaeae6 100644
--- a/drivers/s390/char/keyboard.h
+++ b/drivers/s390/char/keyboard.h
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/char/keyboard.h
  *    ebcdic keycode functions for s390 console drivers
  *
- *    Copyright IBM Corp. 2003
+ *    Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  */
 
@@ -20,7 +21,7 @@ typedef void (fn_handler_fn)(struct kbd_data *);
  */
 
 struct kbd_data {
-        struct tty_port *port;
+        struct tty_struct *tty;
         unsigned short **key_maps;
         char **func_table;
         fn_handler_fn **fn_handler;
@@ -41,24 +42,16 @@ int kbd_ioctl(struct kbd_data *, unsigned int, unsigned long);
  * Helper Functions.
  */
 static inline void
-kbd_put_queue(struct tty_port *port, int ch)
+kbd_put_queue(struct tty_struct *tty, int ch)
 {
-        struct tty_struct *tty = tty_port_tty_get(port);
-        if (!tty)
-                return;
         tty_insert_flip_char(tty, ch, 0);
         tty_schedule_flip(tty);
-        tty_kref_put(tty);
 }
 
 static inline void
-kbd_puts_queue(struct tty_port *port, char *cp)
+kbd_puts_queue(struct tty_struct *tty, char *cp)
 {
-        struct tty_struct *tty = tty_port_tty_get(port);
-        if (!tty)
-                return;
         while (*cp)
                 tty_insert_flip_char(tty, *cp++, 0);
         tty_schedule_flip(tty);
-        tty_kref_put(tty);
 }
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index f4ff515db25..5b8b8592d31 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -571,11 +571,8 @@ static int __init mon_init(void)
         if (rc)
                 goto out_iucv;
         monreader_device = kzalloc(sizeof(struct device), GFP_KERNEL);
-        if (!monreader_device) {
-                rc = -ENOMEM;
+        if (!monreader_device)
                 goto out_driver;
-        }
-
         dev_set_name(monreader_device, "monreader-dev");
         monreader_device->bus = &iucv_bus;
         monreader_device->parent = iucv_root;
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 9a6c140c5f0..810ac38631c 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -7,6 +7,7 @@
  *     Copyright IBM Corp. 2003, 2009
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -75,7 +76,7 @@ static LIST_HEAD(raw3270_devices);
 static int raw3270_registered;
 
 /* Module parameters */
-static bool tubxcorrect = 0;
+static int tubxcorrect = 0;
 module_param(tubxcorrect, bool, 0);
 
 /*
@@ -329,6 +330,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         struct raw3270_request *rq;
         int rc;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_C70]++;
         rp = dev_get_drvdata(&cdev->dev);
         if (!rp)
                 return;
@@ -1396,7 +1398,6 @@ static struct ccw_driver raw3270_ccw_driver = {
         .freeze         = &raw3270_pm_stop,
         .thaw           = &raw3270_pm_start,
         .restore        = &raw3270_pm_start,
-        .int_class      = IRQIO_C70,
 };
 
 static int
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 12c16a65dd2..eaa7e78186f 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -334,7 +334,7 @@ sclp_dispatch_evbufs(struct sccb_header *sccb)
                         reg->receiver_fn(evbuf);
                         spin_lock_irqsave(&sclp_lock, flags);
                 } else if (reg == NULL)
-                        rc = -EOPNOTSUPP;
+                        rc = -ENOSYS;
         }
         spin_unlock_irqrestore(&sclp_lock, flags);
         return rc;
@@ -393,14 +393,14 @@ __sclp_find_req(u32 sccb)
 /* Handler for external interruption. Perform request post-processing.
  * Prepare read event data request if necessary. Start processing of next
  * request on queue. */
-static void sclp_interrupt_handler(struct ext_code ext_code,
+static void sclp_interrupt_handler(unsigned int ext_int_code,
                                    unsigned int param32, unsigned long param64)
 {
         struct sclp_req *req;
         u32 finished_sccb;
         u32 evbuf_pending;
 
-        inc_irq_stat(IRQEXT_SCP);
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_SCP]++;
         spin_lock(&sclp_lock);
         finished_sccb = param32 & 0xfffffff8;
         evbuf_pending = param32 & 0x3;
@@ -654,6 +654,16 @@ sclp_remove_processed(struct sccb_header *sccb)
 
 EXPORT_SYMBOL(sclp_remove_processed);
 
+struct init_sccb {
+        struct sccb_header header;
+        u16 _reserved;
+        u16 mask_length;
+        sccb_mask_t receive_mask;
+        sccb_mask_t send_mask;
+        sccb_mask_t sclp_receive_mask;
+        sccb_mask_t sclp_send_mask;
+} __attribute__((packed));
+
 /* Prepare init mask request. Called while sclp_lock is locked. */
 static inline void
 __sclp_make_init_req(u32 receive_mask, u32 send_mask)
@@ -808,12 +818,12 @@ EXPORT_SYMBOL(sclp_reactivate);
 
 /* Handler for external interruption used during initialization. Modify
  * request state to done. */
-static void sclp_check_handler(struct ext_code ext_code,
+static void sclp_check_handler(unsigned int ext_int_code,
                                unsigned int param32, unsigned long param64)
 {
         u32 finished_sccb;
 
-        inc_irq_stat(IRQEXT_SCP);
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_SCP]++;
         finished_sccb = param32 & 0xfffffff8;
         /* Is this the interrupt we are waiting for? */
         if (finished_sccb == 0)
diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h
index 25bcd4c0ed8..49a1bb52bc8 100644
--- a/drivers/s390/char/sclp.h
+++ b/drivers/s390/char/sclp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 1999,2012
+ * Copyright IBM Corp. 1999, 2009
  *
  * Author(s): Martin Peschke <mpeschke@de.ibm.com>
  *            Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -88,22 +88,11 @@ struct sccb_header {
         u16     response_code;
 } __attribute__((packed));
 
-struct init_sccb {
-        struct sccb_header header;
-        u16 _reserved;
-        u16 mask_length;
-        sccb_mask_t receive_mask;
-        sccb_mask_t send_mask;
-        sccb_mask_t sclp_receive_mask;
-        sccb_mask_t sclp_send_mask;
-} __attribute__((packed));
-
 extern u64 sclp_facilities;
 #define SCLP_HAS_CHP_INFO       (sclp_facilities & 0x8000000000000000ULL)
 #define SCLP_HAS_CHP_RECONFIG   (sclp_facilities & 0x2000000000000000ULL)
 #define SCLP_HAS_CPU_INFO       (sclp_facilities & 0x0800000000000000ULL)
 #define SCLP_HAS_CPU_RECONFIG   (sclp_facilities & 0x0400000000000000ULL)
-#define SCLP_HAS_PCI_RECONFIG   (sclp_facilities & 0x0000000040000000ULL)
 
 
 struct gds_subvector {
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index c44d13f607b..837e010299a 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2007,2012
+ * Copyright IBM Corp. 2007, 2009
  *
  * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>,
  *            Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
@@ -12,19 +12,15 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/err.h>
-#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/memory.h>
-#include <linux/module.h>
 #include <linux/platform_device.h>
-#include <asm/ctl_reg.h>
 #include <asm/chpid.h>
-#include <asm/setup.h>
-#include <asm/page.h>
 #include <asm/sclp.h>
+#include <asm/setup.h>
 
 #include "sclp.h"
 
@@ -41,8 +37,7 @@ struct read_info_sccb {
         u64     facilities;             /* 48-55 */
         u8      _reserved2[84 - 56];    /* 56-83 */
         u8      fac84;                  /* 84 */
-        u8      fac85;                  /* 85 */
-        u8      _reserved3[91 - 86];    /* 86-90 */
+        u8      _reserved3[91 - 85];    /* 85-90 */
         u8      flags;                  /* 91 */
         u8      _reserved4[100 - 92];   /* 92-99 */
         u32     rnsize2;                /* 100-103 */
@@ -50,13 +45,11 @@ struct read_info_sccb {
         u8      _reserved5[4096 - 112]; /* 112-4095 */
 } __attribute__((packed, aligned(PAGE_SIZE)));
 
-static struct init_sccb __initdata early_event_mask_sccb __aligned(PAGE_SIZE);
 static struct read_info_sccb __initdata early_read_info_sccb;
 static int __initdata early_read_info_sccb_valid;
 
 u64 sclp_facilities;
 static u8 sclp_fac84;
-static u8 sclp_fac85;
 static unsigned long long rzm;
 static unsigned long long rnmax;
 
@@ -68,8 +61,8 @@ static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb)
         rc = sclp_service_call(cmd, sccb);
         if (rc)
                 goto out;
-        __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA |
-                        PSW_MASK_BA | PSW_MASK_EXT | PSW_MASK_WAIT);
+        __load_psw_mask(PSW_BASE_BITS | PSW_MASK_EXT |
+                        PSW_MASK_WAIT | PSW_DEFAULT_KEY);
         local_irq_disable();
 out:
         /* Contents of the sccb might have changed. */
@@ -107,19 +100,6 @@ static void __init sclp_read_info_early(void)
         }
 }
 
-static void __init sclp_event_mask_early(void)
-{
-        struct init_sccb *sccb = &early_event_mask_sccb;
-        int rc;
-
-        do {
-                memset(sccb, 0, sizeof(*sccb));
-                sccb->header.length = sizeof(*sccb);
-                sccb->mask_length = sizeof(sccb_mask_t);
-                rc = sclp_cmd_sync_early(SCLP_CMDW_WRITE_EVENT_MASK, sccb);
-        } while (rc == -EBUSY);
-}
-
 void __init sclp_facilities_detect(void)
 {
         struct read_info_sccb *sccb;
@@ -131,34 +111,9 @@ void __init sclp_facilities_detect(void)
         sccb = &early_read_info_sccb;
         sclp_facilities = sccb->facilities;
         sclp_fac84 = sccb->fac84;
-        sclp_fac85 = sccb->fac85;
         rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;
         rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;
         rzm <<= 20;
-
-        sclp_event_mask_early();
-}
-
-bool __init sclp_has_linemode(void)
-{
-        struct init_sccb *sccb = &early_event_mask_sccb;
-
-        if (sccb->header.response_code != 0x20)
-                return 0;
-        if (sccb->sclp_send_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK))
-                return 1;
-        return 0;
-}
-
-bool __init sclp_has_vt220(void)
-{
-        struct init_sccb *sccb = &early_event_mask_sccb;
-
-        if (sccb->header.response_code != 0x20)
-                return 0;
-        if (sccb->sclp_send_mask & EVTYP_VT220MSG_MASK)
-                return 1;
-        return 0;
 }
 
 unsigned long long sclp_get_rnmax(void)
@@ -171,12 +126,6 @@ unsigned long long sclp_get_rzm(void)
         return rzm;
 }
 
-u8 sclp_get_fac85(void)
-{
-        return sclp_fac85;
-}
-EXPORT_SYMBOL_GPL(sclp_get_fac85);
-
 /*
  * This function will be called after sclp_facilities_detect(), which gets
  * called from early.c code. Therefore the sccb should have valid contents.
@@ -402,15 +351,7 @@ out:
 
 static int sclp_assign_storage(u16 rn)
 {
-        unsigned long long start;
-        int rc;
-
-        rc = do_assign_storage(0x000d0001, rn);
-        if (rc)
-                return rc;
-        start = rn2addr(rn);
-        storage_key_init_range(start, start + rzm);
-        return 0;
+        return do_assign_storage(0x000d0001, rn);
 }
 
 static int sclp_unassign_storage(u16 rn)
@@ -500,8 +441,9 @@ static int sclp_mem_notifier(struct notifier_block *nb,
         start = arg->start_pfn << PAGE_SHIFT;
         size = arg->nr_pages << PAGE_SHIFT;
         mutex_lock(&sclp_mem_mutex);
-        for_each_clear_bit(id, sclp_storage_ids, sclp_max_storage_id + 1)
-                sclp_attach_storage(id);
+        for (id = 0; id <= sclp_max_storage_id; id++)
+                if (!test_bit(id, sclp_storage_ids))
+                        sclp_attach_storage(id);
         switch (action) {
         case MEM_ONLINE:
         case MEM_GOING_OFFLINE:
@@ -702,67 +644,6 @@ __initcall(sclp_detect_standby_memory);
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
 /*
- * PCI I/O adapter configuration related functions.
- */
-#define SCLP_CMDW_CONFIGURE_PCI                 0x001a0001
-#define SCLP_CMDW_DECONFIGURE_PCI               0x001b0001
-
-#define SCLP_RECONFIG_PCI_ATPYE                 2
-
-struct pci_cfg_sccb {
-        struct sccb_header header;
-        u8 atype;               /* adapter type */
-        u8 reserved1;
-        u16 reserved2;
-        u32 aid;                /* adapter identifier */
-} __packed;
-
-static int do_pci_configure(sclp_cmdw_t cmd, u32 fid)
-{
-        struct pci_cfg_sccb *sccb;
-        int rc;
-
-        if (!SCLP_HAS_PCI_RECONFIG)
-                return -EOPNOTSUPP;
-
-        sccb = (struct pci_cfg_sccb *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
-        if (!sccb)
-                return -ENOMEM;
-
-        sccb->header.length = PAGE_SIZE;
-        sccb->atype = SCLP_RECONFIG_PCI_ATPYE;
-        sccb->aid = fid;
-        rc = do_sync_request(cmd, sccb);
-        if (rc)
-                goto out;
-        switch (sccb->header.response_code) {
-        case 0x0020:
-        case 0x0120:
-                break;
-        default:
-                pr_warn("configure PCI I/O adapter failed: cmd=0x%08x  response=0x%04x\n",
-                        cmd, sccb->header.response_code);
-                rc = -EIO;
-                break;
-        }
-out:
-        free_page((unsigned long) sccb);
-        return rc;
-}
-
-int sclp_pci_configure(u32 fid)
-{
-        return do_pci_configure(SCLP_CMDW_CONFIGURE_PCI, fid);
-}
-EXPORT_SYMBOL(sclp_pci_configure);
-
-int sclp_pci_deconfigure(u32 fid)
-{
-        return do_pci_configure(SCLP_CMDW_DECONFIGURE_PCI, fid);
-}
-EXPORT_SYMBOL(sclp_pci_deconfigure);
-
-/*
  * Channel path configuration related functions.
  */
 
diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index 444d36183a2..95b909ac2b7 100644
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/char/sclp_config.c
+ *
  *    Copyright IBM Corp. 2007
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
  */
@@ -9,7 +11,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/cpu.h>
-#include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/workqueue.h>
 #include <asm/smp.h>
 
@@ -29,14 +31,14 @@ static struct work_struct sclp_cpu_change_work;
 static void sclp_cpu_capability_notify(struct work_struct *work)
 {
         int cpu;
-        struct device *dev;
+        struct sys_device *sysdev;
 
         s390_adjust_jiffies();
         pr_warning("cpu capability changed.\n");
         get_online_cpus();
         for_each_online_cpu(cpu) {
-                dev = get_cpu_device(cpu);
-                kobject_uevent(&dev->kobj, KOBJ_CHANGE);
+                sysdev = get_cpu_sysdev(cpu);
+                kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
         }
         put_online_cpus();
 }
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c
index d70d8c20229..5716487b8c9 100644
--- a/drivers/s390/char/sclp_cpi.c
+++ b/drivers/s390/char/sclp_cpi.c
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/sclp_cpi.c
  *    SCLP control programm identification
  *
  *    Copyright IBM Corp. 2001, 2007
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 2acea809e2a..4a51e3f0968 100644
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/sclp_cpi_sys.c
  *    SCLP control program identification sysfs interface
  *
  *    Copyright IBM Corp. 2001, 2007
@@ -20,7 +21,6 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
-#include <linux/export.h>
 #include <asm/ebcdic.h>
 #include <asm/sclp.h>
 
diff --git a/drivers/s390/char/sclp_cpi_sys.h b/drivers/s390/char/sclp_cpi_sys.h
index 65bb6a99c97..deef3e6ff49 100644
--- a/drivers/s390/char/sclp_cpi_sys.h
+++ b/drivers/s390/char/sclp_cpi_sys.h
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/sclp_cpi_sys.h
  *    SCLP control program identification sysfs interface
  *
  *    Copyright IBM Corp. 2007
diff --git a/drivers/s390/char/sclp_ocf.c b/drivers/s390/char/sclp_ocf.c
index 2553db0fdb5..ab294d5a534 100644
--- a/drivers/s390/char/sclp_ocf.c
+++ b/drivers/s390/char/sclp_ocf.c
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/sclp_ocf.c
  *    SCLP OCF communication parameters sysfs interface
  *
  *    Copyright IBM Corp. 2011
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index 475e470d976..a90a02c28d6 100644
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/char/sclp_quiesce.c
  *     signal quiesce handler
  *
- *  Copyright IBM Corp. 1999, 2004
+ *  (C) Copyright IBM Corp. 1999,2004
  *  Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
  *             Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
@@ -14,6 +15,7 @@
 #include <linux/reboot.h>
 #include <linux/atomic.h>
 #include <asm/ptrace.h>
+#include <asm/sigp.h>
 #include <asm/smp.h>
 
 #include "sclp.h"
@@ -28,8 +30,7 @@ static void do_machine_quiesce(void)
         psw_t quiesce_psw;
 
         smp_send_stop();
-        quiesce_psw.mask =
-                PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA | PSW_MASK_WAIT;
+        quiesce_psw.mask = PSW_BASE_BITS | PSW_MASK_WAIT;
         quiesce_psw.addr = 0xfff;
         __load_psw(quiesce_psw);
 }
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index 3b13d58fe87..4be63be7344 100644
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -463,7 +463,7 @@ sclp_emit_buffer(struct sclp_buffer *buffer,
                 /* Use write priority message */
                 sccb->msg_buf.header.type = EVTYP_PMSGCMD;
         else
-                return -EOPNOTSUPP;
+                return -ENOSYS;
         buffer->request.command = SCLP_CMDW_WRITE_EVENT_DATA;
         buffer->request.status = SCLP_REQ_FILLED;
         buffer->request.callback = sclp_writedata_callback;
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index b1032931a1c..fa733ecd3d7 100644
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -1,14 +1,13 @@
 /*
  * Sclp "store data in absolut storage"
  *
- * Copyright IBM Corp. 2003, 2007
+ * Copyright IBM Corp. 2003,2007
  * Author(s): Michael Holzheu
  */
 
 #define KMSG_COMPONENT "sclp_sdias"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/completion.h>
 #include <linux/sched.h>
 #include <asm/sclp.h>
 #include <asm/debug.h>
@@ -63,29 +62,15 @@ struct sdias_sccb {
 } __attribute__((packed));
 
 static struct sdias_sccb sccb __attribute__((aligned(4096)));
-static struct sdias_evbuf sdias_evbuf;
 
-static DECLARE_COMPLETION(evbuf_accepted);
-static DECLARE_COMPLETION(evbuf_done);
+static int sclp_req_done;
+static wait_queue_head_t sdias_wq;
 static DEFINE_MUTEX(sdias_mutex);
 
-/*
- * Called by SCLP base when read event data has been completed (async mode only)
- */
-static void sclp_sdias_receiver_fn(struct evbuf_header *evbuf)
-{
-        memcpy(&sdias_evbuf, evbuf,
-               min_t(unsigned long, sizeof(sdias_evbuf), evbuf->length));
-        complete(&evbuf_done);
-        TRACE("sclp_sdias_receiver_fn done\n");
-}
-
-/*
- * Called by SCLP base when sdias event has been accepted
- */
 static void sdias_callback(struct sclp_req *request, void *data)
 {
-        complete(&evbuf_accepted);
+        sclp_req_done = 1;
+        wake_up(&sdias_wq); /* Inform caller, that request is complete */
         TRACE("callback done\n");
 }
 
@@ -95,6 +80,7 @@ static int sdias_sclp_send(struct sclp_req *req)
         int rc;
 
         for (retries = SDIAS_RETRIES; retries; retries--) {
+                sclp_req_done = 0;
                 TRACE("add request\n");
                 rc = sclp_add_request(req);
                 if (rc) {
@@ -105,31 +91,16 @@ static int sdias_sclp_send(struct sclp_req *req)
                         continue;
                 }
                 /* initiated, wait for completion of service call */
-                wait_for_completion(&evbuf_accepted);
+                wait_event(sdias_wq, (sclp_req_done == 1));
                 if (req->status == SCLP_REQ_FAILED) {
                         TRACE("sclp request failed\n");
+                        rc = -EIO;
                         continue;
                 }
-                /* if not accepted, retry */
-                if (!(sccb.evbuf.hdr.flags & 0x80)) {
-                        TRACE("sclp request failed: flags=%x\n",
-                              sccb.evbuf.hdr.flags);
-                        continue;
-                }
-                /*
-                 * for the sync interface the response is in the initial sccb
-                 */
-                if (!sclp_sdias_register.receiver_fn) {
-                        memcpy(&sdias_evbuf, &sccb.evbuf, sizeof(sdias_evbuf));
-                        TRACE("sync request done\n");
-                        return 0;
-                }
-                /* otherwise we wait for completion */
-                wait_for_completion(&evbuf_done);
                 TRACE("request done\n");
-                return 0;
+                break;
         }
-        return -EIO;
+        return rc;
 }
 
 /*
@@ -169,12 +140,13 @@ int sclp_sdias_blk_count(void)
                 goto out;
         }
 
-        switch (sdias_evbuf.event_status) {
+        switch (sccb.evbuf.event_status) {
                 case 0:
-                        rc = sdias_evbuf.blk_cnt;
+                        rc = sccb.evbuf.blk_cnt;
                         break;
                 default:
-                        pr_err("SCLP error: %x\n", sdias_evbuf.event_status);
+                        pr_err("SCLP error: %x\n",
+                               sccb.evbuf.event_status);
                         rc = -EIO;
                         goto out;
         }
@@ -211,7 +183,7 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)
         sccb.evbuf.event_qual = EQ_STORE_DATA;
         sccb.evbuf.data_id = DI_FCP_DUMP;
         sccb.evbuf.event_id = 4712;
-#ifdef CONFIG_64BIT
+#ifdef __s390x__
         sccb.evbuf.asa_size = ASA_SIZE_64;
 #else
         sccb.evbuf.asa_size = ASA_SIZE_32;
@@ -239,20 +211,18 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)
                 goto out;
         }
 
-        switch (sdias_evbuf.event_status) {
+        switch (sccb.evbuf.event_status) {
                 case EVSTATE_ALL_STORED:
                         TRACE("all stored\n");
-                        break;
                 case EVSTATE_PART_STORED:
-                        TRACE("part stored: %i\n", sdias_evbuf.blk_cnt);
+                        TRACE("part stored: %i\n", sccb.evbuf.blk_cnt);
                         break;
                 case EVSTATE_NO_DATA:
                         TRACE("no data\n");
-                        /* fall through */
                 default:
                         pr_err("Error from SCLP while copying hsa. "
                                "Event status = %x\n",
-                               sdias_evbuf.event_status);
+                               sccb.evbuf.event_status);
                         rc = -EIO;
         }
 out:
@@ -260,50 +230,19 @@ out:
         return rc;
 }
 
-static int __init sclp_sdias_register_check(void)
+int __init sclp_sdias_init(void)
 {
         int rc;
 
-        rc = sclp_register(&sclp_sdias_register);
-        if (rc)
-                return rc;
-        if (sclp_sdias_blk_count() == 0) {
-                sclp_unregister(&sclp_sdias_register);
-                return -ENODEV;
-        }
-        return 0;
-}
-
-static int __init sclp_sdias_init_sync(void)
-{
-        TRACE("Try synchronous mode\n");
-        sclp_sdias_register.receive_mask = 0;
-        sclp_sdias_register.receiver_fn = NULL;
-        return sclp_sdias_register_check();
-}
-
-static int __init sclp_sdias_init_async(void)
-{
-        TRACE("Try asynchronous mode\n");
-        sclp_sdias_register.receive_mask = EVTYP_SDIAS_MASK;
-        sclp_sdias_register.receiver_fn = sclp_sdias_receiver_fn;
-        return sclp_sdias_register_check();
-}
-
-int __init sclp_sdias_init(void)
-{
         if (ipl_info.type != IPL_TYPE_FCP_DUMP)
                 return 0;
         sdias_dbf = debug_register("dump_sdias", 4, 1, 4 * sizeof(long));
         debug_register_view(sdias_dbf, &debug_sprintf_view);
         debug_set_level(sdias_dbf, 6);
-        if (sclp_sdias_init_sync() == 0)
-                goto out;
-        if (sclp_sdias_init_async() == 0)
-                goto out;
-        TRACE("init failed\n");
-        return -ENODEV;
-out:
+        rc = sclp_register(&sclp_sdias_register);
+        if (rc)
+                return rc;
+        init_waitqueue_head(&sdias_wq);
         TRACE("init done\n");
         return 0;
 }
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 877fbc37c1e..a879c139926 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -1,8 +1,9 @@
 /*
+ *  drivers/s390/char/sclp_tty.c
  *    SCLP line mode terminal driver.
  *
  *  S390 version
- *    Copyright IBM Corp. 1999
+ *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Martin Peschke <mpeschke@de.ibm.com>
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
  */
@@ -47,7 +48,7 @@ static struct sclp_buffer *sclp_ttybuf;
 /* Timer for delayed output of console messages. */
 static struct timer_list sclp_tty_timer;
 
-static struct tty_port sclp_port;
+static struct tty_struct *sclp_tty;
 static unsigned char sclp_tty_chars[SCLP_TTY_BUF_SIZE];
 static unsigned short int sclp_tty_chars_count;
 
@@ -63,7 +64,7 @@ static int sclp_tty_columns = 80;
 static int
 sclp_tty_open(struct tty_struct *tty, struct file *filp)
 {
-        tty_port_tty_set(&sclp_port, tty);
+        sclp_tty = tty;
         tty->driver_data = NULL;
         tty->low_latency = 0;
         return 0;
@@ -75,7 +76,7 @@ sclp_tty_close(struct tty_struct *tty, struct file *filp)
 {
         if (tty->count > 1)
                 return;
-        tty_port_tty_set(&sclp_port, NULL);
+        sclp_tty = NULL;
 }
 
 /*
@@ -107,7 +108,6 @@ sclp_tty_write_room (struct tty_struct *tty)
 static void
 sclp_ttybuf_callback(struct sclp_buffer *buffer, int rc)
 {
-        struct tty_struct *tty;
         unsigned long flags;
         void *page;
 
@@ -126,10 +126,8 @@ sclp_ttybuf_callback(struct sclp_buffer *buffer, int rc)
                 spin_unlock_irqrestore(&sclp_tty_lock, flags);
         } while (buffer && sclp_emit_buffer(buffer, sclp_ttybuf_callback));
         /* check if the tty needs a wake up call */
-        tty = tty_port_tty_get(&sclp_port);
-        if (tty != NULL) {
-                tty_wakeup(tty);
-                tty_kref_put(tty);
+        if (sclp_tty != NULL) {
+                tty_wakeup(sclp_tty);
         }
 }
 
@@ -328,22 +326,21 @@ sclp_tty_flush_buffer(struct tty_struct *tty)
 static void
 sclp_tty_input(unsigned char* buf, unsigned int count)
 {
-        struct tty_struct *tty = tty_port_tty_get(&sclp_port);
         unsigned int cchar;
 
         /*
          * If this tty driver is currently closed
          * then throw the received input away.
          */
-        if (tty == NULL)
+        if (sclp_tty == NULL)
                 return;
-        cchar = ctrlchar_handle(buf, count, tty);
+        cchar = ctrlchar_handle(buf, count, sclp_tty);
         switch (cchar & CTRLCHAR_MASK) {
         case CTRLCHAR_SYSRQ:
                 break;
         case CTRLCHAR_CTRL:
-                tty_insert_flip_char(tty, cchar, TTY_NORMAL);
-                tty_flip_buffer_push(tty);
+                tty_insert_flip_char(sclp_tty, cchar, TTY_NORMAL);
+                tty_flip_buffer_push(sclp_tty);
                 break;
         case CTRLCHAR_NONE:
                 /* send (normal) input to line discipline */
@@ -351,14 +348,13 @@ sclp_tty_input(unsigned char* buf, unsigned int count)
                     (strncmp((const char *) buf + count - 2, "^n", 2) &&
                      strncmp((const char *) buf + count - 2, "\252n", 2))) {
                         /* add the auto \n */
-                        tty_insert_flip_string(tty, buf, count);
-                        tty_insert_flip_char(tty, '\n', TTY_NORMAL);
+                        tty_insert_flip_string(sclp_tty, buf, count);
+                        tty_insert_flip_char(sclp_tty, '\n', TTY_NORMAL);
                 } else
-                        tty_insert_flip_string(tty, buf, count - 2);
-                tty_flip_buffer_push(tty);
+                        tty_insert_flip_string(sclp_tty, buf, count - 2);
+                tty_flip_buffer_push(sclp_tty);
                 break;
         }
-        tty_kref_put(tty);
 }
 
 /*
@@ -547,6 +543,7 @@ sclp_tty_init(void)
                 sclp_tty_tolower = 1;
         }
         sclp_tty_chars_count = 0;
+        sclp_tty = NULL;
 
         rc = sclp_register(&sclp_input_event);
         if (rc) {
@@ -554,8 +551,7 @@ sclp_tty_init(void)
                 return rc;
         }
 
-        tty_port_init(&sclp_port);
-
+        driver->owner = THIS_MODULE;
         driver->driver_name = "sclp_line";
         driver->name = "sclp_line";
         driver->major = TTY_MAJOR;
@@ -568,11 +564,9 @@ sclp_tty_init(void)
         driver->init_termios.c_lflag = ISIG | ECHO;
         driver->flags = TTY_DRIVER_REAL_RAW;
         tty_set_operations(driver, &sclp_ops);
-        tty_port_link_device(&sclp_port, driver, 0);
         rc = tty_register_driver(driver);
         if (rc) {
                 put_tty_driver(driver);
-                tty_port_destroy(&sclp_port);
                 return rc;
         }
         sclp_tty_driver = driver;
diff --git a/drivers/s390/char/sclp_tty.h b/drivers/s390/char/sclp_tty.h
index c8773421c31..4b965b22fec 100644
--- a/drivers/s390/char/sclp_tty.h
+++ b/drivers/s390/char/sclp_tty.h
@@ -1,8 +1,9 @@
 /*
+ *  drivers/s390/char/sclp_tty.h
  *    interface to the SCLP-read/write driver
  *
  *  S390 version
- *    Copyright IBM Corp. 1999
+ *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Martin Peschke <mpeschke@de.ibm.com>
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
  */
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index effcc8756e0..5d706e6c946 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -34,6 +34,7 @@
 #define SCLP_VT220_DEVICE_NAME          "ttysclp"
 #define SCLP_VT220_CONSOLE_NAME         "ttyS"
 #define SCLP_VT220_CONSOLE_INDEX        1       /* console=ttyS1 */
+#define SCLP_VT220_BUF_SIZE             80
 
 /* Representation of a single write request */
 struct sclp_vt220_request {
@@ -55,7 +56,8 @@ struct sclp_vt220_sccb {
 /* Structures and data needed to register tty driver */
 static struct tty_driver *sclp_vt220_driver;
 
-static struct tty_port sclp_vt220_port;
+/* The tty_struct that the kernel associated with us */
+static struct tty_struct *sclp_vt220_tty;
 
 /* Lock to protect internal data from concurrent access */
 static spinlock_t sclp_vt220_lock;
@@ -114,7 +116,6 @@ static struct sclp_register sclp_vt220_register = {
 static void
 sclp_vt220_process_queue(struct sclp_vt220_request *request)
 {
-        struct tty_struct *tty;
         unsigned long flags;
         void *page;
 
@@ -140,10 +141,8 @@ sclp_vt220_process_queue(struct sclp_vt220_request *request)
         if (request == NULL && sclp_vt220_flush_later)
                 sclp_vt220_emit_current();
         /* Check if the tty needs a wake up call */
-        tty = tty_port_tty_get(&sclp_vt220_port);
-        if (tty) {
-                tty_wakeup(tty);
-                tty_kref_put(tty);
+        if (sclp_vt220_tty != NULL) {
+                tty_wakeup(sclp_vt220_tty);
         }
 }
 
@@ -461,12 +460,11 @@ sclp_vt220_write(struct tty_struct *tty, const unsigned char *buf, int count)
 static void
 sclp_vt220_receiver_fn(struct evbuf_header *evbuf)
 {
-        struct tty_struct *tty = tty_port_tty_get(&sclp_vt220_port);
         char *buffer;
         unsigned int count;
 
         /* Ignore input if device is not open */
-        if (tty == NULL)
+        if (sclp_vt220_tty == NULL)
                 return;
 
         buffer = (char *) ((addr_t) evbuf + sizeof(struct evbuf_header));
@@ -480,11 +478,10 @@ sclp_vt220_receiver_fn(struct evbuf_header *evbuf)
                 /* Send input to line discipline */
                 buffer++;
                 count--;
-                tty_insert_flip_string(tty, buffer, count);
-                tty_flip_buffer_push(tty);
+                tty_insert_flip_string(sclp_vt220_tty, buffer, count);
+                tty_flip_buffer_push(sclp_vt220_tty);
                 break;
         }
-        tty_kref_put(tty);
 }
 
 /*
@@ -494,7 +491,10 @@ static int
 sclp_vt220_open(struct tty_struct *tty, struct file *filp)
 {
         if (tty->count == 1) {
-                tty_port_tty_set(&sclp_vt220_port, tty);
+                sclp_vt220_tty = tty;
+                tty->driver_data = kmalloc(SCLP_VT220_BUF_SIZE, GFP_KERNEL);
+                if (tty->driver_data == NULL)
+                        return -ENOMEM;
                 tty->low_latency = 0;
                 if (!tty->winsize.ws_row && !tty->winsize.ws_col) {
                         tty->winsize.ws_row = 24;
@@ -510,8 +510,11 @@ sclp_vt220_open(struct tty_struct *tty, struct file *filp)
 static void
 sclp_vt220_close(struct tty_struct *tty, struct file *filp)
 {
-        if (tty->count == 1)
-                tty_port_tty_set(&sclp_vt220_port, NULL);
+        if (tty->count == 1) {
+                sclp_vt220_tty = NULL;
+                kfree(tty->driver_data);
+                tty->driver_data = NULL;
+        }
 }
 
 /*
@@ -615,7 +618,6 @@ static void __init __sclp_vt220_cleanup(void)
                 return;
         sclp_unregister(&sclp_vt220_register);
         __sclp_vt220_free_pages();
-        tty_port_destroy(&sclp_vt220_port);
 }
 
 /* Allocate buffer pages and register with sclp core. Controlled by init
@@ -633,9 +635,9 @@ static int __init __sclp_vt220_init(int num_pages)
         INIT_LIST_HEAD(&sclp_vt220_empty);
         INIT_LIST_HEAD(&sclp_vt220_outqueue);
         init_timer(&sclp_vt220_timer);
-        tty_port_init(&sclp_vt220_port);
         sclp_vt220_current_request = NULL;
         sclp_vt220_buffered_chars = 0;
+        sclp_vt220_tty = NULL;
         sclp_vt220_flush_later = 0;
 
         /* Allocate pages for output buffering */
@@ -651,7 +653,6 @@ out:
         if (rc) {
                 __sclp_vt220_free_pages();
                 sclp_vt220_init_count--;
-                tty_port_destroy(&sclp_vt220_port);
         }
         return rc;
 }
@@ -684,6 +685,7 @@ static int __init sclp_vt220_tty_init(void)
         if (rc)
                 goto out_driver;
 
+        driver->owner = THIS_MODULE;
         driver->driver_name = SCLP_VT220_DRIVER_NAME;
         driver->name = SCLP_VT220_DEVICE_NAME;
         driver->major = SCLP_VT220_MAJOR;
@@ -693,7 +695,6 @@ static int __init sclp_vt220_tty_init(void)
         driver->init_termios = tty_std_termios;
         driver->flags = TTY_DRIVER_REAL_RAW;
         tty_set_operations(driver, &sclp_vt220_ops);
-        tty_port_link_device(&sclp_vt220_port, driver, 0);
 
         rc = tty_register_driver(driver);
         if (rc)
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h
index ea664dd4f56..267b54e8ff5 100644
--- a/drivers/s390/char/tape.h
+++ b/drivers/s390/char/tape.h
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/tape.h
  *    tape device driver for 3480/3490E/3590 tapes.
  *
  *  S390 and zSeries version
@@ -15,6 +16,7 @@
 #include <asm/ccwdev.h>
 #include <asm/debug.h>
 #include <asm/idals.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mtio.h>
@@ -152,6 +154,12 @@ struct tape_discipline {
         struct tape_request *(*read_block)(struct tape_device *, size_t);
         struct tape_request *(*write_block)(struct tape_device *, size_t);
         void (*process_eov)(struct tape_device*);
+#ifdef CONFIG_S390_TAPE_BLOCK
+        /* Block device stuff. */
+        struct tape_request *(*bread)(struct tape_device *, struct request *);
+        void (*check_locate)(struct tape_device *, struct tape_request *);
+        void (*free_bread)(struct tape_request *);
+#endif
         /* ioctl function for additional ioctls. */
         int (*ioctl_fn)(struct tape_device *, unsigned int, unsigned long);
         /* Array of tape commands with TAPE_NR_MTOPS entries */
@@ -174,6 +182,26 @@ struct tape_char_data {
         int block_size;                 /*   of size block_size. */
 };
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+/* Block Frontend Data */
+struct tape_blk_data
+{
+        struct tape_device *    device;
+        /* Block device request queue. */
+        struct request_queue *  request_queue;
+        spinlock_t              request_queue_lock;
+
+        /* Task to move entries from block request to CCS request queue. */
+        struct work_struct      requeue_task;
+        atomic_t                requeue_scheduled;
+
+        /* Current position on the tape. */
+        long                    block_position;
+        int                     medium_changed;
+        struct gendisk *        disk;
+};
+#endif
+
 /* Tape Info */
 struct tape_device {
         /* entry in tape_device_list */
@@ -220,6 +248,10 @@ struct tape_device {
 
         /* Character device frontend data */
         struct tape_char_data           char_data;
+#ifdef CONFIG_S390_TAPE_BLOCK
+        /* Block dev frontend data */
+        struct tape_blk_data            blk_data;
+#endif
 
         /* Function to start or stop the next request later. */
         struct delayed_work             tape_dnr;
@@ -281,6 +313,19 @@ extern void tapechar_exit(void);
 extern int  tapechar_setup_device(struct tape_device *);
 extern void tapechar_cleanup_device(struct tape_device *);
 
+/* Externals from tape_block.c */
+#ifdef CONFIG_S390_TAPE_BLOCK
+extern int tapeblock_init (void);
+extern void tapeblock_exit(void);
+extern int tapeblock_setup_device(struct tape_device *);
+extern void tapeblock_cleanup_device(struct tape_device *);
+#else
+static inline int tapeblock_init (void) {return 0;}
+static inline void tapeblock_exit (void) {;}
+static inline int tapeblock_setup_device(struct tape_device *t) {return 0;}
+static inline void tapeblock_cleanup_device (struct tape_device *t) {;}
+#endif
+
 /* tape initialisation functions */
 #ifdef CONFIG_PROC_FS
 extern void tape_proc_init (void);
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 9aa79702b37..9eff2df70dd 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/tape_34xx.c
  *    tape device discipline for 3480/3490 tapes.
  *
  *    Copyright IBM Corp. 2001, 2009
@@ -322,6 +323,20 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
         inhibit_cu_recovery = (*device->modeset_byte & 0x80) ? 1 : 0;
         sense = irb->ecw;
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+        if (request->op == TO_BLOCK) {
+                /*
+                 * Recovery for block device requests. Set the block_position
+                 * to something invalid and retry.
+                 */
+                device->blk_data.block_position = -1;
+                if (request->retries-- <= 0)
+                        return tape_34xx_erp_failed(request, -EIO);
+                else
+                        return tape_34xx_erp_retry(request);
+        }
+#endif
+
         if (
                 sense[0] & SENSE_COMMAND_REJECT &&
                 sense[1] & SENSE_WRITE_PROTECT
@@ -1114,6 +1129,123 @@ tape_34xx_mtseek(struct tape_device *device, int mt_count)
         return tape_do_io_free(device, request);
 }
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+/*
+ * Tape block read for 34xx.
+ */
+static struct tape_request *
+tape_34xx_bread(struct tape_device *device, struct request *req)
+{
+        struct tape_request *request;
+        struct ccw1 *ccw;
+        int count = 0;
+        unsigned off;
+        char *dst;
+        struct bio_vec *bv;
+        struct req_iterator iter;
+        struct tape_34xx_block_id *     start_block;
+
+        DBF_EVENT(6, "xBREDid:");
+
+        /* Count the number of blocks for the request. */
+        rq_for_each_segment(bv, req, iter)
+                count += bv->bv_len >> (TAPEBLOCK_HSEC_S2B + 9);
+
+        /* Allocate the ccw request. */
+        request = tape_alloc_request(3+count+1, 8);
+        if (IS_ERR(request))
+                return request;
+
+        /* Setup ccws. */
+        request->op = TO_BLOCK;
+        start_block = (struct tape_34xx_block_id *) request->cpdata;
+        start_block->block = blk_rq_pos(req) >> TAPEBLOCK_HSEC_S2B;
+        DBF_EVENT(6, "start_block = %i\n", start_block->block);
+
+        ccw = request->cpaddr;
+        ccw = tape_ccw_cc(ccw, MODE_SET_DB, 1, device->modeset_byte);
+
+        /*
+         * We always setup a nop after the mode set ccw. This slot is
+         * used in tape_std_check_locate to insert a locate ccw if the
+         * current tape position doesn't match the start block to be read.
+         * The second nop will be filled with a read block id which is in
+         * turn used by tape_34xx_free_bread to populate the segment bid
+         * table.
+         */
+        ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
+        ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
+
+        rq_for_each_segment(bv, req, iter) {
+                dst = kmap(bv->bv_page) + bv->bv_offset;
+                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
+                        ccw->flags = CCW_FLAG_CC;
+                        ccw->cmd_code = READ_FORWARD;
+                        ccw->count = TAPEBLOCK_HSEC_SIZE;
+                        set_normalized_cda(ccw, (void*) __pa(dst));
+                        ccw++;
+                        dst += TAPEBLOCK_HSEC_SIZE;
+                }
+        }
+
+        ccw = tape_ccw_end(ccw, NOP, 0, NULL);
+        DBF_EVENT(6, "xBREDccwg\n");
+        return request;
+}
+
+static void
+tape_34xx_free_bread (struct tape_request *request)
+{
+        struct ccw1* ccw;
+
+        ccw = request->cpaddr;
+        if ((ccw + 2)->cmd_code == READ_BLOCK_ID) {
+                struct {
+                        struct tape_34xx_block_id       cbid;
+                        struct tape_34xx_block_id       dbid;
+                } __attribute__ ((packed)) *rbi_data;
+
+                rbi_data = request->cpdata;
+
+                if (request->device)
+                        tape_34xx_add_sbid(request->device, rbi_data->cbid);
+        }
+
+        /* Last ccw is a nop and doesn't need clear_normalized_cda */
+        for (; ccw->flags & CCW_FLAG_CC; ccw++)
+                if (ccw->cmd_code == READ_FORWARD)
+                        clear_normalized_cda(ccw);
+        tape_free_request(request);
+}
+
+/*
+ * check_locate is called just before the tape request is passed to
+ * the common io layer for execution. It has to check the current
+ * tape position and insert a locate ccw if it doesn't match the
+ * start block for the request.
+ */
+static void
+tape_34xx_check_locate(struct tape_device *device, struct tape_request *request)
+{
+        struct tape_34xx_block_id *     start_block;
+
+        start_block = (struct tape_34xx_block_id *) request->cpdata;
+        if (start_block->block == device->blk_data.block_position)
+                return;
+
+        DBF_LH(4, "Block seek(%06d+%06d)\n", start_block->block, device->bof);
+        start_block->wrap    = 0;
+        start_block->segment = 1;
+        start_block->format  = (*device->modeset_byte & 0x08) ?
+                                TAPE34XX_FMT_3480_XF :
+                                TAPE34XX_FMT_3480;
+        start_block->block   = start_block->block + device->bof;
+        tape_34xx_merge_sbid(device, start_block);
+        tape_ccw_cc(request->cpaddr + 1, LOCATE, 4, request->cpdata);
+        tape_ccw_cc(request->cpaddr + 2, READ_BLOCK_ID, 8, request->cpdata);
+}
+#endif
+
 /*
  * List of 3480/3490 magnetic tape commands.
  */
@@ -1163,6 +1295,11 @@ static struct tape_discipline tape_discipline_34xx = {
         .irq = tape_34xx_irq,
         .read_block = tape_std_read_block,
         .write_block = tape_std_write_block,
+#ifdef CONFIG_S390_TAPE_BLOCK
+        .bread = tape_34xx_bread,
+        .free_bread = tape_34xx_free_bread,
+        .check_locate = tape_34xx_check_locate,
+#endif
         .ioctl_fn = tape_34xx_ioctl,
         .mtop_array = tape_34xx_mtop
 };
@@ -1193,7 +1330,6 @@ static struct ccw_driver tape_34xx_driver = {
         .set_online = tape_34xx_online,
         .set_offline = tape_generic_offline,
         .freeze = tape_generic_pm_suspend,
-        .int_class = IRQIO_TAP,
 };
 
 static int
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 327cb19ad0b..a7d57072888 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/tape_3590.c
  *    tape device discipline for 3590 tapes.
  *
  *    Copyright IBM Corp. 2001, 2009
@@ -669,6 +670,92 @@ tape_3590_schedule_work(struct tape_device *device, enum tape_op op)
         return 0;
 }
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+/*
+ * Tape Block READ
+ */
+static struct tape_request *
+tape_3590_bread(struct tape_device *device, struct request *req)
+{
+        struct tape_request *request;
+        struct ccw1 *ccw;
+        int count = 0, start_block;
+        unsigned off;
+        char *dst;
+        struct bio_vec *bv;
+        struct req_iterator iter;
+
+        DBF_EVENT(6, "xBREDid:");
+        start_block = blk_rq_pos(req) >> TAPEBLOCK_HSEC_S2B;
+        DBF_EVENT(6, "start_block = %i\n", start_block);
+
+        rq_for_each_segment(bv, req, iter)
+                count += bv->bv_len >> (TAPEBLOCK_HSEC_S2B + 9);
+
+        request = tape_alloc_request(2 + count + 1, 4);
+        if (IS_ERR(request))
+                return request;
+        request->op = TO_BLOCK;
+        *(__u32 *) request->cpdata = start_block;
+        ccw = request->cpaddr;
+        ccw = tape_ccw_cc(ccw, MODE_SET_DB, 1, device->modeset_byte);
+
+        /*
+         * We always setup a nop after the mode set ccw. This slot is
+         * used in tape_std_check_locate to insert a locate ccw if the
+         * current tape position doesn't match the start block to be read.
+         */
+        ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
+
+        rq_for_each_segment(bv, req, iter) {
+                dst = page_address(bv->bv_page) + bv->bv_offset;
+                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
+                        ccw->flags = CCW_FLAG_CC;
+                        ccw->cmd_code = READ_FORWARD;
+                        ccw->count = TAPEBLOCK_HSEC_SIZE;
+                        set_normalized_cda(ccw, (void *) __pa(dst));
+                        ccw++;
+                        dst += TAPEBLOCK_HSEC_SIZE;
+                }
+                BUG_ON(off > bv->bv_len);
+        }
+        ccw = tape_ccw_end(ccw, NOP, 0, NULL);
+        DBF_EVENT(6, "xBREDccwg\n");
+        return request;
+}
+
+static void
+tape_3590_free_bread(struct tape_request *request)
+{
+        struct ccw1 *ccw;
+
+        /* Last ccw is a nop and doesn't need clear_normalized_cda */
+        for (ccw = request->cpaddr; ccw->flags & CCW_FLAG_CC; ccw++)
+                if (ccw->cmd_code == READ_FORWARD)
+                        clear_normalized_cda(ccw);
+        tape_free_request(request);
+}
+
+/*
+ * check_locate is called just before the tape request is passed to
+ * the common io layer for execution. It has to check the current
+ * tape position and insert a locate ccw if it doesn't match the
+ * start block for the request.
+ */
+static void
+tape_3590_check_locate(struct tape_device *device, struct tape_request *request)
+{
+        __u32 *start_block;
+
+        start_block = (__u32 *) request->cpdata;
+        if (*start_block != device->blk_data.block_position) {
+                /* Add the start offset of the file to get the real block. */
+                *start_block += device->bof;
+                tape_ccw_cc(request->cpaddr + 1, LOCATE, 4, request->cpdata);
+        }
+}
+#endif
+
 static void tape_3590_med_state_set(struct tape_device *device,
                                     struct tape_3590_med_sense *sense)
 {
@@ -1336,6 +1423,20 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
 {
         struct tape_3590_sense *sense;
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+        if (request->op == TO_BLOCK) {
+                /*
+                 * Recovery for block device requests. Set the block_position
+                 * to something invalid and retry.
+                 */
+                device->blk_data.block_position = -1;
+                if (request->retries-- <= 0)
+                        return tape_3590_erp_failed(device, request, irb, -EIO);
+                else
+                        return tape_3590_erp_retry(device, request, irb);
+        }
+#endif
+
         sense = (struct tape_3590_sense *) irb->ecw;
 
         DBF_EVENT(6, "Unit Check: RQC = %x\n", sense->rc_rqc);
@@ -1628,6 +1729,11 @@ static struct tape_discipline tape_discipline_3590 = {
         .irq = tape_3590_irq,
         .read_block = tape_std_read_block,
         .write_block = tape_std_write_block,
+#ifdef CONFIG_S390_TAPE_BLOCK
+        .bread = tape_3590_bread,
+        .free_bread = tape_3590_free_bread,
+        .check_locate = tape_3590_check_locate,
+#endif
         .ioctl_fn = tape_3590_ioctl,
         .mtop_array = tape_3590_mtop
 };
@@ -1656,7 +1762,6 @@ static struct ccw_driver tape_3590_driver = {
         .set_offline = tape_generic_offline,
         .set_online = tape_3590_online,
         .freeze = tape_generic_pm_suspend,
-        .int_class = IRQIO_TAP,
 };
 
 /*
diff --git a/drivers/s390/char/tape_3590.h b/drivers/s390/char/tape_3590.h
index 36b759e89d2..4534055f137 100644
--- a/drivers/s390/char/tape_3590.h
+++ b/drivers/s390/char/tape_3590.h
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/char/tape_3590.h
  *    tape device discipline for 3590 tapes.
  *
- *    Copyright IBM Corp. 2001, 2006
+ *    Copyright IBM Corp. 2001,2006
  *    Author(s): Stefan Bader <shbader@de.ibm.com>
  *               Michael Holzheu <holzheu@de.ibm.com>
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 2d61db3fc62..87cd0ab242d 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -1,8 +1,9 @@
 /*
+ *  drivers/s390/char/tape_char.c
  *    character device frontend for tape device driver
  *
  *  S390 and zSeries version
- *    Copyright IBM Corp. 2001, 2006
+ *    Copyright IBM Corp. 2001,2006
  *    Author(s): Carsten Otte <cotte@de.ibm.com>
  *               Michael Holzheu <holzheu@de.ibm.com>
  *               Tuan Ngo-Anh <ngoanh@de.ibm.com>
@@ -160,6 +161,11 @@ tapechar_read(struct file *filp, char __user *data, size_t count, loff_t *ppos)
         if (rc)
                 return rc;
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+        /* Changes position. */
+        device->blk_data.medium_changed = 1;
+#endif
+
         DBF_EVENT(6, "TCHAR:nbytes: %lx\n", block_size);
         /* Let the discipline build the ccw chain. */
         request = device->discipline->read_block(device, block_size);
@@ -212,6 +218,11 @@ tapechar_write(struct file *filp, const char __user *data, size_t count, loff_t
         if (rc)
                 return rc;
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+        /* Changes position. */
+        device->blk_data.medium_changed = 1;
+#endif
+
         DBF_EVENT(6,"TCHAR:nbytes: %lx\n", block_size);
         DBF_EVENT(6, "TCHAR:nblocks: %x\n", nblocks);
         /* Let the discipline build the ccw chain. */
@@ -368,6 +379,9 @@ __tapechar_ioctl(struct tape_device *device,
                         case MTBSFM:
                         case MTFSFM:
                         case MTSEEK:
+#ifdef CONFIG_S390_TAPE_BLOCK
+                                device->blk_data.medium_changed = 1;
+#endif
                                 if (device->required_tapemarks)
                                         tape_std_terminate_write(device);
                         default:
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 54b3c79203f..55343df61ed 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -1,5 +1,6 @@
 /*
- * Copyright IBM Corp. 2004
+ * (C) Copyright IBM Corp. 2004
+ * tape_class.c
  *
  * Tape class device support
  *
@@ -16,7 +17,7 @@
 
 MODULE_AUTHOR("Stefan Bader <shbader@de.ibm.com>");
 MODULE_DESCRIPTION(
-        "Copyright IBM Corp. 2004   All Rights Reserved.\n"
+        "(C) Copyright IBM Corp. 2004   All Rights Reserved.\n"
         "tape_class.c"
 );
 MODULE_LICENSE("GPL");
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h
index a332c10d50a..9e32780c317 100644
--- a/drivers/s390/char/tape_class.h
+++ b/drivers/s390/char/tape_class.h
@@ -1,5 +1,6 @@
 /*
- * Copyright IBM Corp. 2004   All Rights Reserved.
+ * (C) Copyright IBM Corp. 2004   All Rights Reserved.
+ * tape_class.h
  *
  * Tape class device support
  *
@@ -13,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/major.h>
+#include <linux/kobj_map.h>
 #include <linux/cdev.h>
 
 #include <linux/device.h>
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index f3b5123faf0..7978a0adeaf 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/char/tape_core.c
  *    basic function of the tape device driver
  *
  *  S390 and zSeries version
@@ -13,6 +14,7 @@
 #define KMSG_COMPONENT "tape"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/init.h>      // for kernel parameters
 #include <linux/kmod.h>      // for requesting modules
@@ -400,6 +402,9 @@ tape_generic_online(struct tape_device *device,
         rc = tapechar_setup_device(device);
         if (rc)
                 goto out_minor;
+        rc = tapeblock_setup_device(device);
+        if (rc)
+                goto out_char;
 
         tape_state_set(device, TS_UNUSED);
 
@@ -407,6 +412,8 @@ tape_generic_online(struct tape_device *device,
 
         return 0;
 
+out_char:
+        tapechar_cleanup_device(device);
 out_minor:
         tape_remove_minor(device);
 out_discipline:
@@ -420,6 +427,7 @@ out:
 static void
 tape_cleanup_device(struct tape_device *device)
 {
+        tapeblock_cleanup_device(device);
         tapechar_cleanup_device(device);
         device->discipline->cleanup_device(device);
         module_put(device->discipline->owner);
@@ -778,6 +786,10 @@ __tape_start_io(struct tape_device *device, struct tape_request *request)
 {
         int rc;
 
+#ifdef CONFIG_S390_TAPE_BLOCK
+        if (request->op == TO_BLOCK)
+                device->discipline->check_locate(device, request);
+#endif
         rc = ccw_device_start(
                 device->cdev,
                 request->cpaddr,
@@ -1103,6 +1115,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         struct tape_request *request;
         int rc;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_TAP]++;
         device = dev_get_drvdata(&cdev->dev);
         if (device == NULL) {
                 return;
@@ -1242,7 +1255,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 }
 
 /*
- * Tape device open function used by tape_char frontend.
+ * Tape device open function used by tape_char & tape_block frontends.
  */
 int
 tape_open(struct tape_device *device)
@@ -1272,7 +1285,7 @@ tape_open(struct tape_device *device)
 }
 
 /*
- * Tape device release function used by tape_char frontend.
+ * Tape device release function used by tape_char & tape_block frontends.
  */
 int
 tape_release(struct tape_device *device)
@@ -1333,6 +1346,7 @@ tape_init (void)
         DBF_EVENT(3, "tape init\n");
         tape_proc_init();
         tapechar_init ();
+        tapeblock_init ();
         return 0;
 }
 
@@ -1346,6 +1360,7 @@ tape_exit(void)
 
         /* Get rid of the frontends */
         tapechar_exit();
+        tapeblock_exit();
         tape_proc_cleanup();
         debug_unregister (TAPE_DBF_AREA);
 }
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index 8733b232a11..0ceb37984f7 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -1,8 +1,9 @@
 /*
+ *  drivers/s390/char/tape.c
  *    tape device driver for S/390 and zSeries tapes.
  *
  *  S390 and zSeries version
- *    Copyright IBM Corp. 2001
+ *    Copyright (C) 2001 IBM Corporation
  *    Author(s): Carsten Otte <cotte@de.ibm.com>
  *               Michael Holzheu <holzheu@de.ibm.com>
  *               Tuan Ngo-Anh <ngoanh@de.ibm.com>
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 981a99fd8d4..e7650170274 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -1,8 +1,9 @@
 /*
+ *  drivers/s390/char/tape_std.c
  *    standard tape device functions for ibm tapes.
  *
  *  S390 and zSeries version
- *    Copyright IBM Corp. 2001, 2002
+ *    Copyright (C) 2001,2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Carsten Otte <cotte@de.ibm.com>
  *               Michael Holzheu <holzheu@de.ibm.com>
  *               Tuan Ngo-Anh <ngoanh@de.ibm.com>
diff --git a/drivers/s390/char/tape_std.h b/drivers/s390/char/tape_std.h
index 8c760c03683..1fc95235934 100644
--- a/drivers/s390/char/tape_std.h
+++ b/drivers/s390/char/tape_std.h
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/char/tape_std.h
  *    standard tape device functions for ibm tapes.
  *
- *    Copyright IBM Corp. 2001, 2006
+ *    Copyright (C) IBM Corp. 2001,2006
  *    Author(s): Carsten Otte <cotte@de.ibm.com>
  *               Tuan Ngo-Anh <ngoanh@de.ibm.com>
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -100,7 +101,11 @@ struct tape_request *tape_std_read_block(struct tape_device *, size_t);
 void tape_std_read_backward(struct tape_device *device,
                             struct tape_request *request);
 struct tape_request *tape_std_write_block(struct tape_device *, size_t);
+struct tape_request *tape_std_bread(struct tape_device *, struct request *);
+void tape_std_free_bread(struct tape_request *);
 void tape_std_check_locate(struct tape_device *, struct tape_request *);
+struct tape_request *tape_std_bwrite(struct request *,
+                                     struct tape_device *, int);
 
 /* Some non-mtop commands. */
 int tape_std_assign(struct tape_device *);
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 43ea0593bdb..2db1482b406 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -1,10 +1,11 @@
 /*
+ *  drivers/s390/char/tty3270.c
  *    IBM/3270 Driver - tty functions.
  *
  *  Author(s):
  *    Original 3270 Code for 2.4 written by Richard Hitt (UTS Global)
  *    Rewritten for 2.5 by Martin Schwidefsky <schwidefsky@de.ibm.com>
- *      -- Copyright IBM Corp. 2003
+ *      -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
  */
 
 #include <linux/module.h>
@@ -60,7 +61,7 @@ struct tty3270_line {
  */
 struct tty3270 {
         struct raw3270_view view;
-        struct tty_port port;
+        struct tty_struct *tty;         /* Pointer to tty structure */
         void **freemem_pages;           /* Array of pages used for freemem. */
         struct list_head freemem;       /* List of free memory for strings. */
 
@@ -323,8 +324,9 @@ tty3270_blank_line(struct tty3270 *tp)
 static void
 tty3270_write_callback(struct raw3270_request *rq, void *data)
 {
-        struct tty3270 *tp = container_of(rq->view, struct tty3270, view);
+        struct tty3270 *tp;
 
+        tp = (struct tty3270 *) rq->view;
         if (rq->rc != 0) {
                 /* Write wasn't successful. Refresh all. */
                 tp->update_flags = TTY_UPDATE_ALL;
@@ -448,9 +450,10 @@ tty3270_rcl_add(struct tty3270 *tp, char *input, int len)
 static void
 tty3270_rcl_backward(struct kbd_data *kbd)
 {
-        struct tty3270 *tp = container_of(kbd->port, struct tty3270, port);
+        struct tty3270 *tp;
         struct string *s;
 
+        tp = kbd->tty->driver_data;
         spin_lock_bh(&tp->view.lock);
         if (tp->inattr == TF_INPUT) {
                 if (tp->rcl_walk && tp->rcl_walk->prev != &tp->rcl_lines)
@@ -475,8 +478,9 @@ tty3270_rcl_backward(struct kbd_data *kbd)
 static void
 tty3270_exit_tty(struct kbd_data *kbd)
 {
-        struct tty3270 *tp = container_of(kbd->port, struct tty3270, port);
+        struct tty3270 *tp;
 
+        tp = kbd->tty->driver_data;
         raw3270_deactivate_view(&tp->view);
 }
 
@@ -486,9 +490,10 @@ tty3270_exit_tty(struct kbd_data *kbd)
 static void
 tty3270_scroll_forward(struct kbd_data *kbd)
 {
-        struct tty3270 *tp = container_of(kbd->port, struct tty3270, port);
+        struct tty3270 *tp;
         int nr_up;
 
+        tp = kbd->tty->driver_data;
         spin_lock_bh(&tp->view.lock);
         nr_up = tp->nr_up - tp->view.rows + 2;
         if (nr_up < 0)
@@ -508,9 +513,10 @@ tty3270_scroll_forward(struct kbd_data *kbd)
 static void
 tty3270_scroll_backward(struct kbd_data *kbd)
 {
-        struct tty3270 *tp = container_of(kbd->port, struct tty3270, port);
+        struct tty3270 *tp;
         int nr_up;
 
+        tp = kbd->tty->driver_data;
         spin_lock_bh(&tp->view.lock);
         nr_up = tp->nr_up + tp->view.rows - 2;
         if (nr_up + tp->view.rows - 2 > tp->nr_lines)
@@ -531,10 +537,11 @@ static void
 tty3270_read_tasklet(struct raw3270_request *rrq)
 {
         static char kreset_data = TW_KR;
-        struct tty3270 *tp = container_of(rrq->view, struct tty3270, view);
+        struct tty3270 *tp;
         char *input;
         int len;
 
+        tp = (struct tty3270 *) rrq->view;
         spin_lock_bh(&tp->view.lock);
         /*
          * Two AID keys are special: For 0x7d (enter) the input line
@@ -570,10 +577,13 @@ tty3270_read_tasklet(struct raw3270_request *rrq)
         raw3270_request_add_data(tp->kreset, &kreset_data, 1);
         raw3270_start(&tp->view, tp->kreset);
 
-        while (len-- > 0)
-                kbd_keycode(tp->kbd, *input++);
-        /* Emit keycode for AID byte. */
-        kbd_keycode(tp->kbd, 256 + tp->input->string[0]);
+        /* Emit input string. */
+        if (tp->tty) {
+                while (len-- > 0)
+                        kbd_keycode(tp->kbd, *input++);
+                /* Emit keycode for AID byte. */
+                kbd_keycode(tp->kbd, 256 + tp->input->string[0]);
+        }
 
         raw3270_request_reset(rrq);
         xchg(&tp->read, rrq);
@@ -586,10 +596,9 @@ tty3270_read_tasklet(struct raw3270_request *rrq)
 static void
 tty3270_read_callback(struct raw3270_request *rq, void *data)
 {
-        struct tty3270 *tp = container_of(rq->view, struct tty3270, view);
         raw3270_get_view(rq->view);
         /* Schedule tasklet to pass input to tty. */
-        tasklet_schedule(&tp->readlet);
+        tasklet_schedule(&((struct tty3270 *) rq->view)->readlet);
 }
 
 /*
@@ -626,8 +635,9 @@ tty3270_issue_read(struct tty3270 *tp, int lock)
 static int
 tty3270_activate(struct raw3270_view *view)
 {
-        struct tty3270 *tp = container_of(view, struct tty3270, view);
+        struct tty3270 *tp;
 
+        tp = (struct tty3270 *) view;
         tp->update_flags = TTY_UPDATE_ALL;
         tty3270_set_timer(tp, 1);
         return 0;
@@ -636,8 +646,9 @@ tty3270_activate(struct raw3270_view *view)
 static void
 tty3270_deactivate(struct raw3270_view *view)
 {
-        struct tty3270 *tp = container_of(view, struct tty3270, view);
+        struct tty3270 *tp;
 
+        tp = (struct tty3270 *) view;
         del_timer(&tp->timer);
 }
 
@@ -679,17 +690,6 @@ tty3270_alloc_view(void)
         if (!tp->freemem_pages)
                 goto out_tp;
         INIT_LIST_HEAD(&tp->freemem);
-        INIT_LIST_HEAD(&tp->lines);
-        INIT_LIST_HEAD(&tp->update);
-        INIT_LIST_HEAD(&tp->rcl_lines);
-        tp->rcl_max = 20;
-        tty_port_init(&tp->port);
-        setup_timer(&tp->timer, (void (*)(unsigned long)) tty3270_update,
-                    (unsigned long) tp);
-        tasklet_init(&tp->readlet,
-                     (void (*)(unsigned long)) tty3270_read_tasklet,
-                     (unsigned long) tp->read);
-
         for (pages = 0; pages < TTY3270_STRING_PAGES; pages++) {
                 tp->freemem_pages[pages] = (void *)
                         __get_free_pages(GFP_KERNEL|GFP_DMA, 0);
@@ -722,7 +722,6 @@ out_pages:
         while (pages--)
                 free_pages((unsigned long) tp->freemem_pages[pages], 0);
         kfree(tp->freemem_pages);
-        tty_port_destroy(&tp->port);
 out_tp:
         kfree(tp);
 out_err:
@@ -745,7 +744,6 @@ tty3270_free_view(struct tty3270 *tp)
         for (pages = 0; pages < TTY3270_STRING_PAGES; pages++)
                 free_pages((unsigned long) tp->freemem_pages[pages], 0);
         kfree(tp->freemem_pages);
-        tty_port_destroy(&tp->port);
         kfree(tp);
 }
 
@@ -796,15 +794,16 @@ tty3270_free_screen(struct tty3270 *tp)
 static void
 tty3270_release(struct raw3270_view *view)
 {
-        struct tty3270 *tp = container_of(view, struct tty3270, view);
-        struct tty_struct *tty = tty_port_tty_get(&tp->port);
+        struct tty3270 *tp;
+        struct tty_struct *tty;
 
+        tp = (struct tty3270 *) view;
+        tty = tp->tty;
         if (tty) {
                 tty->driver_data = NULL;
-                tty_port_tty_set(&tp->port, NULL);
+                tp->tty = tp->kbd->tty = NULL;
                 tty_hangup(tty);
                 raw3270_put_view(&tp->view);
-                tty_kref_put(tty);
         }
 }
 
@@ -814,9 +813,8 @@ tty3270_release(struct raw3270_view *view)
 static void
 tty3270_free(struct raw3270_view *view)
 {
-        struct tty3270 *tp = container_of(view, struct tty3270, view);
-        tty3270_free_screen(tp);
-        tty3270_free_view(tp);
+        tty3270_free_screen((struct tty3270 *) view);
+        tty3270_free_view((struct tty3270 *) view);
 }
 
 /*
@@ -825,13 +823,14 @@ tty3270_free(struct raw3270_view *view)
 static void
 tty3270_del_views(void)
 {
+        struct tty3270 *tp;
         int i;
 
         for (i = 0; i < tty3270_max_index; i++) {
-                struct raw3270_view *view =
+                tp = (struct tty3270 *)
                         raw3270_find_view(&tty3270_fn, i + RAW3270_FIRSTMINOR);
-                if (!IS_ERR(view))
-                        raw3270_del_view(view);
+                if (!IS_ERR(tp))
+                        raw3270_del_view(&tp->view);
         }
 }
 
@@ -844,33 +843,35 @@ static struct raw3270_fn tty3270_fn = {
 };
 
 /*
- * This routine is called whenever a 3270 tty is opened first time.
+ * This routine is called whenever a 3270 tty is opened.
  */
-static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
+static int
+tty3270_open(struct tty_struct *tty, struct file * filp)
 {
-        struct raw3270_view *view;
         struct tty3270 *tp;
         int i, rc;
 
+        if (tty->count > 1)
+                return 0;
         /* Check if the tty3270 is already there. */
-        view = raw3270_find_view(&tty3270_fn,
+        tp = (struct tty3270 *)
+                raw3270_find_view(&tty3270_fn,
                                   tty->index + RAW3270_FIRSTMINOR);
-        if (!IS_ERR(view)) {
-                tp = container_of(view, struct tty3270, view);
+        if (!IS_ERR(tp)) {
                 tty->driver_data = tp;
                 tty->winsize.ws_row = tp->view.rows - 2;
                 tty->winsize.ws_col = tp->view.cols;
                 tty->low_latency = 0;
-                /* why to reassign? */
-                tty_port_tty_set(&tp->port, tty);
+                tp->tty = tty;
+                tp->kbd->tty = tty;
                 tp->inattr = TF_INPUT;
-                return tty_port_install(&tp->port, driver, tty);
+                return 0;
         }
         if (tty3270_max_index < tty->index + 1)
                 tty3270_max_index = tty->index + 1;
 
         /* Quick exit if there is no device for tty->index. */
-        if (PTR_ERR(view) == -ENODEV)
+        if (PTR_ERR(tp) == -ENODEV)
                 return -ENODEV;
 
         /* Allocate tty3270 structure on first open. */
@@ -878,6 +879,16 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
         if (IS_ERR(tp))
                 return PTR_ERR(tp);
 
+        INIT_LIST_HEAD(&tp->lines);
+        INIT_LIST_HEAD(&tp->update);
+        INIT_LIST_HEAD(&tp->rcl_lines);
+        tp->rcl_max = 20;
+        setup_timer(&tp->timer, (void (*)(unsigned long)) tty3270_update,
+                    (unsigned long) tp);
+        tasklet_init(&tp->readlet, 
+                     (void (*)(unsigned long)) tty3270_read_tasklet,
+                     (unsigned long) tp->read);
+
         rc = raw3270_add_view(&tp->view, &tty3270_fn,
                               tty->index + RAW3270_FIRSTMINOR);
         if (rc) {
@@ -892,8 +903,9 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
                 return rc;
         }
 
-        tty_port_tty_set(&tp->port, tty);
+        tp->tty = tty;
         tty->low_latency = 0;
+        tty->driver_data = tp;
         tty->winsize.ws_row = tp->view.rows - 2;
         tty->winsize.ws_col = tp->view.cols;
 
@@ -905,7 +917,7 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
         for (i = 0; i < tp->view.rows - 2; i++)
                 tty3270_blank_line(tp);
 
-        tp->kbd->port = &tp->port;
+        tp->kbd->tty = tty;
         tp->kbd->fn_handler[KVAL(K_INCRCONSOLE)] = tty3270_exit_tty;
         tp->kbd->fn_handler[KVAL(K_SCROLLBACK)] = tty3270_scroll_backward;
         tp->kbd->fn_handler[KVAL(K_SCROLLFORW)] = tty3270_scroll_forward;
@@ -913,15 +925,6 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
         kbd_ascebc(tp->kbd, tp->view.ascebc);
 
         raw3270_activate_view(&tp->view);
-
-        rc = tty_port_install(&tp->port, driver, tty);
-        if (rc) {
-                raw3270_put_view(&tp->view);
-                return rc;
-        }
-
-        tty->driver_data = tp;
-
         return 0;
 }
 
@@ -932,22 +935,16 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
 static void
 tty3270_close(struct tty_struct *tty, struct file * filp)
 {
-        struct tty3270 *tp = tty->driver_data;
+        struct tty3270 *tp;
 
         if (tty->count > 1)
                 return;
+        tp = (struct tty3270 *) tty->driver_data;
         if (tp) {
                 tty->driver_data = NULL;
-                tty_port_tty_set(&tp->port, NULL);
-        }
-}
-
-static void tty3270_cleanup(struct tty_struct *tty)
-{
-        struct tty3270 *tp = tty->driver_data;
-
-        if (tp)
+                tp->tty = tp->kbd->tty = NULL;
                 raw3270_put_view(&tp->view);
+        }
 }
 
 /*
@@ -1394,7 +1391,7 @@ tty3270_escape_sequence(struct tty3270 *tp, char ch)
                         tty3270_lf(tp);
                         break;
                 case 'Z':               /* Respond ID. */
-                        kbd_puts_queue(&tp->port, "\033[?6c");
+                        kbd_puts_queue(tp->tty, "\033[?6c");
                         break;
                 case '7':               /* Save cursor position. */
                         tp->saved_cx = tp->cx;
@@ -1440,11 +1437,11 @@ tty3270_escape_sequence(struct tty3270 *tp, char ch)
         tp->esc_state = ESnormal;
         if (ch == 'n' && !tp->esc_ques) {
                 if (tp->esc_par[0] == 5)                /* Status report. */
-                        kbd_puts_queue(&tp->port, "\033[0n");
+                        kbd_puts_queue(tp->tty, "\033[0n");
                 else if (tp->esc_par[0] == 6) { /* Cursor report. */
                         char buf[40];
                         sprintf(buf, "\033[%d;%dR", tp->cy + 1, tp->cx + 1);
-                        kbd_puts_queue(&tp->port, buf);
+                        kbd_puts_queue(tp->tty, buf);
                 }
                 return;
         }
@@ -1516,13 +1513,12 @@ tty3270_escape_sequence(struct tty3270 *tp, char ch)
  * String write routine for 3270 ttys
  */
 static void
-tty3270_do_write(struct tty3270 *tp, struct tty_struct *tty,
-                const unsigned char *buf, int count)
+tty3270_do_write(struct tty3270 *tp, const unsigned char *buf, int count)
 {
         int i_msg, i;
 
         spin_lock_bh(&tp->view.lock);
-        for (i_msg = 0; !tty->stopped && i_msg < count; i_msg++) {
+        for (i_msg = 0; !tp->tty->stopped && i_msg < count; i_msg++) {
                 if (tp->esc_state != 0) {
                         /* Continue escape sequence. */
                         tty3270_escape_sequence(tp, buf[i_msg]);
@@ -1599,10 +1595,10 @@ tty3270_write(struct tty_struct * tty,
         if (!tp)
                 return 0;
         if (tp->char_count > 0) {
-                tty3270_do_write(tp, tty, tp->char_buf, tp->char_count);
+                tty3270_do_write(tp, tp->char_buf, tp->char_count);
                 tp->char_count = 0;
         }
-        tty3270_do_write(tp, tty, buf, count);
+        tty3270_do_write(tp, buf, count);
         return count;
 }
 
@@ -1633,7 +1629,7 @@ tty3270_flush_chars(struct tty_struct *tty)
         if (!tp)
                 return;
         if (tp->char_count > 0) {
-                tty3270_do_write(tp, tty, tp->char_buf, tp->char_count);
+                tty3270_do_write(tp, tp->char_buf, tp->char_count);
                 tp->char_count = 0;
         }
 }
@@ -1751,8 +1747,7 @@ static long tty3270_compat_ioctl(struct tty_struct *tty,
 #endif
 
 static const struct tty_operations tty3270_ops = {
-        .install = tty3270_install,
-        .cleanup = tty3270_cleanup,
+        .open = tty3270_open,
         .close = tty3270_close,
         .write = tty3270_write,
         .put_char = tty3270_put_char,
@@ -1789,6 +1784,7 @@ static int __init tty3270_init(void)
          * Entries in tty3270_driver that are NOT initialized:
          * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc
          */
+        driver->owner = THIS_MODULE;
         driver->driver_name = "ttyTUB";
         driver->name = "ttyTUB";
         driver->major = IBM_TTY3270_MAJOR;
@@ -1796,7 +1792,7 @@ static int __init tty3270_init(void)
         driver->type = TTY_DRIVER_TYPE_SYSTEM;
         driver->subtype = SYSTEM_TYPE_TTY;
         driver->init_termios = tty_std_termios;
-        driver->flags = TTY_DRIVER_RESET_TERMIOS;
+        driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_DYNAMIC_DEV;
         tty_set_operations(driver, &tty3270_ops);
         ret = tty_register_driver(driver);
         if (ret) {
@@ -1815,7 +1811,6 @@ tty3270_exit(void)
         driver = tty3270_driver;
         tty3270_driver = NULL;
         tty_unregister_driver(driver);
-        put_tty_driver(driver);
         tty3270_del_views();
 }
 
diff --git a/drivers/s390/char/tty3270.h b/drivers/s390/char/tty3270.h
index 11141a8f897..799da57f039 100644
--- a/drivers/s390/char/tty3270.h
+++ b/drivers/s390/char/tty3270.h
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/char/tty3270.h
+ *
  *    Copyright IBM Corp. 2007
  *
  */
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 0fdedadff7b..31a3ccbb649 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2004, 2010
+ * Copyright IBM Corp. 2004,2010
  * Interface implementation for communication with the z/VM control program
  *
  * Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
@@ -13,11 +13,9 @@
 
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 #include <asm/compat.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
diff --git a/drivers/s390/char/vmcp.h b/drivers/s390/char/vmcp.h
index 1e29b041838..6a993948e18 100644
--- a/drivers/s390/char/vmcp.h
+++ b/drivers/s390/char/vmcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2004, 2005
+ * Copyright (C) 2004, 2005 IBM Corporation
  * Interface implementation for communication with the z/VM control program
  * Version 1.0
  * Author(s): Christian Borntraeger <cborntra@de.ibm.com>
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 9b3a24e8d3a..524d988d89d 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -1,4 +1,5 @@
 /*
+ * drivers/s390/char/vmlogrdr.c
  *      character device driver for reading z/VM system service records
  *
  *
@@ -321,7 +322,7 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
          * only allow for blocking reads to be open
          */
         if (filp->f_flags & O_NONBLOCK)
-                return -EOPNOTSUPP;
+                return -ENOSYS;
 
         /* Besure this device hasn't already been opened */
         spin_lock_bh(&logptr->priv_lock);
@@ -655,19 +656,10 @@ static ssize_t vmlogrdr_recording_status_show(struct device_driver *driver,
         len = strlen(buf);
         return len;
 }
+
+
 static DRIVER_ATTR(recording_status, 0444, vmlogrdr_recording_status_show,
                    NULL);
-static struct attribute *vmlogrdr_drv_attrs[] = {
-        &driver_attr_recording_status.attr,
-        NULL,
-};
-static struct attribute_group vmlogrdr_drv_attr_group = {
-        .attrs = vmlogrdr_drv_attrs,
-};
-static const struct attribute_group *vmlogrdr_drv_attr_groups[] = {
-        &vmlogrdr_drv_attr_group,
-        NULL,
-};
 
 static struct attribute *vmlogrdr_attrs[] = {
         &dev_attr_autopurge.attr,
@@ -676,13 +668,6 @@ static struct attribute *vmlogrdr_attrs[] = {
         &dev_attr_recording.attr,
         NULL,
 };
-static struct attribute_group vmlogrdr_attr_group = {
-        .attrs = vmlogrdr_attrs,
-};
-static const struct attribute_group *vmlogrdr_attr_groups[] = {
-        &vmlogrdr_attr_group,
-        NULL,
-};
 
 static int vmlogrdr_pm_prepare(struct device *dev)
 {
@@ -707,14 +692,18 @@ static const struct dev_pm_ops vmlogrdr_pm_ops = {
         .prepare = vmlogrdr_pm_prepare,
 };
 
+static struct attribute_group vmlogrdr_attr_group = {
+        .attrs = vmlogrdr_attrs,
+};
+
 static struct class *vmlogrdr_class;
 static struct device_driver vmlogrdr_driver = {
         .name = "vmlogrdr",
         .bus  = &iucv_bus,
         .pm = &vmlogrdr_pm_ops,
-        .groups = vmlogrdr_drv_attr_groups,
 };
 
+
 static int vmlogrdr_register_driver(void)
 {
         int ret;
@@ -728,14 +717,21 @@ static int vmlogrdr_register_driver(void)
         if (ret)
                 goto out_iucv;
 
+        ret = driver_create_file(&vmlogrdr_driver,
+                                 &driver_attr_recording_status);
+        if (ret)
+                goto out_driver;
+
         vmlogrdr_class = class_create(THIS_MODULE, "vmlogrdr");
         if (IS_ERR(vmlogrdr_class)) {
                 ret = PTR_ERR(vmlogrdr_class);
                 vmlogrdr_class = NULL;
-                goto out_driver;
+                goto out_attr;
         }
         return 0;
 
+out_attr:
+        driver_remove_file(&vmlogrdr_driver, &driver_attr_recording_status);
 out_driver:
         driver_unregister(&vmlogrdr_driver);
 out_iucv:
@@ -749,6 +745,7 @@ static void vmlogrdr_unregister_driver(void)
 {
         class_destroy(vmlogrdr_class);
         vmlogrdr_class = NULL;
+        driver_remove_file(&vmlogrdr_driver, &driver_attr_recording_status);
         driver_unregister(&vmlogrdr_driver);
         iucv_unregister(&vmlogrdr_iucv_handler, 1);
 }
@@ -765,7 +762,6 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
                 dev->driver = &vmlogrdr_driver;
-                dev->groups = vmlogrdr_attr_groups;
                 dev_set_drvdata(dev, priv);
                 /*
                  * The release function could be called after the
@@ -783,6 +779,11 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
                 return ret;
         }
 
+        ret = sysfs_create_group(&dev->kobj, &vmlogrdr_attr_group);
+        if (ret) {
+                device_unregister(dev);
+                return ret;
+        }
         priv->class_device = device_create(vmlogrdr_class, dev,
                                            MKDEV(vmlogrdr_major,
                                                  priv->minor_num),
@@ -790,6 +791,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
         if (IS_ERR(priv->class_device)) {
                 ret = PTR_ERR(priv->class_device);
                 priv->class_device=NULL;
+                sysfs_remove_group(&dev->kobj, &vmlogrdr_attr_group);
                 device_unregister(dev);
                 return ret;
         }
@@ -802,6 +804,7 @@ static int vmlogrdr_unregister_device(struct vmlogrdr_priv_t *priv)
 {
         device_destroy(vmlogrdr_class, MKDEV(vmlogrdr_major, priv->minor_num));
         if (priv->device != NULL) {
+                sysfs_remove_group(&priv->device->kobj, &vmlogrdr_attr_group);
                 device_unregister(priv->device);
                 priv->device=NULL;
         }
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 483f72ba030..f6b00c3df42 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -11,9 +11,9 @@
 #define KMSG_COMPONENT "vmur"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/cdev.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 
 #include <asm/uaccess.h>
 #include <asm/cio.h>
@@ -74,7 +74,6 @@ static struct ccw_driver ur_driver = {
         .set_online     = ur_set_online,
         .set_offline    = ur_set_offline,
         .freeze         = ur_pm_suspend,
-        .int_class      = IRQIO_VMR,
 };
 
 static DEFINE_MUTEX(vmur_mutex);
@@ -306,6 +305,7 @@ static void ur_int_handler(struct ccw_device *cdev, unsigned long intparm,
 {
         struct urdev *urd;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_VMR]++;
         TRACE("ur_int_handler: intparm=0x%lx cstat=%02x dstat=%02x res=%u\n",
               intparm, irb->scsw.cmd.cstat, irb->scsw.cmd.dstat,
               irb->scsw.cmd.count);
@@ -903,7 +903,7 @@ static int ur_set_online(struct ccw_device *cdev)
                 goto fail_urdev_put;
         }
 
-        urd->char_device->ops = &ur_fops;
+        cdev_init(urd->char_device, &ur_fops);
         urd->char_device->dev = MKDEV(major, minor);
         urd->char_device->owner = ur_fops.owner;
 
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index e9b72311e25..11312f401c7 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -1,7 +1,7 @@
 /*
  * Watchdog implementation based on z/VM Watchdog Timer API
  *
- * Copyright IBM Corp. 2004, 2009
+ * Copyright IBM Corp. 2004,2009
  *
  * The user space watchdog daemon can use this driver as
  * /dev/vmwatchdog to have z/VM execute the specified CP
@@ -28,9 +28,9 @@
 #define MAX_CMDLEN 240
 #define MIN_INTERVAL 15
 static char vmwdt_cmd[MAX_CMDLEN] = "IPL";
-static bool vmwdt_conceal;
+static int vmwdt_conceal;
 
-static bool vmwdt_nowayout = WATCHDOG_NOWAYOUT;
+static int vmwdt_nowayout = WATCHDOG_NOWAYOUT;
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>");
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index e3b9308b0fe..3b94044027c 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -5,7 +5,7 @@
  *
  * For more information please refer to Documentation/s390/zfcpdump.txt
  *
- * Copyright IBM Corp. 2003, 2008
+ * Copyright IBM Corp. 2003,2008
  * Author(s): Michael Holzheu
  */
 
@@ -16,11 +16,11 @@
 #include <linux/slab.h>
 #include <linux/miscdevice.h>
 #include <linux/debugfs.h>
-#include <linux/module.h>
 #include <asm/asm-offsets.h>
 #include <asm/ipl.h>
 #include <asm/sclp.h>
 #include <asm/setup.h>
+#include <asm/sigp.h>
 #include <asm/uaccess.h>
 #include <asm/debug.h>
 #include <asm/processor.h>
@@ -142,6 +142,22 @@ static int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count)
         return memcpy_hsa(dest, src, count, TO_KERNEL);
 }
 
+static int memcpy_real_user(void __user *dest, unsigned long src, size_t count)
+{
+        static char buf[4096];
+        int offs = 0, size;
+
+        while (offs < count) {
+                size = min(sizeof(buf), count - offs);
+                if (memcpy_real(buf, (void *) src + offs, size))
+                        return -EFAULT;
+                if (copy_to_user(dest + offs, buf, size))
+                        return -EFAULT;
+                offs += size;
+        }
+        return 0;
+}
+
 static int __init init_cpu_info(enum arch_id arch)
 {
         struct save_area *sa;
@@ -330,8 +346,8 @@ static ssize_t zcore_read(struct file *file, char __user *buf, size_t count,
 
         /* Copy from real mem */
         size = count - mem_offs - hdr_count;
-        rc = copy_to_user_real(buf + hdr_count + mem_offs,
-                               (void *) mem_start + mem_offs, size);
+        rc = memcpy_real_user(buf + hdr_count + mem_offs, mem_start + mem_offs,
+                              size);
         if (rc)
                 goto fail;
 
@@ -640,8 +656,6 @@ static int __init zcore_init(void)
 
         if (ipl_info.type != IPL_TYPE_FCP_DUMP)
                 return -ENODATA;
-        if (OLDMEM_BASE)
-                return -ENODATA;
 
         zcore_dbf = debug_register("zcore", 4, 1, 4 * sizeof(long));
         debug_register_view(zcore_dbf, &debug_sprintf_view);
diff --git a/drivers/s390/cio/Makefile b/drivers/s390/cio/Makefile
index 8c4a386e97f..e1b700a1964 100644
--- a/drivers/s390/cio/Makefile
+++ b/drivers/s390/cio/Makefile
@@ -8,8 +8,6 @@ ccw_device-objs += device.o device_fsm.o device_ops.o
 ccw_device-objs += device_id.o device_pgid.o device_status.o
 obj-y += ccw_device.o cmf.o
 obj-$(CONFIG_CHSC_SCH) += chsc_sch.o
-obj-$(CONFIG_EADM_SCH) += eadm_sch.o
-obj-$(CONFIG_SCM_BUS) += scm.o
 obj-$(CONFIG_CCWGROUP) += ccwgroup.o
 
 qdio-objs := qdio_main.o qdio_thinint.o qdio_debug.o qdio_setup.o
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index bc10220f684..65d2e769dfa 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/cio/airq.c
  *    Support for adapter interruptions
  *
- *    Copyright IBM Corp. 1999, 2007
+ *    Copyright IBM Corp. 1999,2007
  *    Author(s): Ingo Adlung <adlung@de.ibm.com>
  *               Cornelia Huck <cornelia.huck@de.ibm.com>
  *               Arnd Bergmann <arndb@de.ibm.com>
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 2d2a966a3b3..76058a5166e 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -1,7 +1,9 @@
 /*
+ *  drivers/s390/cio/blacklist.c
  *   S/390 common I/O routines -- blacklisting of specific devices
  *
- *    Copyright IBM Corp. 1999, 2002
+ *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
+ *                            IBM Corporation
  *    Author(s): Ingo Adlung (adlung@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Arnd Bergmann (arndb@de.ibm.com)
@@ -333,9 +335,10 @@ cio_ignore_write(struct file *file, const char __user *user_buf,
                 return -EINVAL;
         if (user_len > 65536)
                 user_len = 65536;
-        buf = vzalloc(user_len + 1); /* maybe better use the stack? */
+        buf = vmalloc (user_len + 1); /* maybe better use the stack? */
         if (buf == NULL)
                 return -ENOMEM;
+        memset(buf, 0, user_len + 1);
 
         if (strncpy_from_user (buf, user_buf, user_len) < 0) {
                 rc = -EFAULT;
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 84846c2b96d..cda9bd6e48e 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -1,7 +1,7 @@
 /*
  *  bus driver for ccwgroup
  *
- *  Copyright IBM Corp. 2002, 2012
+ *  Copyright IBM Corp. 2002, 2009
  *
  *  Author(s): Arnd Bergmann (arndb@de.ibm.com)
  *             Cornelia Huck (cornelia.huck@de.ibm.com)
@@ -15,13 +15,10 @@
 #include <linux/ctype.h>
 #include <linux/dcache.h>
 
-#include <asm/cio.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 
-#include "device.h"
-
-#define CCW_BUS_ID_SIZE         10
+#define CCW_BUS_ID_SIZE         20
 
 /* In Linux 2.4, we had a channel device layer called "chandev"
  * that did all sorts of obscure stuff for networking devices.
@@ -30,9 +27,33 @@
  * to devices that use multiple subchannels.
  */
 
+/* a device matches a driver if all its slave devices match the same
+ * entry of the driver */
+static int
+ccwgroup_bus_match (struct device * dev, struct device_driver * drv)
+{
+        struct ccwgroup_device *gdev;
+        struct ccwgroup_driver *gdrv;
+
+        gdev = to_ccwgroupdev(dev);
+        gdrv = to_ccwgroupdrv(drv);
+
+        if (gdev->creator_id == gdrv->driver_id)
+                return 1;
+
+        return 0;
+}
+static int
+ccwgroup_uevent (struct device *dev, struct kobj_uevent_env *env)
+{
+        /* TODO */
+        return 0;
+}
+
 static struct bus_type ccwgroup_bus_type;
 
-static void __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
+static void
+__ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
 {
         int i;
         char str[8];
@@ -42,6 +63,7 @@ static void __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
                 sysfs_remove_link(&gdev->dev.kobj, str);
                 sysfs_remove_link(&gdev->cdev[i]->dev.kobj, "group_device");
         }
+        
 }
 
 /*
@@ -65,105 +87,12 @@ static void __ccwgroup_remove_cdev_refs(struct ccwgroup_device *gdev)
         }
 }
 
-/**
- * ccwgroup_set_online() - enable a ccwgroup device
- * @gdev: target ccwgroup device
- *
- * This function attempts to put the ccwgroup device into the online state.
- * Returns:
- *  %0 on success and a negative error value on failure.
- */
-int ccwgroup_set_online(struct ccwgroup_device *gdev)
-{
-        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
-        int ret = -EINVAL;
-
-        if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
-                return -EAGAIN;
-        if (gdev->state == CCWGROUP_ONLINE)
-                goto out;
-        if (gdrv->set_online)
-                ret = gdrv->set_online(gdev);
-        if (ret)
-                goto out;
-
-        gdev->state = CCWGROUP_ONLINE;
-out:
-        atomic_set(&gdev->onoff, 0);
-        return ret;
-}
-EXPORT_SYMBOL(ccwgroup_set_online);
-
-/**
- * ccwgroup_set_offline() - disable a ccwgroup device
- * @gdev: target ccwgroup device
- *
- * This function attempts to put the ccwgroup device into the offline state.
- * Returns:
- *  %0 on success and a negative error value on failure.
- */
-int ccwgroup_set_offline(struct ccwgroup_device *gdev)
-{
-        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
-        int ret = -EINVAL;
-
-        if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
-                return -EAGAIN;
-        if (gdev->state == CCWGROUP_OFFLINE)
-                goto out;
-        if (gdrv->set_offline)
-                ret = gdrv->set_offline(gdev);
-        if (ret)
-                goto out;
-
-        gdev->state = CCWGROUP_OFFLINE;
-out:
-        atomic_set(&gdev->onoff, 0);
-        return ret;
-}
-EXPORT_SYMBOL(ccwgroup_set_offline);
-
 static ssize_t ccwgroup_online_store(struct device *dev,
                                      struct device_attribute *attr,
-                                     const char *buf, size_t count)
-{
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
-        unsigned long value;
-        int ret;
-
-        if (!dev->driver)
-                return -EINVAL;
-        if (!try_module_get(gdrv->driver.owner))
-                return -EINVAL;
-
-        ret = strict_strtoul(buf, 0, &value);
-        if (ret)
-                goto out;
-
-        if (value == 1)
-                ret = ccwgroup_set_online(gdev);
-        else if (value == 0)
-                ret = ccwgroup_set_offline(gdev);
-        else
-                ret = -EINVAL;
-out:
-        module_put(gdrv->driver.owner);
-        return (ret == 0) ? count : ret;
-}
-
+                                     const char *buf, size_t count);
 static ssize_t ccwgroup_online_show(struct device *dev,
                                     struct device_attribute *attr,
-                                    char *buf)
-{
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        int online;
-
-        online = (gdev->state == CCWGROUP_ONLINE) ? 1 : 0;
-
-        return scnprintf(buf, PAGE_SIZE, "%d\n", online);
-}
-
+                                    char *buf);
 /*
  * Provide an 'ungroup' attribute so the user can remove group devices no
  * longer needed or accidentially created. Saves memory :)
@@ -181,13 +110,14 @@ static void ccwgroup_ungroup_callback(struct device *dev)
         mutex_unlock(&gdev->reg_mutex);
 }
 
-static ssize_t ccwgroup_ungroup_store(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf, size_t count)
+static ssize_t
+ccwgroup_ungroup_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_device *gdev;
         int rc;
 
+        gdev = to_ccwgroupdev(dev);
+
         /* Prevent concurrent online/offline processing and ungrouping. */
         if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
                 return -EAGAIN;
@@ -208,6 +138,7 @@ out:
         }
         return count;
 }
+
 static DEVICE_ATTR(ungroup, 0200, NULL, ccwgroup_ungroup_store);
 static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store);
 
@@ -224,19 +155,21 @@ static const struct attribute_group *ccwgroup_attr_groups[] = {
         NULL,
 };
 
-static void ccwgroup_release(struct device *dev)
+static void
+ccwgroup_release (struct device *dev)
 {
         kfree(to_ccwgroupdev(dev));
 }
 
-static int __ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
+static int
+__ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
 {
         char str[8];
         int i, rc;
 
         for (i = 0; i < gdev->count; i++) {
-                rc = sysfs_create_link(&gdev->cdev[i]->dev.kobj,
-                                       &gdev->dev.kobj, "group_device");
+                rc = sysfs_create_link(&gdev->cdev[i]->dev.kobj, &gdev->dev.kobj,
+                                       "group_device");
                 if (rc) {
                         for (--i; i >= 0; i--)
                                 sysfs_remove_link(&gdev->cdev[i]->dev.kobj,
@@ -246,8 +179,8 @@ static int __ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
         }
         for (i = 0; i < gdev->count; i++) {
                 sprintf(str, "cdev%d", i);
-                rc = sysfs_create_link(&gdev->dev.kobj,
-                                       &gdev->cdev[i]->dev.kobj, str);
+                rc = sysfs_create_link(&gdev->dev.kobj, &gdev->cdev[i]->dev.kobj,
+                                       str);
                 if (rc) {
                         for (--i; i >= 0; i--) {
                                 sprintf(str, "cdev%d", i);
@@ -262,10 +195,9 @@ static int __ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
         return 0;
 }
 
-static int __get_next_id(const char **buf, struct ccw_dev_id *id)
+static int __get_next_bus_id(const char **buf, char *bus_id)
 {
-        unsigned int cssid, ssid, devno;
-        int ret = 0, len;
+        int rc, len;
         char *start, *end;
 
         start = (char *)*buf;
@@ -280,40 +212,49 @@ static int __get_next_id(const char **buf, struct ccw_dev_id *id)
                 len = end - start + 1;
                 end++;
         }
-        if (len <= CCW_BUS_ID_SIZE) {
-                if (sscanf(start, "%2x.%1x.%04x", &cssid, &ssid, &devno) != 3)
-                        ret = -EINVAL;
+        if (len < CCW_BUS_ID_SIZE) {
+                strlcpy(bus_id, start, len);
+                rc = 0;
         } else
-                ret = -EINVAL;
-
-        if (!ret) {
-                id->ssid = ssid;
-                id->devno = devno;
-        }
+                rc = -EINVAL;
         *buf = end;
-        return ret;
+        return rc;
+}
+
+static int __is_valid_bus_id(char bus_id[CCW_BUS_ID_SIZE])
+{
+        int cssid, ssid, devno;
+
+        /* Must be of form %x.%x.%04x */
+        if (sscanf(bus_id, "%x.%1x.%04x", &cssid, &ssid, &devno) != 3)
+                return 0;
+        return 1;
 }
 
 /**
- * ccwgroup_create_dev() - create and register a ccw group device
- * @parent: parent device for the new device
- * @gdrv: driver for the new group device
+ * ccwgroup_create_from_string() - create and register a ccw group device
+ * @root: parent device for the new device
+ * @creator_id: identifier of creating driver
+ * @cdrv: ccw driver of slave devices
  * @num_devices: number of slave devices
  * @buf: buffer containing comma separated bus ids of slave devices
  *
- * Create and register a new ccw group device as a child of @parent. Slave
- * devices are obtained from the list of bus ids given in @buf.
+ * Create and register a new ccw group device as a child of @root. Slave
+ * devices are obtained from the list of bus ids given in @buf and must all
+ * belong to @cdrv.
  * Returns:
  *  %0 on success and an error code on failure.
  * Context:
  *  non-atomic
  */
-int ccwgroup_create_dev(struct device *parent, struct ccwgroup_driver *gdrv,
-                        int num_devices, const char *buf)
+int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
+                                struct ccw_driver *cdrv, int num_devices,
+                                const char *buf)
 {
         struct ccwgroup_device *gdev;
-        struct ccw_dev_id dev_id;
         int rc, i;
+        char tmp_bus_id[CCW_BUS_ID_SIZE];
+        const char *curr_buf;
 
         gdev = kzalloc(sizeof(*gdev) + num_devices * sizeof(gdev->cdev[0]),
                        GFP_KERNEL);
@@ -323,24 +264,29 @@ int ccwgroup_create_dev(struct device *parent, struct ccwgroup_driver *gdrv,
         atomic_set(&gdev->onoff, 0);
         mutex_init(&gdev->reg_mutex);
         mutex_lock(&gdev->reg_mutex);
+        gdev->creator_id = creator_id;
         gdev->count = num_devices;
         gdev->dev.bus = &ccwgroup_bus_type;
-        gdev->dev.parent = parent;
+        gdev->dev.parent = root;
         gdev->dev.release = ccwgroup_release;
         device_initialize(&gdev->dev);
 
-        for (i = 0; i < num_devices && buf; i++) {
-                rc = __get_next_id(&buf, &dev_id);
+        curr_buf = buf;
+        for (i = 0; i < num_devices && curr_buf; i++) {
+                rc = __get_next_bus_id(&curr_buf, tmp_bus_id);
                 if (rc != 0)
                         goto error;
-                gdev->cdev[i] = get_ccwdev_by_dev_id(&dev_id);
+                if (!__is_valid_bus_id(tmp_bus_id)) {
+                        rc = -EINVAL;
+                        goto error;
+                }
+                gdev->cdev[i] = get_ccwdev_by_busid(cdrv, tmp_bus_id);
                 /*
                  * All devices have to be of the same type in
                  * order to be grouped.
                  */
-                if (!gdev->cdev[i] || !gdev->cdev[i]->drv ||
-                    gdev->cdev[i]->drv != gdev->cdev[0]->drv ||
-                    gdev->cdev[i]->id.driver_info !=
+                if (!gdev->cdev[i]
+                    || gdev->cdev[i]->id.driver_info !=
                     gdev->cdev[0]->id.driver_info) {
                         rc = -EINVAL;
                         goto error;
@@ -356,35 +302,29 @@ int ccwgroup_create_dev(struct device *parent, struct ccwgroup_driver *gdrv,
                 spin_unlock_irq(gdev->cdev[i]->ccwlock);
         }
         /* Check for sufficient number of bus ids. */
-        if (i < num_devices) {
+        if (i < num_devices && !curr_buf) {
                 rc = -EINVAL;
                 goto error;
         }
         /* Check for trailing stuff. */
-        if (i == num_devices && strlen(buf) > 0) {
+        if (i == num_devices && strlen(curr_buf) > 0) {
                 rc = -EINVAL;
                 goto error;
         }
 
         dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev));
         gdev->dev.groups = ccwgroup_attr_groups;
-
-        if (gdrv) {
-                gdev->dev.driver = &gdrv->driver;
-                rc = gdrv->setup ? gdrv->setup(gdev) : 0;
-                if (rc)
-                        goto error;
-        }
         rc = device_add(&gdev->dev);
         if (rc)
                 goto error;
+        get_device(&gdev->dev);
         rc = __ccwgroup_create_symlinks(gdev);
-        if (rc) {
-                device_del(&gdev->dev);
-                goto error;
+        if (!rc) {
+                mutex_unlock(&gdev->reg_mutex);
+                put_device(&gdev->dev);
+                return 0;
         }
-        mutex_unlock(&gdev->reg_mutex);
-        return 0;
+        device_unregister(&gdev->dev);
 error:
         for (i = 0; i < num_devices; i++)
                 if (gdev->cdev[i]) {
@@ -399,18 +339,10 @@ error:
         put_device(&gdev->dev);
         return rc;
 }
-EXPORT_SYMBOL(ccwgroup_create_dev);
+EXPORT_SYMBOL(ccwgroup_create_from_string);
 
 static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
-                             void *data)
-{
-        struct device *dev = data;
-
-        if (action == BUS_NOTIFY_UNBIND_DRIVER)
-                device_schedule_callback(dev, ccwgroup_ungroup_callback);
-
-        return NOTIFY_OK;
-}
+                             void *data);
 
 static struct notifier_block ccwgroup_nb = {
         .notifier_call = ccwgroup_notifier
@@ -442,13 +374,128 @@ module_exit(cleanup_ccwgroup);
 
 /************************** driver stuff ******************************/
 
-static int ccwgroup_remove(struct device *dev)
+static int
+ccwgroup_set_online(struct ccwgroup_device *gdev)
 {
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
+        struct ccwgroup_driver *gdrv;
+        int ret;
+
+        if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
+                return -EAGAIN;
+        if (gdev->state == CCWGROUP_ONLINE) {
+                ret = 0;
+                goto out;
+        }
+        if (!gdev->dev.driver) {
+                ret = -EINVAL;
+                goto out;
+        }
+        gdrv = to_ccwgroupdrv (gdev->dev.driver);
+        if ((ret = gdrv->set_online ? gdrv->set_online(gdev) : 0))
+                goto out;
+
+        gdev->state = CCWGROUP_ONLINE;
+ out:
+        atomic_set(&gdev->onoff, 0);
+        return ret;
+}
+
+static int
+ccwgroup_set_offline(struct ccwgroup_device *gdev)
+{
+        struct ccwgroup_driver *gdrv;
+        int ret;
+
+        if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
+                return -EAGAIN;
+        if (gdev->state == CCWGROUP_OFFLINE) {
+                ret = 0;
+                goto out;
+        }
+        if (!gdev->dev.driver) {
+                ret = -EINVAL;
+                goto out;
+        }
+        gdrv = to_ccwgroupdrv (gdev->dev.driver);
+        if ((ret = gdrv->set_offline ? gdrv->set_offline(gdev) : 0))
+                goto out;
+
+        gdev->state = CCWGROUP_OFFLINE;
+ out:
+        atomic_set(&gdev->onoff, 0);
+        return ret;
+}
+
+static ssize_t
+ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct ccwgroup_device *gdev;
+        struct ccwgroup_driver *gdrv;
+        unsigned long value;
+        int ret;
+
+        if (!dev->driver)
+                return -EINVAL;
+
+        gdev = to_ccwgroupdev(dev);
+        gdrv = to_ccwgroupdrv(dev->driver);
+
+        if (!try_module_get(gdrv->driver.owner))
+                return -EINVAL;
+
+        ret = strict_strtoul(buf, 0, &value);
+        if (ret)
+                goto out;
+
+        if (value == 1)
+                ret = ccwgroup_set_online(gdev);
+        else if (value == 0)
+                ret = ccwgroup_set_offline(gdev);
+        else
+                ret = -EINVAL;
+out:
+        module_put(gdrv->driver.owner);
+        return (ret == 0) ? count : ret;
+}
+
+static ssize_t
+ccwgroup_online_show (struct device *dev, struct device_attribute *attr, char *buf)
+{
+        int online;
+
+        online = (to_ccwgroupdev(dev)->state == CCWGROUP_ONLINE);
+
+        return sprintf(buf, online ? "1\n" : "0\n");
+}
+
+static int
+ccwgroup_probe (struct device *dev)
+{
+        struct ccwgroup_device *gdev;
+        struct ccwgroup_driver *gdrv;
+
+        int ret;
+
+        gdev = to_ccwgroupdev(dev);
+        gdrv = to_ccwgroupdrv(dev->driver);
+
+        ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
+
+        return ret;
+}
+
+static int
+ccwgroup_remove (struct device *dev)
+{
+        struct ccwgroup_device *gdev;
+        struct ccwgroup_driver *gdrv;
 
         if (!dev->driver)
                 return 0;
+
+        gdev = to_ccwgroupdev(dev);
+        gdrv = to_ccwgroupdrv(dev->driver);
+
         if (gdrv->remove)
                 gdrv->remove(gdev);
 
@@ -457,11 +504,15 @@ static int ccwgroup_remove(struct device *dev)
 
 static void ccwgroup_shutdown(struct device *dev)
 {
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
+        struct ccwgroup_device *gdev;
+        struct ccwgroup_driver *gdrv;
 
         if (!dev->driver)
                 return;
+
+        gdev = to_ccwgroupdev(dev);
+        gdrv = to_ccwgroupdrv(dev->driver);
+
         if (gdrv->shutdown)
                 gdrv->shutdown(gdev);
 }
@@ -536,11 +587,27 @@ static const struct dev_pm_ops ccwgroup_pm_ops = {
 
 static struct bus_type ccwgroup_bus_type = {
         .name   = "ccwgroup",
+        .match  = ccwgroup_bus_match,
+        .uevent = ccwgroup_uevent,
+        .probe  = ccwgroup_probe,
         .remove = ccwgroup_remove,
         .shutdown = ccwgroup_shutdown,
         .pm = &ccwgroup_pm_ops,
 };
 
+
+static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
+                             void *data)
+{
+        struct device *dev = data;
+
+        if (action == BUS_NOTIFY_UNBIND_DRIVER)
+                device_schedule_callback(dev, ccwgroup_ungroup_callback);
+
+        return NOTIFY_OK;
+}
+
+
 /**
  * ccwgroup_driver_register() - register a ccw group driver
  * @cdriver: driver to be registered
@@ -554,9 +621,9 @@ int ccwgroup_driver_register(struct ccwgroup_driver *cdriver)
 
         return driver_register(&cdriver->driver);
 }
-EXPORT_SYMBOL(ccwgroup_driver_register);
 
-static int __ccwgroup_match_all(struct device *dev, void *data)
+static int
+__ccwgroup_match_all(struct device *dev, void *data)
 {
         return 1;
 }
@@ -572,6 +639,7 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver)
         struct device *dev;
 
         /* We don't want ccwgroup devices to live longer than their driver. */
+        get_driver(&cdriver->driver);
         while ((dev = driver_find_device(&cdriver->driver, NULL, NULL,
                                          __ccwgroup_match_all))) {
                 struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
@@ -583,9 +651,9 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver)
                 mutex_unlock(&gdev->reg_mutex);
                 put_device(dev);
         }
+        put_driver(&cdriver->driver);
         driver_unregister(&cdriver->driver);
 }
-EXPORT_SYMBOL(ccwgroup_driver_unregister);
 
 /**
  * ccwgroup_probe_ccwdev() - probe function for slave devices
@@ -600,7 +668,6 @@ int ccwgroup_probe_ccwdev(struct ccw_device *cdev)
 {
         return 0;
 }
-EXPORT_SYMBOL(ccwgroup_probe_ccwdev);
 
 /**
  * ccwgroup_remove_ccwdev() - remove function for slave devices
@@ -637,5 +704,9 @@ void ccwgroup_remove_ccwdev(struct ccw_device *cdev)
         /* Release ccwgroup device reference for local processing. */
         put_device(&gdev->dev);
 }
-EXPORT_SYMBOL(ccwgroup_remove_ccwdev);
+
 MODULE_LICENSE("GPL");
+EXPORT_SYMBOL(ccwgroup_driver_register);
+EXPORT_SYMBOL(ccwgroup_driver_unregister);
+EXPORT_SYMBOL(ccwgroup_probe_ccwdev);
+EXPORT_SYMBOL(ccwgroup_remove_ccwdev);
diff --git a/drivers/s390/cio/ccwreq.c b/drivers/s390/cio/ccwreq.c
index 5156264d0c7..d15f8b4d78b 100644
--- a/drivers/s390/cio/ccwreq.c
+++ b/drivers/s390/cio/ccwreq.c
@@ -1,13 +1,10 @@
 /*
  *  Handling of internal CCW device requests.
  *
- *    Copyright IBM Corp. 2009, 2011
+ *    Copyright IBM Corp. 2009
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
-#define KMSG_COMPONENT "cio"
-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-
 #include <linux/types.h>
 #include <linux/err.h>
 #include <asm/ccwdev.h>
@@ -326,21 +323,7 @@ void ccw_request_timeout(struct ccw_device *cdev)
 {
         struct subchannel *sch = to_subchannel(cdev->dev.parent);
         struct ccw_request *req = &cdev->private->req;
-        int rc = -ENODEV, chp;
-
-        if (cio_update_schib(sch))
-                goto err;
-
-        for (chp = 0; chp < 8; chp++) {
-                if ((0x80 >> chp) & sch->schib.pmcw.lpum)
-                        pr_warning("%s: No interrupt was received within %lus "
-                                   "(CS=%02x, DS=%02x, CHPID=%x.%02x)\n",
-                                   dev_name(&cdev->dev), req->timeout / HZ,
-                                   scsw_cstat(&sch->schib.scsw),
-                                   scsw_dstat(&sch->schib.scsw),
-                                   sch->schid.cssid,
-                                   sch->schib.pmcw.chpid[chp]);
-        }
+        int rc;
 
         if (!ccwreq_next_path(cdev)) {
                 /* set the final return code for this request */
@@ -359,7 +342,7 @@ err:
  * ccw_request_notoper - notoper handler for I/O request procedure
  * @cdev: ccw device
  *
- * Handle notoper during I/O request procedure.
+ * Handle timeout during I/O request procedure.
  */
 void ccw_request_notoper(struct ccw_device *cdev)
 {
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 50ad5fdd815..2d32233943a 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -1,5 +1,7 @@
 /*
- *    Copyright IBM Corp. 1999, 2010
+ *  drivers/s390/cio/chp.c
+ *
+ *    Copyright IBM Corp. 1999,2010
  *    Author(s): Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Arnd Bergmann (arndb@de.ibm.com)
  *               Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
@@ -8,8 +10,6 @@
 #include <linux/bug.h>
 #include <linux/workqueue.h>
 #include <linux/spinlock.h>
-#include <linux/export.h>
-#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <linux/wait.h>
@@ -360,13 +360,10 @@ static struct attribute *chp_attrs[] = {
         &dev_attr_shared.attr,
         NULL,
 };
+
 static struct attribute_group chp_attr_group = {
         .attrs = chp_attrs,
 };
-static const struct attribute_group *chp_attr_groups[] = {
-        &chp_attr_group,
-        NULL,
-};
 
 static void chp_release(struct device *dev)
 {
@@ -398,7 +395,6 @@ int chp_new(struct chp_id chpid)
         chp->chpid = chpid;
         chp->state = 1;
         chp->dev.parent = &channel_subsystems[chpid.cssid]->device;
-        chp->dev.groups = chp_attr_groups;
         chp->dev.release = chp_release;
         mutex_init(&chp->lock);
 
@@ -428,10 +424,16 @@ int chp_new(struct chp_id chpid)
                 put_device(&chp->dev);
                 goto out;
         }
+        ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
+        if (ret) {
+                device_unregister(&chp->dev);
+                goto out;
+        }
         mutex_lock(&channel_subsystems[chpid.cssid]->mutex);
         if (channel_subsystems[chpid.cssid]->cm_enabled) {
                 ret = chp_add_cmg_attr(chp);
                 if (ret) {
+                        sysfs_remove_group(&chp->dev.kobj, &chp_attr_group);
                         device_unregister(&chp->dev);
                         mutex_unlock(&channel_subsystems[chpid.cssid]->mutex);
                         goto out;
diff --git a/drivers/s390/cio/chp.h b/drivers/s390/cio/chp.h
index e1399dbee83..12b4903d6fe 100644
--- a/drivers/s390/cio/chp.h
+++ b/drivers/s390/cio/chp.h
@@ -1,5 +1,7 @@
 /*
- *    Copyright IBM Corp. 2007, 2010
+ *  drivers/s390/cio/chp.h
+ *
+ *    Copyright IBM Corp. 2007,2010
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 68e80e2734a..75c3f1f8fd4 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/cio/chsc.c
  *   S/390 common I/O routines -- channel subsystem call
  *
- *    Copyright IBM Corp. 1999,2012
+ *    Copyright IBM Corp. 1999,2010
  *    Author(s): Ingo Adlung (adlung@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Arnd Bergmann (arndb@de.ibm.com)
@@ -14,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/pci.h>
 
 #include <asm/cio.h>
 #include <asm/chpid.h>
@@ -53,11 +53,6 @@ int chsc_error_from_response(int response)
                 return -EINVAL;
         case 0x0004:
                 return -EOPNOTSUPP;
-        case 0x000b:
-                return -EBUSY;
-        case 0x0100:
-        case 0x0102:
-                return -ENOMEM;
         default:
                 return -EIO;
         }
@@ -261,45 +256,26 @@ __get_chpid_from_lir(void *data)
         return (u16) (lir->indesc[0]&0x000000ff);
 }
 
-struct chsc_sei_nt0_area {
-        u8  flags;
-        u8  vf;                         /* validity flags */
-        u8  rs;                         /* reporting source */
-        u8  cc;                         /* content code */
-        u16 fla;                        /* full link address */
-        u16 rsid;                       /* reporting source id */
-        u32 reserved1;
-        u32 reserved2;
-        /* ccdf has to be big enough for a link-incident record */
-        u8  ccdf[PAGE_SIZE - 24 - 16];  /* content-code dependent field */
-} __packed;
-
-struct chsc_sei_nt2_area {
-        u8  flags;                      /* p and v bit */
-        u8  reserved1;
-        u8  reserved2;
-        u8  cc;                         /* content code */
-        u32 reserved3[13];
-        u8  ccdf[PAGE_SIZE - 24 - 56];  /* content-code dependent field */
-} __packed;
-
-#define CHSC_SEI_NT0    0ULL
-#define CHSC_SEI_NT2    (1ULL << 61)
-
-struct chsc_sei {
+struct chsc_sei_area {
         struct chsc_header request;
         u32 reserved1;
-        u64 ntsm;                       /* notification type mask */
-        struct chsc_header response;
         u32 reserved2;
-        union {
-                struct chsc_sei_nt0_area nt0_area;
-                struct chsc_sei_nt2_area nt2_area;
-                u8 nt_area[PAGE_SIZE - 24];
-        } u;
-} __packed;
-
-static void chsc_process_sei_link_incident(struct chsc_sei_nt0_area *sei_area)
+        u32 reserved3;
+        struct chsc_header response;
+        u32 reserved4;
+        u8  flags;
+        u8  vf;         /* validity flags */
+        u8  rs;         /* reporting source */
+        u8  cc;         /* content code */
+        u16 fla;        /* full link address */
+        u16 rsid;       /* reporting source id */
+        u32 reserved5;
+        u32 reserved6;
+        u8 ccdf[4096 - 16 - 24];        /* content-code dependent field */
+        /* ccdf has to be big enough for a link-incident record */
+} __attribute__ ((packed));
+
+static void chsc_process_sei_link_incident(struct chsc_sei_area *sei_area)
 {
         struct chp_id chpid;
         int id;
@@ -318,7 +294,7 @@ static void chsc_process_sei_link_incident(struct chsc_sei_nt0_area *sei_area)
         }
 }
 
-static void chsc_process_sei_res_acc(struct chsc_sei_nt0_area *sei_area)
+static void chsc_process_sei_res_acc(struct chsc_sei_area *sei_area)
 {
         struct chp_link link;
         struct chp_id chpid;
@@ -350,7 +326,7 @@ static void chsc_process_sei_res_acc(struct chsc_sei_nt0_area *sei_area)
         s390_process_res_acc(&link);
 }
 
-static void chsc_process_sei_chp_avail(struct chsc_sei_nt0_area *sei_area)
+static void chsc_process_sei_chp_avail(struct chsc_sei_area *sei_area)
 {
         struct channel_path *chp;
         struct chp_id chpid;
@@ -386,7 +362,7 @@ struct chp_config_data {
         u8 pc;
 };
 
-static void chsc_process_sei_chp_config(struct chsc_sei_nt0_area *sei_area)
+static void chsc_process_sei_chp_config(struct chsc_sei_area *sei_area)
 {
         struct chp_config_data *data;
         struct chp_id chpid;
@@ -418,40 +394,13 @@ static void chsc_process_sei_chp_config(struct chsc_sei_nt0_area *sei_area)
         }
 }
 
-static void chsc_process_sei_scm_change(struct chsc_sei_nt0_area *sei_area)
-{
-        int ret;
-
-        CIO_CRW_EVENT(4, "chsc: scm change notification\n");
-        if (sei_area->rs != 7)
-                return;
-
-        ret = scm_update_information();
-        if (ret)
-                CIO_CRW_EVENT(0, "chsc: updating change notification"
-                              " failed (rc=%d).\n", ret);
-}
-
-static void chsc_process_sei_nt2(struct chsc_sei_nt2_area *sei_area)
+static void chsc_process_sei(struct chsc_sei_area *sei_area)
 {
-#ifdef CONFIG_PCI
-        switch (sei_area->cc) {
-        case 1:
-                zpci_event_error(sei_area->ccdf);
-                break;
-        case 2:
-                zpci_event_availability(sei_area->ccdf);
-                break;
-        default:
-                CIO_CRW_EVENT(2, "chsc: unhandled sei content code %d\n",
-                              sei_area->cc);
-                break;
+        /* Check if we might have lost some information. */
+        if (sei_area->flags & 0x40) {
+                CIO_CRW_EVENT(2, "chsc: event overflow\n");
+                css_schedule_eval_all();
         }
-#endif
-}
-
-static void chsc_process_sei_nt0(struct chsc_sei_nt0_area *sei_area)
-{
         /* which kind of information was stored? */
         switch (sei_area->cc) {
         case 1: /* link incident*/
@@ -466,9 +415,6 @@ static void chsc_process_sei_nt0(struct chsc_sei_nt0_area *sei_area)
         case 8: /* channel-path-configuration notification */
                 chsc_process_sei_chp_config(sei_area);
                 break;
-        case 12: /* scm change notification */
-                chsc_process_sei_scm_change(sei_area);
-                break;
         default: /* other stuff */
                 CIO_CRW_EVENT(4, "chsc: unhandled sei content code %d\n",
                               sei_area->cc);
@@ -476,51 +422,9 @@ static void chsc_process_sei_nt0(struct chsc_sei_nt0_area *sei_area)
         }
 }
 
-static int __chsc_process_crw(struct chsc_sei *sei, u64 ntsm)
-{
-        do {
-                memset(sei, 0, sizeof(*sei));
-                sei->request.length = 0x0010;
-                sei->request.code = 0x000e;
-                sei->ntsm = ntsm;
-
-                if (chsc(sei))
-                        break;
-
-                if (sei->response.code == 0x0001) {
-                        CIO_CRW_EVENT(2, "chsc: sei successful\n");
-
-                        /* Check if we might have lost some information. */
-                        if (sei->u.nt0_area.flags & 0x40) {
-                                CIO_CRW_EVENT(2, "chsc: event overflow\n");
-                                css_schedule_eval_all();
-                        }
-
-                        switch (sei->ntsm) {
-                        case CHSC_SEI_NT0:
-                                chsc_process_sei_nt0(&sei->u.nt0_area);
-                                return 1;
-                        case CHSC_SEI_NT2:
-                                chsc_process_sei_nt2(&sei->u.nt2_area);
-                                return 1;
-                        default:
-                                CIO_CRW_EVENT(2, "chsc: unhandled nt (nt=%08Lx)\n",
-                                              sei->ntsm);
-                                return 0;
-                        }
-                } else {
-                        CIO_CRW_EVENT(2, "chsc: sei failed (rc=%04x)\n",
-                                      sei->response.code);
-                        break;
-                }
-        } while (sei->u.nt0_area.flags & 0x80);
-
-        return 0;
-}
-
 static void chsc_process_crw(struct crw *crw0, struct crw *crw1, int overflow)
 {
-        struct chsc_sei *sei;
+        struct chsc_sei_area *sei_area;
 
         if (overflow) {
                 css_schedule_eval_all();
@@ -534,18 +438,25 @@ static void chsc_process_crw(struct crw *crw0, struct crw *crw1, int overflow)
                 return;
         /* Access to sei_page is serialized through machine check handler
          * thread, so no need for locking. */
-        sei = sei_page;
+        sei_area = sei_page;
 
         CIO_TRACE_EVENT(2, "prcss");
+        do {
+                memset(sei_area, 0, sizeof(*sei_area));
+                sei_area->request.length = 0x0010;
+                sei_area->request.code = 0x000e;
+                if (chsc(sei_area))
+                        break;
 
-        /*
-         * The ntsm does not allow to select NT0 and NT2 together. We need to
-         * first check for NT2, than additionally for NT0...
-         */
-#ifdef CONFIG_PCI
-        if (!__chsc_process_crw(sei, CHSC_SEI_NT2))
-#endif
-                __chsc_process_crw(sei, CHSC_SEI_NT0);
+                if (sei_area->response.code == 0x0001) {
+                        CIO_CRW_EVENT(4, "chsc: sei successful\n");
+                        chsc_process_sei(sei_area);
+                } else {
+                        CIO_CRW_EVENT(2, "chsc: sei failed (rc=%04x)\n",
+                                      sei_area->response.code);
+                        break;
+                }
+        } while (sei_area->flags & 0x80);
 }
 
 void chsc_chp_online(struct chp_id chpid)
@@ -618,7 +529,10 @@ __s390_vary_chpid_on(struct subchannel_id schid, void *data)
 int chsc_chp_vary(struct chp_id chpid, int on)
 {
         struct channel_path *chp = chpid_to_chp(chpid);
+        struct chp_link link;
 
+        memset(&link, 0, sizeof(struct chp_link));
+        link.chpid = chpid;
         /* Wait until previous actions have settled. */
         css_wait_for_slow_path();
         /*
@@ -628,10 +542,10 @@ int chsc_chp_vary(struct chp_id chpid, int on)
                 /* Try to update the channel path descritor. */
                 chsc_determine_base_channel_path_desc(chpid, &chp->desc);
                 for_each_subchannel_staged(s390_subchannel_vary_chpid_on,
-                                           __s390_vary_chpid_on, &chpid);
+                                           __s390_vary_chpid_on, &link);
         } else
                 for_each_subchannel_staged(s390_subchannel_vary_chpid_off,
-                                           NULL, &chpid);
+                                           NULL, &link);
 
         return 0;
 }
@@ -1137,33 +1051,3 @@ out:
         return rc;
 }
 EXPORT_SYMBOL_GPL(chsc_siosl);
-
-/**
- * chsc_scm_info() - store SCM information (SSI)
- * @scm_area: request and response block for SSI
- * @token: continuation token
- *
- * Returns 0 on success.
- */
-int chsc_scm_info(struct chsc_scm_info *scm_area, u64 token)
-{
-        int ccode, ret;
-
-        memset(scm_area, 0, sizeof(*scm_area));
-        scm_area->request.length = 0x0020;
-        scm_area->request.code = 0x004C;
-        scm_area->reqtok = token;
-
-        ccode = chsc(scm_area);
-        if (ccode > 0) {
-                ret = (ccode == 3) ? -ENODEV : -EBUSY;
-                goto out;
-        }
-        ret = chsc_error_from_response(scm_area->response.code);
-        if (ret != 0)
-                CIO_MSG_EVENT(2, "chsc: scm info failed (rc=%04x)\n",
-                              scm_area->response.code);
-out:
-        return ret;
-}
-EXPORT_SYMBOL_GPL(chsc_scm_info);
diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index 662dab4b93e..3f15b2aaeae 100644
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -3,7 +3,6 @@
 
 #include <linux/types.h>
 #include <linux/device.h>
-#include <asm/css_chars.h>
 #include <asm/chpid.h>
 #include <asm/chsc.h>
 #include <asm/schid.h>
@@ -119,46 +118,4 @@ int chsc_error_from_response(int response);
 
 int chsc_siosl(struct subchannel_id schid);
 
-/* Functions and definitions to query storage-class memory. */
-struct sale {
-        u64 sa;
-        u32 p:4;
-        u32 op_state:4;
-        u32 data_state:4;
-        u32 rank:4;
-        u32 r:1;
-        u32:7;
-        u32 rid:8;
-        u32:32;
-} __packed;
-
-struct chsc_scm_info {
-        struct chsc_header request;
-        u32:32;
-        u64 reqtok;
-        u32 reserved1[4];
-        struct chsc_header response;
-        u64:56;
-        u8 rq;
-        u32 mbc;
-        u64 msa;
-        u16 is;
-        u16 mmc;
-        u32 mci;
-        u64 nr_scm_ini;
-        u64 nr_scm_unini;
-        u32 reserved2[10];
-        u64 restok;
-        struct sale scmal[248];
-} __packed;
-
-int chsc_scm_info(struct chsc_scm_info *scm_area, u64 token);
-
-#ifdef CONFIG_SCM_BUS
-int scm_update_information(void);
-#else /* CONFIG_SCM_BUS */
-#define scm_update_information() 0
-#endif /* CONFIG_SCM_BUS */
-
-
 #endif
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index facdf809113..e950f1ad4dd 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -1,19 +1,17 @@
 /*
  * Driver for s390 chsc subchannels
  *
- * Copyright IBM Corp. 2008, 2011
+ * Copyright IBM Corp. 2008, 2009
  *
  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  *
  */
 
 #include <linux/slab.h>
-#include <linux/compat.h>
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/kernel_stat.h>
 
 #include <asm/compat.h>
 #include <asm/cio.h>
@@ -58,8 +56,6 @@ static void chsc_subchannel_irq(struct subchannel *sch)
 
         CHSC_LOG(4, "irb");
         CHSC_LOG_HEX(4, irb, sizeof(*irb));
-        inc_irq_stat(IRQIO_CSC);
-
         /* Copy irb to provided request and set done. */
         if (!request) {
                 CHSC_MSG(0, "Interrupt on sch 0.%x.%04x with no request\n",
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index c8faf6230b0..eb3140ee821 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
  *
- *    Copyright IBM Corp. 1999, 2008
+ *    Copyright IBM Corp. 1999,2008
  *    Author(s): Ingo Adlung (adlung@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Arnd Bergmann (arndb@de.ibm.com)
@@ -600,6 +601,8 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
         struct pt_regs *old_regs;
 
         old_regs = set_irq_regs(regs);
+        s390_idle_check(regs, S390_lowcore.int_clock,
+                        S390_lowcore.async_enter_timer);
         irq_enter();
         __this_cpu_write(s390_idle.nohz_delay, 1);
         if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)
@@ -611,7 +614,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
         tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
         irb = (struct irb *)&S390_lowcore.irb;
         do {
-                kstat_incr_irqs_this_cpu(IO_INTERRUPT, NULL);
+                kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++;
                 if (tpi_info->adapter_IO) {
                         do_adapter_IO(tpi_info->isc);
                         continue;
@@ -619,7 +622,6 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
                 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
                 if (!sch) {
                         /* Clear pending interrupt condition. */
-                        inc_irq_stat(IRQIO_CIO);
                         tsch(tpi_info->schid, irb);
                         continue;
                 }
@@ -632,10 +634,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
                         /* Call interrupt handler if there is one. */
                         if (sch->driver && sch->driver->irq)
                                 sch->driver->irq(sch);
-                        else
-                                inc_irq_stat(IRQIO_CIO);
-                } else
-                        inc_irq_stat(IRQIO_CIO);
+                }
                 spin_unlock(sch->lock);
                 /*
                  * Are more interrupts pending?
@@ -655,34 +654,44 @@ static struct io_subchannel_private console_priv;
 static int console_subchannel_in_use;
 
 /*
- * Use cio_tsch to update the subchannel status and call the interrupt handler
- * if status had been pending. Called with the console_subchannel lock.
+ * Use cio_tpi to get a pending interrupt and call the interrupt handler.
+ * Return non-zero if an interrupt was processed, zero otherwise.
  */
-static void cio_tsch(struct subchannel *sch)
+static int cio_tpi(void)
 {
+        struct tpi_info *tpi_info;
+        struct subchannel *sch;
         struct irb *irb;
         int irq_context;
 
+        tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
+        if (tpi(NULL) != 1)
+                return 0;
+        if (tpi_info->adapter_IO) {
+                do_adapter_IO(tpi_info->isc);
+                return 1;
+        }
         irb = (struct irb *)&S390_lowcore.irb;
         /* Store interrupt response block to lowcore. */
-        if (tsch(sch->schid, irb) != 0)
+        if (tsch(tpi_info->schid, irb) != 0)
                 /* Not status pending or not operational. */
-                return;
-        memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
-        /* Call interrupt handler with updated status. */
+                return 1;
+        sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
+        if (!sch)
+                return 1;
         irq_context = in_interrupt();
-        if (!irq_context) {
+        if (!irq_context)
                 local_bh_disable();
-                irq_enter();
-        }
+        irq_enter();
+        spin_lock(sch->lock);
+        memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
         if (sch->driver && sch->driver->irq)
                 sch->driver->irq(sch);
-        else
-                inc_irq_stat(IRQIO_CIO);
-        if (!irq_context) {
-                irq_exit();
+        spin_unlock(sch->lock);
+        irq_exit();
+        if (!irq_context)
                 _local_bh_enable();
-        }
+        return 1;
 }
 
 void *cio_get_console_priv(void)
@@ -694,16 +703,34 @@ void *cio_get_console_priv(void)
  * busy wait for the next interrupt on the console
  */
 void wait_cons_dev(void)
+        __releases(console_subchannel.lock)
+        __acquires(console_subchannel.lock)
 {
+        unsigned long cr6      __attribute__ ((aligned (8)));
+        unsigned long save_cr6 __attribute__ ((aligned (8)));
+
+        /* 
+         * before entering the spinlock we may already have
+         * processed the interrupt on a different CPU...
+         */
         if (!console_subchannel_in_use)
                 return;
 
-        while (1) {
-                cio_tsch(&console_subchannel);
-                if (console_subchannel.schib.scsw.cmd.actl == 0)
-                        break;
-                udelay_simple(100);
-        }
+        /* disable all but the console isc */
+        __ctl_store (save_cr6, 6, 6);
+        cr6 = 1UL << (31 - CONSOLE_ISC);
+        __ctl_load (cr6, 6, 6);
+
+        do {
+                spin_unlock(console_subchannel.lock);
+                if (!cio_tpi())
+                        cpu_relax();
+                spin_lock(console_subchannel.lock);
+        } while (console_subchannel.schib.scsw.cmd.actl != 0);
+        /*
+         * restore previous isc value
+         */
+        __ctl_load (save_cr6, 6, 6);
 }
 
 static int
@@ -1029,9 +1056,9 @@ extern void do_reipl_asm(__u32 schid);
 /* Make sure all subchannels are quiet before we re-ipl an lpar. */
 void reipl_ccw_dev(struct ccw_dev_id *devid)
 {
-        struct subchannel_id uninitialized_var(schid);
+        struct subchannel_id schid;
 
-        s390_reset_system(NULL, NULL);
+        s390_reset_system();
         if (reipl_find_schid(devid, &schid) != 0)
                 panic("IPL Device not found\n");
         do_reipl_asm(*((__u32*)&schid));
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 4a1ff5c2eb8..155a82bcb9e 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -68,13 +68,8 @@ struct schib {
         __u8 mda[4];             /* model dependent area */
 } __attribute__ ((packed,aligned(4)));
 
-/*
- * When rescheduled, todo's with higher values will overwrite those
- * with lower values.
- */
 enum sch_todo {
         SCH_TODO_NOTHING,
-        SCH_TODO_EVAL,
         SCH_TODO_UNREG,
 };
 
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index c9fc61c0a86..2985eb43948 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -1,7 +1,9 @@
 /*
+ * linux/drivers/s390/cio/cmf.c
+ *
  * Linux on zSeries Channel Measurement Facility support
  *
- * Copyright IBM Corp. 2000, 2006
+ * Copyright 2000,2006 IBM Corporation
  *
  * Authors: Arnd Bergmann <arndb@de.ibm.com>
  *          Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -96,7 +98,7 @@ enum cmb_format {
  * enum cmb_format.
  */
 static int format = CMF_AUTODETECT;
-module_param(format, bint, 0444);
+module_param(format, bool, 0444);
 
 /**
  * struct cmb_operations - functions to use depending on cmb_format
@@ -1339,7 +1341,7 @@ module_init(init_cmf);
 MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("channel measurement facility base driver\n"
-                   "Copyright IBM Corp. 2003\n");
+                   "Copyright 2003 IBM Corporation\n");
 
 EXPORT_SYMBOL_GPL(enable_cmf);
 EXPORT_SYMBOL_GPL(disable_cmf);
diff --git a/drivers/s390/cio/crw.c b/drivers/s390/cio/crw.c
index 0f8a25f98b1..425f741a280 100644
--- a/drivers/s390/cio/crw.c
+++ b/drivers/s390/cio/crw.c
@@ -1,7 +1,7 @@
 /*
  *   Channel report handling code
  *
- *    Copyright IBM Corp. 2000, 2009
+ *    Copyright IBM Corp. 2000,2009
  *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
  *               Cornelia Huck <cornelia.huck@de.ibm.com>,
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/wait.h>
 #include <asm/crw.h>
-#include <asm/ctl_reg.h>
 
 static DEFINE_MUTEX(crw_handler_mutex);
 static crw_handler_t crw_handlers[NR_RSCS];
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index fd00afd8b85..92d7324acb1 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -195,6 +195,51 @@ void css_sch_device_unregister(struct subchannel *sch)
 }
 EXPORT_SYMBOL_GPL(css_sch_device_unregister);
 
+static void css_sch_todo(struct work_struct *work)
+{
+        struct subchannel *sch;
+        enum sch_todo todo;
+
+        sch = container_of(work, struct subchannel, todo_work);
+        /* Find out todo. */
+        spin_lock_irq(sch->lock);
+        todo = sch->todo;
+        CIO_MSG_EVENT(4, "sch_todo: sch=0.%x.%04x, todo=%d\n", sch->schid.ssid,
+                      sch->schid.sch_no, todo);
+        sch->todo = SCH_TODO_NOTHING;
+        spin_unlock_irq(sch->lock);
+        /* Perform todo. */
+        if (todo == SCH_TODO_UNREG)
+                css_sch_device_unregister(sch);
+        /* Release workqueue ref. */
+        put_device(&sch->dev);
+}
+
+/**
+ * css_sched_sch_todo - schedule a subchannel operation
+ * @sch: subchannel
+ * @todo: todo
+ *
+ * Schedule the operation identified by @todo to be performed on the slow path
+ * workqueue. Do nothing if another operation with higher priority is already
+ * scheduled. Needs to be called with subchannel lock held.
+ */
+void css_sched_sch_todo(struct subchannel *sch, enum sch_todo todo)
+{
+        CIO_MSG_EVENT(4, "sch_todo: sched sch=0.%x.%04x todo=%d\n",
+                      sch->schid.ssid, sch->schid.sch_no, todo);
+        if (sch->todo >= todo)
+                return;
+        /* Get workqueue ref. */
+        if (!get_device(&sch->dev))
+                return;
+        sch->todo = todo;
+        if (!queue_work(cio_work_q, &sch->todo_work)) {
+                /* Already queued, release workqueue ref. */
+                put_device(&sch->dev);
+        }
+}
+
 static void ssd_from_pmcw(struct chsc_ssd_info *ssd, struct pmcw *pmcw)
 {
         int i;
@@ -377,11 +422,7 @@ static int css_evaluate_new_subchannel(struct subchannel_id schid, int slow)
                 /* Will be done on the slow path. */
                 return -EAGAIN;
         }
-        if (stsch_err(schid, &schib)) {
-                /* Subchannel is not provided. */
-                return -ENXIO;
-        }
-        if (!css_sch_is_valid(&schib)) {
+        if (stsch_err(schid, &schib) || !css_sch_is_valid(&schib)) {
                 /* Unusable - ignore. */
                 return 0;
         }
@@ -425,66 +466,6 @@ static void css_evaluate_subchannel(struct subchannel_id schid, int slow)
                 css_schedule_eval(schid);
 }
 
-/**
- * css_sched_sch_todo - schedule a subchannel operation
- * @sch: subchannel
- * @todo: todo
- *
- * Schedule the operation identified by @todo to be performed on the slow path
- * workqueue. Do nothing if another operation with higher priority is already
- * scheduled. Needs to be called with subchannel lock held.
- */
-void css_sched_sch_todo(struct subchannel *sch, enum sch_todo todo)
-{
-        CIO_MSG_EVENT(4, "sch_todo: sched sch=0.%x.%04x todo=%d\n",
-                      sch->schid.ssid, sch->schid.sch_no, todo);
-        if (sch->todo >= todo)
-                return;
-        /* Get workqueue ref. */
-        if (!get_device(&sch->dev))
-                return;
-        sch->todo = todo;
-        if (!queue_work(cio_work_q, &sch->todo_work)) {
-                /* Already queued, release workqueue ref. */
-                put_device(&sch->dev);
-        }
-}
-EXPORT_SYMBOL_GPL(css_sched_sch_todo);
-
-static void css_sch_todo(struct work_struct *work)
-{
-        struct subchannel *sch;
-        enum sch_todo todo;
-        int ret;
-
-        sch = container_of(work, struct subchannel, todo_work);
-        /* Find out todo. */
-        spin_lock_irq(sch->lock);
-        todo = sch->todo;
-        CIO_MSG_EVENT(4, "sch_todo: sch=0.%x.%04x, todo=%d\n", sch->schid.ssid,
-                      sch->schid.sch_no, todo);
-        sch->todo = SCH_TODO_NOTHING;
-        spin_unlock_irq(sch->lock);
-        /* Perform todo. */
-        switch (todo) {
-        case SCH_TODO_NOTHING:
-                break;
-        case SCH_TODO_EVAL:
-                ret = css_evaluate_known_subchannel(sch, 1);
-                if (ret == -EAGAIN) {
-                        spin_lock_irq(sch->lock);
-                        css_sched_sch_todo(sch, todo);
-                        spin_unlock_irq(sch->lock);
-                }
-                break;
-        case SCH_TODO_UNREG:
-                css_sch_device_unregister(sch);
-                break;
-        }
-        /* Release workqueue ref. */
-        put_device(&sch->dev);
-}
-
 static struct idset *slow_subchannel_set;
 static spinlock_t slow_subchannel_lock;
 static wait_queue_head_t css_eval_wq;
@@ -540,7 +521,6 @@ static int slow_eval_unknown_fn(struct subchannel_id schid, void *data)
                 case -ENOMEM:
                 case -EIO:
                         /* These should abort looping */
-                        idset_sch_del_subseq(slow_subchannel_set, schid);
                         break;
                 default:
                         rc = 0;
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 4af3dfe70ef..80ebdddf774 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -112,6 +112,9 @@ extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *);
 extern void css_reiterate_subchannels(void);
 void css_update_ssd_info(struct subchannel *sch);
 
+#define __MAX_SUBCHANNEL 65535
+#define __MAX_SSID 3
+
 struct channel_subsystem {
         u8 cssid;
         int valid;
@@ -130,8 +133,6 @@ struct channel_subsystem {
 
 extern struct channel_subsystem *channel_subsystems[];
 
-void channel_subsystem_reinit(void);
-
 /* Helper functions to build lists for the slow path. */
 void css_schedule_eval(struct subchannel_id schid);
 void css_schedule_eval_all(void);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 7cd5c6812ac..8e04c00cf0a 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1,7 +1,8 @@
 /*
+ *  drivers/s390/cio/device.c
  *  bus driver for ccw devices
  *
- *    Copyright IBM Corp. 2002, 2008
+ *    Copyright IBM Corp. 2002,2008
  *    Author(s): Arnd Bergmann (arndb@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
@@ -20,7 +21,6 @@
 #include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/timer.h>
-#include <linux/kernel_stat.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -694,17 +694,7 @@ static int match_dev_id(struct device *dev, void *data)
         return ccw_dev_id_is_equal(&cdev->private->dev_id, dev_id);
 }
 
-/**
- * get_ccwdev_by_dev_id() - obtain device from a ccw device id
- * @dev_id: id of the device to be searched
- *
- * This function searches all devices attached to the ccw bus for a device
- * matching @dev_id.
- * Returns:
- *  If a device is found its reference count is increased and returned;
- *  else %NULL is returned.
- */
-struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id)
+static struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id)
 {
         struct device *dev;
 
@@ -712,7 +702,6 @@ struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id)
 
         return dev ? to_ccwdev(dev) : NULL;
 }
-EXPORT_SYMBOL_GPL(get_ccwdev_by_dev_id);
 
 static void ccw_device_do_unbind_bind(struct ccw_device *cdev)
 {
@@ -758,7 +747,6 @@ static int io_subchannel_initialize_dev(struct subchannel *sch,
                                         struct ccw_device *cdev)
 {
         cdev->private->cdev = cdev;
-        cdev->private->int_class = IRQIO_CIO;
         atomic_set(&cdev->private->onoff, 0);
         cdev->dev.parent = &sch->dev;
         cdev->dev.release = ccw_device_release;
@@ -1022,8 +1010,6 @@ static void io_subchannel_irq(struct subchannel *sch)
         CIO_TRACE_EVENT(6, dev_name(&sch->dev));
         if (cdev)
                 dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
-        else
-                inc_irq_stat(IRQIO_CIO);
 }
 
 void io_subchannel_init_config(struct subchannel *sch)
@@ -1424,10 +1410,8 @@ static enum io_sch_action sch_get_action(struct subchannel *sch)
         }
         if (device_is_disconnected(cdev))
                 return IO_SCH_REPROBE;
-        if (cdev->online && !cdev->private->flags.resuming)
+        if (cdev->online)
                 return IO_SCH_VERIFY;
-        if (cdev->private->state == DEV_STATE_NOT_OPER)
-                return IO_SCH_UNREG_ATTACH;
         return IO_SCH_NOP;
 }
 
@@ -1469,6 +1453,12 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
                 rc = 0;
                 goto out_unlock;
         case IO_SCH_VERIFY:
+                if (cdev->private->flags.resuming == 1) {
+                        if (cio_enable_subchannel(sch, (u32)(addr_t)sch)) {
+                                ccw_device_set_notoper(cdev);
+                                break;
+                        }
+                }
                 /* Trigger path verification. */
                 io_subchannel_verify(sch);
                 rc = 0;
@@ -1515,14 +1505,11 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
                         goto out;
                 break;
         case IO_SCH_UNREG_ATTACH:
-                spin_lock_irqsave(sch->lock, flags);
                 if (cdev->private->flags.resuming) {
                         /* Device will be handled later. */
                         rc = 0;
-                        goto out_unlock;
+                        goto out;
                 }
-                sch_set_cdev(sch, NULL);
-                spin_unlock_irqrestore(sch->lock, flags);
                 /* Unregister ccw device. */
                 ccw_device_unregister(cdev);
                 break;
@@ -1634,7 +1621,6 @@ ccw_device_probe_console(void)
         memset(&console_private, 0, sizeof(struct ccw_device_private));
         console_cdev.private = &console_private;
         console_private.cdev = &console_cdev;
-        console_private.int_class = IRQIO_CIO;
         ret = ccw_device_console_enable(&console_cdev, sch);
         if (ret) {
                 cio_release_console();
@@ -1685,9 +1671,15 @@ struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,
                                        const char *bus_id)
 {
         struct device *dev;
+        struct device_driver *drv;
+
+        drv = get_driver(&cdrv->driver);
+        if (!drv)
+                return NULL;
 
-        dev = driver_find_device(&cdrv->driver, NULL, (void *)bus_id,
+        dev = driver_find_device(drv, NULL, (void *)bus_id,
                                  __ccwdev_check_busid);
+        put_driver(drv);
 
         return dev ? to_ccwdev(dev) : NULL;
 }
@@ -1710,18 +1702,11 @@ ccw_device_probe (struct device *dev)
         int ret;
 
         cdev->drv = cdrv; /* to let the driver call _set_online */
-        /* Note: we interpret class 0 in this context as an uninitialized
-         * field since it translates to a non-I/O interrupt class. */
-        if (cdrv->int_class != 0)
-                cdev->private->int_class = cdrv->int_class;
-        else
-                cdev->private->int_class = IRQIO_CIO;
 
         ret = cdrv->probe ? cdrv->probe(cdev) : -ENODEV;
 
         if (ret) {
                 cdev->drv = NULL;
-                cdev->private->int_class = IRQIO_CIO;
                 return ret;
         }
 
@@ -1755,7 +1740,6 @@ ccw_device_remove (struct device *dev)
         }
         ccw_device_set_timeout(cdev, 0);
         cdev->drv = NULL;
-        cdev->private->int_class = IRQIO_CIO;
         return 0;
 }
 
@@ -1871,9 +1855,9 @@ static void __ccw_device_pm_restore(struct ccw_device *cdev)
          */
         cdev->private->flags.resuming = 1;
         cdev->private->path_new_mask = LPM_ANYPATH;
-        css_sched_sch_todo(sch, SCH_TODO_EVAL);
+        css_schedule_eval(sch->schid);
         spin_unlock_irq(sch->lock);
-        css_wait_for_slow_path();
+        css_complete_work();
 
         /* cdev may have been moved to a different subchannel. */
         sch = to_subchannel(cdev->dev.parent);
@@ -2036,6 +2020,16 @@ void ccw_driver_unregister(struct ccw_driver *cdriver)
         driver_unregister(&cdriver->driver);
 }
 
+/* Helper func for qdio. */
+struct subchannel_id
+ccw_device_get_subchannel_id(struct ccw_device *cdev)
+{
+        struct subchannel *sch;
+
+        sch = to_subchannel(cdev->dev.parent);
+        return sch->schid;
+}
+
 static void ccw_device_todo(struct work_struct *work)
 {
         struct ccw_device_private *priv;
@@ -2128,3 +2122,4 @@ EXPORT_SYMBOL(ccw_device_set_offline);
 EXPORT_SYMBOL(ccw_driver_register);
 EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);
+EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 7d4ecb65db0..0b7245c72d5 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -5,7 +5,6 @@
 #include <linux/atomic.h>
 #include <linux/wait.h>
 #include <linux/notifier.h>
-#include <linux/kernel_stat.h>
 #include "io_sch.h"
 
 /*
@@ -57,16 +56,7 @@ extern fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS];
 static inline void
 dev_fsm_event(struct ccw_device *cdev, enum dev_event dev_event)
 {
-        int state = cdev->private->state;
-
-        if (dev_event == DEV_EVENT_INTERRUPT) {
-                if (state == DEV_STATE_ONLINE)
-                        inc_irq_stat(cdev->private->int_class);
-                else if (state != DEV_STATE_CMFCHANGE &&
-                         state != DEV_STATE_CMFUPDATE)
-                        inc_irq_stat(IRQIO_CIO);
-        }
-        dev_jumptable[state][dev_event](cdev, dev_event);
+        dev_jumptable[cdev->private->state][dev_event](cdev, dev_event);
 }
 
 /*
@@ -100,7 +90,6 @@ int ccw_device_test_sense_data(struct ccw_device *);
 void ccw_device_schedule_sch_unregister(struct ccw_device *);
 int ccw_purge_blacklisted(void);
 void ccw_device_sched_todo(struct ccw_device *cdev, enum cdev_todo todo);
-struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id);
 
 /* Function prototypes for device status and basic sense stuff. */
 void ccw_device_accumulate_irb(struct ccw_device *, struct irb *);
@@ -141,7 +130,9 @@ int ccw_device_notify(struct ccw_device *, int);
 void ccw_device_set_disconnected(struct ccw_device *cdev);
 void ccw_device_set_notoper(struct ccw_device *cdev);
 
+/* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
+extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *);
 
 /* Channel measurement facility related */
 void retry_set_schib(struct ccw_device *cdev);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 1bb1d00095a..52c233fa2b1 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -1,7 +1,8 @@
 /*
+ * drivers/s390/cio/device_fsm.c
  * finite state machine for device handling
  *
- *    Copyright IBM Corp. 2002, 2008
+ *    Copyright IBM Corp. 2002,2008
  *    Author(s): Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
@@ -495,26 +496,8 @@ static void ccw_device_reset_path_events(struct ccw_device *cdev)
         cdev->private->pgid_reset_mask = 0;
 }
 
-static void create_fake_irb(struct irb *irb, int type)
-{
-        memset(irb, 0, sizeof(*irb));
-        if (type == FAKE_CMD_IRB) {
-                struct cmd_scsw *scsw = &irb->scsw.cmd;
-                scsw->cc = 1;
-                scsw->fctl = SCSW_FCTL_START_FUNC;
-                scsw->actl = SCSW_ACTL_START_PEND;
-                scsw->stctl = SCSW_STCTL_STATUS_PEND;
-        } else if (type == FAKE_TM_IRB) {
-                struct tm_scsw *scsw = &irb->scsw.tm;
-                scsw->x = 1;
-                scsw->cc = 1;
-                scsw->fctl = SCSW_FCTL_START_FUNC;
-                scsw->actl = SCSW_ACTL_START_PEND;
-                scsw->stctl = SCSW_STCTL_STATUS_PEND;
-        }
-}
-
-void ccw_device_verify_done(struct ccw_device *cdev, int err)
+void
+ccw_device_verify_done(struct ccw_device *cdev, int err)
 {
         struct subchannel *sch;
 
@@ -537,8 +520,12 @@ callback:
                 ccw_device_done(cdev, DEV_STATE_ONLINE);
                 /* Deliver fake irb to device driver, if needed. */
                 if (cdev->private->flags.fake_irb) {
-                        create_fake_irb(&cdev->private->irb,
-                                        cdev->private->flags.fake_irb);
+                        memset(&cdev->private->irb, 0, sizeof(struct irb));
+                        cdev->private->irb.scsw.cmd.cc = 1;
+                        cdev->private->irb.scsw.cmd.fctl = SCSW_FCTL_START_FUNC;
+                        cdev->private->irb.scsw.cmd.actl = SCSW_ACTL_START_PEND;
+                        cdev->private->irb.scsw.cmd.stctl =
+                                SCSW_STCTL_STATUS_PEND;
                         cdev->private->flags.fake_irb = 0;
                         if (cdev->handler)
                                 cdev->handler(cdev, cdev->private->intparm,
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index d4fa30541a3..78a0b43862c 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -1,7 +1,7 @@
 /*
  *  CCW device SENSE ID I/O handling.
  *
- *    Copyright IBM Corp. 2002, 2009
+ *    Copyright IBM Corp. 2002,2009
  *    Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
  *               Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index c77b6e06bf6..f98698d5735 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -198,7 +198,7 @@ int ccw_device_start_key(struct ccw_device *cdev, struct ccw1 *cpa,
         if (cdev->private->state == DEV_STATE_VERIFY) {
                 /* Remember to fake irb when finished. */
                 if (!cdev->private->flags.fake_irb) {
-                        cdev->private->flags.fake_irb = FAKE_CMD_IRB;
+                        cdev->private->flags.fake_irb = 1;
                         cdev->private->intparm = intparm;
                         return 0;
                 } else
@@ -213,9 +213,9 @@ int ccw_device_start_key(struct ccw_device *cdev, struct ccw1 *cpa,
         ret = cio_set_options (sch, flags);
         if (ret)
                 return ret;
-        /* Adjust requested path mask to exclude unusable paths. */
+        /* Adjust requested path mask to excluded varied off paths. */
         if (lpm) {
-                lpm &= sch->lpm;
+                lpm &= sch->opm;
                 if (lpm == 0)
                         return -EACCES;
         }
@@ -605,21 +605,11 @@ int ccw_device_tm_start_key(struct ccw_device *cdev, struct tcw *tcw,
         sch = to_subchannel(cdev->dev.parent);
         if (!sch->schib.pmcw.ena)
                 return -EINVAL;
-        if (cdev->private->state == DEV_STATE_VERIFY) {
-                /* Remember to fake irb when finished. */
-                if (!cdev->private->flags.fake_irb) {
-                        cdev->private->flags.fake_irb = FAKE_TM_IRB;
-                        cdev->private->intparm = intparm;
-                        return 0;
-                } else
-                        /* There's already a fake I/O around. */
-                        return -EBUSY;
-        }
         if (cdev->private->state != DEV_STATE_ONLINE)
                 return -EIO;
-        /* Adjust requested path mask to exclude unusable paths. */
+        /* Adjust requested path mask to excluded varied off paths. */
         if (lpm) {
-                lpm &= sch->lpm;
+                lpm &= sch->opm;
                 if (lpm == 0)
                         return -EACCES;
         }
@@ -755,18 +745,14 @@ int ccw_device_tm_intrg(struct ccw_device *cdev)
 }
 EXPORT_SYMBOL(ccw_device_tm_intrg);
 
-/**
- * ccw_device_get_schid - obtain a subchannel id
- * @cdev: device to obtain the id for
- * @schid: where to fill in the values
- */
-void ccw_device_get_schid(struct ccw_device *cdev, struct subchannel_id *schid)
-{
-        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+// FIXME: these have to go:
 
-        *schid = sch->schid;
+int
+_ccw_device_get_subchannel_number(struct ccw_device *cdev)
+{
+        return cdev->private->schid.sch_no;
 }
-EXPORT_SYMBOL_GPL(ccw_device_get_schid);
+
 
 MODULE_LICENSE("GPL");
 EXPORT_SYMBOL(ccw_device_set_options_mask);
@@ -781,4 +767,5 @@ EXPORT_SYMBOL(ccw_device_start_timeout_key);
 EXPORT_SYMBOL(ccw_device_start_key);
 EXPORT_SYMBOL(ccw_device_get_ciw);
 EXPORT_SYMBOL(ccw_device_get_path_mask);
+EXPORT_SYMBOL(_ccw_device_get_subchannel_number);
 EXPORT_SYMBOL_GPL(ccw_device_get_chp_desc);
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index 908d287f66c..07a4fd29f09 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -1,7 +1,7 @@
 /*
  *  CCW device PGID and path verification I/O handling.
  *
- *    Copyright IBM Corp. 2002, 2009
+ *    Copyright IBM Corp. 2002,2009
  *    Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>
  *               Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
@@ -234,7 +234,7 @@ static int pgid_cmp(struct pgid *p1, struct pgid *p2)
  * Determine pathgroup state from PGID data.
  */
 static void pgid_analyze(struct ccw_device *cdev, struct pgid **p,
-                         int *mismatch, u8 *reserved, u8 *reset)
+                         int *mismatch, int *reserved, u8 *reset)
 {
         struct pgid *pgid = &cdev->private->pgid[0];
         struct pgid *first = NULL;
@@ -248,7 +248,7 @@ static void pgid_analyze(struct ccw_device *cdev, struct pgid **p,
                 if ((cdev->private->pgid_valid_mask & lpm) == 0)
                         continue;
                 if (pgid->inf.ps.state2 == SNID_STATE2_RESVD_ELSE)
-                        *reserved |= lpm;
+                        *reserved = 1;
                 if (pgid_is_reset(pgid)) {
                         *reset |= lpm;
                         continue;
@@ -316,14 +316,14 @@ static void snid_done(struct ccw_device *cdev, int rc)
         struct subchannel *sch = to_subchannel(cdev->dev.parent);
         struct pgid *pgid;
         int mismatch = 0;
-        u8 reserved = 0;
+        int reserved = 0;
         u8 reset = 0;
         u8 donepm;
 
         if (rc)
                 goto out;
         pgid_analyze(cdev, &pgid, &mismatch, &reserved, &reset);
-        if (reserved == cdev->private->pgid_valid_mask)
+        if (reserved)
                 rc = -EUSERS;
         else if (mismatch)
                 rc = -EOPNOTSUPP;
@@ -336,7 +336,7 @@ static void snid_done(struct ccw_device *cdev, int rc)
         }
 out:
         CIO_MSG_EVENT(2, "snid: device 0.%x.%04x: rc=%d pvm=%02x vpm=%02x "
-                      "todo=%02x mism=%d rsvd=%02x reset=%02x\n", id->ssid,
+                      "todo=%02x mism=%d rsvd=%d reset=%02x\n", id->ssid,
                       id->devno, rc, cdev->private->pgid_valid_mask, sch->vpm,
                       cdev->private->pgid_todo_mask, mismatch, reserved, reset);
         switch (rc) {
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index 15b56a15db1..66d8066ef22 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -1,5 +1,8 @@
 /*
- *    Copyright IBM Corp. 2002
+ * drivers/s390/cio/device_status.c
+ *
+ *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
+ *                       IBM Corporation
  *    Author(s): Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
  *
diff --git a/drivers/s390/cio/eadm_sch.c b/drivers/s390/cio/eadm_sch.c
deleted file mode 100644
index d9eddcba7e8..00000000000
--- a/drivers/s390/cio/eadm_sch.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Driver for s390 eadm subchannels
- *
- * Copyright IBM Corp. 2012
- * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
- */
-
-#include <linux/kernel_stat.h>
-#include <linux/workqueue.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/module.h>
-#include <linux/timer.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-
-#include <asm/css_chars.h>
-#include <asm/debug.h>
-#include <asm/isc.h>
-#include <asm/cio.h>
-#include <asm/scsw.h>
-#include <asm/eadm.h>
-
-#include "eadm_sch.h"
-#include "ioasm.h"
-#include "cio.h"
-#include "css.h"
-#include "orb.h"
-
-MODULE_DESCRIPTION("driver for s390 eadm subchannels");
-MODULE_LICENSE("GPL");
-
-#define EADM_TIMEOUT (5 * HZ)
-static DEFINE_SPINLOCK(list_lock);
-static LIST_HEAD(eadm_list);
-
-static debug_info_t *eadm_debug;
-
-#define EADM_LOG(imp, txt) do {                                 \
-                debug_text_event(eadm_debug, imp, txt);         \
-        } while (0)
-
-static void EADM_LOG_HEX(int level, void *data, int length)
-{
-        if (level > eadm_debug->level)
-                return;
-        while (length > 0) {
-                debug_event(eadm_debug, level, data, length);
-                length -= eadm_debug->buf_size;
-                data += eadm_debug->buf_size;
-        }
-}
-
-static void orb_init(union orb *orb)
-{
-        memset(orb, 0, sizeof(union orb));
-        orb->eadm.compat1 = 1;
-        orb->eadm.compat2 = 1;
-        orb->eadm.fmt = 1;
-        orb->eadm.x = 1;
-}
-
-static int eadm_subchannel_start(struct subchannel *sch, struct aob *aob)
-{
-        union orb *orb = &get_eadm_private(sch)->orb;
-        int cc;
-
-        orb_init(orb);
-        orb->eadm.aob = (u32)__pa(aob);
-        orb->eadm.intparm = (u32)(addr_t)sch;
-        orb->eadm.key = PAGE_DEFAULT_KEY >> 4;
-
-        EADM_LOG(6, "start");
-        EADM_LOG_HEX(6, &sch->schid, sizeof(sch->schid));
-
-        cc = ssch(sch->schid, orb);
-        switch (cc) {
-        case 0:
-                sch->schib.scsw.eadm.actl |= SCSW_ACTL_START_PEND;
-                break;
-        case 1:         /* status pending */
-        case 2:         /* busy */
-                return -EBUSY;
-        case 3:         /* not operational */
-                return -ENODEV;
-        }
-        return 0;
-}
-
-static int eadm_subchannel_clear(struct subchannel *sch)
-{
-        int cc;
-
-        cc = csch(sch->schid);
-        if (cc)
-                return -ENODEV;
-
-        sch->schib.scsw.eadm.actl |= SCSW_ACTL_CLEAR_PEND;
-        return 0;
-}
-
-static void eadm_subchannel_timeout(unsigned long data)
-{
-        struct subchannel *sch = (struct subchannel *) data;
-
-        spin_lock_irq(sch->lock);
-        EADM_LOG(1, "timeout");
-        EADM_LOG_HEX(1, &sch->schid, sizeof(sch->schid));
-        if (eadm_subchannel_clear(sch))
-                EADM_LOG(0, "clear failed");
-        spin_unlock_irq(sch->lock);
-}
-
-static void eadm_subchannel_set_timeout(struct subchannel *sch, int expires)
-{
-        struct eadm_private *private = get_eadm_private(sch);
-
-        if (expires == 0) {
-                del_timer(&private->timer);
-                return;
-        }
-        if (timer_pending(&private->timer)) {
-                if (mod_timer(&private->timer, jiffies + expires))
-                        return;
-        }
-        private->timer.function = eadm_subchannel_timeout;
-        private->timer.data = (unsigned long) sch;
-        private->timer.expires = jiffies + expires;
-        add_timer(&private->timer);
-}
-
-static void eadm_subchannel_irq(struct subchannel *sch)
-{
-        struct eadm_private *private = get_eadm_private(sch);
-        struct eadm_scsw *scsw = &sch->schib.scsw.eadm;
-        struct irb *irb = (struct irb *)&S390_lowcore.irb;
-        int error = 0;
-
-        EADM_LOG(6, "irq");
-        EADM_LOG_HEX(6, irb, sizeof(*irb));
-
-        inc_irq_stat(IRQIO_ADM);
-
-        if ((scsw->stctl & (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND))
-            && scsw->eswf == 1 && irb->esw.eadm.erw.r)
-                error = -EIO;
-
-        if (scsw->fctl & SCSW_FCTL_CLEAR_FUNC)
-                error = -ETIMEDOUT;
-
-        eadm_subchannel_set_timeout(sch, 0);
-
-        if (private->state != EADM_BUSY) {
-                EADM_LOG(1, "irq unsol");
-                EADM_LOG_HEX(1, irb, sizeof(*irb));
-                private->state = EADM_NOT_OPER;
-                css_sched_sch_todo(sch, SCH_TODO_EVAL);
-                return;
-        }
-        scm_irq_handler((struct aob *)(unsigned long)scsw->aob, error);
-        private->state = EADM_IDLE;
-}
-
-static struct subchannel *eadm_get_idle_sch(void)
-{
-        struct eadm_private *private;
-        struct subchannel *sch;
-        unsigned long flags;
-
-        spin_lock_irqsave(&list_lock, flags);
-        list_for_each_entry(private, &eadm_list, head) {
-                sch = private->sch;
-                spin_lock(sch->lock);
-                if (private->state == EADM_IDLE) {
-                        private->state = EADM_BUSY;
-                        list_move_tail(&private->head, &eadm_list);
-                        spin_unlock(sch->lock);
-                        spin_unlock_irqrestore(&list_lock, flags);
-
-                        return sch;
-                }
-                spin_unlock(sch->lock);
-        }
-        spin_unlock_irqrestore(&list_lock, flags);
-
-        return NULL;
-}
-
-static int eadm_start_aob(struct aob *aob)
-{
-        struct eadm_private *private;
-        struct subchannel *sch;
-        unsigned long flags;
-        int ret;
-
-        sch = eadm_get_idle_sch();
-        if (!sch)
-                return -EBUSY;
-
-        spin_lock_irqsave(sch->lock, flags);
-        eadm_subchannel_set_timeout(sch, EADM_TIMEOUT);
-        ret = eadm_subchannel_start(sch, aob);
-        if (!ret)
-                goto out_unlock;
-
-        /* Handle start subchannel failure. */
-        eadm_subchannel_set_timeout(sch, 0);
-        private = get_eadm_private(sch);
-        private->state = EADM_NOT_OPER;
-        css_sched_sch_todo(sch, SCH_TODO_EVAL);
-
-out_unlock:
-        spin_unlock_irqrestore(sch->lock, flags);
-
-        return ret;
-}
-
-static int eadm_subchannel_probe(struct subchannel *sch)
-{
-        struct eadm_private *private;
-        int ret;
-
-        private = kzalloc(sizeof(*private), GFP_KERNEL | GFP_DMA);
-        if (!private)
-                return -ENOMEM;
-
-        INIT_LIST_HEAD(&private->head);
-        init_timer(&private->timer);
-
-        spin_lock_irq(sch->lock);
-        set_eadm_private(sch, private);
-        private->state = EADM_IDLE;
-        private->sch = sch;
-        sch->isc = EADM_SCH_ISC;
-        ret = cio_enable_subchannel(sch, (u32)(unsigned long)sch);
-        if (ret) {
-                set_eadm_private(sch, NULL);
-                spin_unlock_irq(sch->lock);
-                kfree(private);
-                goto out;
-        }
-        spin_unlock_irq(sch->lock);
-
-        spin_lock_irq(&list_lock);
-        list_add(&private->head, &eadm_list);
-        spin_unlock_irq(&list_lock);
-
-        if (dev_get_uevent_suppress(&sch->dev)) {
-                dev_set_uevent_suppress(&sch->dev, 0);
-                kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
-        }
-out:
-        return ret;
-}
-
-static void eadm_quiesce(struct subchannel *sch)
-{
-        int ret;
-
-        do {
-                spin_lock_irq(sch->lock);
-                ret = cio_disable_subchannel(sch);
-                spin_unlock_irq(sch->lock);
-        } while (ret == -EBUSY);
-}
-
-static int eadm_subchannel_remove(struct subchannel *sch)
-{
-        struct eadm_private *private = get_eadm_private(sch);
-
-        spin_lock_irq(&list_lock);
-        list_del(&private->head);
-        spin_unlock_irq(&list_lock);
-
-        eadm_quiesce(sch);
-
-        spin_lock_irq(sch->lock);
-        set_eadm_private(sch, NULL);
-        spin_unlock_irq(sch->lock);
-
-        kfree(private);
-
-        return 0;
-}
-
-static void eadm_subchannel_shutdown(struct subchannel *sch)
-{
-        eadm_quiesce(sch);
-}
-
-static int eadm_subchannel_freeze(struct subchannel *sch)
-{
-        return cio_disable_subchannel(sch);
-}
-
-static int eadm_subchannel_restore(struct subchannel *sch)
-{
-        return cio_enable_subchannel(sch, (u32)(unsigned long)sch);
-}
-
-/**
- * eadm_subchannel_sch_event - process subchannel event
- * @sch: subchannel
- * @process: non-zero if function is called in process context
- *
- * An unspecified event occurred for this subchannel. Adjust data according
- * to the current operational state of the subchannel. Return zero when the
- * event has been handled sufficiently or -EAGAIN when this function should
- * be called again in process context.
- */
-static int eadm_subchannel_sch_event(struct subchannel *sch, int process)
-{
-        struct eadm_private *private;
-        unsigned long flags;
-        int ret = 0;
-
-        spin_lock_irqsave(sch->lock, flags);
-        if (!device_is_registered(&sch->dev))
-                goto out_unlock;
-
-        if (work_pending(&sch->todo_work))
-                goto out_unlock;
-
-        if (cio_update_schib(sch)) {
-                css_sched_sch_todo(sch, SCH_TODO_UNREG);
-                goto out_unlock;
-        }
-        private = get_eadm_private(sch);
-        if (private->state == EADM_NOT_OPER)
-                private->state = EADM_IDLE;
-
-out_unlock:
-        spin_unlock_irqrestore(sch->lock, flags);
-
-        return ret;
-}
-
-static struct css_device_id eadm_subchannel_ids[] = {
-        { .match_flags = 0x1, .type = SUBCHANNEL_TYPE_ADM, },
-        { /* end of list */ },
-};
-MODULE_DEVICE_TABLE(css, eadm_subchannel_ids);
-
-static struct css_driver eadm_subchannel_driver = {
-        .drv = {
-                .name = "eadm_subchannel",
-                .owner = THIS_MODULE,
-        },
-        .subchannel_type = eadm_subchannel_ids,
-        .irq = eadm_subchannel_irq,
-        .probe = eadm_subchannel_probe,
-        .remove = eadm_subchannel_remove,
-        .shutdown = eadm_subchannel_shutdown,
-        .sch_event = eadm_subchannel_sch_event,
-        .freeze = eadm_subchannel_freeze,
-        .thaw = eadm_subchannel_restore,
-        .restore = eadm_subchannel_restore,
-};
-
-static struct eadm_ops eadm_ops = {
-        .eadm_start = eadm_start_aob,
-        .owner = THIS_MODULE,
-};
-
-static int __init eadm_sch_init(void)
-{
-        int ret;
-
-        if (!css_general_characteristics.eadm)
-                return -ENXIO;
-
-        eadm_debug = debug_register("eadm_log", 16, 1, 16);
-        if (!eadm_debug)
-                return -ENOMEM;
-
-        debug_register_view(eadm_debug, &debug_hex_ascii_view);
-        debug_set_level(eadm_debug, 2);
-
-        isc_register(EADM_SCH_ISC);
-        ret = css_driver_register(&eadm_subchannel_driver);
-        if (ret)
-                goto cleanup;
-
-        register_eadm_ops(&eadm_ops);
-        return ret;
-
-cleanup:
-        isc_unregister(EADM_SCH_ISC);
-        debug_unregister(eadm_debug);
-        return ret;
-}
-
-static void __exit eadm_sch_exit(void)
-{
-        unregister_eadm_ops(&eadm_ops);
-        css_driver_unregister(&eadm_subchannel_driver);
-        isc_unregister(EADM_SCH_ISC);
-        debug_unregister(eadm_debug);
-}
-module_init(eadm_sch_init);
-module_exit(eadm_sch_exit);
diff --git a/drivers/s390/cio/eadm_sch.h b/drivers/s390/cio/eadm_sch.h
deleted file mode 100644
index 2779be09398..00000000000
--- a/drivers/s390/cio/eadm_sch.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef EADM_SCH_H
-#define EADM_SCH_H
-
-#include <linux/device.h>
-#include <linux/timer.h>
-#include <linux/list.h>
-#include "orb.h"
-
-struct eadm_private {
-        union orb orb;
-        enum {EADM_IDLE, EADM_BUSY, EADM_NOT_OPER} state;
-        struct timer_list timer;
-        struct list_head head;
-        struct subchannel *sch;
-} __aligned(8);
-
-#define get_eadm_private(n) ((struct eadm_private *)dev_get_drvdata(&n->dev))
-#define set_eadm_private(n, p) (dev_set_drvdata(&n->dev, p))
-
-#endif
diff --git a/drivers/s390/cio/idset.c b/drivers/s390/cio/idset.c
index 65d13e38803..4d10981c7cc 100644
--- a/drivers/s390/cio/idset.c
+++ b/drivers/s390/cio/idset.c
@@ -1,10 +1,11 @@
 /*
- *    Copyright IBM Corp. 2007, 2012
+ *  drivers/s390/cio/idset.c
+ *
+ *    Copyright IBM Corp. 2007
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
 #include <linux/vmalloc.h>
-#include <linux/bitmap.h>
 #include <linux/bitops.h>
 #include "idset.h"
 #include "css.h"
@@ -90,14 +91,6 @@ void idset_sch_del(struct idset *set, struct subchannel_id schid)
         idset_del(set, schid.ssid, schid.sch_no);
 }
 
-/* Clear ids starting from @schid up to end of subchannel set. */
-void idset_sch_del_subseq(struct idset *set, struct subchannel_id schid)
-{
-        int pos = schid.ssid * set->num_id + schid.sch_no;
-
-        bitmap_clear(set->bitmap, pos, set->num_id - schid.sch_no);
-}
-
 int idset_sch_contains(struct idset *set, struct subchannel_id schid)
 {
         return idset_contains(set, schid.ssid, schid.sch_no);
@@ -120,12 +113,20 @@ int idset_sch_get_first(struct idset *set, struct subchannel_id *schid)
 
 int idset_is_empty(struct idset *set)
 {
-        return bitmap_empty(set->bitmap, set->num_ssid * set->num_id);
+        int bitnum;
+
+        bitnum = find_first_bit(set->bitmap, set->num_ssid * set->num_id);
+        if (bitnum >= set->num_ssid * set->num_id)
+                return 1;
+        return 0;
 }
 
 void idset_add_set(struct idset *to, struct idset *from)
 {
-        int len = min(to->num_ssid * to->num_id, from->num_ssid * from->num_id);
+        unsigned long i, len;
 
-        bitmap_or(to->bitmap, to->bitmap, from->bitmap, len);
+        len = min(__BITOPS_WORDS(to->num_ssid * to->num_id),
+                  __BITOPS_WORDS(from->num_ssid * from->num_id));
+        for (i = 0; i < len ; i++)
+                to->bitmap[i] |= from->bitmap[i];
 }
diff --git a/drivers/s390/cio/idset.h b/drivers/s390/cio/idset.h
index 06d3bc01bb0..7543da4529f 100644
--- a/drivers/s390/cio/idset.h
+++ b/drivers/s390/cio/idset.h
@@ -1,5 +1,7 @@
 /*
- *    Copyright IBM Corp. 2007, 2012
+ *  drivers/s390/cio/idset.h
+ *
+ *    Copyright IBM Corp. 2007
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
@@ -17,7 +19,6 @@ void idset_fill(struct idset *set);
 struct idset *idset_sch_new(void);
 void idset_sch_add(struct idset *set, struct subchannel_id id);
 void idset_sch_del(struct idset *set, struct subchannel_id id);
-void idset_sch_del_subseq(struct idset *set, struct subchannel_id schid);
 int idset_sch_contains(struct idset *set, struct subchannel_id id);
 int idset_sch_get_first(struct idset *set, struct subchannel_id *id);
 int idset_is_empty(struct idset *set);
diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index 76253dfcc1b..ba31ad88f4f 100644
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -4,7 +4,6 @@
 #include <linux/types.h>
 #include <asm/schid.h>
 #include <asm/ccwdev.h>
-#include <asm/irq.h>
 #include "css.h"
 #include "orb.h"
 
@@ -111,9 +110,6 @@ enum cdev_todo {
         CDEV_TODO_UNREG_EVAL,
 };
 
-#define FAKE_CMD_IRB    1
-#define FAKE_TM_IRB     2
-
 struct ccw_device_private {
         struct ccw_device *cdev;
         struct subchannel *sch;
@@ -141,7 +137,7 @@ struct ccw_device_private {
                 unsigned int doverify:1;    /* delayed path verification */
                 unsigned int donotify:1;    /* call notify function */
                 unsigned int recog_done:1;  /* dev. recog. complete */
-                unsigned int fake_irb:2;    /* deliver faked irb */
+                unsigned int fake_irb:1;    /* deliver faked irb */
                 unsigned int resuming:1;    /* recognition while resume */
                 unsigned int pgroup:1;      /* pathgroup is set up */
                 unsigned int mpath:1;       /* multipathing is set up */
@@ -161,7 +157,6 @@ struct ccw_device_private {
         struct list_head cmb_list;      /* list of measured devices */
         u64 cmb_start_time;             /* clock value of cmb reset */
         void *cmb_wait;                 /* deferred cmb enable/disable */
-        enum interruption_class int_class;
 };
 
 static inline int rsch(struct subchannel_id schid)
diff --git a/drivers/s390/cio/orb.h b/drivers/s390/cio/orb.h
index 7a640530e7f..45a9865c2b3 100644
--- a/drivers/s390/cio/orb.h
+++ b/drivers/s390/cio/orb.h
@@ -59,33 +59,9 @@ struct tm_orb {
         u32:32;
 }  __packed __aligned(4);
 
-/*
- * eadm operation request block
- */
-struct eadm_orb {
-        u32 intparm;
-        u32 key:4;
-        u32:4;
-        u32 compat1:1;
-        u32 compat2:1;
-        u32:21;
-        u32 x:1;
-        u32 aob;
-        u32 css_prio:8;
-        u32:8;
-        u32 scm_prio:8;
-        u32:8;
-        u32:29;
-        u32 fmt:3;
-        u32:32;
-        u32:32;
-        u32:32;
-}  __packed __aligned(4);
-
 union orb {
         struct cmd_orb cmd;
         struct tm_orb tm;
-        struct eadm_orb eadm;
 }  __packed __aligned(4);
 
 #endif /* S390_ORB_H */
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 5132554d791..e5c966462c5 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -1,5 +1,7 @@
 /*
- * Copyright IBM Corp. 2000, 2009
+ * linux/drivers/s390/cio/qdio.h
+ *
+ * Copyright 2000,2009 IBM Corp.
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
  *            Jan Glauber <jang@linux.vnet.ibm.com>
  */
@@ -16,6 +18,14 @@
 #define QDIO_BUSY_BIT_RETRIES           1000            /* = 10s retry time */
 #define QDIO_INPUT_THRESHOLD            (500 << 12)     /* 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,
@@ -34,7 +44,6 @@ enum qdio_irq_states {
 #define SLSB_STATE_NOT_INIT     0x0
 #define SLSB_STATE_EMPTY        0x1
 #define SLSB_STATE_PRIMED       0x2
-#define SLSB_STATE_PENDING      0x3
 #define SLSB_STATE_HALTED       0xe
 #define SLSB_STATE_ERROR        0xf
 #define SLSB_TYPE_INPUT         0x0
@@ -58,8 +67,6 @@ enum qdio_irq_states {
         (SLSB_OWNER_PROG | SLSB_TYPE_OUTPUT | SLSB_STATE_NOT_INIT) /* 0xa0 */
 #define SLSB_P_OUTPUT_EMPTY     \
         (SLSB_OWNER_PROG | SLSB_TYPE_OUTPUT | SLSB_STATE_EMPTY)    /* 0xa1 */
-#define SLSB_P_OUTPUT_PENDING \
-        (SLSB_OWNER_PROG | SLSB_TYPE_OUTPUT | SLSB_STATE_PENDING)  /* 0xa3 */
 #define SLSB_CU_OUTPUT_PRIMED   \
         (SLSB_OWNER_CU | SLSB_TYPE_OUTPUT | SLSB_STATE_PRIMED)     /* 0x62 */
 #define SLSB_P_OUTPUT_HALTED    \
@@ -77,11 +84,19 @@ enum qdio_irq_states {
 #define CHSC_FLAG_QDIO_CAPABILITY       0x80
 #define CHSC_FLAG_VALIDITY              0x40
 
+/* qdio adapter-characteristics-1 flag */
+#define AC1_SIGA_INPUT_NEEDED           0x40    /* process input queues */
+#define AC1_SIGA_OUTPUT_NEEDED          0x20    /* process output queues */
+#define AC1_SIGA_SYNC_NEEDED            0x10    /* ask hypervisor to sync */
+#define AC1_AUTOMATIC_SYNC_ON_THININT   0x08    /* set by hypervisor */
+#define AC1_AUTOMATIC_SYNC_ON_OUT_PCI   0x04    /* set by hypervisor */
+#define AC1_SC_QEBSM_AVAILABLE          0x02    /* available for subchannel */
+#define AC1_SC_QEBSM_ENABLED            0x01    /* enabled for subchannel */
+
 /* SIGA flags */
 #define QDIO_SIGA_WRITE         0x00
 #define QDIO_SIGA_READ          0x01
 #define QDIO_SIGA_SYNC          0x02
-#define QDIO_SIGA_WRITEQ        0x04
 #define QDIO_SIGA_QEBSM_FLAG    0x80
 
 #ifdef CONFIG_64BIT
@@ -238,12 +253,6 @@ struct qdio_input_q {
 struct qdio_output_q {
         /* PCIs are enabled for the queue */
         int pci_out_enabled;
-        /* cq: use asynchronous output buffers */
-        int use_cq;
-        /* cq: aobs used for particual SBAL */
-        struct qaob **aobs;
-        /* cq: sbal state related to asynchronous operation */
-        struct qdio_outbuf_state *sbal_state;
         /* timer to check for more outbound work */
         struct timer_list timer;
         /* used SBALs before tasklet schedule */
@@ -280,9 +289,6 @@ struct qdio_q {
         /* error condition during a data transfer */
         unsigned int qdio_error;
 
-        /* last scan of the queue */
-        u64 timestamp;
-
         struct tasklet_struct tasklet;
         struct qdio_queue_perf_stat q_stats;
 
@@ -416,7 +422,20 @@ static inline int multicast_outbound(struct qdio_q *q)
 #define queue_irqs_disabled(q)                  \
         (test_bit(QDIO_QUEUE_IRQS_DISABLED, &q->u.in.queue_irq_state) != 0)
 
-extern u64 last_ai_time;
+#define TIQDIO_SHARED_IND               63
+
+/* device state change indicators */
+struct indicator_t {
+        u32 ind;        /* u32 because of compare-and-swap performance */
+        atomic_t count; /* use count, 0 or 1 for non-shared indicators */
+};
+
+extern struct indicator_t *q_indicators;
+
+static inline int shared_ind(u32 *dsci)
+{
+        return dsci == &q_indicators[TIQDIO_SHARED_IND].ind;
+}
 
 /* prototypes for thin interrupt */
 void qdio_setup_thinint(struct qdio_irq *irq_ptr);
@@ -429,8 +448,6 @@ int tiqdio_allocate_memory(void);
 void tiqdio_free_memory(void);
 int tiqdio_register_thinints(void);
 void tiqdio_unregister_thinints(void);
-void clear_nonshared_ind(struct qdio_irq *);
-int test_nonshared_ind(struct qdio_irq *);
 
 /* prototypes for setup */
 void qdio_inbound_processing(unsigned long data);
@@ -452,9 +469,6 @@ int qdio_setup_create_sysfs(struct ccw_device *cdev);
 void qdio_setup_destroy_sysfs(struct ccw_device *cdev);
 int qdio_setup_init(void);
 void qdio_setup_exit(void);
-int qdio_enable_async_operation(struct qdio_output_q *q);
-void qdio_disable_async_operation(struct qdio_output_q *q);
-struct qaob *qdio_allocate_aob(void);
 
 int debug_get_buf_state(struct qdio_q *q, unsigned int bufnr,
                         unsigned char *state);
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index e6e0d31c02a..0e615cb912d 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -1,12 +1,12 @@
 /*
- *  Copyright IBM Corp. 2008, 2009
+ *  drivers/s390/cio/qdio_debug.c
+ *
+ *  Copyright IBM Corp. 2008,2009
  *
  *  Author: Jan Glauber (jang@linux.vnet.ibm.com)
  */
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
-#include <linux/uaccess.h>
-#include <linux/export.h>
 #include <asm/debug.h>
 #include "qdio_debug.h"
 #include "qdio.h"
@@ -54,17 +54,15 @@ static int qstat_show(struct seq_file *m, void *v)
         if (!q)
                 return 0;
 
-        seq_printf(m, "Timestamp: %Lx  Last AI: %Lx\n",
-                   q->timestamp, last_ai_time);
-        seq_printf(m, "nr_used: %d  ftc: %d  last_move: %d\n",
-                   atomic_read(&q->nr_buf_used),
+        seq_printf(m, "DSCI: %d   nr_used: %d\n",
+                   *(u32 *)q->irq_ptr->dsci, atomic_read(&q->nr_buf_used));
+        seq_printf(m, "ftc: %d  last_move: %d\n",
                    q->first_to_check, q->last_move);
         if (q->is_input_q) {
                 seq_printf(m, "polling: %d  ack start: %d  ack count: %d\n",
                            q->u.in.polling, q->u.in.ack_start,
                            q->u.in.ack_count);
-                seq_printf(m, "DSCI: %d   IRQs disabled: %u\n",
-                           *(u32 *)q->irq_ptr->dsci,
+                seq_printf(m, "IRQs disabled: %u\n",
                            test_bit(QDIO_QUEUE_IRQS_DISABLED,
                            &q->u.in.queue_irq_state));
         }
@@ -78,9 +76,6 @@ static int qstat_show(struct seq_file *m, void *v)
                 case SLSB_P_OUTPUT_NOT_INIT:
                         seq_printf(m, "N");
                         break;
-                case SLSB_P_OUTPUT_PENDING:
-                        seq_printf(m, "P");
-                        break;
                 case SLSB_P_INPUT_PRIMED:
                 case SLSB_CU_OUTPUT_PRIMED:
                         seq_printf(m, "+");
diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h
index 7f8b973da29..5d70bd162ae 100644
--- a/drivers/s390/cio/qdio_debug.h
+++ b/drivers/s390/cio/qdio_debug.h
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/cio/qdio_debug.h
+ *
  *  Copyright IBM Corp. 2008
  *
  *  Author: Jan Glauber (jang@linux.vnet.ibm.com)
@@ -37,14 +39,10 @@ static inline int qdio_dbf_passes(debug_info_t *dbf_grp, int level)
                 debug_text_event(qdio_dbf_setup, DBF_ERR, debug_buffer); \
         } while (0)
 
-static inline void DBF_HEX(void *addr, int len)
-{
-        while (len > 0) {
-                debug_event(qdio_dbf_setup, DBF_ERR, addr, len);
-                len -= qdio_dbf_setup->buf_size;
-                addr += qdio_dbf_setup->buf_size;
-        }
-}
+#define DBF_HEX(addr, len) \
+        do { \
+                debug_event(qdio_dbf_setup, DBF_ERR, (void*)(addr), len); \
+        } while (0)
 
 #define DBF_ERROR(text...) \
         do { \
@@ -53,14 +51,11 @@ static inline void DBF_HEX(void *addr, int len)
                 debug_text_event(qdio_dbf_error, DBF_ERR, debug_buffer); \
         } while (0)
 
-static inline void DBF_ERROR_HEX(void *addr, int len)
-{
-        while (len > 0) {
-                debug_event(qdio_dbf_error, DBF_ERR, addr, len);
-                len -= qdio_dbf_error->buf_size;
-                addr += qdio_dbf_error->buf_size;
-        }
-}
+#define DBF_ERROR_HEX(addr, len) \
+        do { \
+                debug_event(qdio_dbf_error, DBF_ERR, (void*)(addr), len); \
+        } while (0)
+
 
 #define DBF_DEV_EVENT(level, device, text...) \
         do { \
@@ -71,15 +66,10 @@ static inline void DBF_ERROR_HEX(void *addr, int len)
                 } \
         } while (0)
 
-static inline void DBF_DEV_HEX(struct qdio_irq *dev, void *addr,
-                               int len, int level)
-{
-        while (len > 0) {
-                debug_event(dev->debug_area, level, addr, len);
-                len -= dev->debug_area->buf_size;
-                addr += dev->debug_area->buf_size;
-        }
-}
+#define DBF_DEV_HEX(level, device, addr, len) \
+        do { \
+                debug_event(device->debug_area, level, (void*)(addr), len); \
+        } while (0)
 
 void qdio_allocate_dbf(struct qdio_initialize *init_data,
                        struct qdio_irq *irq_ptr);
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 1671d3461f2..288c9140290 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -1,7 +1,9 @@
 /*
+ * linux/drivers/s390/cio/qdio_main.c
+ *
  * Linux for s390 qdio support, buffer handling, qdio API and module support.
  *
- * Copyright IBM Corp. 2000, 2008
+ * Copyright 2000,2008 IBM Corp.
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
  *            Jan Glauber <jang@linux.vnet.ibm.com>
  * 2.6 cio integration by Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -12,11 +14,10 @@
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/gfp.h>
-#include <linux/io.h>
+#include <linux/kernel_stat.h>
 #include <linux/atomic.h>
 #include <asm/debug.h>
 #include <asm/qdio.h>
-#include <asm/ipl.h>
 
 #include "cio.h"
 #include "css.h"
@@ -61,7 +62,7 @@ static inline int do_siga_input(unsigned long schid, unsigned int mask,
                 "       ipm     %0\n"
                 "       srl     %0,28\n"
                 : "=d" (cc)
-                : "d" (__fc), "d" (__schid), "d" (__mask) : "cc");
+                : "d" (__fc), "d" (__schid), "d" (__mask) : "cc", "memory");
         return cc;
 }
 
@@ -72,27 +73,26 @@ static inline int do_siga_input(unsigned long schid, unsigned int mask,
  * @bb: busy bit indicator, set only if SIGA-w/wt could not access a buffer
  * @fc: function code to perform
  *
- * Returns condition code.
+ * Returns cc or QDIO_ERROR_SIGA_ACCESS_EXCEPTION.
  * Note: For IQDC unicast queues only the highest priority queue is processed.
  */
 static inline int do_siga_output(unsigned long schid, unsigned long mask,
-                                 unsigned int *bb, unsigned int fc,
-                                 unsigned long aob)
+                                 unsigned int *bb, unsigned int fc)
 {
         register unsigned long __fc asm("0") = fc;
         register unsigned long __schid asm("1") = schid;
         register unsigned long __mask asm("2") = mask;
-        register unsigned long __aob asm("3") = aob;
-        int cc;
+        int cc = QDIO_ERROR_SIGA_ACCESS_EXCEPTION;
 
         asm volatile(
                 "       siga    0\n"
-                "       ipm     %0\n"
+                "0:     ipm     %0\n"
                 "       srl     %0,28\n"
-                : "=d" (cc), "+d" (__fc), "+d" (__aob)
-                : "d" (__schid), "d" (__mask)
-                : "cc");
-        *bb = __fc >> 31;
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : "+d" (cc), "+d" (__fc), "+d" (__schid), "+d" (__mask)
+                : : "cc", "memory");
+        *bb = ((unsigned int) __fc) >> 31;
         return cc;
 }
 
@@ -101,12 +101,9 @@ static inline int qdio_check_ccq(struct qdio_q *q, unsigned int ccq)
         /* all done or next buffer state different */
         if (ccq == 0 || ccq == 32)
                 return 0;
-        /* no buffer processed */
-        if (ccq == 97)
-                return 1;
         /* not all buffers processed */
-        if (ccq == 96)
-                return 2;
+        if (ccq == 96 || ccq == 97)
+                return 1;
         /* notify devices immediately */
         DBF_ERROR("%4x ccq:%3d", SCH_NO(q), ccq);
         return -EIO;
@@ -126,9 +123,12 @@ static inline int qdio_check_ccq(struct qdio_q *q, unsigned int ccq)
 static int qdio_do_eqbs(struct qdio_q *q, unsigned char *state,
                         int start, int count, int auto_ack)
 {
-        int rc, tmp_count = count, tmp_start = start, nr = q->nr, retried = 0;
         unsigned int ccq = 0;
+        int tmp_count = count, tmp_start = start;
+        int nr = q->nr;
+        int rc;
 
+        BUG_ON(!q->irq_ptr->sch_token);
         qperf_inc(q, eqbs);
 
         if (!q->is_input_q)
@@ -137,33 +137,29 @@ again:
         ccq = do_eqbs(q->irq_ptr->sch_token, state, nr, &tmp_start, &tmp_count,
                       auto_ack);
         rc = qdio_check_ccq(q, ccq);
-        if (!rc)
-                return count - tmp_count;
+
+        /* At least one buffer was processed, return and extract the remaining
+         * buffers later.
+         */
+        if ((ccq == 96) && (count != tmp_count)) {
+                qperf_inc(q, eqbs_partial);
+                return (count - tmp_count);
+        }
 
         if (rc == 1) {
                 DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "EQBS again:%2d", ccq);
                 goto again;
         }
 
-        if (rc == 2) {
-                qperf_inc(q, eqbs_partial);
-                DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "EQBS part:%02x",
-                        tmp_count);
-                /*
-                 * Retry once, if that fails bail out and process the
-                 * extracted buffers before trying again.
-                 */
-                if (!retried++)
-                        goto again;
-                else
-                        return count - tmp_count;
+        if (rc < 0) {
+                DBF_ERROR("%4x EQBS ERROR", SCH_NO(q));
+                DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
+                q->handler(q->irq_ptr->cdev,
+                           QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
+                           0, -1, -1, q->irq_ptr->int_parm);
+                return 0;
         }
-
-        DBF_ERROR("%4x EQBS ERROR", SCH_NO(q));
-        DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
-        q->handler(q->irq_ptr->cdev, QDIO_ERROR_GET_BUF_STATE,
-                   q->nr, q->first_to_kick, count, q->irq_ptr->int_parm);
-        return 0;
+        return count - tmp_count;
 }
 
 /**
@@ -187,6 +183,8 @@ static int qdio_do_sqbs(struct qdio_q *q, unsigned char state, int start,
 
         if (!count)
                 return 0;
+
+        BUG_ON(!q->irq_ptr->sch_token);
         qperf_inc(q, sqbs);
 
         if (!q->is_input_q)
@@ -194,44 +192,41 @@ static int qdio_do_sqbs(struct qdio_q *q, unsigned char state, int start,
 again:
         ccq = do_sqbs(q->irq_ptr->sch_token, state, nr, &tmp_start, &tmp_count);
         rc = qdio_check_ccq(q, ccq);
-        if (!rc) {
-                WARN_ON_ONCE(tmp_count);
-                return count - tmp_count;
-        }
-
-        if (rc == 1 || rc == 2) {
+        if (rc == 1) {
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "SQBS again:%2d", ccq);
                 qperf_inc(q, sqbs_partial);
                 goto again;
         }
-
-        DBF_ERROR("%4x SQBS ERROR", SCH_NO(q));
-        DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
-        q->handler(q->irq_ptr->cdev, QDIO_ERROR_SET_BUF_STATE,
-                   q->nr, q->first_to_kick, count, q->irq_ptr->int_parm);
-        return 0;
+        if (rc < 0) {
+                DBF_ERROR("%4x SQBS ERROR", SCH_NO(q));
+                DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
+                q->handler(q->irq_ptr->cdev,
+                           QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
+                           0, -1, -1, q->irq_ptr->int_parm);
+                return 0;
+        }
+        WARN_ON(tmp_count);
+        return count - tmp_count;
 }
 
 /* returns number of examined buffers and their common state in *state */
 static inline int get_buf_states(struct qdio_q *q, unsigned int bufnr,
                                  unsigned char *state, unsigned int count,
-                                 int auto_ack, int merge_pending)
+                                 int auto_ack)
 {
         unsigned char __state = 0;
         int i;
 
+        BUG_ON(bufnr > QDIO_MAX_BUFFERS_MASK);
+        BUG_ON(count > QDIO_MAX_BUFFERS_PER_Q);
+
         if (is_qebsm(q))
                 return qdio_do_eqbs(q, state, bufnr, count, auto_ack);
 
         for (i = 0; i < count; i++) {
-                if (!__state) {
+                if (!__state)
                         __state = q->slsb.val[bufnr];
-                        if (merge_pending && __state == SLSB_P_OUTPUT_PENDING)
-                                __state = SLSB_P_OUTPUT_EMPTY;
-                } else if (merge_pending) {
-                        if ((q->slsb.val[bufnr] & __state) != __state)
-                                break;
-                } else if (q->slsb.val[bufnr] != __state)
+                else if (q->slsb.val[bufnr] != __state)
                         break;
                 bufnr = next_buf(bufnr);
         }
@@ -242,7 +237,7 @@ static inline int get_buf_states(struct qdio_q *q, unsigned int bufnr,
 static inline int get_buf_state(struct qdio_q *q, unsigned int bufnr,
                                 unsigned char *state, int auto_ack)
 {
-        return get_buf_states(q, bufnr, state, 1, auto_ack, 0);
+        return get_buf_states(q, bufnr, state, 1, auto_ack);
 }
 
 /* wrap-around safe setting of slsb states, returns number of changed buffers */
@@ -251,6 +246,9 @@ static inline int set_buf_states(struct qdio_q *q, int bufnr,
 {
         int i;
 
+        BUG_ON(bufnr > QDIO_MAX_BUFFERS_MASK);
+        BUG_ON(count > QDIO_MAX_BUFFERS_PER_Q);
+
         if (is_qebsm(q))
                 return qdio_do_sqbs(q, state, bufnr, count);
 
@@ -268,7 +266,7 @@ static inline int set_buf_state(struct qdio_q *q, int bufnr,
 }
 
 /* set slsb states to initial state */
-static void qdio_init_buf_states(struct qdio_irq *irq_ptr)
+void qdio_init_buf_states(struct qdio_irq *irq_ptr)
 {
         struct qdio_q *q;
         int i;
@@ -299,7 +297,7 @@ static inline int qdio_siga_sync(struct qdio_q *q, unsigned int output,
         cc = do_siga_sync(schid, output, input, fc);
         if (unlikely(cc))
                 DBF_ERROR("%4x SIGA-S:%2d", SCH_NO(q), cc);
-        return (cc) ? -EIO : 0;
+        return cc;
 }
 
 static inline int qdio_siga_sync_q(struct qdio_q *q)
@@ -310,31 +308,23 @@ static inline int qdio_siga_sync_q(struct qdio_q *q)
                 return qdio_siga_sync(q, q->mask, 0);
 }
 
-static int qdio_siga_output(struct qdio_q *q, unsigned int *busy_bit,
-        unsigned long aob)
+static int qdio_siga_output(struct qdio_q *q, unsigned int *busy_bit)
 {
         unsigned long schid = *((u32 *) &q->irq_ptr->schid);
         unsigned int fc = QDIO_SIGA_WRITE;
         u64 start_time = 0;
         int retries = 0, cc;
-        unsigned long laob = 0;
-
-        if (q->u.out.use_cq && aob != 0) {
-                fc = QDIO_SIGA_WRITEQ;
-                laob = aob;
-        }
 
         if (is_qebsm(q)) {
                 schid = q->irq_ptr->sch_token;
                 fc |= QDIO_SIGA_QEBSM_FLAG;
         }
 again:
-        WARN_ON_ONCE((aob && queue_type(q) != QDIO_IQDIO_QFMT) ||
-                (aob && fc != QDIO_SIGA_WRITEQ));
-        cc = do_siga_output(schid, q->mask, busy_bit, fc, laob);
+        cc = do_siga_output(schid, q->mask, busy_bit, fc);
 
         /* hipersocket busy condition */
         if (unlikely(*busy_bit)) {
+                WARN_ON(queue_type(q) != QDIO_IQDIO_QFMT || cc != 2);
                 retries++;
 
                 if (!start_time) {
@@ -369,7 +359,7 @@ static inline int qdio_siga_input(struct qdio_q *q)
         cc = do_siga_input(schid, q->mask, fc);
         if (unlikely(cc))
                 DBF_ERROR("%4x SIGA-R:%2d", SCH_NO(q), cc);
-        return (cc) ? -EIO : 0;
+        return cc;
 }
 
 #define qdio_siga_sync_out(q) qdio_siga_sync(q, ~0U, 0)
@@ -389,7 +379,7 @@ int debug_get_buf_state(struct qdio_q *q, unsigned int bufnr,
 {
         if (need_siga_sync(q))
                 qdio_siga_sync_q(q);
-        return get_buf_states(q, bufnr, state, 1, 0, 0);
+        return get_buf_states(q, bufnr, state, 1, 0);
 }
 
 static inline void qdio_stop_polling(struct qdio_q *q)
@@ -428,7 +418,7 @@ static void process_buffer_error(struct qdio_q *q, int count)
         unsigned char state = (q->is_input_q) ? SLSB_P_INPUT_NOT_INIT :
                                         SLSB_P_OUTPUT_NOT_INIT;
 
-        q->qdio_error = QDIO_ERROR_SLSB_STATE;
+        q->qdio_error |= QDIO_ERROR_SLSB_STATE;
 
         /* special handling for no target buffer empty */
         if ((!q->is_input_q &&
@@ -436,7 +426,7 @@ static void process_buffer_error(struct qdio_q *q, int count)
                 qperf_inc(q, target_full);
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "OUTFULL FTC:%02x",
                               q->first_to_check);
-                goto set;
+                return;
         }
 
         DBF_ERROR("%4x BUF ERROR", SCH_NO(q));
@@ -446,7 +436,6 @@ static void process_buffer_error(struct qdio_q *q, int count)
                   q->sbal[q->first_to_check]->element[14].sflags,
                   q->sbal[q->first_to_check]->element[15].sflags);
 
-set:
         /*
          * Interrupts may be avoided as long as the error is present
          * so change the buffer state immediately to avoid starvation.
@@ -504,8 +493,6 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_clock();
-
         /*
          * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
          * would return 0.
@@ -520,7 +507,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
          * No siga sync here, as a PCI or we after a thin interrupt
          * already sync'ed the queues.
          */
-        count = get_buf_states(q, q->first_to_check, &state, count, 1, 0);
+        count = get_buf_states(q, q->first_to_check, &state, count, 1);
         if (!count)
                 goto out;
 
@@ -548,7 +535,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in nop");
                 break;
         default:
-                WARN_ON_ONCE(1);
+                BUG();
         }
 out:
         return q->first_to_check;
@@ -560,7 +547,7 @@ static int qdio_inbound_q_moved(struct qdio_q *q)
 
         bufnr = get_inbound_buffer_frontier(q);
 
-        if (bufnr != q->last_move) {
+        if ((bufnr != q->last_move) || q->qdio_error) {
                 q->last_move = bufnr;
                 if (!is_thinint_irq(q->irq_ptr) && MACHINE_IS_LPAR)
                         q->u.in.timestamp = get_clock();
@@ -603,104 +590,6 @@ static inline int qdio_inbound_q_done(struct qdio_q *q)
                 return 0;
 }
 
-static inline int contains_aobs(struct qdio_q *q)
-{
-        return !q->is_input_q && q->u.out.use_cq;
-}
-
-static inline void qdio_trace_aob(struct qdio_irq *irq, struct qdio_q *q,
-                                int i, struct qaob *aob)
-{
-        int tmp;
-
-        DBF_DEV_EVENT(DBF_INFO, irq, "AOB%d:%lx", i,
-                        (unsigned long) virt_to_phys(aob));
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES00:%lx",
-                        (unsigned long) aob->res0[0]);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES01:%lx",
-                        (unsigned long) aob->res0[1]);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES02:%lx",
-                        (unsigned long) aob->res0[2]);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES03:%lx",
-                        (unsigned long) aob->res0[3]);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES04:%lx",
-                        (unsigned long) aob->res0[4]);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES05:%lx",
-                        (unsigned long) aob->res0[5]);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES1:%x", aob->res1);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES2:%x", aob->res2);
-        DBF_DEV_EVENT(DBF_INFO, irq, "RES3:%x", aob->res3);
-        DBF_DEV_EVENT(DBF_INFO, irq, "AORC:%u", aob->aorc);
-        DBF_DEV_EVENT(DBF_INFO, irq, "FLAGS:%u", aob->flags);
-        DBF_DEV_EVENT(DBF_INFO, irq, "CBTBS:%u", aob->cbtbs);
-        DBF_DEV_EVENT(DBF_INFO, irq, "SBC:%u", aob->sb_count);
-        for (tmp = 0; tmp < QDIO_MAX_ELEMENTS_PER_BUFFER; ++tmp) {
-                DBF_DEV_EVENT(DBF_INFO, irq, "SBA%d:%lx", tmp,
-                                (unsigned long) aob->sba[tmp]);
-                DBF_DEV_EVENT(DBF_INFO, irq, "rSBA%d:%lx", tmp,
-                                (unsigned long) q->sbal[i]->element[tmp].addr);
-                DBF_DEV_EVENT(DBF_INFO, irq, "DC%d:%u", tmp, aob->dcount[tmp]);
-                DBF_DEV_EVENT(DBF_INFO, irq, "rDC%d:%u", tmp,
-                                q->sbal[i]->element[tmp].length);
-        }
-        DBF_DEV_EVENT(DBF_INFO, irq, "USER0:%lx", (unsigned long) aob->user0);
-        for (tmp = 0; tmp < 2; ++tmp) {
-                DBF_DEV_EVENT(DBF_INFO, irq, "RES4%d:%lx", tmp,
-                        (unsigned long) aob->res4[tmp]);
-        }
-        DBF_DEV_EVENT(DBF_INFO, irq, "USER1:%lx", (unsigned long) aob->user1);
-        DBF_DEV_EVENT(DBF_INFO, irq, "USER2:%lx", (unsigned long) aob->user2);
-}
-
-static inline void qdio_handle_aobs(struct qdio_q *q, int start, int count)
-{
-        unsigned char state = 0;
-        int j, b = start;
-
-        if (!contains_aobs(q))
-                return;
-
-        for (j = 0; j < count; ++j) {
-                get_buf_state(q, b, &state, 0);
-                if (state == SLSB_P_OUTPUT_PENDING) {
-                        struct qaob *aob = q->u.out.aobs[b];
-                        if (aob == NULL)
-                                continue;
-
-                        q->u.out.sbal_state[b].flags |=
-                                QDIO_OUTBUF_STATE_FLAG_PENDING;
-                        q->u.out.aobs[b] = NULL;
-                } else if (state == SLSB_P_OUTPUT_EMPTY) {
-                        q->u.out.sbal_state[b].aob = NULL;
-                }
-                b = next_buf(b);
-        }
-}
-
-static inline unsigned long qdio_aob_for_buffer(struct qdio_output_q *q,
-                                        int bufnr)
-{
-        unsigned long phys_aob = 0;
-
-        if (!q->use_cq)
-                goto out;
-
-        if (!q->aobs[bufnr]) {
-                struct qaob *aob = qdio_allocate_aob();
-                q->aobs[bufnr] = aob;
-        }
-        if (q->aobs[bufnr]) {
-                q->sbal_state[bufnr].flags = QDIO_OUTBUF_STATE_FLAG_NONE;
-                q->sbal_state[bufnr].aob = q->aobs[bufnr];
-                q->aobs[bufnr]->user1 = (u64) q->sbal_state[bufnr].user;
-                phys_aob = virt_to_phys(q->aobs[bufnr]);
-                WARN_ON_ONCE(phys_aob & 0xFF);
-        }
-
-out:
-        return phys_aob;
-}
-
 static void qdio_kick_handler(struct qdio_q *q)
 {
         int start = q->first_to_kick;
@@ -721,8 +610,6 @@ static void qdio_kick_handler(struct qdio_q *q)
                               start, count);
         }
 
-        qdio_handle_aobs(q, start, count);
-
         q->handler(q->irq_ptr->cdev, q->qdio_error, q->nr, start, count,
                    q->irq_ptr->int_parm);
 
@@ -772,8 +659,6 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_clock();
-
         if (need_siga_sync(q))
                 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
                     !pci_out_supported(q)) ||
@@ -787,24 +672,23 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
          */
         count = min(atomic_read(&q->nr_buf_used), QDIO_MAX_BUFFERS_MASK);
         stop = add_buf(q->first_to_check, count);
+
         if (q->first_to_check == stop)
-                goto out;
+                return q->first_to_check;
 
-        count = get_buf_states(q, q->first_to_check, &state, count, 0, 1);
+        count = get_buf_states(q, q->first_to_check, &state, count, 0);
         if (!count)
-                goto out;
+                return q->first_to_check;
 
         switch (state) {
         case SLSB_P_OUTPUT_EMPTY:
                 /* the adapter got it */
-                DBF_DEV_EVENT(DBF_INFO, q->irq_ptr,
-                        "out empty:%1d %02x", q->nr, count);
+                DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out empty:%1d %02x", q->nr, count);
 
                 atomic_sub(count, &q->nr_buf_used);
                 q->first_to_check = add_buf(q->first_to_check, count);
                 if (q->irq_ptr->perf_stat_enabled)
                         account_sbals(q, count);
-
                 break;
         case SLSB_P_OUTPUT_ERROR:
                 process_buffer_error(q, count);
@@ -817,17 +701,14 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
                 /* the adapter has not fetched the output yet */
                 if (q->irq_ptr->perf_stat_enabled)
                         q->q_stats.nr_sbal_nop++;
-                DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out primed:%1d",
-                              q->nr);
+                DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out primed:%1d", q->nr);
                 break;
         case SLSB_P_OUTPUT_NOT_INIT:
         case SLSB_P_OUTPUT_HALTED:
                 break;
         default:
-                WARN_ON_ONCE(1);
+                BUG();
         }
-
-out:
         return q->first_to_check;
 }
 
@@ -843,7 +724,7 @@ static inline int qdio_outbound_q_moved(struct qdio_q *q)
 
         bufnr = get_outbound_buffer_frontier(q);
 
-        if (bufnr != q->last_move) {
+        if ((bufnr != q->last_move) || q->qdio_error) {
                 q->last_move = bufnr;
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out moved:%1d", q->nr);
                 return 1;
@@ -851,7 +732,7 @@ static inline int qdio_outbound_q_moved(struct qdio_q *q)
                 return 0;
 }
 
-static int qdio_kick_outbound_q(struct qdio_q *q, unsigned long aob)
+static int qdio_kick_outbound_q(struct qdio_q *q)
 {
         int retries = 0, cc;
         unsigned int busy_bit;
@@ -863,7 +744,7 @@ static int qdio_kick_outbound_q(struct qdio_q *q, unsigned long aob)
 retry:
         qperf_inc(q, siga_write);
 
-        cc = qdio_siga_output(q, &busy_bit, aob);
+        cc = qdio_siga_output(q, &busy_bit);
         switch (cc) {
         case 0:
                 break;
@@ -874,16 +755,13 @@ retry:
                                 goto retry;
                         }
                         DBF_ERROR("%4x cc2 BBC:%1d", SCH_NO(q), q->nr);
-                        cc = -EBUSY;
-                } else {
+                        cc |= QDIO_ERROR_SIGA_BUSY;
+                } else
                         DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w cc2:%1d", q->nr);
-                        cc = -ENOBUFS;
-                }
                 break;
         case 1:
         case 3:
                 DBF_ERROR("%4x SIGA-W:%1d", SCH_NO(q), cc);
-                cc = -EIO;
                 break;
         }
         if (retries) {
@@ -896,7 +774,7 @@ retry:
 static void __qdio_outbound_processing(struct qdio_q *q)
 {
         qperf_inc(q, tasklet_outbound);
-        WARN_ON_ONCE(atomic_read(&q->nr_buf_used) < 0);
+        BUG_ON(atomic_read(&q->nr_buf_used) < 0);
 
         if (qdio_outbound_q_moved(q))
                 qdio_kick_handler(q);
@@ -905,13 +783,21 @@ static void __qdio_outbound_processing(struct qdio_q *q)
                 if (!pci_out_supported(q) && !qdio_outbound_q_done(q))
                         goto sched;
 
+        /* bail out for HiperSockets unicast queues */
+        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)
+                goto sched;
+
         if (q->u.out.pci_out_enabled)
                 return;
 
         /*
          * Now we know that queue type is either qeth without pci enabled
-         * or HiperSockets. Make sure buffer switch from PRIMED to EMPTY
-         * is noticed and outbound_handler is called after some time.
+         * or HiperSockets multicast. Make sure buffer switch from PRIMED to
+         * EMPTY is noticed and outbound_handler is called after some time.
          */
         if (qdio_outbound_q_done(q))
                 del_timer(&q->u.out.timer);
@@ -1035,9 +921,8 @@ static void qdio_int_handler_pci(struct qdio_irq *irq_ptr)
                         }
                         q->u.in.queue_start_poll(q->irq_ptr->cdev, q->nr,
                                                  q->irq_ptr->int_parm);
-                } else {
+                } else
                         tasklet_schedule(&q->tasklet);
-                }
         }
 
         if (!pci_out_supported(q))
@@ -1057,7 +942,6 @@ static void qdio_handle_activate_check(struct ccw_device *cdev,
 {
         struct qdio_irq *irq_ptr = cdev->private->qdio_data;
         struct qdio_q *q;
-        int count;
 
         DBF_ERROR("%4x ACT CHECK", irq_ptr->schid.sch_no);
         DBF_ERROR("intp :%lx", intparm);
@@ -1071,17 +955,10 @@ static void qdio_handle_activate_check(struct ccw_device *cdev,
                 dump_stack();
                 goto no_handler;
         }
-
-        count = sub_buf(q->first_to_check, q->first_to_kick);
-        q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE,
-                   q->nr, q->first_to_kick, count, irq_ptr->int_parm);
+        q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
+                   0, -1, -1, irq_ptr->int_parm);
 no_handler:
         qdio_set_state(irq_ptr, QDIO_IRQ_STATE_STOPPED);
-        /*
-         * In case of z/VM LGR (Live Guest Migration) QDIO recovery will happen.
-         * Therefore we call the LGR detection function here.
-         */
-        lgr_info_log();
 }
 
 static void qdio_establish_handle_irq(struct ccw_device *cdev, int cstat,
@@ -1118,14 +995,21 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
                 return;
         }
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_QDI]++;
         if (irq_ptr->perf_stat_enabled)
                 irq_ptr->perf_stat.qdio_int++;
 
         if (IS_ERR(irb)) {
-                DBF_ERROR("%4x IO error", irq_ptr->schid.sch_no);
-                qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
-                wake_up(&cdev->private->wait_q);
-                return;
+                switch (PTR_ERR(irb)) {
+                case -EIO:
+                        DBF_ERROR("%4x IO error", irq_ptr->schid.sch_no);
+                        qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
+                        wake_up(&cdev->private->wait_q);
+                        return;
+                default:
+                        WARN_ON(1);
+                        return;
+                }
         }
         qdio_irq_check_sense(irq_ptr, irb);
         cstat = irb->scsw.cmd.cstat;
@@ -1151,7 +1035,7 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
         case QDIO_IRQ_STATE_STOPPED:
                 break;
         default:
-                WARN_ON_ONCE(1);
+                WARN_ON(1);
         }
         wake_up(&cdev->private->wait_q);
 }
@@ -1205,7 +1089,7 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
         if (!irq_ptr)
                 return -ENODEV;
 
-        WARN_ON_ONCE(irqs_disabled());
+        BUG_ON(irqs_disabled());
         DBF_EVENT("qshutdown:%4x", cdev->private->schid.sch_no);
 
         mutex_lock(&irq_ptr->setup_mutex);
@@ -1336,6 +1220,7 @@ int qdio_allocate(struct qdio_initialize *init_data)
         irq_ptr->qdr = (struct qdr *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
         if (!irq_ptr->qdr)
                 goto out_rel;
+        WARN_ON((unsigned long)irq_ptr->qdr & 0xfff);
 
         if (qdio_allocate_qs(irq_ptr, init_data->no_input_qs,
                              init_data->no_output_qs))
@@ -1351,26 +1236,6 @@ out_err:
 }
 EXPORT_SYMBOL_GPL(qdio_allocate);
 
-static void qdio_detect_hsicq(struct qdio_irq *irq_ptr)
-{
-        struct qdio_q *q = irq_ptr->input_qs[0];
-        int i, use_cq = 0;
-
-        if (irq_ptr->nr_input_qs > 1 && queue_type(q) == QDIO_IQDIO_QFMT)
-                use_cq = 1;
-
-        for_each_output_queue(irq_ptr, q, i) {
-                if (use_cq) {
-                        if (qdio_enable_async_operation(&q->u.out) < 0) {
-                                use_cq = 0;
-                                continue;
-                        }
-                } else
-                        qdio_disable_async_operation(&q->u.out);
-        }
-        DBF_EVENT("use_cq:%d", use_cq);
-}
-
 /**
  * qdio_establish - establish queues on a qdio subchannel
  * @init_data: initialization data
@@ -1434,8 +1299,7 @@ int qdio_establish(struct qdio_initialize *init_data)
         }
 
         qdio_setup_ssqd_info(irq_ptr);
-
-        qdio_detect_hsicq(irq_ptr);
+        DBF_EVENT("qib ac:%4x", irq_ptr->qib.ac);
 
         /* qebsm is now setup if available, initialize buffer states */
         qdio_init_buf_states(irq_ptr);
@@ -1574,11 +1438,16 @@ static int handle_inbound(struct qdio_q *q, unsigned int callflags,
 
 set:
         count = set_buf_states(q, bufnr, SLSB_CU_INPUT_EMPTY, count);
+
         used = atomic_add_return(count, &q->nr_buf_used) - count;
+        BUG_ON(used + count > QDIO_MAX_BUFFERS_PER_Q);
+
+        /* no need to signal as long as the adapter had free buffers */
+        if (used)
+                return 0;
 
         if (need_siga_in(q))
                 return qdio_siga_input(q);
-
         return 0;
 }
 
@@ -1599,6 +1468,7 @@ static int handle_outbound(struct qdio_q *q, unsigned int callflags,
 
         count = set_buf_states(q, bufnr, SLSB_CU_OUTPUT_PRIMED, count);
         used = atomic_add_return(count, &q->nr_buf_used);
+        BUG_ON(used > QDIO_MAX_BUFFERS_PER_Q);
 
         if (used == QDIO_MAX_BUFFERS_PER_Q)
                 qperf_inc(q, outbound_queue_full);
@@ -1610,21 +1480,17 @@ static int handle_outbound(struct qdio_q *q, unsigned int callflags,
                 q->u.out.pci_out_enabled = 0;
 
         if (queue_type(q) == QDIO_IQDIO_QFMT) {
-                unsigned long phys_aob = 0;
-
-                /* One SIGA-W per buffer required for unicast HSI */
+                /* One SIGA-W per buffer required for unicast HiperSockets. */
                 WARN_ON_ONCE(count > 1 && !multicast_outbound(q));
 
-                phys_aob = qdio_aob_for_buffer(&q->u.out, bufnr);
-
-                rc = qdio_kick_outbound_q(q, phys_aob);
+                rc = qdio_kick_outbound_q(q);
         } else if (need_siga_sync(q)) {
                 rc = qdio_siga_sync_q(q);
         } else {
                 /* try to fast requeue buffers */
                 get_buf_state(q, prev_buf(bufnr), &state, 0);
                 if (state != SLSB_CU_OUTPUT_PRIMED)
-                        rc = qdio_kick_outbound_q(q, 0);
+                        rc = qdio_kick_outbound_q(q);
                 else
                         qperf_inc(q, fast_requeue);
         }
@@ -1663,7 +1529,7 @@ int do_QDIO(struct ccw_device *cdev, unsigned int callflags,
                       "do%02x b:%02x c:%02x", callflags, bufnr, count);
 
         if (irq_ptr->state != QDIO_IRQ_STATE_ACTIVE)
-                return -EIO;
+                return -EBUSY;
         if (!count)
                 return 0;
         if (callflags & QDIO_FLAG_SYNC_INPUT)
@@ -1694,7 +1560,11 @@ int qdio_start_irq(struct ccw_device *cdev, int nr)
                 return -ENODEV;
         q = irq_ptr->input_qs[nr];
 
-        clear_nonshared_ind(irq_ptr);
+        WARN_ON(queue_irqs_enabled(q));
+
+        if (!shared_ind(q->irq_ptr->dsci))
+                xchg(q->irq_ptr->dsci, 0);
+
         qdio_stop_polling(q);
         clear_bit(QDIO_QUEUE_IRQS_DISABLED, &q->u.in.queue_irq_state);
 
@@ -1702,7 +1572,7 @@ int qdio_start_irq(struct ccw_device *cdev, int nr)
          * We need to check again to not lose initiative after
          * resetting the ACK state.
          */
-        if (test_nonshared_ind(irq_ptr))
+        if (!shared_ind(q->irq_ptr->dsci) && *q->irq_ptr->dsci)
                 goto rescan;
         if (!qdio_inbound_q_done(q))
                 goto rescan;
@@ -1740,6 +1610,7 @@ int qdio_get_next_buffers(struct ccw_device *cdev, int nr, int *bufnr,
         if (!irq_ptr)
                 return -ENODEV;
         q = irq_ptr->input_qs[nr];
+        WARN_ON(queue_irqs_enabled(q));
 
         /*
          * Cannot rely on automatic sync after interrupt since queues may
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 16ecd35b8e5..89107d0938c 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -1,12 +1,13 @@
 /*
+ * driver/s390/cio/qdio_setup.c
+ *
  * qdio queue initialization
  *
- * Copyright IBM Corp. 2008
+ * Copyright (C) IBM Corp. 2008
  * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
  */
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 #include <asm/qdio.h>
 
 #include "cio.h"
@@ -18,19 +19,6 @@
 #include "qdio_debug.h"
 
 static struct kmem_cache *qdio_q_cache;
-static struct kmem_cache *qdio_aob_cache;
-
-struct qaob *qdio_allocate_aob(void)
-{
-        return kmem_cache_zalloc(qdio_aob_cache, GFP_ATOMIC);
-}
-EXPORT_SYMBOL_GPL(qdio_allocate_aob);
-
-void qdio_release_aob(struct qaob *aob)
-{
-        kmem_cache_free(qdio_aob_cache, aob);
-}
-EXPORT_SYMBOL_GPL(qdio_release_aob);
 
 /*
  * qebsm is only available under 64bit but the adapter sets the feature
@@ -140,8 +128,10 @@ static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr,
         q->sl = (struct sl *)((char *)q->slib + PAGE_SIZE / 2);
 
         /* fill in sbal */
-        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++)
+        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++) {
                 q->sbal[j] = *sbals_array++;
+                BUG_ON((unsigned long)q->sbal[j] & 0xff);
+        }
 
         /* fill in slib */
         if (i > 0) {
@@ -164,37 +154,29 @@ static void setup_queues(struct qdio_irq *irq_ptr,
         struct qdio_q *q;
         void **input_sbal_array = qdio_init->input_sbal_addr_array;
         void **output_sbal_array = qdio_init->output_sbal_addr_array;
-        struct qdio_outbuf_state *output_sbal_state_array =
-                                  qdio_init->output_sbal_state_array;
         int i;
 
         for_each_input_queue(irq_ptr, q, i) {
-                DBF_EVENT("inq:%1d", i);
+                DBF_EVENT("in-q:%1d", i);
                 setup_queues_misc(q, irq_ptr, qdio_init->input_handler, i);
 
                 q->is_input_q = 1;
-                q->u.in.queue_start_poll = qdio_init->queue_start_poll_array ?
-                                qdio_init->queue_start_poll_array[i] : NULL;
-
+                q->u.in.queue_start_poll = qdio_init->queue_start_poll;
                 setup_storage_lists(q, irq_ptr, input_sbal_array, i);
                 input_sbal_array += QDIO_MAX_BUFFERS_PER_Q;
 
-                if (is_thinint_irq(irq_ptr)) {
+                if (is_thinint_irq(irq_ptr))
                         tasklet_init(&q->tasklet, tiqdio_inbound_processing,
                                      (unsigned long) q);
-                } else {
+                else
                         tasklet_init(&q->tasklet, qdio_inbound_processing,
                                      (unsigned long) q);
-                }
         }
 
         for_each_output_queue(irq_ptr, q, i) {
                 DBF_EVENT("outq:%1d", i);
                 setup_queues_misc(q, irq_ptr, qdio_init->output_handler, i);
 
-                q->u.out.sbal_state = output_sbal_state_array;
-                output_sbal_state_array += QDIO_MAX_BUFFERS_PER_Q;
-
                 q->is_input_q = 0;
                 q->u.out.scan_threshold = qdio_init->scan_threshold;
                 setup_storage_lists(q, irq_ptr, output_sbal_array, i);
@@ -307,8 +289,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr)
 
         check_and_setup_qebsm(irq_ptr, qdioac, irq_ptr->ssqd_desc.sch_token);
         process_ac_flags(irq_ptr, qdioac);
-        DBF_EVENT("ac 1:%2x 2:%4x", qdioac, irq_ptr->ssqd_desc.qdioac2);
-        DBF_EVENT("3:%4x qib:%4x", irq_ptr->ssqd_desc.qdioac3, irq_ptr->qib.ac);
+        DBF_EVENT("qdioac:%4x", qdioac);
 }
 
 void qdio_release_memory(struct qdio_irq *irq_ptr)
@@ -330,19 +311,6 @@ void qdio_release_memory(struct qdio_irq *irq_ptr)
         for (i = 0; i < QDIO_MAX_QUEUES_PER_IRQ; i++) {
                 q = irq_ptr->output_qs[i];
                 if (q) {
-                        if (q->u.out.use_cq) {
-                                int n;
-
-                                for (n = 0; n < QDIO_MAX_BUFFERS_PER_Q; ++n) {
-                                        struct qaob *aob = q->u.out.aobs[n];
-                                        if (aob) {
-                                                qdio_release_aob(aob);
-                                                q->u.out.aobs[n] = NULL;
-                                        }
-                                }
-
-                                qdio_disable_async_operation(&q->u.out);
-                        }
                         free_page((unsigned long) q->slib);
                         kmem_cache_free(qdio_q_cache, q);
                 }
@@ -377,7 +345,6 @@ static void setup_qdr(struct qdio_irq *irq_ptr,
         int i;
 
         irq_ptr->qdr->qfmt = qdio_init->q_format;
-        irq_ptr->qdr->ac = qdio_init->qdr_ac;
         irq_ptr->qdr->iqdcnt = qdio_init->no_input_qs;
         irq_ptr->qdr->oqdcnt = qdio_init->no_output_qs;
         irq_ptr->qdr->iqdsz = sizeof(struct qdesfmt0) / 4; /* size in words */
@@ -432,8 +399,9 @@ int qdio_setup_irq(struct qdio_initialize *init_data)
         irq_ptr->int_parm = init_data->int_parm;
         irq_ptr->nr_input_qs = init_data->no_input_qs;
         irq_ptr->nr_output_qs = init_data->no_output_qs;
+
+        irq_ptr->schid = ccw_device_get_subchannel_id(init_data->cdev);
         irq_ptr->cdev = init_data->cdev;
-        ccw_device_get_schid(irq_ptr->cdev, &irq_ptr->schid);
         setup_queues(irq_ptr, init_data);
 
         setup_qib(irq_ptr, init_data);
@@ -480,7 +448,7 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
         char s[80];
 
         snprintf(s, 80, "qdio: %s %s on SC %x using "
-                 "AI:%d QEBSM:%d PRI:%d TDD:%d SIGA:%s%s%s%s%s\n",
+                 "AI:%d QEBSM:%d PCI:%d TDD:%d SIGA:%s%s%s%s%s\n",
                  dev_name(&cdev->dev),
                  (irq_ptr->qib.qfmt == QDIO_QETH_QFMT) ? "OSA" :
                         ((irq_ptr->qib.qfmt == QDIO_ZFCP_QFMT) ? "ZFCP" : "HS"),
@@ -497,60 +465,23 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
         printk(KERN_INFO "%s", s);
 }
 
-int qdio_enable_async_operation(struct qdio_output_q *outq)
-{
-        outq->aobs = kzalloc(sizeof(struct qaob *) * QDIO_MAX_BUFFERS_PER_Q,
-                             GFP_ATOMIC);
-        if (!outq->aobs) {
-                outq->use_cq = 0;
-                return -ENOMEM;
-        }
-        outq->use_cq = 1;
-        return 0;
-}
-
-void qdio_disable_async_operation(struct qdio_output_q *q)
-{
-        kfree(q->aobs);
-        q->aobs = NULL;
-        q->use_cq = 0;
-}
-
 int __init qdio_setup_init(void)
 {
-        int rc;
-
         qdio_q_cache = kmem_cache_create("qdio_q", sizeof(struct qdio_q),
                                          256, 0, NULL);
         if (!qdio_q_cache)
                 return -ENOMEM;
 
-        qdio_aob_cache = kmem_cache_create("qdio_aob",
-                                        sizeof(struct qaob),
-                                        sizeof(struct qaob),
-                                        0,
-                                        NULL);
-        if (!qdio_aob_cache) {
-                rc = -ENOMEM;
-                goto free_qdio_q_cache;
-        }
-
         /* Check for OSA/FCP thin interrupts (bit 67). */
         DBF_EVENT("thinint:%1d",
                   (css_general_characteristics.aif_osa) ? 1 : 0);
 
         /* Check for QEBSM support in general (bit 58). */
         DBF_EVENT("cssQEBSM:%1d", (qebsm_possible()) ? 1 : 0);
-        rc = 0;
-out:
-        return rc;
-free_qdio_q_cache:
-        kmem_cache_destroy(qdio_q_cache);
-        goto out;
+        return 0;
 }
 
 void qdio_setup_exit(void)
 {
-        kmem_cache_destroy(qdio_aob_cache);
         kmem_cache_destroy(qdio_q_cache);
 }
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index bde5255200d..2a1d4dfaf85 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -1,5 +1,7 @@
 /*
- * Copyright IBM Corp. 2000, 2009
+ * linux/drivers/s390/cio/thinint_qdio.c
+ *
+ * Copyright 2000,2009 IBM Corp.
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
  *            Cornelia Huck <cornelia.huck@de.ibm.com>
  *            Jan Glauber <jang@linux.vnet.ibm.com>
@@ -24,24 +26,17 @@
  */
 #define TIQDIO_NR_NONSHARED_IND         63
 #define TIQDIO_NR_INDICATORS            (TIQDIO_NR_NONSHARED_IND + 1)
-#define TIQDIO_SHARED_IND               63
-
-/* device state change indicators */
-struct indicator_t {
-        u32 ind;        /* u32 because of compare-and-swap performance */
-        atomic_t count; /* use count, 0 or 1 for non-shared indicators */
-};
 
 /* list of thin interrupt input queues */
 static LIST_HEAD(tiq_list);
-static DEFINE_MUTEX(tiq_list_lock);
+DEFINE_MUTEX(tiq_list_lock);
 
 /* adapter local summary indicator */
 static u8 *tiqdio_alsi;
 
-static struct indicator_t *q_indicators;
+struct indicator_t *q_indicators;
 
-u64 last_ai_time;
+static u64 last_ai_time;
 
 /* returns addr for the device state change indicator */
 static u32 *get_indicator(void)
@@ -72,8 +67,12 @@ static void put_indicator(u32 *addr)
 
 void tiqdio_add_input_queues(struct qdio_irq *irq_ptr)
 {
+        struct qdio_q *q;
+        int i;
+
         mutex_lock(&tiq_list_lock);
-        list_add_rcu(&irq_ptr->input_qs[0]->entry, &tiq_list);
+        for_each_input_queue(irq_ptr, q, i)
+                list_add_rcu(&q->entry, &tiq_list);
         mutex_unlock(&tiq_list_lock);
         xchg(irq_ptr->dsci, 1 << 7);
 }
@@ -81,53 +80,19 @@ void tiqdio_add_input_queues(struct qdio_irq *irq_ptr)
 void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
 {
         struct qdio_q *q;
+        int i;
 
-        q = irq_ptr->input_qs[0];
-        /* if establish triggered an error */
-        if (!q || !q->entry.prev || !q->entry.next)
-                return;
-
-        mutex_lock(&tiq_list_lock);
-        list_del_rcu(&q->entry);
-        mutex_unlock(&tiq_list_lock);
-        synchronize_rcu();
-}
-
-static inline int has_multiple_inq_on_dsci(struct qdio_irq *irq_ptr)
-{
-        return irq_ptr->nr_input_qs > 1;
-}
-
-static inline int references_shared_dsci(struct qdio_irq *irq_ptr)
-{
-        return irq_ptr->dsci == &q_indicators[TIQDIO_SHARED_IND].ind;
-}
-
-static inline int shared_ind(struct qdio_irq *irq_ptr)
-{
-        return references_shared_dsci(irq_ptr) ||
-                has_multiple_inq_on_dsci(irq_ptr);
-}
-
-void clear_nonshared_ind(struct qdio_irq *irq_ptr)
-{
-        if (!is_thinint_irq(irq_ptr))
-                return;
-        if (shared_ind(irq_ptr))
-                return;
-        xchg(irq_ptr->dsci, 0);
-}
+        for (i = 0; i < irq_ptr->nr_input_qs; i++) {
+                q = irq_ptr->input_qs[i];
+                /* if establish triggered an error */
+                if (!q || !q->entry.prev || !q->entry.next)
+                        continue;
 
-int test_nonshared_ind(struct qdio_irq *irq_ptr)
-{
-        if (!is_thinint_irq(irq_ptr))
-                return 0;
-        if (shared_ind(irq_ptr))
-                return 0;
-        if (*irq_ptr->dsci)
-                return 1;
-        else
-                return 0;
+                mutex_lock(&tiq_list_lock);
+                list_del_rcu(&q->entry);
+                mutex_unlock(&tiq_list_lock);
+                synchronize_rcu();
+        }
 }
 
 static inline u32 clear_shared_ind(void)
@@ -137,40 +102,6 @@ static inline u32 clear_shared_ind(void)
         return xchg(&q_indicators[TIQDIO_SHARED_IND].ind, 0);
 }
 
-static inline void tiqdio_call_inq_handlers(struct qdio_irq *irq)
-{
-        struct qdio_q *q;
-        int i;
-
-        for_each_input_queue(irq, q, i) {
-                if (!references_shared_dsci(irq) &&
-                    has_multiple_inq_on_dsci(irq))
-                        xchg(q->irq_ptr->dsci, 0);
-
-                if (q->u.in.queue_start_poll) {
-                        /* skip if polling is enabled or already in work */
-                        if (test_and_set_bit(QDIO_QUEUE_IRQS_DISABLED,
-                                             &q->u.in.queue_irq_state)) {
-                                qperf_inc(q, int_discarded);
-                                continue;
-                        }
-
-                        /* avoid dsci clear here, done after processing */
-                        q->u.in.queue_start_poll(q->irq_ptr->cdev, q->nr,
-                                                 q->irq_ptr->int_parm);
-                } else {
-                        if (!shared_ind(q->irq_ptr))
-                                xchg(q->irq_ptr->dsci, 0);
-
-                        /*
-                         * Call inbound processing but not directly
-                         * since that could starve other thinint queues.
-                         */
-                        tasklet_schedule(&q->tasklet);
-                }
-        }
-}
-
 /**
  * tiqdio_thinint_handler - thin interrupt handler for qdio
  * @alsi: pointer to adapter local summary indicator
@@ -182,25 +113,42 @@ static void tiqdio_thinint_handler(void *alsi, void *data)
         struct qdio_q *q;
 
         last_ai_time = S390_lowcore.int_clock;
-        inc_irq_stat(IRQIO_QAI);
+        kstat_cpu(smp_processor_id()).irqs[IOINT_QAI]++;
 
         /* protect tiq_list entries, only changed in activate or shutdown */
         rcu_read_lock();
 
         /* check for work on all inbound thinint queues */
         list_for_each_entry_rcu(q, &tiq_list, entry) {
-                struct qdio_irq *irq;
 
                 /* only process queues from changed sets */
-                irq = q->irq_ptr;
-                if (unlikely(references_shared_dsci(irq))) {
+                if (unlikely(shared_ind(q->irq_ptr->dsci))) {
                         if (!si_used)
                                 continue;
-                } else if (!*irq->dsci)
+                } else if (!*q->irq_ptr->dsci)
                         continue;
 
-                tiqdio_call_inq_handlers(irq);
+                if (q->u.in.queue_start_poll) {
+                        /* skip if polling is enabled or already in work */
+                        if (test_and_set_bit(QDIO_QUEUE_IRQS_DISABLED,
+                                             &q->u.in.queue_irq_state)) {
+                                qperf_inc(q, int_discarded);
+                                continue;
+                        }
 
+                        /* avoid dsci clear here, done after processing */
+                        q->u.in.queue_start_poll(q->irq_ptr->cdev, q->nr,
+                                                 q->irq_ptr->int_parm);
+                } else {
+                        /* only clear it if the indicator is non-shared */
+                        if (!shared_ind(q->irq_ptr->dsci))
+                                xchg(q->irq_ptr->dsci, 0);
+                        /*
+                         * Call inbound processing but not directly
+                         * since that could starve other thinint queues.
+                         */
+                        tasklet_schedule(&q->tasklet);
+                }
                 qperf_inc(q, adapter_int);
         }
         rcu_read_unlock();
diff --git a/drivers/s390/cio/scm.c b/drivers/s390/cio/scm.c
deleted file mode 100644
index bcf20f3aa51..00000000000
--- a/drivers/s390/cio/scm.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Recognize and maintain s390 storage class memory.
- *
- * Copyright IBM Corp. 2012
- * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
- */
-
-#include <linux/device.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <asm/eadm.h>
-#include "chsc.h"
-
-static struct device *scm_root;
-static struct eadm_ops *eadm_ops;
-static DEFINE_MUTEX(eadm_ops_mutex);
-
-#define to_scm_dev(n) container_of(n, struct scm_device, dev)
-#define to_scm_drv(d) container_of(d, struct scm_driver, drv)
-
-static int scmdev_probe(struct device *dev)
-{
-        struct scm_device *scmdev = to_scm_dev(dev);
-        struct scm_driver *scmdrv = to_scm_drv(dev->driver);
-
-        return scmdrv->probe ? scmdrv->probe(scmdev) : -ENODEV;
-}
-
-static int scmdev_remove(struct device *dev)
-{
-        struct scm_device *scmdev = to_scm_dev(dev);
-        struct scm_driver *scmdrv = to_scm_drv(dev->driver);
-
-        return scmdrv->remove ? scmdrv->remove(scmdev) : -ENODEV;
-}
-
-static int scmdev_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-        return add_uevent_var(env, "MODALIAS=scm:scmdev");
-}
-
-static struct bus_type scm_bus_type = {
-        .name  = "scm",
-        .probe = scmdev_probe,
-        .remove = scmdev_remove,
-        .uevent = scmdev_uevent,
-};
-
-/**
- * scm_driver_register() - register a scm driver
- * @scmdrv: driver to be registered
- */
-int scm_driver_register(struct scm_driver *scmdrv)
-{
-        struct device_driver *drv = &scmdrv->drv;
-
-        drv->bus = &scm_bus_type;
-
-        return driver_register(drv);
-}
-EXPORT_SYMBOL_GPL(scm_driver_register);
-
-/**
- * scm_driver_unregister() - deregister a scm driver
- * @scmdrv: driver to be deregistered
- */
-void scm_driver_unregister(struct scm_driver *scmdrv)
-{
-        driver_unregister(&scmdrv->drv);
-}
-EXPORT_SYMBOL_GPL(scm_driver_unregister);
-
-int scm_get_ref(void)
-{
-        int ret = 0;
-
-        mutex_lock(&eadm_ops_mutex);
-        if (!eadm_ops || !try_module_get(eadm_ops->owner))
-                ret = -ENOENT;
-        mutex_unlock(&eadm_ops_mutex);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(scm_get_ref);
-
-void scm_put_ref(void)
-{
-        mutex_lock(&eadm_ops_mutex);
-        module_put(eadm_ops->owner);
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(scm_put_ref);
-
-void register_eadm_ops(struct eadm_ops *ops)
-{
-        mutex_lock(&eadm_ops_mutex);
-        eadm_ops = ops;
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(register_eadm_ops);
-
-void unregister_eadm_ops(struct eadm_ops *ops)
-{
-        mutex_lock(&eadm_ops_mutex);
-        eadm_ops = NULL;
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(unregister_eadm_ops);
-
-int scm_start_aob(struct aob *aob)
-{
-        return eadm_ops->eadm_start(aob);
-}
-EXPORT_SYMBOL_GPL(scm_start_aob);
-
-void scm_irq_handler(struct aob *aob, int error)
-{
-        struct aob_rq_header *aobrq = (void *) aob->request.data;
-        struct scm_device *scmdev = aobrq->scmdev;
-        struct scm_driver *scmdrv = to_scm_drv(scmdev->dev.driver);
-
-        scmdrv->handler(scmdev, aobrq->data, error);
-}
-EXPORT_SYMBOL_GPL(scm_irq_handler);
-
-#define scm_attr(name)                                                  \
-static ssize_t show_##name(struct device *dev,                          \
-               struct device_attribute *attr, char *buf)                \
-{                                                                       \
-        struct scm_device *scmdev = to_scm_dev(dev);                    \
-        int ret;                                                        \
-                                                                        \
-        device_lock(dev);                                               \
-        ret = sprintf(buf, "%u\n", scmdev->attrs.name);                 \
-        device_unlock(dev);                                             \
-                                                                        \
-        return ret;                                                     \
-}                                                                       \
-static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL);
-
-scm_attr(persistence);
-scm_attr(oper_state);
-scm_attr(data_state);
-scm_attr(rank);
-scm_attr(release);
-scm_attr(res_id);
-
-static struct attribute *scmdev_attrs[] = {
-        &dev_attr_persistence.attr,
-        &dev_attr_oper_state.attr,
-        &dev_attr_data_state.attr,
-        &dev_attr_rank.attr,
-        &dev_attr_release.attr,
-        &dev_attr_res_id.attr,
-        NULL,
-};
-
-static struct attribute_group scmdev_attr_group = {
-        .attrs = scmdev_attrs,
-};
-
-static const struct attribute_group *scmdev_attr_groups[] = {
-        &scmdev_attr_group,
-        NULL,
-};
-
-static void scmdev_release(struct device *dev)
-{
-        struct scm_device *scmdev = to_scm_dev(dev);
-
-        kfree(scmdev);
-}
-
-static void scmdev_setup(struct scm_device *scmdev, struct sale *sale,
-                         unsigned int size, unsigned int max_blk_count)
-{
-        dev_set_name(&scmdev->dev, "%016llx", (unsigned long long) sale->sa);
-        scmdev->nr_max_block = max_blk_count;
-        scmdev->address = sale->sa;
-        scmdev->size = 1UL << size;
-        scmdev->attrs.rank = sale->rank;
-        scmdev->attrs.persistence = sale->p;
-        scmdev->attrs.oper_state = sale->op_state;
-        scmdev->attrs.data_state = sale->data_state;
-        scmdev->attrs.rank = sale->rank;
-        scmdev->attrs.release = sale->r;
-        scmdev->attrs.res_id = sale->rid;
-        scmdev->dev.parent = scm_root;
-        scmdev->dev.bus = &scm_bus_type;
-        scmdev->dev.release = scmdev_release;
-        scmdev->dev.groups = scmdev_attr_groups;
-}
-
-/*
- * Check for state-changes, notify the driver and userspace.
- */
-static void scmdev_update(struct scm_device *scmdev, struct sale *sale)
-{
-        struct scm_driver *scmdrv;
-        bool changed;
-
-        device_lock(&scmdev->dev);
-        changed = scmdev->attrs.rank != sale->rank ||
-                  scmdev->attrs.oper_state != sale->op_state;
-        scmdev->attrs.rank = sale->rank;
-        scmdev->attrs.oper_state = sale->op_state;
-        if (!scmdev->dev.driver)
-                goto out;
-        scmdrv = to_scm_drv(scmdev->dev.driver);
-        if (changed && scmdrv->notify)
-                scmdrv->notify(scmdev);
-out:
-        device_unlock(&scmdev->dev);
-        if (changed)
-                kobject_uevent(&scmdev->dev.kobj, KOBJ_CHANGE);
-}
-
-static int check_address(struct device *dev, void *data)
-{
-        struct scm_device *scmdev = to_scm_dev(dev);
-        struct sale *sale = data;
-
-        return scmdev->address == sale->sa;
-}
-
-static struct scm_device *scmdev_find(struct sale *sale)
-{
-        struct device *dev;
-
-        dev = bus_find_device(&scm_bus_type, NULL, sale, check_address);
-
-        return dev ? to_scm_dev(dev) : NULL;
-}
-
-static int scm_add(struct chsc_scm_info *scm_info, size_t num)
-{
-        struct sale *sale, *scmal = scm_info->scmal;
-        struct scm_device *scmdev;
-        int ret;
-
-        for (sale = scmal; sale < scmal + num; sale++) {
-                scmdev = scmdev_find(sale);
-                if (scmdev) {
-                        scmdev_update(scmdev, sale);
-                        /* Release reference from scm_find(). */
-                        put_device(&scmdev->dev);
-                        continue;
-                }
-                scmdev = kzalloc(sizeof(*scmdev), GFP_KERNEL);
-                if (!scmdev)
-                        return -ENODEV;
-                scmdev_setup(scmdev, sale, scm_info->is, scm_info->mbc);
-                ret = device_register(&scmdev->dev);
-                if (ret) {
-                        /* Release reference from device_initialize(). */
-                        put_device(&scmdev->dev);
-                        return ret;
-                }
-        }
-
-        return 0;
-}
-
-int scm_update_information(void)
-{
-        struct chsc_scm_info *scm_info;
-        u64 token = 0;
-        size_t num;
-        int ret;
-
-        scm_info = (void *)__get_free_page(GFP_KERNEL | GFP_DMA);
-        if (!scm_info)
-                return -ENOMEM;
-
-        do {
-                ret = chsc_scm_info(scm_info, token);
-                if (ret)
-                        break;
-
-                num = (scm_info->response.length -
-                       (offsetof(struct chsc_scm_info, scmal) -
-                        offsetof(struct chsc_scm_info, response))
-                      ) / sizeof(struct sale);
-
-                ret = scm_add(scm_info, num);
-                if (ret)
-                        break;
-
-                token = scm_info->restok;
-        } while (token);
-
-        free_page((unsigned long)scm_info);
-
-        return ret;
-}
-
-static int __init scm_init(void)
-{
-        int ret;
-
-        ret = bus_register(&scm_bus_type);
-        if (ret)
-                return ret;
-
-        scm_root = root_device_register("scm");
-        if (IS_ERR(scm_root)) {
-                bus_unregister(&scm_bus_type);
-                return PTR_ERR(scm_root);
-        }
-
-        scm_update_information();
-        return 0;
-}
-subsys_initcall_sync(scm_init);
diff --git a/drivers/s390/crypto/Makefile b/drivers/s390/crypto/Makefile
index 771faf7094d..f0a12d2eb78 100644
--- a/drivers/s390/crypto/Makefile
+++ b/drivers/s390/crypto/Makefile
@@ -2,7 +2,16 @@
 # S/390 crypto devices
 #
 
+ifdef CONFIG_ZCRYPT_MONOLITHIC
+
+z90crypt-objs := zcrypt_mono.o ap_bus.o zcrypt_api.o \
+                zcrypt_pcica.o zcrypt_pcicc.o zcrypt_pcixcc.o zcrypt_cex2a.o
+obj-$(CONFIG_ZCRYPT) += z90crypt.o
+
+else
+
 ap-objs := ap_bus.o
 obj-$(CONFIG_ZCRYPT) += ap.o zcrypt_api.o zcrypt_pcicc.o zcrypt_pcixcc.o
-obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o zcrypt_cex4.o
-obj-$(CONFIG_ZCRYPT) += zcrypt_msgtype6.o zcrypt_msgtype50.o
+obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o
+
+endif
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index b8b340ac533..b77ae519d79 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -1,5 +1,7 @@
 /*
- * Copyright IBM Corp. 2006, 2012
+ * linux/drivers/s390/crypto/ap_bus.c
+ *
+ * Copyright (C) 2006 IBM Corporation
  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  *            Martin Schwidefsky <schwidefsky@de.ibm.com>
  *            Ralph Wuerthner <rwuerthn@de.ibm.com>
@@ -40,10 +42,10 @@
 #include <asm/reset.h>
 #include <asm/airq.h>
 #include <linux/atomic.h>
+#include <asm/system.h>
 #include <asm/isc.h>
 #include <linux/hrtimer.h>
 #include <linux/ktime.h>
-#include <asm/facility.h>
 
 #include "ap_bus.h"
 
@@ -62,14 +64,13 @@ static void ap_interrupt_handler(void *unused1, void *unused2);
 static void ap_reset(struct ap_device *ap_dev);
 static void ap_config_timeout(unsigned long ptr);
 static int ap_select_domain(void);
-static void ap_query_configuration(void);
 
 /*
  * Module description.
  */
 MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("Adjunct Processor Bus driver, " \
-                   "Copyright IBM Corp. 2006, 2012");
+MODULE_DESCRIPTION("Adjunct Processor Bus driver, "
+                   "Copyright 2006 IBM Corporation");
 MODULE_LICENSE("GPL");
 
 /*
@@ -85,7 +86,6 @@ module_param_named(poll_thread, ap_thread_flag, int, 0000);
 MODULE_PARM_DESC(poll_thread, "Turn on/off poll thread, default is 0 (off).");
 
 static struct device *ap_root_device = NULL;
-static struct ap_config_info *ap_configuration;
 static DEFINE_SPINLOCK(ap_device_list_lock);
 static LIST_HEAD(ap_device_list);
 
@@ -160,19 +160,6 @@ static int ap_interrupts_available(void)
 }
 
 /**
- * ap_configuration_available(): Test if AP configuration
- * information is available.
- *
- * Returns 1 if AP configuration information is available.
- */
-#ifdef CONFIG_64BIT
-static int ap_configuration_available(void)
-{
-        return test_facility(2) && test_facility(12);
-}
-#endif
-
-/**
  * ap_test_queue(): Test adjunct processor queue.
  * @qid: The AP queue number
  * @queue_depth: Pointer to queue depth value
@@ -228,7 +215,7 @@ ap_queue_interruption_control(ap_qid_t qid, void *ind)
         register struct ap_queue_status reg1_out asm ("1");
         register void *reg2 asm ("2") = ind;
         asm volatile(
-                ".long 0xb2af0000"              /* PQAP(AQIC) */
+                ".long 0xb2af0000"              /* PQAP(RAPQ) */
                 : "+d" (reg0), "+d" (reg1_in), "=d" (reg1_out), "+d" (reg2)
                 :
                 : "cc" );
@@ -245,7 +232,7 @@ __ap_query_functions(ap_qid_t qid, unsigned int *functions)
         register unsigned long reg2 asm ("2");
 
         asm volatile(
-                ".long 0xb2af0000\n"            /* PQAP(TAPQ) */
+                ".long 0xb2af0000\n"
                 "0:\n"
                 EX_TABLE(0b, 0b)
                 : "+d" (reg0), "+d" (reg1), "=d" (reg2)
@@ -257,26 +244,6 @@ __ap_query_functions(ap_qid_t qid, unsigned int *functions)
 }
 #endif
 
-#ifdef CONFIG_64BIT
-static inline int __ap_query_configuration(struct ap_config_info *config)
-{
-        register unsigned long reg0 asm ("0") = 0x04000000UL;
-        register unsigned long reg1 asm ("1") = -EINVAL;
-        register unsigned char *reg2 asm ("2") = (unsigned char *)config;
-
-        asm volatile(
-                ".long 0xb2af0000\n"            /* PQAP(QCI) */
-                "0: la    %1,0\n"
-                "1:\n"
-                EX_TABLE(0b, 1b)
-                : "+d" (reg0), "+d" (reg1), "+d" (reg2)
-                :
-                : "cc");
-
-        return reg1;
-}
-#endif
-
 /**
  * ap_query_functions(): Query supported functions.
  * @qid: The AP queue number
@@ -327,6 +294,25 @@ static int ap_query_functions(ap_qid_t qid, unsigned int *functions)
 }
 
 /**
+ * ap_4096_commands_availablen(): Check for availability of 4096 bit RSA
+ * support.
+ * @qid: The AP queue number
+ *
+ * Returns 1 if 4096 bit RSA keys are support fo the AP, returns 0 if not.
+ */
+int ap_4096_commands_available(ap_qid_t qid)
+{
+        unsigned int functions;
+
+        if (ap_query_functions(qid, &functions))
+                return 0;
+
+        return test_ap_facility(functions, 1) &&
+               test_ap_facility(functions, 2);
+}
+EXPORT_SYMBOL(ap_4096_commands_available);
+
+/**
  * ap_queue_enable_interruption(): Enable interruption on an AP.
  * @qid: The AP queue number
  * @ind: the notification indicator byte
@@ -352,12 +338,6 @@ static int ap_queue_enable_interruption(ap_qid_t qid, void *ind)
                         break;
                 case AP_RESPONSE_RESET_IN_PROGRESS:
                 case AP_RESPONSE_BUSY:
-                        if (i < AP_MAX_RESET - 1) {
-                                udelay(5);
-                                status = ap_queue_interruption_control(qid,
-                                                                       ind);
-                                continue;
-                        }
                         break;
                 case AP_RESPONSE_Q_NOT_AVAIL:
                 case AP_RESPONSE_DECONFIGURED:
@@ -411,7 +391,7 @@ __ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length,
                 reg0 |= 0x400000UL;
 
         asm volatile (
-                "0: .long 0xb2ad0042\n"         /* NQAP */
+                "0: .long 0xb2ad0042\n"         /* DQAP */
                 "   brc   2,0b"
                 : "+d" (reg0), "=d" (reg1), "+d" (reg2), "+d" (reg3)
                 : "d" (reg4), "d" (reg5), "m" (*(msgblock *) msg)
@@ -470,7 +450,7 @@ __ap_recv(ap_qid_t qid, unsigned long long *psmid, void *msg, size_t length)
 
 
         asm volatile(
-                "0: .long 0xb2ae0064\n"         /* DQAP */
+                "0: .long 0xb2ae0064\n"
                 "   brc   6,0b\n"
                 : "+d" (reg0), "=d" (reg1), "+d" (reg2),
                 "+d" (reg4), "+d" (reg5), "+d" (reg6), "+d" (reg7),
@@ -673,34 +653,6 @@ static ssize_t ap_request_count_show(struct device *dev,
 
 static DEVICE_ATTR(request_count, 0444, ap_request_count_show, NULL);
 
-static ssize_t ap_requestq_count_show(struct device *dev,
-                                      struct device_attribute *attr, char *buf)
-{
-        struct ap_device *ap_dev = to_ap_dev(dev);
-        int rc;
-
-        spin_lock_bh(&ap_dev->lock);
-        rc = snprintf(buf, PAGE_SIZE, "%d\n", ap_dev->requestq_count);
-        spin_unlock_bh(&ap_dev->lock);
-        return rc;
-}
-
-static DEVICE_ATTR(requestq_count, 0444, ap_requestq_count_show, NULL);
-
-static ssize_t ap_pendingq_count_show(struct device *dev,
-                                      struct device_attribute *attr, char *buf)
-{
-        struct ap_device *ap_dev = to_ap_dev(dev);
-        int rc;
-
-        spin_lock_bh(&ap_dev->lock);
-        rc = snprintf(buf, PAGE_SIZE, "%d\n", ap_dev->pendingq_count);
-        spin_unlock_bh(&ap_dev->lock);
-        return rc;
-}
-
-static DEVICE_ATTR(pendingq_count, 0444, ap_pendingq_count_show, NULL);
-
 static ssize_t ap_modalias_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
@@ -709,23 +661,11 @@ static ssize_t ap_modalias_show(struct device *dev,
 
 static DEVICE_ATTR(modalias, 0444, ap_modalias_show, NULL);
 
-static ssize_t ap_functions_show(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
-{
-        struct ap_device *ap_dev = to_ap_dev(dev);
-        return snprintf(buf, PAGE_SIZE, "0x%08X\n", ap_dev->functions);
-}
-
-static DEVICE_ATTR(ap_functions, 0444, ap_functions_show, NULL);
-
 static struct attribute *ap_dev_attrs[] = {
         &dev_attr_hwtype.attr,
         &dev_attr_depth.attr,
         &dev_attr_request_count.attr,
-        &dev_attr_requestq_count.attr,
-        &dev_attr_pendingq_count.attr,
         &dev_attr_modalias.attr,
-        &dev_attr_ap_functions.attr,
         NULL
 };
 static struct attribute_group ap_dev_attr_group = {
@@ -828,7 +768,6 @@ static int ap_bus_resume(struct device *dev)
                 ap_suspend_flag = 0;
                 if (!ap_interrupts_available())
                         ap_interrupt_indicator = NULL;
-                ap_query_configuration();
                 if (!user_set_domain) {
                         ap_domain_index = -1;
                         ap_select_domain();
@@ -897,12 +836,12 @@ static void __ap_flush_queue(struct ap_device *ap_dev)
         list_for_each_entry_safe(ap_msg, next, &ap_dev->pendingq, list) {
                 list_del_init(&ap_msg->list);
                 ap_dev->pendingq_count--;
-                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
         }
         list_for_each_entry_safe(ap_msg, next, &ap_dev->requestq, list) {
                 list_del_init(&ap_msg->list);
                 ap_dev->requestq_count--;
-                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
         }
 }
 
@@ -952,20 +891,6 @@ void ap_driver_unregister(struct ap_driver *ap_drv)
 }
 EXPORT_SYMBOL(ap_driver_unregister);
 
-void ap_bus_force_rescan(void)
-{
-        /* Delete the AP bus rescan timer. */
-        del_timer(&ap_config_timer);
-
-        /* processing a synchonuous bus rescan */
-        ap_scan_bus(NULL);
-
-        /* Setup the AP bus rescan timer again. */
-        ap_config_timer.expires = jiffies + ap_config_time * HZ;
-        add_timer(&ap_config_timer);
-}
-EXPORT_SYMBOL(ap_bus_force_rescan);
-
 /*
  * AP bus attributes.
  */
@@ -1068,65 +993,6 @@ static struct bus_attribute *const ap_bus_attrs[] = {
         NULL,
 };
 
-static inline int ap_test_config(unsigned int *field, unsigned int nr)
-{
-        if (nr > 0xFFu)
-                return 0;
-        return ap_test_bit((field + (nr >> 5)), (nr & 0x1f));
-}
-
-/*
- * ap_test_config_card_id(): Test, whether an AP card ID is configured.
- * @id AP card ID
- *
- * Returns 0 if the card is not configured
- *         1 if the card is configured or
- *           if the configuration information is not available
- */
-static inline int ap_test_config_card_id(unsigned int id)
-{
-        if (!ap_configuration)
-                return 1;
-        return ap_test_config(ap_configuration->apm, id);
-}
-
-/*
- * ap_test_config_domain(): Test, whether an AP usage domain is configured.
- * @domain AP usage domain ID
- *
- * Returns 0 if the usage domain is not configured
- *         1 if the usage domain is configured or
- *           if the configuration information is not available
- */
-static inline int ap_test_config_domain(unsigned int domain)
-{
-        if (!ap_configuration)
-                return 1;
-        return ap_test_config(ap_configuration->aqm, domain);
-}
-
-/**
- * ap_query_configuration(): Query AP configuration information.
- *
- * Query information of installed cards and configured domains from AP.
- */
-static void ap_query_configuration(void)
-{
-#ifdef CONFIG_64BIT
-        if (ap_configuration_available()) {
-                if (!ap_configuration)
-                        ap_configuration =
-                                kzalloc(sizeof(struct ap_config_info),
-                                        GFP_KERNEL);
-                if (ap_configuration)
-                        __ap_query_configuration(ap_configuration);
-        } else
-                ap_configuration = NULL;
-#else
-        ap_configuration = NULL;
-#endif
-}
-
 /**
  * ap_select_domain(): Select an AP domain.
  *
@@ -1135,7 +1001,6 @@ static void ap_query_configuration(void)
 static int ap_select_domain(void)
 {
         int queue_depth, device_type, count, max_count, best_domain;
-        ap_qid_t qid;
         int rc, i, j;
 
         /*
@@ -1149,13 +1014,9 @@ static int ap_select_domain(void)
         best_domain = -1;
         max_count = 0;
         for (i = 0; i < AP_DOMAINS; i++) {
-                if (!ap_test_config_domain(i))
-                        continue;
                 count = 0;
                 for (j = 0; j < AP_DEVICES; j++) {
-                        if (!ap_test_config_card_id(j))
-                                continue;
-                        qid = AP_MKQID(j, i);
+                        ap_qid_t qid = AP_MKQID(j, i);
                         rc = ap_query_queue(qid, &queue_depth, &device_type);
                         if (rc)
                                 continue;
@@ -1272,7 +1133,7 @@ out:
 
 static void ap_interrupt_handler(void *unused1, void *unused2)
 {
-        inc_irq_stat(IRQIO_APB);
+        kstat_cpu(smp_processor_id()).irqs[IOINT_APB]++;
         tasklet_schedule(&ap_tasklet);
 }
 
@@ -1304,7 +1165,6 @@ static void ap_scan_bus(struct work_struct *unused)
         unsigned int device_functions;
         int rc, i;
 
-        ap_query_configuration();
         if (ap_select_domain() != 0)
                 return;
         for (i = 0; i < AP_DEVICES; i++) {
@@ -1312,10 +1172,7 @@ static void ap_scan_bus(struct work_struct *unused)
                 dev = bus_find_device(&ap_bus_type, NULL,
                                       (void *)(unsigned long)qid,
                                       __ap_scan_bus);
-                if (ap_test_config_card_id(i))
-                        rc = ap_query_queue(qid, &queue_depth, &device_type);
-                else
-                        rc = -ENODEV;
+                rc = ap_query_queue(qid, &queue_depth, &device_type);
                 if (dev) {
                         if (rc == -EBUSY) {
                                 set_current_state(TASK_UNINTERRUPTIBLE);
@@ -1356,22 +1213,29 @@ static void ap_scan_bus(struct work_struct *unused)
                             (unsigned long) ap_dev);
                 switch (device_type) {
                 case 0:
-                        /* device type probing for old cards */
                         if (ap_probe_device_type(ap_dev)) {
                                 kfree(ap_dev);
                                 continue;
                         }
                         break;
+                case 10:
+                        if (ap_query_functions(qid, &device_functions)) {
+                                kfree(ap_dev);
+                                continue;
+                        }
+                        if (test_ap_facility(device_functions, 3))
+                                ap_dev->device_type = AP_DEVICE_TYPE_CEX3C;
+                        else if (test_ap_facility(device_functions, 4))
+                                ap_dev->device_type = AP_DEVICE_TYPE_CEX3A;
+                        else {
+                                kfree(ap_dev);
+                                continue;
+                        }
+                        break;
                 default:
                         ap_dev->device_type = device_type;
                 }
 
-                rc = ap_query_functions(qid, &device_functions);
-                if (!rc)
-                        ap_dev->functions = device_functions;
-                else
-                        ap_dev->functions = 0u;
-
                 ap_dev->device.bus = &ap_bus_type;
                 ap_dev->device.parent = ap_root_device;
                 if (dev_set_name(&ap_dev->device, "card%02x",
@@ -1407,16 +1271,18 @@ ap_config_timeout(unsigned long ptr)
 }
 
 /**
- * __ap_schedule_poll_timer(): Schedule poll timer.
+ * ap_schedule_poll_timer(): Schedule poll timer.
  *
  * Set up the timer to run the poll tasklet
  */
-static inline void __ap_schedule_poll_timer(void)
+static inline void ap_schedule_poll_timer(void)
 {
         ktime_t hr_time;
 
         spin_lock_bh(&ap_poll_timer_lock);
-        if (hrtimer_is_queued(&ap_poll_timer) || ap_suspend_flag)
+        if (ap_using_interrupts() || ap_suspend_flag)
+                goto out;
+        if (hrtimer_is_queued(&ap_poll_timer))
                 goto out;
         if (ktime_to_ns(hrtimer_expires_remaining(&ap_poll_timer)) <= 0) {
                 hr_time = ktime_set(0, poll_timeout);
@@ -1428,18 +1294,6 @@ out:
 }
 
 /**
- * ap_schedule_poll_timer(): Schedule poll timer.
- *
- * Set up the timer to run the poll tasklet
- */
-static inline void ap_schedule_poll_timer(void)
-{
-        if (ap_using_interrupts())
-                return;
-        __ap_schedule_poll_timer();
-}
-
-/**
  * ap_poll_read(): Receive pending reply messages from an AP device.
  * @ap_dev: pointer to the AP device
  * @flags: pointer to control flags, bit 2^0 is set if another poll is
@@ -1465,7 +1319,7 @@ static int ap_poll_read(struct ap_device *ap_dev, unsigned long *flags)
                                 continue;
                         list_del_init(&ap_msg->list);
                         ap_dev->pendingq_count--;
-                        ap_msg->receive(ap_dev, ap_msg, ap_dev->reply);
+                        ap_dev->drv->receive(ap_dev, ap_msg, ap_dev->reply);
                         break;
                 }
                 if (ap_dev->queue_count > 0)
@@ -1520,9 +1374,8 @@ static int ap_poll_write(struct ap_device *ap_dev, unsigned long *flags)
                         *flags |= 1;
                 *flags |= 2;
                 break;
-        case AP_RESPONSE_RESET_IN_PROGRESS:
-                __ap_schedule_poll_timer();
         case AP_RESPONSE_Q_FULL:
+        case AP_RESPONSE_RESET_IN_PROGRESS:
                 *flags |= 2;
                 break;
         case AP_RESPONSE_MESSAGE_TOO_BIG:
@@ -1586,10 +1439,10 @@ static int __ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_ms
                         return -EBUSY;
                 case AP_RESPONSE_REQ_FAC_NOT_INST:
                 case AP_RESPONSE_MESSAGE_TOO_BIG:
-                        ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-EINVAL));
+                        ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-EINVAL));
                         return -EINVAL;
                 default:        /* Device is gone. */
-                        ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                        ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
                         return -ENODEV;
                 }
         } else {
@@ -1607,10 +1460,6 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
         unsigned long flags;
         int rc;
 
-        /* For asynchronous message handling a valid receive-callback
-         * is required. */
-        BUG_ON(!ap_msg->receive);
-
         spin_lock_bh(&ap_dev->lock);
         if (!ap_dev->unregistered) {
                 /* Make room on the queue by polling for finished requests. */
@@ -1622,7 +1471,7 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
                 if (rc == -ENODEV)
                         ap_dev->unregistered = 1;
         } else {
-                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
                 rc = -ENODEV;
         }
         spin_unlock_bh(&ap_dev->lock);
@@ -1692,8 +1541,6 @@ static void ap_reset(struct ap_device *ap_dev)
         rc = ap_init_queue(ap_dev->qid);
         if (rc == -ENODEV)
                 ap_dev->unregistered = 1;
-        else
-                __ap_schedule_poll_timer();
 }
 
 static int __ap_poll_device(struct ap_device *ap_dev, unsigned long *flags)
@@ -1917,7 +1764,6 @@ int __init ap_module_init(void)
                 goto out_root;
         }
 
-        ap_query_configuration();
         if (ap_select_domain() == 0)
                 ap_scan_bus(NULL);
 
@@ -2003,5 +1849,7 @@ void ap_module_exit(void)
         }
 }
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 module_init(ap_module_init);
 module_exit(ap_module_exit);
+#endif
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 685f6cc022f..d960a6309ee 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -1,5 +1,7 @@
 /*
- * Copyright IBM Corp. 2006, 2012
+ * linux/drivers/s390/crypto/ap_bus.h
+ *
+ * Copyright (C) 2006 IBM Corporation
  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  *            Martin Schwidefsky <schwidefsky@de.ibm.com>
  *            Ralph Wuerthner <rwuerthn@de.ibm.com>
@@ -83,12 +85,13 @@ int ap_queue_status_invalid_test(struct ap_queue_status *status)
         return !(memcmp(status, &invalid, sizeof(struct ap_queue_status)));
 }
 
-#define AP_MAX_BITS 31
-static inline int ap_test_bit(unsigned int *ptr, unsigned int nr)
+#define MAX_AP_FACILITY 31
+
+static inline int test_ap_facility(unsigned int function, unsigned int nr)
 {
-        if (nr > AP_MAX_BITS)
+        if (nr > MAX_AP_FACILITY)
                 return 0;
-        return (*ptr & (0x80000000u >> nr)) != 0;
+        return function & (unsigned int)(0x80000000 >> nr);
 }
 
 #define AP_RESPONSE_NORMAL              0x00
@@ -116,15 +119,6 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr)
 #define AP_DEVICE_TYPE_CEX2C    7
 #define AP_DEVICE_TYPE_CEX3A    8
 #define AP_DEVICE_TYPE_CEX3C    9
-#define AP_DEVICE_TYPE_CEX4     10
-
-/*
- * Known function facilities
- */
-#define AP_FUNC_MEX4K 1
-#define AP_FUNC_CRT4K 2
-#define AP_FUNC_COPRO 3
-#define AP_FUNC_ACCEL 4
 
 /*
  * AP reset flag states
@@ -142,6 +136,9 @@ struct ap_driver {
 
         int (*probe)(struct ap_device *);
         void (*remove)(struct ap_device *);
+        /* receive is called from tasklet context */
+        void (*receive)(struct ap_device *, struct ap_message *,
+                        struct ap_message *);
         int request_timeout;            /* request timeout in jiffies */
 };
 
@@ -159,7 +156,6 @@ struct ap_device {
         ap_qid_t qid;                   /* AP queue id. */
         int queue_depth;                /* AP queue depth.*/
         int device_type;                /* AP device type. */
-        unsigned int functions;         /* AP device function bitfield. */
         int unregistered;               /* marks AP device as unregistered */
         struct timer_list timeout;      /* Timer for request timeouts. */
         int reset;                      /* Reset required after req. timeout. */
@@ -187,22 +183,8 @@ struct ap_message {
 
         void *private;                  /* ap driver private pointer. */
         unsigned int special:1;         /* Used for special commands. */
-        /* receive is called from tasklet context */
-        void (*receive)(struct ap_device *, struct ap_message *,
-                        struct ap_message *);
 };
 
-struct ap_config_info {
-        unsigned int special_command:1;
-        unsigned int ap_extended:1;
-        unsigned char reserved1:6;
-        unsigned char reserved2[15];
-        unsigned int apm[8];            /* AP ID mask */
-        unsigned int aqm[8];            /* AP queue mask */
-        unsigned int adm[8];            /* AP domain mask */
-        unsigned char reserved4[16];
-} __packed;
-
 #define AP_DEVICE(dt)                                   \
         .dev_type=(dt),                                 \
         .match_flags=AP_DEVICE_ID_MATCH_DEVICE_TYPE,
@@ -217,7 +199,6 @@ static inline void ap_init_message(struct ap_message *ap_msg)
         ap_msg->psmid = 0;
         ap_msg->length = 0;
         ap_msg->special = 0;
-        ap_msg->receive = NULL;
 }
 
 /*
@@ -231,9 +212,10 @@ int ap_recv(ap_qid_t, unsigned long long *, void *, size_t);
 void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg);
 void ap_cancel_message(struct ap_device *ap_dev, struct ap_message *ap_msg);
 void ap_flush_queue(struct ap_device *ap_dev);
-void ap_bus_force_rescan(void);
 
 int ap_module_init(void);
 void ap_module_exit(void);
 
+int ap_4096_commands_available(ap_qid_t qid);
+
 #endif /* _AP_BUS_H_ */
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 31cfaa55607..88ad33ed5d3 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_api.c
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2012
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *             Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -9,7 +11,6 @@
  *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
  *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
  *                                Ralph Wuerthner <rwuerthn@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,39 +39,25 @@
 #include <linux/atomic.h>
 #include <asm/uaccess.h>
 #include <linux/hw_random.h>
-#include <linux/debugfs.h>
-#include <asm/debug.h>
 
-#include "zcrypt_debug.h"
 #include "zcrypt_api.h"
 
 /*
  * Module description.
  */
 MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("Cryptographic Coprocessor interface, " \
-                   "Copyright IBM Corp. 2001, 2012");
+MODULE_DESCRIPTION("Cryptographic Coprocessor interface, "
+                   "Copyright 2001, 2006 IBM Corporation");
 MODULE_LICENSE("GPL");
 
 static DEFINE_SPINLOCK(zcrypt_device_lock);
 static LIST_HEAD(zcrypt_device_list);
 static int zcrypt_device_count = 0;
 static atomic_t zcrypt_open_count = ATOMIC_INIT(0);
-static atomic_t zcrypt_rescan_count = ATOMIC_INIT(0);
-
-atomic_t zcrypt_rescan_req = ATOMIC_INIT(0);
-EXPORT_SYMBOL(zcrypt_rescan_req);
 
 static int zcrypt_rng_device_add(void);
 static void zcrypt_rng_device_remove(void);
 
-static DEFINE_SPINLOCK(zcrypt_ops_list_lock);
-static LIST_HEAD(zcrypt_ops_list);
-
-static debug_info_t *zcrypt_dbf_common;
-static debug_info_t *zcrypt_dbf_devices;
-static struct dentry *debugfs_root;
-
 /*
  * Device attributes common for all crypto devices.
  */
@@ -100,8 +87,6 @@ static ssize_t zcrypt_online_store(struct device *dev,
         if (sscanf(buf, "%d\n", &online) != 1 || online < 0 || online > 1)
                 return -EINVAL;
         zdev->online = online;
-        ZCRYPT_DBF_DEV(DBF_INFO, zdev, "dev%04xo%dman", zdev->ap_dev->qid,
-                       zdev->online);
         if (!online)
                 ap_flush_queue(zdev->ap_dev);
         return count;
@@ -120,24 +105,6 @@ static struct attribute_group zcrypt_device_attr_group = {
 };
 
 /**
- * Process a rescan of the transport layer.
- *
- * Returns 1, if the rescan has been processed, otherwise 0.
- */
-static inline int zcrypt_process_rescan(void)
-{
-        if (atomic_read(&zcrypt_rescan_req)) {
-                atomic_set(&zcrypt_rescan_req, 0);
-                atomic_inc(&zcrypt_rescan_count);
-                ap_bus_force_rescan();
-                ZCRYPT_DBF_COMMON(DBF_INFO, "rescan%07d",
-                                  atomic_inc_return(&zcrypt_rescan_count));
-                return 1;
-        }
-        return 0;
-}
-
-/**
  * __zcrypt_increase_preference(): Increase preference of a crypto device.
  * @zdev: Pointer the crypto device
  *
@@ -225,7 +192,6 @@ struct zcrypt_device *zcrypt_device_alloc(size_t max_response_size)
         zdev->reply.length = max_response_size;
         spin_lock_init(&zdev->lock);
         INIT_LIST_HEAD(&zdev->list);
-        zdev->dbf_area = zcrypt_dbf_devices;
         return zdev;
 
 out_free:
@@ -251,8 +217,6 @@ int zcrypt_device_register(struct zcrypt_device *zdev)
 {
         int rc;
 
-        if (!zdev->ops)
-                return -ENODEV;
         rc = sysfs_create_group(&zdev->ap_dev->device.kobj,
                                 &zcrypt_device_attr_group);
         if (rc)
@@ -261,8 +225,6 @@ int zcrypt_device_register(struct zcrypt_device *zdev)
         kref_init(&zdev->refcount);
         spin_lock_bh(&zcrypt_device_lock);
         zdev->online = 1;       /* New devices are online by default. */
-        ZCRYPT_DBF_DEV(DBF_INFO, zdev, "dev%04xo%dreg", zdev->ap_dev->qid,
-                       zdev->online);
         list_add_tail(&zdev->list, &zcrypt_device_list);
         __zcrypt_increase_preference(zdev);
         zcrypt_device_count++;
@@ -309,67 +271,6 @@ void zcrypt_device_unregister(struct zcrypt_device *zdev)
 }
 EXPORT_SYMBOL(zcrypt_device_unregister);
 
-void zcrypt_msgtype_register(struct zcrypt_ops *zops)
-{
-        if (zops->owner) {
-                spin_lock_bh(&zcrypt_ops_list_lock);
-                list_add_tail(&zops->list, &zcrypt_ops_list);
-                spin_unlock_bh(&zcrypt_ops_list_lock);
-        }
-}
-EXPORT_SYMBOL(zcrypt_msgtype_register);
-
-void zcrypt_msgtype_unregister(struct zcrypt_ops *zops)
-{
-        spin_lock_bh(&zcrypt_ops_list_lock);
-        list_del_init(&zops->list);
-        spin_unlock_bh(&zcrypt_ops_list_lock);
-}
-EXPORT_SYMBOL(zcrypt_msgtype_unregister);
-
-static inline
-struct zcrypt_ops *__ops_lookup(unsigned char *name, int variant)
-{
-        struct zcrypt_ops *zops;
-        int found = 0;
-
-        spin_lock_bh(&zcrypt_ops_list_lock);
-        list_for_each_entry(zops, &zcrypt_ops_list, list) {
-                if ((zops->variant == variant) &&
-                    (!strncmp(zops->owner->name, name, MODULE_NAME_LEN))) {
-                        found = 1;
-                        break;
-                }
-        }
-        spin_unlock_bh(&zcrypt_ops_list_lock);
-
-        if (!found)
-                return NULL;
-        return zops;
-}
-
-struct zcrypt_ops *zcrypt_msgtype_request(unsigned char *name, int variant)
-{
-        struct zcrypt_ops *zops = NULL;
-
-        zops = __ops_lookup(name, variant);
-        if (!zops) {
-                request_module(name);
-                zops = __ops_lookup(name, variant);
-        }
-        if ((!zops) || (!try_module_get(zops->owner)))
-                return NULL;
-        return zops;
-}
-EXPORT_SYMBOL(zcrypt_msgtype_request);
-
-void zcrypt_msgtype_release(struct zcrypt_ops *zops)
-{
-        if (zops)
-                module_put(zops->owner);
-}
-EXPORT_SYMBOL(zcrypt_msgtype_release);
-
 /**
  * zcrypt_read (): Not supported beyond zcrypt 1.3.1.
  *
@@ -741,11 +642,6 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
                 do {
                         rc = zcrypt_rsa_modexpo(&mex);
                 } while (rc == -EAGAIN);
-                /* on failure: retry once again after a requested rescan */
-                if ((rc == -ENODEV) && (zcrypt_process_rescan()))
-                        do {
-                                rc = zcrypt_rsa_modexpo(&mex);
-                        } while (rc == -EAGAIN);
                 if (rc)
                         return rc;
                 return put_user(mex.outputdatalength, &umex->outputdatalength);
@@ -758,11 +654,6 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
                 do {
                         rc = zcrypt_rsa_crt(&crt);
                 } while (rc == -EAGAIN);
-                /* on failure: retry once again after a requested rescan */
-                if ((rc == -ENODEV) && (zcrypt_process_rescan()))
-                        do {
-                                rc = zcrypt_rsa_crt(&crt);
-                        } while (rc == -EAGAIN);
                 if (rc)
                         return rc;
                 return put_user(crt.outputdatalength, &ucrt->outputdatalength);
@@ -775,11 +666,6 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
                 do {
                         rc = zcrypt_send_cprb(&xcRB);
                 } while (rc == -EAGAIN);
-                /* on failure: retry once again after a requested rescan */
-                if ((rc == -ENODEV) && (zcrypt_process_rescan()))
-                        do {
-                                rc = zcrypt_send_cprb(&xcRB);
-                        } while (rc == -EAGAIN);
                 if (copy_to_user(uxcRB, &xcRB, sizeof(xcRB)))
                         return -EFAULT;
                 return rc;
@@ -886,15 +772,10 @@ static long trans_modexpo32(struct file *filp, unsigned int cmd,
         do {
                 rc = zcrypt_rsa_modexpo(&mex64);
         } while (rc == -EAGAIN);
-        /* on failure: retry once again after a requested rescan */
-        if ((rc == -ENODEV) && (zcrypt_process_rescan()))
-                do {
-                        rc = zcrypt_rsa_modexpo(&mex64);
-                } while (rc == -EAGAIN);
-        if (rc)
-                return rc;
-        return put_user(mex64.outputdatalength,
-                        &umex32->outputdatalength);
+        if (!rc)
+                rc = put_user(mex64.outputdatalength,
+                              &umex32->outputdatalength);
+        return rc;
 }
 
 struct compat_ica_rsa_modexpo_crt {
@@ -931,15 +812,10 @@ static long trans_modexpo_crt32(struct file *filp, unsigned int cmd,
         do {
                 rc = zcrypt_rsa_crt(&crt64);
         } while (rc == -EAGAIN);
-        /* on failure: retry once again after a requested rescan */
-        if ((rc == -ENODEV) && (zcrypt_process_rescan()))
-                do {
-                        rc = zcrypt_rsa_crt(&crt64);
-                } while (rc == -EAGAIN);
-        if (rc)
-                return rc;
-        return put_user(crt64.outputdatalength,
-                        &ucrt32->outputdatalength);
+        if (!rc)
+                rc = put_user(crt64.outputdatalength,
+                              &ucrt32->outputdatalength);
+        return rc;
 }
 
 struct compat_ica_xcRB {
@@ -995,11 +871,6 @@ static long trans_xcRB32(struct file *filp, unsigned int cmd,
         do {
                 rc = zcrypt_send_cprb(&xcRB64);
         } while (rc == -EAGAIN);
-        /* on failure: retry once again after a requested rescan */
-        if ((rc == -ENODEV) && (zcrypt_process_rescan()))
-                do {
-                        rc = zcrypt_send_cprb(&xcRB64);
-                } while (rc == -EAGAIN);
         xcRB32.reply_control_blk_length = xcRB64.reply_control_blk_length;
         xcRB32.reply_data_length = xcRB64.reply_data_length;
         xcRB32.status = xcRB64.status;
@@ -1257,9 +1128,6 @@ static int zcrypt_rng_data_read(struct hwrng *rng, u32 *data)
          */
         if (zcrypt_rng_buffer_index == 0) {
                 rc = zcrypt_rng((char *) zcrypt_rng_buffer);
-                /* on failure: retry once again after a requested rescan */
-                if ((rc == -ENODEV) && (zcrypt_process_rescan()))
-                        rc = zcrypt_rng((char *) zcrypt_rng_buffer);
                 if (rc < 0)
                         return -EIO;
                 zcrypt_rng_buffer_index = rc / sizeof *data;
@@ -1312,30 +1180,6 @@ static void zcrypt_rng_device_remove(void)
         mutex_unlock(&zcrypt_rng_mutex);
 }
 
-int __init zcrypt_debug_init(void)
-{
-        debugfs_root = debugfs_create_dir("zcrypt", NULL);
-
-        zcrypt_dbf_common = debug_register("zcrypt_common", 1, 1, 16);
-        debug_register_view(zcrypt_dbf_common, &debug_hex_ascii_view);
-        debug_set_level(zcrypt_dbf_common, DBF_ERR);
-
-        zcrypt_dbf_devices = debug_register("zcrypt_devices", 1, 1, 16);
-        debug_register_view(zcrypt_dbf_devices, &debug_hex_ascii_view);
-        debug_set_level(zcrypt_dbf_devices, DBF_ERR);
-
-        return 0;
-}
-
-void zcrypt_debug_exit(void)
-{
-        debugfs_remove(debugfs_root);
-        if (zcrypt_dbf_common)
-                debug_unregister(zcrypt_dbf_common);
-        if (zcrypt_dbf_devices)
-                debug_unregister(zcrypt_dbf_devices);
-}
-
 /**
  * zcrypt_api_init(): Module initialization.
  *
@@ -1345,12 +1189,6 @@ int __init zcrypt_api_init(void)
 {
         int rc;
 
-        rc = zcrypt_debug_init();
-        if (rc)
-                goto out;
-
-        atomic_set(&zcrypt_rescan_req, 0);
-
         /* Register the request sprayer. */
         rc = misc_register(&zcrypt_misc_device);
         if (rc < 0)
@@ -1380,8 +1218,9 @@ void zcrypt_api_exit(void)
 {
         remove_proc_entry("driver/z90crypt", NULL);
         misc_deregister(&zcrypt_misc_device);
-        zcrypt_debug_exit();
 }
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 module_init(zcrypt_api_init);
 module_exit(zcrypt_api_exit);
+#endif
diff --git a/drivers/s390/crypto/zcrypt_api.h b/drivers/s390/crypto/zcrypt_api.h
index 89632919c99..9688f3985b0 100644
--- a/drivers/s390/crypto/zcrypt_api.h
+++ b/drivers/s390/crypto/zcrypt_api.h
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_api.h
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2012
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *             Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -9,7 +11,6 @@
  *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
  *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
  *                                Ralph Wuerthner <rwuerthn@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,10 +30,8 @@
 #ifndef _ZCRYPT_API_H_
 #define _ZCRYPT_API_H_
 
-#include <linux/atomic.h>
-#include <asm/debug.h>
-#include <asm/zcrypt.h>
 #include "ap_bus.h"
+#include <asm/zcrypt.h>
 
 /* deprecated status calls */
 #define ICAZ90STATUS            _IOR(ZCRYPT_IOCTL_MAGIC, 0x10, struct ica_z90_status)
@@ -90,9 +89,6 @@ struct zcrypt_ops {
                                 struct ica_rsa_modexpo_crt *);
         long (*send_cprb)(struct zcrypt_device *, struct ica_xcRB *);
         long (*rng)(struct zcrypt_device *, char *);
-        struct list_head list;          /* zcrypt ops list. */
-        struct module *owner;
-        int variant;
 };
 
 struct zcrypt_device {
@@ -114,23 +110,14 @@ struct zcrypt_device {
 
         struct ap_message reply;        /* Per-device reply structure. */
         int max_exp_bit_length;
-
-        debug_info_t *dbf_area;         /* debugging */
 };
 
-/* transport layer rescanning */
-extern atomic_t zcrypt_rescan_req;
-
 struct zcrypt_device *zcrypt_device_alloc(size_t);
 void zcrypt_device_free(struct zcrypt_device *);
 void zcrypt_device_get(struct zcrypt_device *);
 int zcrypt_device_put(struct zcrypt_device *);
 int zcrypt_device_register(struct zcrypt_device *);
 void zcrypt_device_unregister(struct zcrypt_device *);
-void zcrypt_msgtype_register(struct zcrypt_ops *);
-void zcrypt_msgtype_unregister(struct zcrypt_ops *);
-struct zcrypt_ops *zcrypt_msgtype_request(unsigned char *, int);
-void zcrypt_msgtype_release(struct zcrypt_ops *);
 int zcrypt_api_init(void);
 void zcrypt_api_exit(void);
 
diff --git a/drivers/s390/crypto/zcrypt_cca_key.h b/drivers/s390/crypto/zcrypt_cca_key.h
index 1f42f103c76..ed82f2f59b1 100644
--- a/drivers/s390/crypto/zcrypt_cca_key.h
+++ b/drivers/s390/crypto/zcrypt_cca_key.h
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_cca_key.h
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2006
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
index 1e849d6e1df..da171b5f399 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.c
+++ b/drivers/s390/crypto/zcrypt_cex2a.c
@@ -1,14 +1,15 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_cex2a.c
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2012
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
  *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
  *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
  *                                Ralph Wuerthner <rwuerthn@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +37,6 @@
 #include "zcrypt_api.h"
 #include "zcrypt_error.h"
 #include "zcrypt_cex2a.h"
-#include "zcrypt_msgtype50.h"
 
 #define CEX2A_MIN_MOD_SIZE        1     /*    8 bits    */
 #define CEX2A_MAX_MOD_SIZE      256     /* 2048 bits    */
@@ -63,23 +63,364 @@ static struct ap_device_id zcrypt_cex2a_ids[] = {
         { /* end of list */ },
 };
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 MODULE_DEVICE_TABLE(ap, zcrypt_cex2a_ids);
 MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("CEX2A Cryptographic Coprocessor device driver, " \
-                   "Copyright IBM Corp. 2001, 2012");
+MODULE_DESCRIPTION("CEX2A Cryptographic Coprocessor device driver, "
+                   "Copyright 2001, 2006 IBM Corporation");
 MODULE_LICENSE("GPL");
+#endif
 
 static int zcrypt_cex2a_probe(struct ap_device *ap_dev);
 static void zcrypt_cex2a_remove(struct ap_device *ap_dev);
+static void zcrypt_cex2a_receive(struct ap_device *, struct ap_message *,
+                                 struct ap_message *);
 
 static struct ap_driver zcrypt_cex2a_driver = {
         .probe = zcrypt_cex2a_probe,
         .remove = zcrypt_cex2a_remove,
+        .receive = zcrypt_cex2a_receive,
         .ids = zcrypt_cex2a_ids,
         .request_timeout = CEX2A_CLEANUP_TIME,
 };
 
 /**
+ * Convert a ICAMEX message to a type50 MEX message.
+ *
+ * @zdev: crypto device pointer
+ * @zreq: crypto request pointer
+ * @mex: pointer to user input data
+ *
+ * Returns 0 on success or -EFAULT.
+ */
+static int ICAMEX_msg_to_type50MEX_msg(struct zcrypt_device *zdev,
+                                       struct ap_message *ap_msg,
+                                       struct ica_rsa_modexpo *mex)
+{
+        unsigned char *mod, *exp, *inp;
+        int mod_len;
+
+        mod_len = mex->inputdatalength;
+
+        if (mod_len <= 128) {
+                struct type50_meb1_msg *meb1 = ap_msg->message;
+                memset(meb1, 0, sizeof(*meb1));
+                ap_msg->length = sizeof(*meb1);
+                meb1->header.msg_type_code = TYPE50_TYPE_CODE;
+                meb1->header.msg_len = sizeof(*meb1);
+                meb1->keyblock_type = TYPE50_MEB1_FMT;
+                mod = meb1->modulus + sizeof(meb1->modulus) - mod_len;
+                exp = meb1->exponent + sizeof(meb1->exponent) - mod_len;
+                inp = meb1->message + sizeof(meb1->message) - mod_len;
+        } else if (mod_len <= 256) {
+                struct type50_meb2_msg *meb2 = ap_msg->message;
+                memset(meb2, 0, sizeof(*meb2));
+                ap_msg->length = sizeof(*meb2);
+                meb2->header.msg_type_code = TYPE50_TYPE_CODE;
+                meb2->header.msg_len = sizeof(*meb2);
+                meb2->keyblock_type = TYPE50_MEB2_FMT;
+                mod = meb2->modulus + sizeof(meb2->modulus) - mod_len;
+                exp = meb2->exponent + sizeof(meb2->exponent) - mod_len;
+                inp = meb2->message + sizeof(meb2->message) - mod_len;
+        } else {
+                /* mod_len > 256 = 4096 bit RSA Key */
+                struct type50_meb3_msg *meb3 = ap_msg->message;
+                memset(meb3, 0, sizeof(*meb3));
+                ap_msg->length = sizeof(*meb3);
+                meb3->header.msg_type_code = TYPE50_TYPE_CODE;
+                meb3->header.msg_len = sizeof(*meb3);
+                meb3->keyblock_type = TYPE50_MEB3_FMT;
+                mod = meb3->modulus + sizeof(meb3->modulus) - mod_len;
+                exp = meb3->exponent + sizeof(meb3->exponent) - mod_len;
+                inp = meb3->message + sizeof(meb3->message) - mod_len;
+        }
+
+        if (copy_from_user(mod, mex->n_modulus, mod_len) ||
+            copy_from_user(exp, mex->b_key, mod_len) ||
+            copy_from_user(inp, mex->inputdata, mod_len))
+                return -EFAULT;
+        return 0;
+}
+
+/**
+ * Convert a ICACRT message to a type50 CRT message.
+ *
+ * @zdev: crypto device pointer
+ * @zreq: crypto request pointer
+ * @crt: pointer to user input data
+ *
+ * Returns 0 on success or -EFAULT.
+ */
+static int ICACRT_msg_to_type50CRT_msg(struct zcrypt_device *zdev,
+                                       struct ap_message *ap_msg,
+                                       struct ica_rsa_modexpo_crt *crt)
+{
+        int mod_len, short_len, long_len, long_offset, limit;
+        unsigned char *p, *q, *dp, *dq, *u, *inp;
+
+        mod_len = crt->inputdatalength;
+        short_len = mod_len / 2;
+        long_len = mod_len / 2 + 8;
+
+        /*
+         * CEX2A cannot handle p, dp, or U > 128 bytes.
+         * If we have one of these, we need to do extra checking.
+         * For CEX3A the limit is 256 bytes.
+         */
+        if (zdev->max_mod_size == CEX3A_MAX_MOD_SIZE)
+                limit = 256;
+        else
+                limit = 128;
+
+        if (long_len > limit) {
+                /*
+                 * zcrypt_rsa_crt already checked for the leading
+                 * zeroes of np_prime, bp_key and u_mult_inc.
+                 */
+                long_offset = long_len - limit;
+                long_len = limit;
+        } else
+                long_offset = 0;
+
+        /*
+         * Instead of doing extra work for p, dp, U > 64 bytes, we'll just use
+         * the larger message structure.
+         */
+        if (long_len <= 64) {
+                struct type50_crb1_msg *crb1 = ap_msg->message;
+                memset(crb1, 0, sizeof(*crb1));
+                ap_msg->length = sizeof(*crb1);
+                crb1->header.msg_type_code = TYPE50_TYPE_CODE;
+                crb1->header.msg_len = sizeof(*crb1);
+                crb1->keyblock_type = TYPE50_CRB1_FMT;
+                p = crb1->p + sizeof(crb1->p) - long_len;
+                q = crb1->q + sizeof(crb1->q) - short_len;
+                dp = crb1->dp + sizeof(crb1->dp) - long_len;
+                dq = crb1->dq + sizeof(crb1->dq) - short_len;
+                u = crb1->u + sizeof(crb1->u) - long_len;
+                inp = crb1->message + sizeof(crb1->message) - mod_len;
+        } else if (long_len <= 128) {
+                struct type50_crb2_msg *crb2 = ap_msg->message;
+                memset(crb2, 0, sizeof(*crb2));
+                ap_msg->length = sizeof(*crb2);
+                crb2->header.msg_type_code = TYPE50_TYPE_CODE;
+                crb2->header.msg_len = sizeof(*crb2);
+                crb2->keyblock_type = TYPE50_CRB2_FMT;
+                p = crb2->p + sizeof(crb2->p) - long_len;
+                q = crb2->q + sizeof(crb2->q) - short_len;
+                dp = crb2->dp + sizeof(crb2->dp) - long_len;
+                dq = crb2->dq + sizeof(crb2->dq) - short_len;
+                u = crb2->u + sizeof(crb2->u) - long_len;
+                inp = crb2->message + sizeof(crb2->message) - mod_len;
+        } else {
+                /* long_len >= 256 */
+                struct type50_crb3_msg *crb3 = ap_msg->message;
+                memset(crb3, 0, sizeof(*crb3));
+                ap_msg->length = sizeof(*crb3);
+                crb3->header.msg_type_code = TYPE50_TYPE_CODE;
+                crb3->header.msg_len = sizeof(*crb3);
+                crb3->keyblock_type = TYPE50_CRB3_FMT;
+                p = crb3->p + sizeof(crb3->p) - long_len;
+                q = crb3->q + sizeof(crb3->q) - short_len;
+                dp = crb3->dp + sizeof(crb3->dp) - long_len;
+                dq = crb3->dq + sizeof(crb3->dq) - short_len;
+                u = crb3->u + sizeof(crb3->u) - long_len;
+                inp = crb3->message + sizeof(crb3->message) - mod_len;
+        }
+
+        if (copy_from_user(p, crt->np_prime + long_offset, long_len) ||
+            copy_from_user(q, crt->nq_prime, short_len) ||
+            copy_from_user(dp, crt->bp_key + long_offset, long_len) ||
+            copy_from_user(dq, crt->bq_key, short_len) ||
+            copy_from_user(u, crt->u_mult_inv + long_offset, long_len) ||
+            copy_from_user(inp, crt->inputdata, mod_len))
+                return -EFAULT;
+
+        return 0;
+}
+
+/**
+ * Copy results from a type 80 reply message back to user space.
+ *
+ * @zdev: crypto device pointer
+ * @reply: reply AP message.
+ * @data: pointer to user output data
+ * @length: size of user output data
+ *
+ * Returns 0 on success or -EFAULT.
+ */
+static int convert_type80(struct zcrypt_device *zdev,
+                          struct ap_message *reply,
+                          char __user *outputdata,
+                          unsigned int outputdatalength)
+{
+        struct type80_hdr *t80h = reply->message;
+        unsigned char *data;
+
+        if (t80h->len < sizeof(*t80h) + outputdatalength) {
+                /* The result is too short, the CEX2A card may not do that.. */
+                zdev->online = 0;
+                return -EAGAIN; /* repeat the request on a different device. */
+        }
+        if (zdev->user_space_type == ZCRYPT_CEX2A)
+                BUG_ON(t80h->len > CEX2A_MAX_RESPONSE_SIZE);
+        else
+                BUG_ON(t80h->len > CEX3A_MAX_RESPONSE_SIZE);
+        data = reply->message + t80h->len - outputdatalength;
+        if (copy_to_user(outputdata, data, outputdatalength))
+                return -EFAULT;
+        return 0;
+}
+
+static int convert_response(struct zcrypt_device *zdev,
+                            struct ap_message *reply,
+                            char __user *outputdata,
+                            unsigned int outputdatalength)
+{
+        /* Response type byte is the second byte in the response. */
+        switch (((unsigned char *) reply->message)[1]) {
+        case TYPE82_RSP_CODE:
+        case TYPE88_RSP_CODE:
+                return convert_error(zdev, reply);
+        case TYPE80_RSP_CODE:
+                return convert_type80(zdev, reply,
+                                      outputdata, outputdatalength);
+        default: /* Unknown response type, this should NEVER EVER happen */
+                zdev->online = 0;
+                return -EAGAIN; /* repeat the request on a different device. */
+        }
+}
+
+/**
+ * This function is called from the AP bus code after a crypto request
+ * "msg" has finished with the reply message "reply".
+ * It is called from tasklet context.
+ * @ap_dev: pointer to the AP device
+ * @msg: pointer to the AP message
+ * @reply: pointer to the AP reply message
+ */
+static void zcrypt_cex2a_receive(struct ap_device *ap_dev,
+                                 struct ap_message *msg,
+                                 struct ap_message *reply)
+{
+        static struct error_hdr error_reply = {
+                .type = TYPE82_RSP_CODE,
+                .reply_code = REP82_ERROR_MACHINE_FAILURE,
+        };
+        struct type80_hdr *t80h;
+        int length;
+
+        /* Copy the reply message to the request message buffer. */
+        if (IS_ERR(reply)) {
+                memcpy(msg->message, &error_reply, sizeof(error_reply));
+                goto out;
+        }
+        t80h = reply->message;
+        if (t80h->type == TYPE80_RSP_CODE) {
+                if (ap_dev->device_type == AP_DEVICE_TYPE_CEX2A)
+                        length = min(CEX2A_MAX_RESPONSE_SIZE, (int) t80h->len);
+                else
+                        length = min(CEX3A_MAX_RESPONSE_SIZE, (int) t80h->len);
+                memcpy(msg->message, reply->message, length);
+        } else
+                memcpy(msg->message, reply->message, sizeof error_reply);
+out:
+        complete((struct completion *) msg->private);
+}
+
+static atomic_t zcrypt_step = ATOMIC_INIT(0);
+
+/**
+ * The request distributor calls this function if it picked the CEX2A
+ * device to handle a modexpo request.
+ * @zdev: pointer to zcrypt_device structure that identifies the
+ *        CEX2A device to the request distributor
+ * @mex: pointer to the modexpo request buffer
+ */
+static long zcrypt_cex2a_modexpo(struct zcrypt_device *zdev,
+                                 struct ica_rsa_modexpo *mex)
+{
+        struct ap_message ap_msg;
+        struct completion work;
+        int rc;
+
+        ap_init_message(&ap_msg);
+        if (zdev->user_space_type == ZCRYPT_CEX2A)
+                ap_msg.message = kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        else
+                ap_msg.message = kmalloc(CEX3A_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        if (!ap_msg.message)
+                return -ENOMEM;
+        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
+                                atomic_inc_return(&zcrypt_step);
+        ap_msg.private = &work;
+        rc = ICAMEX_msg_to_type50MEX_msg(zdev, &ap_msg, mex);
+        if (rc)
+                goto out_free;
+        init_completion(&work);
+        ap_queue_message(zdev->ap_dev, &ap_msg);
+        rc = wait_for_completion_interruptible(&work);
+        if (rc == 0)
+                rc = convert_response(zdev, &ap_msg, mex->outputdata,
+                                      mex->outputdatalength);
+        else
+                /* Signal pending. */
+                ap_cancel_message(zdev->ap_dev, &ap_msg);
+out_free:
+        kfree(ap_msg.message);
+        return rc;
+}
+
+/**
+ * The request distributor calls this function if it picked the CEX2A
+ * device to handle a modexpo_crt request.
+ * @zdev: pointer to zcrypt_device structure that identifies the
+ *        CEX2A device to the request distributor
+ * @crt: pointer to the modexpoc_crt request buffer
+ */
+static long zcrypt_cex2a_modexpo_crt(struct zcrypt_device *zdev,
+                                     struct ica_rsa_modexpo_crt *crt)
+{
+        struct ap_message ap_msg;
+        struct completion work;
+        int rc;
+
+        ap_init_message(&ap_msg);
+        if (zdev->user_space_type == ZCRYPT_CEX2A)
+                ap_msg.message = kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        else
+                ap_msg.message = kmalloc(CEX3A_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        if (!ap_msg.message)
+                return -ENOMEM;
+        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
+                                atomic_inc_return(&zcrypt_step);
+        ap_msg.private = &work;
+        rc = ICACRT_msg_to_type50CRT_msg(zdev, &ap_msg, crt);
+        if (rc)
+                goto out_free;
+        init_completion(&work);
+        ap_queue_message(zdev->ap_dev, &ap_msg);
+        rc = wait_for_completion_interruptible(&work);
+        if (rc == 0)
+                rc = convert_response(zdev, &ap_msg, crt->outputdata,
+                                      crt->outputdatalength);
+        else
+                /* Signal pending. */
+                ap_cancel_message(zdev->ap_dev, &ap_msg);
+out_free:
+        kfree(ap_msg.message);
+        return rc;
+}
+
+/**
+ * The crypto operations for a CEX2A card.
+ */
+static struct zcrypt_ops zcrypt_cex2a_ops = {
+        .rsa_modexpo = zcrypt_cex2a_modexpo,
+        .rsa_modexpo_crt = zcrypt_cex2a_modexpo_crt,
+};
+
+/**
  * Probe function for CEX2A cards. It always accepts the AP device
  * since the bus_match already checked the hardware type.
  * @ap_dev: pointer to the AP device.
@@ -111,8 +452,7 @@ static int zcrypt_cex2a_probe(struct ap_device *ap_dev)
                 zdev->min_mod_size = CEX2A_MIN_MOD_SIZE;
                 zdev->max_mod_size = CEX2A_MAX_MOD_SIZE;
                 zdev->max_exp_bit_length = CEX2A_MAX_MOD_SIZE;
-                if (ap_test_bit(&ap_dev->functions, AP_FUNC_MEX4K) &&
-                    ap_test_bit(&ap_dev->functions, AP_FUNC_CRT4K)) {
+                if (ap_4096_commands_available(ap_dev->qid)) {
                         zdev->max_mod_size = CEX3A_MAX_MOD_SIZE;
                         zdev->max_exp_bit_length = CEX3A_MAX_MOD_SIZE;
                 }
@@ -120,18 +460,16 @@ static int zcrypt_cex2a_probe(struct ap_device *ap_dev)
                 zdev->speed_rating = CEX3A_SPEED_RATING;
                 break;
         }
-        if (!zdev)
-                return -ENODEV;
-        zdev->ops = zcrypt_msgtype_request(MSGTYPE50_NAME,
-                                           MSGTYPE50_VARIANT_DEFAULT);
-        zdev->ap_dev = ap_dev;
-        zdev->online = 1;
-        ap_dev->reply = &zdev->reply;
-        ap_dev->private = zdev;
-        rc = zcrypt_device_register(zdev);
+        if (zdev != NULL) {
+                zdev->ap_dev = ap_dev;
+                zdev->ops = &zcrypt_cex2a_ops;
+                zdev->online = 1;
+                ap_dev->reply = &zdev->reply;
+                ap_dev->private = zdev;
+                rc = zcrypt_device_register(zdev);
+        }
         if (rc) {
                 ap_dev->private = NULL;
-                zcrypt_msgtype_release(zdev->ops);
                 zcrypt_device_free(zdev);
         }
         return rc;
@@ -144,10 +482,8 @@ static int zcrypt_cex2a_probe(struct ap_device *ap_dev)
 static void zcrypt_cex2a_remove(struct ap_device *ap_dev)
 {
         struct zcrypt_device *zdev = ap_dev->private;
-        struct zcrypt_ops *zops = zdev->ops;
 
         zcrypt_device_unregister(zdev);
-        zcrypt_msgtype_release(zops);
 }
 
 int __init zcrypt_cex2a_init(void)
@@ -160,5 +496,7 @@ void __exit zcrypt_cex2a_exit(void)
         ap_driver_unregister(&zcrypt_cex2a_driver);
 }
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 module_init(zcrypt_cex2a_init);
 module_exit(zcrypt_cex2a_exit);
+#endif
diff --git a/drivers/s390/crypto/zcrypt_cex2a.h b/drivers/s390/crypto/zcrypt_cex2a.h
index 0dce4b9af18..0350665810c 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.h
+++ b/drivers/s390/crypto/zcrypt_cex2a.h
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_cex2a.h
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2006
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
diff --git a/drivers/s390/crypto/zcrypt_cex4.c b/drivers/s390/crypto/zcrypt_cex4.c
deleted file mode 100644
index ce1226398ac..00000000000
--- a/drivers/s390/crypto/zcrypt_cex4.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *  Copyright IBM Corp. 2012
- *  Author(s): Holger Dengler <hd@linux.vnet.ibm.com>
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/atomic.h>
-#include <linux/uaccess.h>
-
-#include "ap_bus.h"
-#include "zcrypt_api.h"
-#include "zcrypt_msgtype6.h"
-#include "zcrypt_msgtype50.h"
-#include "zcrypt_error.h"
-#include "zcrypt_cex4.h"
-
-#define CEX4A_MIN_MOD_SIZE        1     /*    8 bits    */
-#define CEX4A_MAX_MOD_SIZE_2K   256     /* 2048 bits    */
-#define CEX4A_MAX_MOD_SIZE_4K   512     /* 4096 bits    */
-
-#define CEX4C_MIN_MOD_SIZE       16     /*  256 bits    */
-#define CEX4C_MAX_MOD_SIZE      512     /* 4096 bits    */
-
-#define CEX4A_SPEED_RATING      900      /* TODO new card, new speed rating */
-#define CEX4C_SPEED_RATING      6500     /* TODO new card, new speed rating */
-
-#define CEX4A_MAX_MESSAGE_SIZE  MSGTYPE50_CRB3_MAX_MSG_SIZE
-#define CEX4C_MAX_MESSAGE_SIZE  MSGTYPE06_MAX_MSG_SIZE
-
-#define CEX4_CLEANUP_TIME       (15*HZ)
-
-static struct ap_device_id zcrypt_cex4_ids[] = {
-        { AP_DEVICE(AP_DEVICE_TYPE_CEX4)  },
-        { /* end of list */ },
-};
-
-MODULE_DEVICE_TABLE(ap, zcrypt_cex4_ids);
-MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("CEX4 Cryptographic Card device driver, " \
-                   "Copyright IBM Corp. 2012");
-MODULE_LICENSE("GPL");
-
-static int zcrypt_cex4_probe(struct ap_device *ap_dev);
-static void zcrypt_cex4_remove(struct ap_device *ap_dev);
-
-static struct ap_driver zcrypt_cex4_driver = {
-        .probe = zcrypt_cex4_probe,
-        .remove = zcrypt_cex4_remove,
-        .ids = zcrypt_cex4_ids,
-        .request_timeout = CEX4_CLEANUP_TIME,
-};
-
-/**
- * Probe function for CEX4 cards. It always accepts the AP device
- * since the bus_match already checked the hardware type.
- * @ap_dev: pointer to the AP device.
- */
-static int zcrypt_cex4_probe(struct ap_device *ap_dev)
-{
-        struct zcrypt_device *zdev = NULL;
-        int rc = 0;
-
-        switch (ap_dev->device_type) {
-        case AP_DEVICE_TYPE_CEX4:
-                if (ap_test_bit(&ap_dev->functions, AP_FUNC_ACCEL)) {
-                        zdev = zcrypt_device_alloc(CEX4A_MAX_MESSAGE_SIZE);
-                        if (!zdev)
-                                return -ENOMEM;
-                        zdev->type_string = "CEX4A";
-                        zdev->user_space_type = ZCRYPT_CEX3A;
-                        zdev->min_mod_size = CEX4A_MIN_MOD_SIZE;
-                        if (ap_test_bit(&ap_dev->functions, AP_FUNC_MEX4K) &&
-                            ap_test_bit(&ap_dev->functions, AP_FUNC_CRT4K)) {
-                                zdev->max_mod_size =
-                                        CEX4A_MAX_MOD_SIZE_4K;
-                                zdev->max_exp_bit_length =
-                                        CEX4A_MAX_MOD_SIZE_4K;
-                        } else {
-                                zdev->max_mod_size =
-                                        CEX4A_MAX_MOD_SIZE_2K;
-                                zdev->max_exp_bit_length =
-                                        CEX4A_MAX_MOD_SIZE_2K;
-                        }
-                        zdev->short_crt = 1;
-                        zdev->speed_rating = CEX4A_SPEED_RATING;
-                        zdev->ops = zcrypt_msgtype_request(MSGTYPE50_NAME,
-                                                           MSGTYPE50_VARIANT_DEFAULT);
-                } else if (ap_test_bit(&ap_dev->functions, AP_FUNC_COPRO)) {
-                        zdev = zcrypt_device_alloc(CEX4C_MAX_MESSAGE_SIZE);
-                        if (!zdev)
-                                return -ENOMEM;
-                        zdev->type_string = "CEX4C";
-                        zdev->user_space_type = ZCRYPT_CEX3C;
-                        zdev->min_mod_size = CEX4C_MIN_MOD_SIZE;
-                        zdev->max_mod_size = CEX4C_MAX_MOD_SIZE;
-                        zdev->max_exp_bit_length = CEX4C_MAX_MOD_SIZE;
-                        zdev->short_crt = 0;
-                        zdev->speed_rating = CEX4C_SPEED_RATING;
-                        zdev->ops = zcrypt_msgtype_request(MSGTYPE06_NAME,
-                                                           MSGTYPE06_VARIANT_DEFAULT);
-                }
-                break;
-        }
-        if (!zdev)
-                return -ENODEV;
-        zdev->ap_dev = ap_dev;
-        zdev->online = 1;
-        ap_dev->reply = &zdev->reply;
-        ap_dev->private = zdev;
-        rc = zcrypt_device_register(zdev);
-        if (rc) {
-                zcrypt_msgtype_release(zdev->ops);
-                ap_dev->private = NULL;
-                zcrypt_device_free(zdev);
-        }
-        return rc;
-}
-
-/**
- * This is called to remove the extended CEX4 driver information
- * if an AP device is removed.
- */
-static void zcrypt_cex4_remove(struct ap_device *ap_dev)
-{
-        struct zcrypt_device *zdev = ap_dev->private;
-        struct zcrypt_ops *zops;
-
-        if (zdev) {
-                zops = zdev->ops;
-                zcrypt_device_unregister(zdev);
-                zcrypt_msgtype_release(zops);
-        }
-}
-
-int __init zcrypt_cex4_init(void)
-{
-        return ap_driver_register(&zcrypt_cex4_driver, THIS_MODULE, "cex4");
-}
-
-void __exit zcrypt_cex4_exit(void)
-{
-        ap_driver_unregister(&zcrypt_cex4_driver);
-}
-
-module_init(zcrypt_cex4_init);
-module_exit(zcrypt_cex4_exit);
diff --git a/drivers/s390/crypto/zcrypt_cex4.h b/drivers/s390/crypto/zcrypt_cex4.h
deleted file mode 100644
index 719571375cc..00000000000
--- a/drivers/s390/crypto/zcrypt_cex4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- *  Copyright IBM Corp. 2012
- *  Author(s): Holger Dengler <hd@linux.vnet.ibm.com>
- */
-
-#ifndef _ZCRYPT_CEX4_H_
-#define _ZCRYPT_CEX4_H_
-
-int zcrypt_cex4_init(void);
-void zcrypt_cex4_exit(void);
-
-#endif /* _ZCRYPT_CEX4_H_ */
diff --git a/drivers/s390/crypto/zcrypt_debug.h b/drivers/s390/crypto/zcrypt_debug.h
deleted file mode 100644
index 841ea72e4a4..00000000000
--- a/drivers/s390/crypto/zcrypt_debug.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright IBM Corp. 2012
- *  Author(s): Holger Dengler (hd@linux.vnet.ibm.com)
- */
-#ifndef ZCRYPT_DEBUG_H
-#define ZCRYPT_DEBUG_H
-
-#include <asm/debug.h>
-#include "zcrypt_api.h"
-
-/* that gives us 15 characters in the text event views */
-#define ZCRYPT_DBF_LEN  16
-
-/* sort out low debug levels early to avoid wasted sprints */
-static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level)
-{
-        return (level <= dbf_grp->level);
-}
-
-#define DBF_ERR         3       /* error conditions     */
-#define DBF_WARN        4       /* warning conditions   */
-#define DBF_INFO        6       /* informational        */
-
-#define RC2WARN(rc) ((rc) ? DBF_WARN : DBF_INFO)
-
-#define ZCRYPT_DBF_COMMON(level, text...) \
-        do { \
-                if (zcrypt_dbf_passes(zcrypt_dbf_common, level)) { \
-                        char debug_buffer[ZCRYPT_DBF_LEN]; \
-                        snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \
-                        debug_text_event(zcrypt_dbf_common, level, \
-                                         debug_buffer); \
-                } \
-        } while (0)
-
-#define ZCRYPT_DBF_DEVICES(level, text...) \
-        do { \
-                if (zcrypt_dbf_passes(zcrypt_dbf_devices, level)) { \
-                        char debug_buffer[ZCRYPT_DBF_LEN]; \
-                        snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \
-                        debug_text_event(zcrypt_dbf_devices, level, \
-                                         debug_buffer); \
-                } \
-        } while (0)
-
-#define ZCRYPT_DBF_DEV(level, device, text...) \
-        do { \
-                if (zcrypt_dbf_passes(device->dbf_area, level)) { \
-                        char debug_buffer[ZCRYPT_DBF_LEN]; \
-                        snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \
-                        debug_text_event(device->dbf_area, level, \
-                                         debug_buffer); \
-                } \
-        } while (0)
-
-int zcrypt_debug_init(void);
-void zcrypt_debug_exit(void);
-
-#endif /* ZCRYPT_DEBUG_H */
diff --git a/drivers/s390/crypto/zcrypt_error.h b/drivers/s390/crypto/zcrypt_error.h
index 0079b661721..03ba27f05f9 100644
--- a/drivers/s390/crypto/zcrypt_error.h
+++ b/drivers/s390/crypto/zcrypt_error.h
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_error.h
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2006
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
@@ -26,8 +28,6 @@
 #ifndef _ZCRYPT_ERROR_H_
 #define _ZCRYPT_ERROR_H_
 
-#include <linux/atomic.h>
-#include "zcrypt_debug.h"
 #include "zcrypt_api.h"
 
 /**
@@ -110,27 +110,16 @@ static inline int convert_error(struct zcrypt_device *zdev,
                  * and then repeat the request.
                  */
                 WARN_ON(1);
-                atomic_set(&zcrypt_rescan_req, 1);
                 zdev->online = 0;
-                ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                               zdev->ap_dev->qid,
-                               zdev->online, ehdr->reply_code);
                 return -EAGAIN;
         case REP82_ERROR_TRANSPORT_FAIL:
         case REP82_ERROR_MACHINE_FAILURE:
         //   REP88_ERROR_MODULE_FAILURE         // '10' CEX2A
                 /* If a card fails disable it and repeat the request. */
-                atomic_set(&zcrypt_rescan_req, 1);
                 zdev->online = 0;
-                ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                               zdev->ap_dev->qid,
-                               zdev->online, ehdr->reply_code);
                 return -EAGAIN;
         default:
                 zdev->online = 0;
-                ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                               zdev->ap_dev->qid,
-                               zdev->online, ehdr->reply_code);
                 return -EAGAIN; /* repeat the request on a different device. */
         }
 }
diff --git a/drivers/s390/crypto/zcrypt_msgtype50.c b/drivers/s390/crypto/zcrypt_msgtype50.c
deleted file mode 100644
index 7c522f338bd..00000000000
--- a/drivers/s390/crypto/zcrypt_msgtype50.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2012
- *  Author(s): Robert Burroughs
- *             Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *                                Ralph Wuerthner <rwuerthn@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/atomic.h>
-#include <linux/uaccess.h>
-
-#include "ap_bus.h"
-#include "zcrypt_api.h"
-#include "zcrypt_error.h"
-#include "zcrypt_msgtype50.h"
-
-#define CEX3A_MAX_MOD_SIZE      512     /* 4096 bits    */
-
-#define CEX2A_MAX_RESPONSE_SIZE 0x110   /* max outputdatalength + type80_hdr */
-
-#define CEX3A_MAX_RESPONSE_SIZE 0x210   /* 512 bit modulus
-                                         * (max outputdatalength) +
-                                         * type80_hdr*/
-
-MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("Cryptographic Accelerator (message type 50), " \
-                   "Copyright IBM Corp. 2001, 2012");
-MODULE_LICENSE("GPL");
-
-static void zcrypt_cex2a_receive(struct ap_device *, struct ap_message *,
-                                 struct ap_message *);
-
-/**
- * The type 50 message family is associated with a CEX2A card.
- *
- * The four members of the family are described below.
- *
- * Note that all unsigned char arrays are right-justified and left-padded
- * with zeroes.
- *
- * Note that all reserved fields must be zeroes.
- */
-struct type50_hdr {
-        unsigned char   reserved1;
-        unsigned char   msg_type_code;  /* 0x50 */
-        unsigned short  msg_len;
-        unsigned char   reserved2;
-        unsigned char   ignored;
-        unsigned short  reserved3;
-} __packed;
-
-#define TYPE50_TYPE_CODE        0x50
-
-#define TYPE50_MEB1_FMT         0x0001
-#define TYPE50_MEB2_FMT         0x0002
-#define TYPE50_MEB3_FMT         0x0003
-#define TYPE50_CRB1_FMT         0x0011
-#define TYPE50_CRB2_FMT         0x0012
-#define TYPE50_CRB3_FMT         0x0013
-
-/* Mod-Exp, with a small modulus */
-struct type50_meb1_msg {
-        struct type50_hdr header;
-        unsigned short  keyblock_type;  /* 0x0001 */
-        unsigned char   reserved[6];
-        unsigned char   exponent[128];
-        unsigned char   modulus[128];
-        unsigned char   message[128];
-} __packed;
-
-/* Mod-Exp, with a large modulus */
-struct type50_meb2_msg {
-        struct type50_hdr header;
-        unsigned short  keyblock_type;  /* 0x0002 */
-        unsigned char   reserved[6];
-        unsigned char   exponent[256];
-        unsigned char   modulus[256];
-        unsigned char   message[256];
-} __packed;
-
-/* Mod-Exp, with a larger modulus */
-struct type50_meb3_msg {
-        struct type50_hdr header;
-        unsigned short  keyblock_type;  /* 0x0003 */
-        unsigned char   reserved[6];
-        unsigned char   exponent[512];
-        unsigned char   modulus[512];
-        unsigned char   message[512];
-} __packed;
-
-/* CRT, with a small modulus */
-struct type50_crb1_msg {
-        struct type50_hdr header;
-        unsigned short  keyblock_type;  /* 0x0011 */
-        unsigned char   reserved[6];
-        unsigned char   p[64];
-        unsigned char   q[64];
-        unsigned char   dp[64];
-        unsigned char   dq[64];
-        unsigned char   u[64];
-        unsigned char   message[128];
-} __packed;
-
-/* CRT, with a large modulus */
-struct type50_crb2_msg {
-        struct type50_hdr header;
-        unsigned short  keyblock_type;  /* 0x0012 */
-        unsigned char   reserved[6];
-        unsigned char   p[128];
-        unsigned char   q[128];
-        unsigned char   dp[128];
-        unsigned char   dq[128];
-        unsigned char   u[128];
-        unsigned char   message[256];
-} __packed;
-
-/* CRT, with a larger modulus */
-struct type50_crb3_msg {
-        struct type50_hdr header;
-        unsigned short  keyblock_type;  /* 0x0013 */
-        unsigned char   reserved[6];
-        unsigned char   p[256];
-        unsigned char   q[256];
-        unsigned char   dp[256];
-        unsigned char   dq[256];
-        unsigned char   u[256];
-        unsigned char   message[512];
-} __packed;
-
-/**
- * The type 80 response family is associated with a CEX2A card.
- *
- * Note that all unsigned char arrays are right-justified and left-padded
- * with zeroes.
- *
- * Note that all reserved fields must be zeroes.
- */
-
-#define TYPE80_RSP_CODE 0x80
-
-struct type80_hdr {
-        unsigned char   reserved1;
-        unsigned char   type;           /* 0x80 */
-        unsigned short  len;
-        unsigned char   code;           /* 0x00 */
-        unsigned char   reserved2[3];
-        unsigned char   reserved3[8];
-} __packed;
-
-/**
- * Convert a ICAMEX message to a type50 MEX message.
- *
- * @zdev: crypto device pointer
- * @zreq: crypto request pointer
- * @mex: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICAMEX_msg_to_type50MEX_msg(struct zcrypt_device *zdev,
-                                       struct ap_message *ap_msg,
-                                       struct ica_rsa_modexpo *mex)
-{
-        unsigned char *mod, *exp, *inp;
-        int mod_len;
-
-        mod_len = mex->inputdatalength;
-
-        if (mod_len <= 128) {
-                struct type50_meb1_msg *meb1 = ap_msg->message;
-                memset(meb1, 0, sizeof(*meb1));
-                ap_msg->length = sizeof(*meb1);
-                meb1->header.msg_type_code = TYPE50_TYPE_CODE;
-                meb1->header.msg_len = sizeof(*meb1);
-                meb1->keyblock_type = TYPE50_MEB1_FMT;
-                mod = meb1->modulus + sizeof(meb1->modulus) - mod_len;
-                exp = meb1->exponent + sizeof(meb1->exponent) - mod_len;
-                inp = meb1->message + sizeof(meb1->message) - mod_len;
-        } else if (mod_len <= 256) {
-                struct type50_meb2_msg *meb2 = ap_msg->message;
-                memset(meb2, 0, sizeof(*meb2));
-                ap_msg->length = sizeof(*meb2);
-                meb2->header.msg_type_code = TYPE50_TYPE_CODE;
-                meb2->header.msg_len = sizeof(*meb2);
-                meb2->keyblock_type = TYPE50_MEB2_FMT;
-                mod = meb2->modulus + sizeof(meb2->modulus) - mod_len;
-                exp = meb2->exponent + sizeof(meb2->exponent) - mod_len;
-                inp = meb2->message + sizeof(meb2->message) - mod_len;
-        } else {
-                /* mod_len > 256 = 4096 bit RSA Key */
-                struct type50_meb3_msg *meb3 = ap_msg->message;
-                memset(meb3, 0, sizeof(*meb3));
-                ap_msg->length = sizeof(*meb3);
-                meb3->header.msg_type_code = TYPE50_TYPE_CODE;
-                meb3->header.msg_len = sizeof(*meb3);
-                meb3->keyblock_type = TYPE50_MEB3_FMT;
-                mod = meb3->modulus + sizeof(meb3->modulus) - mod_len;
-                exp = meb3->exponent + sizeof(meb3->exponent) - mod_len;
-                inp = meb3->message + sizeof(meb3->message) - mod_len;
-        }
-
-        if (copy_from_user(mod, mex->n_modulus, mod_len) ||
-            copy_from_user(exp, mex->b_key, mod_len) ||
-            copy_from_user(inp, mex->inputdata, mod_len))
-                return -EFAULT;
-        return 0;
-}
-
-/**
- * Convert a ICACRT message to a type50 CRT message.
- *
- * @zdev: crypto device pointer
- * @zreq: crypto request pointer
- * @crt: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICACRT_msg_to_type50CRT_msg(struct zcrypt_device *zdev,
-                                       struct ap_message *ap_msg,
-                                       struct ica_rsa_modexpo_crt *crt)
-{
-        int mod_len, short_len;
-        unsigned char *p, *q, *dp, *dq, *u, *inp;
-
-        mod_len = crt->inputdatalength;
-        short_len = mod_len / 2;
-
-        /*
-         * CEX2A and CEX3A w/o FW update can handle requests up to
-         * 256 byte modulus (2k keys).
-         * CEX3A with FW update and CEX4A cards are able to handle
-         * 512 byte modulus (4k keys).
-         */
-        if (mod_len <= 128) {           /* up to 1024 bit key size */
-                struct type50_crb1_msg *crb1 = ap_msg->message;
-                memset(crb1, 0, sizeof(*crb1));
-                ap_msg->length = sizeof(*crb1);
-                crb1->header.msg_type_code = TYPE50_TYPE_CODE;
-                crb1->header.msg_len = sizeof(*crb1);
-                crb1->keyblock_type = TYPE50_CRB1_FMT;
-                p = crb1->p + sizeof(crb1->p) - short_len;
-                q = crb1->q + sizeof(crb1->q) - short_len;
-                dp = crb1->dp + sizeof(crb1->dp) - short_len;
-                dq = crb1->dq + sizeof(crb1->dq) - short_len;
-                u = crb1->u + sizeof(crb1->u) - short_len;
-                inp = crb1->message + sizeof(crb1->message) - mod_len;
-        } else if (mod_len <= 256) {    /* up to 2048 bit key size */
-                struct type50_crb2_msg *crb2 = ap_msg->message;
-                memset(crb2, 0, sizeof(*crb2));
-                ap_msg->length = sizeof(*crb2);
-                crb2->header.msg_type_code = TYPE50_TYPE_CODE;
-                crb2->header.msg_len = sizeof(*crb2);
-                crb2->keyblock_type = TYPE50_CRB2_FMT;
-                p = crb2->p + sizeof(crb2->p) - short_len;
-                q = crb2->q + sizeof(crb2->q) - short_len;
-                dp = crb2->dp + sizeof(crb2->dp) - short_len;
-                dq = crb2->dq + sizeof(crb2->dq) - short_len;
-                u = crb2->u + sizeof(crb2->u) - short_len;
-                inp = crb2->message + sizeof(crb2->message) - mod_len;
-        } else if ((mod_len <= 512) &&  /* up to 4096 bit key size */
-                   (zdev->max_mod_size == CEX3A_MAX_MOD_SIZE)) { /* >= CEX3A */
-                struct type50_crb3_msg *crb3 = ap_msg->message;
-                memset(crb3, 0, sizeof(*crb3));
-                ap_msg->length = sizeof(*crb3);
-                crb3->header.msg_type_code = TYPE50_TYPE_CODE;
-                crb3->header.msg_len = sizeof(*crb3);
-                crb3->keyblock_type = TYPE50_CRB3_FMT;
-                p = crb3->p + sizeof(crb3->p) - short_len;
-                q = crb3->q + sizeof(crb3->q) - short_len;
-                dp = crb3->dp + sizeof(crb3->dp) - short_len;
-                dq = crb3->dq + sizeof(crb3->dq) - short_len;
-                u = crb3->u + sizeof(crb3->u) - short_len;
-                inp = crb3->message + sizeof(crb3->message) - mod_len;
-        } else
-                return -EINVAL;
-
-        /*
-         * correct the offset of p, bp and mult_inv according zcrypt.h
-         * block size right aligned (skip the first byte)
-         */
-        if (copy_from_user(p, crt->np_prime + MSGTYPE_ADJUSTMENT, short_len) ||
-            copy_from_user(q, crt->nq_prime, short_len) ||
-            copy_from_user(dp, crt->bp_key + MSGTYPE_ADJUSTMENT, short_len) ||
-            copy_from_user(dq, crt->bq_key, short_len) ||
-            copy_from_user(u, crt->u_mult_inv + MSGTYPE_ADJUSTMENT, short_len) ||
-            copy_from_user(inp, crt->inputdata, mod_len))
-                return -EFAULT;
-
-        return 0;
-}
-
-/**
- * Copy results from a type 80 reply message back to user space.
- *
- * @zdev: crypto device pointer
- * @reply: reply AP message.
- * @data: pointer to user output data
- * @length: size of user output data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int convert_type80(struct zcrypt_device *zdev,
-                          struct ap_message *reply,
-                          char __user *outputdata,
-                          unsigned int outputdatalength)
-{
-        struct type80_hdr *t80h = reply->message;
-        unsigned char *data;
-
-        if (t80h->len < sizeof(*t80h) + outputdatalength) {
-                /* The result is too short, the CEX2A card may not do that.. */
-                zdev->online = 0;
-                return -EAGAIN; /* repeat the request on a different device. */
-        }
-        if (zdev->user_space_type == ZCRYPT_CEX2A)
-                BUG_ON(t80h->len > CEX2A_MAX_RESPONSE_SIZE);
-        else
-                BUG_ON(t80h->len > CEX3A_MAX_RESPONSE_SIZE);
-        data = reply->message + t80h->len - outputdatalength;
-        if (copy_to_user(outputdata, data, outputdatalength))
-                return -EFAULT;
-        return 0;
-}
-
-static int convert_response(struct zcrypt_device *zdev,
-                            struct ap_message *reply,
-                            char __user *outputdata,
-                            unsigned int outputdatalength)
-{
-        /* Response type byte is the second byte in the response. */
-        switch (((unsigned char *) reply->message)[1]) {
-        case TYPE82_RSP_CODE:
-        case TYPE88_RSP_CODE:
-                return convert_error(zdev, reply);
-        case TYPE80_RSP_CODE:
-                return convert_type80(zdev, reply,
-                                      outputdata, outputdatalength);
-        default: /* Unknown response type, this should NEVER EVER happen */
-                zdev->online = 0;
-                return -EAGAIN; /* repeat the request on a different device. */
-        }
-}
-
-/**
- * This function is called from the AP bus code after a crypto request
- * "msg" has finished with the reply message "reply".
- * It is called from tasklet context.
- * @ap_dev: pointer to the AP device
- * @msg: pointer to the AP message
- * @reply: pointer to the AP reply message
- */
-static void zcrypt_cex2a_receive(struct ap_device *ap_dev,
-                                 struct ap_message *msg,
-                                 struct ap_message *reply)
-{
-        static struct error_hdr error_reply = {
-                .type = TYPE82_RSP_CODE,
-                .reply_code = REP82_ERROR_MACHINE_FAILURE,
-        };
-        struct type80_hdr *t80h;
-        int length;
-
-        /* Copy the reply message to the request message buffer. */
-        if (IS_ERR(reply)) {
-                memcpy(msg->message, &error_reply, sizeof(error_reply));
-                goto out;
-        }
-        t80h = reply->message;
-        if (t80h->type == TYPE80_RSP_CODE) {
-                if (ap_dev->device_type == AP_DEVICE_TYPE_CEX2A)
-                        length = min_t(int,
-                                       CEX2A_MAX_RESPONSE_SIZE, t80h->len);
-                else
-                        length = min_t(int,
-                                       CEX3A_MAX_RESPONSE_SIZE, t80h->len);
-                memcpy(msg->message, reply->message, length);
-        } else
-                memcpy(msg->message, reply->message, sizeof(error_reply));
-out:
-        complete((struct completion *) msg->private);
-}
-
-static atomic_t zcrypt_step = ATOMIC_INIT(0);
-
-/**
- * The request distributor calls this function if it picked the CEX2A
- * device to handle a modexpo request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *        CEX2A device to the request distributor
- * @mex: pointer to the modexpo request buffer
- */
-static long zcrypt_cex2a_modexpo(struct zcrypt_device *zdev,
-                                 struct ica_rsa_modexpo *mex)
-{
-        struct ap_message ap_msg;
-        struct completion work;
-        int rc;
-
-        ap_init_message(&ap_msg);
-        if (zdev->user_space_type == ZCRYPT_CEX2A)
-                ap_msg.message = kmalloc(MSGTYPE50_CRB2_MAX_MSG_SIZE,
-                                         GFP_KERNEL);
-        else
-                ap_msg.message = kmalloc(MSGTYPE50_CRB3_MAX_MSG_SIZE,
-                                         GFP_KERNEL);
-        if (!ap_msg.message)
-                return -ENOMEM;
-        ap_msg.receive = zcrypt_cex2a_receive;
-        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                                atomic_inc_return(&zcrypt_step);
-        ap_msg.private = &work;
-        rc = ICAMEX_msg_to_type50MEX_msg(zdev, &ap_msg, mex);
-        if (rc)
-                goto out_free;
-        init_completion(&work);
-        ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible(&work);
-        if (rc == 0)
-                rc = convert_response(zdev, &ap_msg, mex->outputdata,
-                                      mex->outputdatalength);
-        else
-                /* Signal pending. */
-                ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-        kfree(ap_msg.message);
-        return rc;
-}
-
-/**
- * The request distributor calls this function if it picked the CEX2A
- * device to handle a modexpo_crt request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *        CEX2A device to the request distributor
- * @crt: pointer to the modexpoc_crt request buffer
- */
-static long zcrypt_cex2a_modexpo_crt(struct zcrypt_device *zdev,
-                                     struct ica_rsa_modexpo_crt *crt)
-{
-        struct ap_message ap_msg;
-        struct completion work;
-        int rc;
-
-        ap_init_message(&ap_msg);
-        if (zdev->user_space_type == ZCRYPT_CEX2A)
-                ap_msg.message = kmalloc(MSGTYPE50_CRB2_MAX_MSG_SIZE,
-                                         GFP_KERNEL);
-        else
-                ap_msg.message = kmalloc(MSGTYPE50_CRB3_MAX_MSG_SIZE,
-                                         GFP_KERNEL);
-        if (!ap_msg.message)
-                return -ENOMEM;
-        ap_msg.receive = zcrypt_cex2a_receive;
-        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                                atomic_inc_return(&zcrypt_step);
-        ap_msg.private = &work;
-        rc = ICACRT_msg_to_type50CRT_msg(zdev, &ap_msg, crt);
-        if (rc)
-                goto out_free;
-        init_completion(&work);
-        ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible(&work);
-        if (rc == 0)
-                rc = convert_response(zdev, &ap_msg, crt->outputdata,
-                                      crt->outputdatalength);
-        else
-                /* Signal pending. */
-                ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-        kfree(ap_msg.message);
-        return rc;
-}
-
-/**
- * The crypto operations for message type 50.
- */
-static struct zcrypt_ops zcrypt_msgtype50_ops = {
-        .rsa_modexpo = zcrypt_cex2a_modexpo,
-        .rsa_modexpo_crt = zcrypt_cex2a_modexpo_crt,
-        .owner = THIS_MODULE,
-        .variant = MSGTYPE50_VARIANT_DEFAULT,
-};
-
-int __init zcrypt_msgtype50_init(void)
-{
-        zcrypt_msgtype_register(&zcrypt_msgtype50_ops);
-        return 0;
-}
-
-void __exit zcrypt_msgtype50_exit(void)
-{
-        zcrypt_msgtype_unregister(&zcrypt_msgtype50_ops);
-}
-
-module_init(zcrypt_msgtype50_init);
-module_exit(zcrypt_msgtype50_exit);
diff --git a/drivers/s390/crypto/zcrypt_msgtype50.h b/drivers/s390/crypto/zcrypt_msgtype50.h
deleted file mode 100644
index 0a66e4aeeb5..00000000000
--- a/drivers/s390/crypto/zcrypt_msgtype50.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2012
- *  Author(s): Robert Burroughs
- *             Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _ZCRYPT_MSGTYPE50_H_
-#define _ZCRYPT_MSGTYPE50_H_
-
-#define MSGTYPE50_NAME                  "zcrypt_msgtype50"
-#define MSGTYPE50_VARIANT_DEFAULT       0
-
-#define MSGTYPE50_CRB2_MAX_MSG_SIZE     0x390 /*sizeof(struct type50_crb2_msg)*/
-#define MSGTYPE50_CRB3_MAX_MSG_SIZE     0x710 /*sizeof(struct type50_crb3_msg)*/
-
-#define MSGTYPE_ADJUSTMENT              0x08  /*type04 extension (not needed in type50)*/
-
-int zcrypt_msgtype50_init(void);
-void zcrypt_msgtype50_exit(void);
-
-#endif /* _ZCRYPT_MSGTYPE50_H_ */
diff --git a/drivers/s390/crypto/zcrypt_msgtype6.c b/drivers/s390/crypto/zcrypt_msgtype6.c
deleted file mode 100644
index 7d97fa5a26d..00000000000
--- a/drivers/s390/crypto/zcrypt_msgtype6.c
+++ /dev/null
@@ -1,856 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2012
- *  Author(s): Robert Burroughs
- *             Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *                                Ralph Wuerthner <rwuerthn@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/atomic.h>
-#include <linux/uaccess.h>
-
-#include "ap_bus.h"
-#include "zcrypt_api.h"
-#include "zcrypt_error.h"
-#include "zcrypt_msgtype6.h"
-#include "zcrypt_cca_key.h"
-
-#define PCIXCC_MIN_MOD_SIZE_OLD  64     /*  512 bits    */
-#define PCIXCC_MAX_ICA_RESPONSE_SIZE 0x77c /* max size type86 v2 reply      */
-
-#define CEIL4(x) ((((x)+3)/4)*4)
-
-struct response_type {
-        struct completion work;
-        int type;
-};
-#define PCIXCC_RESPONSE_TYPE_ICA  0
-#define PCIXCC_RESPONSE_TYPE_XCRB 1
-
-MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("Cryptographic Coprocessor (message type 6), " \
-                   "Copyright IBM Corp. 2001, 2012");
-MODULE_LICENSE("GPL");
-
-static void zcrypt_msgtype6_receive(struct ap_device *, struct ap_message *,
-                                 struct ap_message *);
-
-/**
- * CPRB
- *        Note that all shorts, ints and longs are little-endian.
- *        All pointer fields are 32-bits long, and mean nothing
- *
- *        A request CPRB is followed by a request_parameter_block.
- *
- *        The request (or reply) parameter block is organized thus:
- *          function code
- *          VUD block
- *          key block
- */
-struct CPRB {
-        unsigned short cprb_len;        /* CPRB length                   */
-        unsigned char cprb_ver_id;      /* CPRB version id.              */
-        unsigned char pad_000;          /* Alignment pad byte.           */
-        unsigned char srpi_rtcode[4];   /* SRPI return code LELONG       */
-        unsigned char srpi_verb;        /* SRPI verb type                */
-        unsigned char flags;            /* flags                         */
-        unsigned char func_id[2];       /* function id                   */
-        unsigned char checkpoint_flag;  /*                               */
-        unsigned char resv2;            /* reserved                      */
-        unsigned short req_parml;       /* request parameter buffer      */
-                                        /* length 16-bit little endian   */
-        unsigned char req_parmp[4];     /* request parameter buffer      *
-                                         * pointer (means nothing: the   *
-                                         * parameter buffer follows      *
-                                         * the CPRB).                    */
-        unsigned char req_datal[4];     /* request data buffer           */
-                                        /* length         ULELONG        */
-        unsigned char req_datap[4];     /* request data buffer           */
-                                        /* pointer                       */
-        unsigned short rpl_parml;       /* reply  parameter buffer       */
-                                        /* length 16-bit little endian   */
-        unsigned char pad_001[2];       /* Alignment pad bytes. ULESHORT */
-        unsigned char rpl_parmp[4];     /* reply parameter buffer        *
-                                         * pointer (means nothing: the   *
-                                         * parameter buffer follows      *
-                                         * the CPRB).                    */
-        unsigned char rpl_datal[4];     /* reply data buffer len ULELONG */
-        unsigned char rpl_datap[4];     /* reply data buffer             */
-                                        /* pointer                       */
-        unsigned short ccp_rscode;      /* server reason code   ULESHORT */
-        unsigned short ccp_rtcode;      /* server return code   ULESHORT */
-        unsigned char repd_parml[2];    /* replied parameter len ULESHORT*/
-        unsigned char mac_data_len[2];  /* Mac Data Length      ULESHORT */
-        unsigned char repd_datal[4];    /* replied data length  ULELONG  */
-        unsigned char req_pc[2];        /* PC identifier                 */
-        unsigned char res_origin[8];    /* resource origin               */
-        unsigned char mac_value[8];     /* Mac Value                     */
-        unsigned char logon_id[8];      /* Logon Identifier              */
-        unsigned char usage_domain[2];  /* cdx                           */
-        unsigned char resv3[18];        /* reserved for requestor        */
-        unsigned short svr_namel;       /* server name length  ULESHORT  */
-        unsigned char svr_name[8];      /* server name                   */
-} __packed;
-
-struct function_and_rules_block {
-        unsigned char function_code[2];
-        unsigned short ulen;
-        unsigned char only_rule[8];
-} __packed;
-
-/**
- * The following is used to initialize the CPRBX passed to the PCIXCC/CEX2C
- * card in a type6 message. The 3 fields that must be filled in at execution
- * time are  req_parml, rpl_parml and usage_domain.
- * Everything about this interface is ascii/big-endian, since the
- * device does *not* have 'Intel inside'.
- *
- * The CPRBX is followed immediately by the parm block.
- * The parm block contains:
- * - function code ('PD' 0x5044 or 'PK' 0x504B)
- * - rule block (one of:)
- *   + 0x000A 'PKCS-1.2' (MCL2 'PD')
- *   + 0x000A 'ZERO-PAD' (MCL2 'PK')
- *   + 0x000A 'ZERO-PAD' (MCL3 'PD' or CEX2C 'PD')
- *   + 0x000A 'MRP     ' (MCL3 'PK' or CEX2C 'PK')
- * - VUD block
- */
-static struct CPRBX static_cprbx = {
-        .cprb_len       =  0x00DC,
-        .cprb_ver_id    =  0x02,
-        .func_id        = {0x54, 0x32},
-};
-
-/**
- * Convert a ICAMEX message to a type6 MEX message.
- *
- * @zdev: crypto device pointer
- * @ap_msg: pointer to AP message
- * @mex: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICAMEX_msg_to_type6MEX_msgX(struct zcrypt_device *zdev,
-                                       struct ap_message *ap_msg,
-                                       struct ica_rsa_modexpo *mex)
-{
-        static struct type6_hdr static_type6_hdrX = {
-                .type           =  0x06,
-                .offset1        =  0x00000058,
-                .agent_id       = {'C', 'A',},
-                .function_code  = {'P', 'K'},
-        };
-        static struct function_and_rules_block static_pke_fnr = {
-                .function_code  = {'P', 'K'},
-                .ulen           = 10,
-                .only_rule      = {'M', 'R', 'P', ' ', ' ', ' ', ' ', ' '}
-        };
-        static struct function_and_rules_block static_pke_fnr_MCL2 = {
-                .function_code  = {'P', 'K'},
-                .ulen           = 10,
-                .only_rule      = {'Z', 'E', 'R', 'O', '-', 'P', 'A', 'D'}
-        };
-        struct {
-                struct type6_hdr hdr;
-                struct CPRBX cprbx;
-                struct function_and_rules_block fr;
-                unsigned short length;
-                char text[0];
-        } __packed * msg = ap_msg->message;
-        int size;
-
-        /* VUD.ciphertext */
-        msg->length = mex->inputdatalength + 2;
-        if (copy_from_user(msg->text, mex->inputdata, mex->inputdatalength))
-                return -EFAULT;
-
-        /* Set up key which is located after the variable length text. */
-        size = zcrypt_type6_mex_key_en(mex, msg->text+mex->inputdatalength, 1);
-        if (size < 0)
-                return size;
-        size += sizeof(*msg) + mex->inputdatalength;
-
-        /* message header, cprbx and f&r */
-        msg->hdr = static_type6_hdrX;
-        msg->hdr.ToCardLen1 = size - sizeof(msg->hdr);
-        msg->hdr.FromCardLen1 = PCIXCC_MAX_ICA_RESPONSE_SIZE - sizeof(msg->hdr);
-
-        msg->cprbx = static_cprbx;
-        msg->cprbx.domain = AP_QID_QUEUE(zdev->ap_dev->qid);
-        msg->cprbx.rpl_msgbl = msg->hdr.FromCardLen1;
-
-        msg->fr = (zdev->user_space_type == ZCRYPT_PCIXCC_MCL2) ?
-                static_pke_fnr_MCL2 : static_pke_fnr;
-
-        msg->cprbx.req_parml = size - sizeof(msg->hdr) - sizeof(msg->cprbx);
-
-        ap_msg->length = size;
-        return 0;
-}
-
-/**
- * Convert a ICACRT message to a type6 CRT message.
- *
- * @zdev: crypto device pointer
- * @ap_msg: pointer to AP message
- * @crt: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICACRT_msg_to_type6CRT_msgX(struct zcrypt_device *zdev,
-                                       struct ap_message *ap_msg,
-                                       struct ica_rsa_modexpo_crt *crt)
-{
-        static struct type6_hdr static_type6_hdrX = {
-                .type           =  0x06,
-                .offset1        =  0x00000058,
-                .agent_id       = {'C', 'A',},
-                .function_code  = {'P', 'D'},
-        };
-        static struct function_and_rules_block static_pkd_fnr = {
-                .function_code  = {'P', 'D'},
-                .ulen           = 10,
-                .only_rule      = {'Z', 'E', 'R', 'O', '-', 'P', 'A', 'D'}
-        };
-
-        static struct function_and_rules_block static_pkd_fnr_MCL2 = {
-                .function_code  = {'P', 'D'},
-                .ulen           = 10,
-                .only_rule      = {'P', 'K', 'C', 'S', '-', '1', '.', '2'}
-        };
-        struct {
-                struct type6_hdr hdr;
-                struct CPRBX cprbx;
-                struct function_and_rules_block fr;
-                unsigned short length;
-                char text[0];
-        } __packed * msg = ap_msg->message;
-        int size;
-
-        /* VUD.ciphertext */
-        msg->length = crt->inputdatalength + 2;
-        if (copy_from_user(msg->text, crt->inputdata, crt->inputdatalength))
-                return -EFAULT;
-
-        /* Set up key which is located after the variable length text. */
-        size = zcrypt_type6_crt_key(crt, msg->text + crt->inputdatalength, 1);
-        if (size < 0)
-                return size;
-        size += sizeof(*msg) + crt->inputdatalength;    /* total size of msg */
-
-        /* message header, cprbx and f&r */
-        msg->hdr = static_type6_hdrX;
-        msg->hdr.ToCardLen1 = size -  sizeof(msg->hdr);
-        msg->hdr.FromCardLen1 = PCIXCC_MAX_ICA_RESPONSE_SIZE - sizeof(msg->hdr);
-
-        msg->cprbx = static_cprbx;
-        msg->cprbx.domain = AP_QID_QUEUE(zdev->ap_dev->qid);
-        msg->cprbx.req_parml = msg->cprbx.rpl_msgbl =
-                size - sizeof(msg->hdr) - sizeof(msg->cprbx);
-
-        msg->fr = (zdev->user_space_type == ZCRYPT_PCIXCC_MCL2) ?
-                static_pkd_fnr_MCL2 : static_pkd_fnr;
-
-        ap_msg->length = size;
-        return 0;
-}
-
-/**
- * Convert a XCRB message to a type6 CPRB message.
- *
- * @zdev: crypto device pointer
- * @ap_msg: pointer to AP message
- * @xcRB: pointer to user input data
- *
- * Returns 0 on success or -EFAULT, -EINVAL.
- */
-struct type86_fmt2_msg {
-        struct type86_hdr hdr;
-        struct type86_fmt2_ext fmt2;
-} __packed;
-
-static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,
-                                       struct ap_message *ap_msg,
-                                       struct ica_xcRB *xcRB)
-{
-        static struct type6_hdr static_type6_hdrX = {
-                .type           =  0x06,
-                .offset1        =  0x00000058,
-        };
-        struct {
-                struct type6_hdr hdr;
-                struct CPRBX cprbx;
-        } __packed * msg = ap_msg->message;
-
-        int rcblen = CEIL4(xcRB->request_control_blk_length);
-        int replylen;
-        char *req_data = ap_msg->message + sizeof(struct type6_hdr) + rcblen;
-        char *function_code;
-
-        /* length checks */
-        ap_msg->length = sizeof(struct type6_hdr) +
-                CEIL4(xcRB->request_control_blk_length) +
-                xcRB->request_data_length;
-        if (ap_msg->length > MSGTYPE06_MAX_MSG_SIZE)
-                return -EINVAL;
-        replylen = sizeof(struct type86_fmt2_msg) +
-                CEIL4(xcRB->reply_control_blk_length) +
-                xcRB->reply_data_length;
-        if (replylen > MSGTYPE06_MAX_MSG_SIZE)
-                return -EINVAL;
-
-        /* prepare type6 header */
-        msg->hdr = static_type6_hdrX;
-        memcpy(msg->hdr.agent_id , &(xcRB->agent_ID), sizeof(xcRB->agent_ID));
-        msg->hdr.ToCardLen1 = xcRB->request_control_blk_length;
-        if (xcRB->request_data_length) {
-                msg->hdr.offset2 = msg->hdr.offset1 + rcblen;
-                msg->hdr.ToCardLen2 = xcRB->request_data_length;
-        }
-        msg->hdr.FromCardLen1 = xcRB->reply_control_blk_length;
-        msg->hdr.FromCardLen2 = xcRB->reply_data_length;
-
-        /* prepare CPRB */
-        if (copy_from_user(&(msg->cprbx), xcRB->request_control_blk_addr,
-                    xcRB->request_control_blk_length))
-                return -EFAULT;
-        if (msg->cprbx.cprb_len + sizeof(msg->hdr.function_code) >
-            xcRB->request_control_blk_length)
-                return -EINVAL;
-        function_code = ((unsigned char *)&msg->cprbx) + msg->cprbx.cprb_len;
-        memcpy(msg->hdr.function_code, function_code,
-               sizeof(msg->hdr.function_code));
-
-        if (memcmp(function_code, "US", 2) == 0)
-                ap_msg->special = 1;
-        else
-                ap_msg->special = 0;
-
-        /* copy data block */
-        if (xcRB->request_data_length &&
-            copy_from_user(req_data, xcRB->request_data_address,
-                xcRB->request_data_length))
-                return -EFAULT;
-        return 0;
-}
-
-/**
- * Copy results from a type 86 ICA reply message back to user space.
- *
- * @zdev: crypto device pointer
- * @reply: reply AP message.
- * @data: pointer to user output data
- * @length: size of user output data
- *
- * Returns 0 on success or -EINVAL, -EFAULT, -EAGAIN in case of an error.
- */
-struct type86x_reply {
-        struct type86_hdr hdr;
-        struct type86_fmt2_ext fmt2;
-        struct CPRBX cprbx;
-        unsigned char pad[4];   /* 4 byte function code/rules block ? */
-        unsigned short length;
-        char text[0];
-} __packed;
-
-static int convert_type86_ica(struct zcrypt_device *zdev,
-                          struct ap_message *reply,
-                          char __user *outputdata,
-                          unsigned int outputdatalength)
-{
-        static unsigned char static_pad[] = {
-                0x00, 0x02,
-                0x1B, 0x7B, 0x5D, 0xB5, 0x75, 0x01, 0x3D, 0xFD,
-                0x8D, 0xD1, 0xC7, 0x03, 0x2D, 0x09, 0x23, 0x57,
-                0x89, 0x49, 0xB9, 0x3F, 0xBB, 0x99, 0x41, 0x5B,
-                0x75, 0x21, 0x7B, 0x9D, 0x3B, 0x6B, 0x51, 0x39,
-                0xBB, 0x0D, 0x35, 0xB9, 0x89, 0x0F, 0x93, 0xA5,
-                0x0B, 0x47, 0xF1, 0xD3, 0xBB, 0xCB, 0xF1, 0x9D,
-                0x23, 0x73, 0x71, 0xFF, 0xF3, 0xF5, 0x45, 0xFB,
-                0x61, 0x29, 0x23, 0xFD, 0xF1, 0x29, 0x3F, 0x7F,
-                0x17, 0xB7, 0x1B, 0xA9, 0x19, 0xBD, 0x57, 0xA9,
-                0xD7, 0x95, 0xA3, 0xCB, 0xED, 0x1D, 0xDB, 0x45,
-                0x7D, 0x11, 0xD1, 0x51, 0x1B, 0xED, 0x71, 0xE9,
-                0xB1, 0xD1, 0xAB, 0xAB, 0x21, 0x2B, 0x1B, 0x9F,
-                0x3B, 0x9F, 0xF7, 0xF7, 0xBD, 0x63, 0xEB, 0xAD,
-                0xDF, 0xB3, 0x6F, 0x5B, 0xDB, 0x8D, 0xA9, 0x5D,
-                0xE3, 0x7D, 0x77, 0x49, 0x47, 0xF5, 0xA7, 0xFD,
-                0xAB, 0x2F, 0x27, 0x35, 0x77, 0xD3, 0x49, 0xC9,
-                0x09, 0xEB, 0xB1, 0xF9, 0xBF, 0x4B, 0xCB, 0x2B,
-                0xEB, 0xEB, 0x05, 0xFF, 0x7D, 0xC7, 0x91, 0x8B,
-                0x09, 0x83, 0xB9, 0xB9, 0x69, 0x33, 0x39, 0x6B,
-                0x79, 0x75, 0x19, 0xBF, 0xBB, 0x07, 0x1D, 0xBD,
-                0x29, 0xBF, 0x39, 0x95, 0x93, 0x1D, 0x35, 0xC7,
-                0xC9, 0x4D, 0xE5, 0x97, 0x0B, 0x43, 0x9B, 0xF1,
-                0x16, 0x93, 0x03, 0x1F, 0xA5, 0xFB, 0xDB, 0xF3,
-                0x27, 0x4F, 0x27, 0x61, 0x05, 0x1F, 0xB9, 0x23,
-                0x2F, 0xC3, 0x81, 0xA9, 0x23, 0x71, 0x55, 0x55,
-                0xEB, 0xED, 0x41, 0xE5, 0xF3, 0x11, 0xF1, 0x43,
-                0x69, 0x03, 0xBD, 0x0B, 0x37, 0x0F, 0x51, 0x8F,
-                0x0B, 0xB5, 0x89, 0x5B, 0x67, 0xA9, 0xD9, 0x4F,
-                0x01, 0xF9, 0x21, 0x77, 0x37, 0x73, 0x79, 0xC5,
-                0x7F, 0x51, 0xC1, 0xCF, 0x97, 0xA1, 0x75, 0xAD,
-                0x35, 0x9D, 0xD3, 0xD3, 0xA7, 0x9D, 0x5D, 0x41,
-                0x6F, 0x65, 0x1B, 0xCF, 0xA9, 0x87, 0x91, 0x09
-        };
-        struct type86x_reply *msg = reply->message;
-        unsigned short service_rc, service_rs;
-        unsigned int reply_len, pad_len;
-        char *data;
-
-        service_rc = msg->cprbx.ccp_rtcode;
-        if (unlikely(service_rc != 0)) {
-                service_rs = msg->cprbx.ccp_rscode;
-                if (service_rc == 8 && service_rs == 66)
-                        return -EINVAL;
-                if (service_rc == 8 && service_rs == 65)
-                        return -EINVAL;
-                if (service_rc == 8 && service_rs == 770)
-                        return -EINVAL;
-                if (service_rc == 8 && service_rs == 783) {
-                        zdev->min_mod_size = PCIXCC_MIN_MOD_SIZE_OLD;
-                        return -EAGAIN;
-                }
-                if (service_rc == 12 && service_rs == 769)
-                        return -EINVAL;
-                if (service_rc == 8 && service_rs == 72)
-                        return -EINVAL;
-                zdev->online = 0;
-                return -EAGAIN; /* repeat the request on a different device. */
-        }
-        data = msg->text;
-        reply_len = msg->length - 2;
-        if (reply_len > outputdatalength)
-                return -EINVAL;
-        /*
-         * For all encipher requests, the length of the ciphertext (reply_len)
-         * will always equal the modulus length. For MEX decipher requests
-         * the output needs to get padded. Minimum pad size is 10.
-         *
-         * Currently, the cases where padding will be added is for:
-         * - PCIXCC_MCL2 using a CRT form token (since PKD didn't support
-         *   ZERO-PAD and CRT is only supported for PKD requests)
-         * - PCICC, always
-         */
-        pad_len = outputdatalength - reply_len;
-        if (pad_len > 0) {
-                if (pad_len < 10)
-                        return -EINVAL;
-                /* 'restore' padding left in the PCICC/PCIXCC card. */
-                if (copy_to_user(outputdata, static_pad, pad_len - 1))
-                        return -EFAULT;
-                if (put_user(0, outputdata + pad_len - 1))
-                        return -EFAULT;
-        }
-        /* Copy the crypto response to user space. */
-        if (copy_to_user(outputdata + pad_len, data, reply_len))
-                return -EFAULT;
-        return 0;
-}
-
-/**
- * Copy results from a type 86 XCRB reply message back to user space.
- *
- * @zdev: crypto device pointer
- * @reply: reply AP message.
- * @xcRB: pointer to XCRB
- *
- * Returns 0 on success or -EINVAL, -EFAULT, -EAGAIN in case of an error.
- */
-static int convert_type86_xcrb(struct zcrypt_device *zdev,
-                               struct ap_message *reply,
-                               struct ica_xcRB *xcRB)
-{
-        struct type86_fmt2_msg *msg = reply->message;
-        char *data = reply->message;
-
-        /* Copy CPRB to user */
-        if (copy_to_user(xcRB->reply_control_blk_addr,
-                data + msg->fmt2.offset1, msg->fmt2.count1))
-                return -EFAULT;
-        xcRB->reply_control_blk_length = msg->fmt2.count1;
-
-        /* Copy data buffer to user */
-        if (msg->fmt2.count2)
-                if (copy_to_user(xcRB->reply_data_addr,
-                        data + msg->fmt2.offset2, msg->fmt2.count2))
-                        return -EFAULT;
-        xcRB->reply_data_length = msg->fmt2.count2;
-        return 0;
-}
-
-static int convert_type86_rng(struct zcrypt_device *zdev,
-                          struct ap_message *reply,
-                          char *buffer)
-{
-        struct {
-                struct type86_hdr hdr;
-                struct type86_fmt2_ext fmt2;
-                struct CPRBX cprbx;
-        } __packed * msg = reply->message;
-        char *data = reply->message;
-
-        if (msg->cprbx.ccp_rtcode != 0 || msg->cprbx.ccp_rscode != 0)
-                return -EINVAL;
-        memcpy(buffer, data + msg->fmt2.offset2, msg->fmt2.count2);
-        return msg->fmt2.count2;
-}
-
-static int convert_response_ica(struct zcrypt_device *zdev,
-                            struct ap_message *reply,
-                            char __user *outputdata,
-                            unsigned int outputdatalength)
-{
-        struct type86x_reply *msg = reply->message;
-
-        /* Response type byte is the second byte in the response. */
-        switch (((unsigned char *) reply->message)[1]) {
-        case TYPE82_RSP_CODE:
-        case TYPE88_RSP_CODE:
-                return convert_error(zdev, reply);
-        case TYPE86_RSP_CODE:
-                if (msg->cprbx.ccp_rtcode &&
-                   (msg->cprbx.ccp_rscode == 0x14f) &&
-                   (outputdatalength > 256)) {
-                        if (zdev->max_exp_bit_length <= 17) {
-                                zdev->max_exp_bit_length = 17;
-                                return -EAGAIN;
-                        } else
-                                return -EINVAL;
-                }
-                if (msg->hdr.reply_code)
-                        return convert_error(zdev, reply);
-                if (msg->cprbx.cprb_ver_id == 0x02)
-                        return convert_type86_ica(zdev, reply,
-                                                  outputdata, outputdatalength);
-                /* Fall through, no break, incorrect cprb version is an unknown
-                 * response */
-        default: /* Unknown response type, this should NEVER EVER happen */
-                zdev->online = 0;
-                return -EAGAIN; /* repeat the request on a different device. */
-        }
-}
-
-static int convert_response_xcrb(struct zcrypt_device *zdev,
-                            struct ap_message *reply,
-                            struct ica_xcRB *xcRB)
-{
-        struct type86x_reply *msg = reply->message;
-
-        /* Response type byte is the second byte in the response. */
-        switch (((unsigned char *) reply->message)[1]) {
-        case TYPE82_RSP_CODE:
-        case TYPE88_RSP_CODE:
-                xcRB->status = 0x0008044DL; /* HDD_InvalidParm */
-                return convert_error(zdev, reply);
-        case TYPE86_RSP_CODE:
-                if (msg->hdr.reply_code) {
-                        memcpy(&(xcRB->status), msg->fmt2.apfs, sizeof(u32));
-                        return convert_error(zdev, reply);
-                }
-                if (msg->cprbx.cprb_ver_id == 0x02)
-                        return convert_type86_xcrb(zdev, reply, xcRB);
-                /* Fall through, no break, incorrect cprb version is an unknown
-                 * response */
-        default: /* Unknown response type, this should NEVER EVER happen */
-                xcRB->status = 0x0008044DL; /* HDD_InvalidParm */
-                zdev->online = 0;
-                return -EAGAIN; /* repeat the request on a different device. */
-        }
-}
-
-static int convert_response_rng(struct zcrypt_device *zdev,
-                                 struct ap_message *reply,
-                                 char *data)
-{
-        struct type86x_reply *msg = reply->message;
-
-        switch (msg->hdr.type) {
-        case TYPE82_RSP_CODE:
-        case TYPE88_RSP_CODE:
-                return -EINVAL;
-        case TYPE86_RSP_CODE:
-                if (msg->hdr.reply_code)
-                        return -EINVAL;
-                if (msg->cprbx.cprb_ver_id == 0x02)
-                        return convert_type86_rng(zdev, reply, data);
-                /* Fall through, no break, incorrect cprb version is an unknown
-                 * response */
-        default: /* Unknown response type, this should NEVER EVER happen */
-                zdev->online = 0;
-                return -EAGAIN; /* repeat the request on a different device. */
-        }
-}
-
-/**
- * This function is called from the AP bus code after a crypto request
- * "msg" has finished with the reply message "reply".
- * It is called from tasklet context.
- * @ap_dev: pointer to the AP device
- * @msg: pointer to the AP message
- * @reply: pointer to the AP reply message
- */
-static void zcrypt_msgtype6_receive(struct ap_device *ap_dev,
-                                  struct ap_message *msg,
-                                  struct ap_message *reply)
-{
-        static struct error_hdr error_reply = {
-                .type = TYPE82_RSP_CODE,
-                .reply_code = REP82_ERROR_MACHINE_FAILURE,
-        };
-        struct response_type *resp_type =
-                (struct response_type *) msg->private;
-        struct type86x_reply *t86r;
-        int length;
-
-        /* Copy the reply message to the request message buffer. */
-        if (IS_ERR(reply)) {
-                memcpy(msg->message, &error_reply, sizeof(error_reply));
-                goto out;
-        }
-        t86r = reply->message;
-        if (t86r->hdr.type == TYPE86_RSP_CODE &&
-                 t86r->cprbx.cprb_ver_id == 0x02) {
-                switch (resp_type->type) {
-                case PCIXCC_RESPONSE_TYPE_ICA:
-                        length = sizeof(struct type86x_reply)
-                                + t86r->length - 2;
-                        length = min(PCIXCC_MAX_ICA_RESPONSE_SIZE, length);
-                        memcpy(msg->message, reply->message, length);
-                        break;
-                case PCIXCC_RESPONSE_TYPE_XCRB:
-                        length = t86r->fmt2.offset2 + t86r->fmt2.count2;
-                        length = min(MSGTYPE06_MAX_MSG_SIZE, length);
-                        memcpy(msg->message, reply->message, length);
-                        break;
-                default:
-                        memcpy(msg->message, &error_reply,
-                               sizeof(error_reply));
-                }
-        } else
-                memcpy(msg->message, reply->message, sizeof(error_reply));
-out:
-        complete(&(resp_type->work));
-}
-
-static atomic_t zcrypt_step = ATOMIC_INIT(0);
-
-/**
- * The request distributor calls this function if it picked the PCIXCC/CEX2C
- * device to handle a modexpo request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *        PCIXCC/CEX2C device to the request distributor
- * @mex: pointer to the modexpo request buffer
- */
-static long zcrypt_msgtype6_modexpo(struct zcrypt_device *zdev,
-                                  struct ica_rsa_modexpo *mex)
-{
-        struct ap_message ap_msg;
-        struct response_type resp_type = {
-                .type = PCIXCC_RESPONSE_TYPE_ICA,
-        };
-        int rc;
-
-        ap_init_message(&ap_msg);
-        ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
-        if (!ap_msg.message)
-                return -ENOMEM;
-        ap_msg.receive = zcrypt_msgtype6_receive;
-        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                                atomic_inc_return(&zcrypt_step);
-        ap_msg.private = &resp_type;
-        rc = ICAMEX_msg_to_type6MEX_msgX(zdev, &ap_msg, mex);
-        if (rc)
-                goto out_free;
-        init_completion(&resp_type.work);
-        ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible(&resp_type.work);
-        if (rc == 0)
-                rc = convert_response_ica(zdev, &ap_msg, mex->outputdata,
-                                          mex->outputdatalength);
-        else
-                /* Signal pending. */
-                ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-        free_page((unsigned long) ap_msg.message);
-        return rc;
-}
-
-/**
- * The request distributor calls this function if it picked the PCIXCC/CEX2C
- * device to handle a modexpo_crt request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *        PCIXCC/CEX2C device to the request distributor
- * @crt: pointer to the modexpoc_crt request buffer
- */
-static long zcrypt_msgtype6_modexpo_crt(struct zcrypt_device *zdev,
-                                      struct ica_rsa_modexpo_crt *crt)
-{
-        struct ap_message ap_msg;
-        struct response_type resp_type = {
-                .type = PCIXCC_RESPONSE_TYPE_ICA,
-        };
-        int rc;
-
-        ap_init_message(&ap_msg);
-        ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
-        if (!ap_msg.message)
-                return -ENOMEM;
-        ap_msg.receive = zcrypt_msgtype6_receive;
-        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                                atomic_inc_return(&zcrypt_step);
-        ap_msg.private = &resp_type;
-        rc = ICACRT_msg_to_type6CRT_msgX(zdev, &ap_msg, crt);
-        if (rc)
-                goto out_free;
-        init_completion(&resp_type.work);
-        ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible(&resp_type.work);
-        if (rc == 0)
-                rc = convert_response_ica(zdev, &ap_msg, crt->outputdata,
-                                          crt->outputdatalength);
-        else
-                /* Signal pending. */
-                ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-        free_page((unsigned long) ap_msg.message);
-        return rc;
-}
-
-/**
- * The request distributor calls this function if it picked the PCIXCC/CEX2C
- * device to handle a send_cprb request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *        PCIXCC/CEX2C device to the request distributor
- * @xcRB: pointer to the send_cprb request buffer
- */
-static long zcrypt_msgtype6_send_cprb(struct zcrypt_device *zdev,
-                                    struct ica_xcRB *xcRB)
-{
-        struct ap_message ap_msg;
-        struct response_type resp_type = {
-                .type = PCIXCC_RESPONSE_TYPE_XCRB,
-        };
-        int rc;
-
-        ap_init_message(&ap_msg);
-        ap_msg.message = kmalloc(MSGTYPE06_MAX_MSG_SIZE, GFP_KERNEL);
-        if (!ap_msg.message)
-                return -ENOMEM;
-        ap_msg.receive = zcrypt_msgtype6_receive;
-        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                                atomic_inc_return(&zcrypt_step);
-        ap_msg.private = &resp_type;
-        rc = XCRB_msg_to_type6CPRB_msgX(zdev, &ap_msg, xcRB);
-        if (rc)
-                goto out_free;
-        init_completion(&resp_type.work);
-        ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible(&resp_type.work);
-        if (rc == 0)
-                rc = convert_response_xcrb(zdev, &ap_msg, xcRB);
-        else
-                /* Signal pending. */
-                ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-        kzfree(ap_msg.message);
-        return rc;
-}
-
-/**
- * The request distributor calls this function if it picked the PCIXCC/CEX2C
- * device to generate random data.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *        PCIXCC/CEX2C device to the request distributor
- * @buffer: pointer to a memory page to return random data
- */
-
-static long zcrypt_msgtype6_rng(struct zcrypt_device *zdev,
-                                    char *buffer)
-{
-        struct ap_message ap_msg;
-        struct response_type resp_type = {
-                .type = PCIXCC_RESPONSE_TYPE_XCRB,
-        };
-        int rc;
-
-        ap_init_message(&ap_msg);
-        ap_msg.message = kmalloc(MSGTYPE06_MAX_MSG_SIZE, GFP_KERNEL);
-        if (!ap_msg.message)
-                return -ENOMEM;
-        ap_msg.receive = zcrypt_msgtype6_receive;
-        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                                atomic_inc_return(&zcrypt_step);
-        ap_msg.private = &resp_type;
-        rng_type6CPRB_msgX(zdev->ap_dev, &ap_msg, ZCRYPT_RNG_BUFFER_SIZE);
-        init_completion(&resp_type.work);
-        ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible(&resp_type.work);
-        if (rc == 0)
-                rc = convert_response_rng(zdev, &ap_msg, buffer);
-        else
-                /* Signal pending. */
-                ap_cancel_message(zdev->ap_dev, &ap_msg);
-        kfree(ap_msg.message);
-        return rc;
-}
-
-/**
- * The crypto operations for a PCIXCC/CEX2C card.
- */
-static struct zcrypt_ops zcrypt_msgtype6_norng_ops = {
-        .owner = THIS_MODULE,
-        .variant = MSGTYPE06_VARIANT_NORNG,
-        .rsa_modexpo = zcrypt_msgtype6_modexpo,
-        .rsa_modexpo_crt = zcrypt_msgtype6_modexpo_crt,
-        .send_cprb = zcrypt_msgtype6_send_cprb,
-};
-
-static struct zcrypt_ops zcrypt_msgtype6_ops = {
-        .owner = THIS_MODULE,
-        .variant = MSGTYPE06_VARIANT_DEFAULT,
-        .rsa_modexpo = zcrypt_msgtype6_modexpo,
-        .rsa_modexpo_crt = zcrypt_msgtype6_modexpo_crt,
-        .send_cprb = zcrypt_msgtype6_send_cprb,
-        .rng = zcrypt_msgtype6_rng,
-};
-
-int __init zcrypt_msgtype6_init(void)
-{
-        zcrypt_msgtype_register(&zcrypt_msgtype6_norng_ops);
-        zcrypt_msgtype_register(&zcrypt_msgtype6_ops);
-        return 0;
-}
-
-void __exit zcrypt_msgtype6_exit(void)
-{
-        zcrypt_msgtype_unregister(&zcrypt_msgtype6_norng_ops);
-        zcrypt_msgtype_unregister(&zcrypt_msgtype6_ops);
-}
-
-module_init(zcrypt_msgtype6_init);
-module_exit(zcrypt_msgtype6_exit);
diff --git a/drivers/s390/crypto/zcrypt_msgtype6.h b/drivers/s390/crypto/zcrypt_msgtype6.h
deleted file mode 100644
index 1e500d3c073..00000000000
--- a/drivers/s390/crypto/zcrypt_msgtype6.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2012
- *  Author(s): Robert Burroughs
- *             Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _ZCRYPT_MSGTYPE6_H_
-#define _ZCRYPT_MSGTYPE6_H_
-
-#include <asm/zcrypt.h>
-
-#define MSGTYPE06_NAME                  "zcrypt_msgtype6"
-#define MSGTYPE06_VARIANT_DEFAULT       0
-#define MSGTYPE06_VARIANT_NORNG         1
-
-#define MSGTYPE06_MAX_MSG_SIZE          (12*1024)
-
-/**
- * The type 6 message family is associated with PCICC or PCIXCC cards.
- *
- * It contains a message header followed by a CPRB, both of which
- * are described below.
- *
- * Note that all reserved fields must be zeroes.
- */
-struct type6_hdr {
-        unsigned char reserved1;        /* 0x00                         */
-        unsigned char type;             /* 0x06                         */
-        unsigned char reserved2[2];     /* 0x0000                       */
-        unsigned char right[4];         /* 0x00000000                   */
-        unsigned char reserved3[2];     /* 0x0000                       */
-        unsigned char reserved4[2];     /* 0x0000                       */
-        unsigned char apfs[4];          /* 0x00000000                   */
-        unsigned int  offset1;          /* 0x00000058 (offset to CPRB)  */
-        unsigned int  offset2;          /* 0x00000000                   */
-        unsigned int  offset3;          /* 0x00000000                   */
-        unsigned int  offset4;          /* 0x00000000                   */
-        unsigned char agent_id[16];     /* PCICC:                       */
-                                        /*    0x0100                    */
-                                        /*    0x4343412d4150504c202020  */
-                                        /*    0x010101                  */
-                                        /* PCIXCC:                      */
-                                        /*    0x4341000000000000        */
-                                        /*    0x0000000000000000        */
-        unsigned char rqid[2];          /* rqid.  internal to 603       */
-        unsigned char reserved5[2];     /* 0x0000                       */
-        unsigned char function_code[2]; /* for PKD, 0x5044 (ascii 'PD') */
-        unsigned char reserved6[2];     /* 0x0000                       */
-        unsigned int  ToCardLen1;       /* (request CPRB len + 3) & -4  */
-        unsigned int  ToCardLen2;       /* db len 0x00000000 for PKD    */
-        unsigned int  ToCardLen3;       /* 0x00000000                   */
-        unsigned int  ToCardLen4;       /* 0x00000000                   */
-        unsigned int  FromCardLen1;     /* response buffer length       */
-        unsigned int  FromCardLen2;     /* db len 0x00000000 for PKD    */
-        unsigned int  FromCardLen3;     /* 0x00000000                   */
-        unsigned int  FromCardLen4;     /* 0x00000000                   */
-} __packed;
-
-/**
- * The type 86 message family is associated with PCICC and PCIXCC cards.
- *
- * It contains a message header followed by a CPRB.  The CPRB is
- * the same as the request CPRB, which is described above.
- *
- * If format is 1, an error condition exists and no data beyond
- * the 8-byte message header is of interest.
- *
- * The non-error message is shown below.
- *
- * Note that all reserved fields must be zeroes.
- */
-struct type86_hdr {
-        unsigned char reserved1;        /* 0x00                         */
-        unsigned char type;             /* 0x86                         */
-        unsigned char format;           /* 0x01 (error) or 0x02 (ok)    */
-        unsigned char reserved2;        /* 0x00                         */
-        unsigned char reply_code;       /* reply code (see above)       */
-        unsigned char reserved3[3];     /* 0x000000                     */
-} __packed;
-
-#define TYPE86_RSP_CODE 0x86
-#define TYPE86_FMT2     0x02
-
-struct type86_fmt2_ext {
-        unsigned char     reserved[4];  /* 0x00000000                   */
-        unsigned char     apfs[4];      /* final status                 */
-        unsigned int      count1;       /* length of CPRB + parameters  */
-        unsigned int      offset1;      /* offset to CPRB               */
-        unsigned int      count2;       /* 0x00000000                   */
-        unsigned int      offset2;      /* db offset 0x00000000 for PKD */
-        unsigned int      count3;       /* 0x00000000                   */
-        unsigned int      offset3;      /* 0x00000000                   */
-        unsigned int      count4;       /* 0x00000000                   */
-        unsigned int      offset4;      /* 0x00000000                   */
-} __packed;
-
-/**
- * Prepare a type6 CPRB message for random number generation
- *
- * @ap_dev: AP device pointer
- * @ap_msg: pointer to AP message
- */
-static inline void rng_type6CPRB_msgX(struct ap_device *ap_dev,
-                               struct ap_message *ap_msg,
-                               unsigned random_number_length)
-{
-        struct {
-                struct type6_hdr hdr;
-                struct CPRBX cprbx;
-                char function_code[2];
-                short int rule_length;
-                char rule[8];
-                short int verb_length;
-                short int key_length;
-        } __packed * msg = ap_msg->message;
-        static struct type6_hdr static_type6_hdrX = {
-                .type           = 0x06,
-                .offset1        = 0x00000058,
-                .agent_id       = {'C', 'A'},
-                .function_code  = {'R', 'L'},
-                .ToCardLen1     = sizeof(*msg) - sizeof(msg->hdr),
-                .FromCardLen1   = sizeof(*msg) - sizeof(msg->hdr),
-        };
-        static struct CPRBX local_cprbx = {
-                .cprb_len       = 0x00dc,
-                .cprb_ver_id    = 0x02,
-                .func_id        = {0x54, 0x32},
-                .req_parml      = sizeof(*msg) - sizeof(msg->hdr) -
-                                  sizeof(msg->cprbx),
-                .rpl_msgbl      = sizeof(*msg) - sizeof(msg->hdr),
-        };
-
-        msg->hdr = static_type6_hdrX;
-        msg->hdr.FromCardLen2 = random_number_length,
-        msg->cprbx = local_cprbx;
-        msg->cprbx.rpl_datal = random_number_length,
-        msg->cprbx.domain = AP_QID_QUEUE(ap_dev->qid);
-        memcpy(msg->function_code, msg->hdr.function_code, 0x02);
-        msg->rule_length = 0x0a;
-        memcpy(msg->rule, "RANDOM  ", 8);
-        msg->verb_length = 0x02;
-        msg->key_length = 0x02;
-        ap_msg->length = sizeof(*msg);
-}
-
-int zcrypt_msgtype6_init(void);
-void zcrypt_msgtype6_exit(void);
-
-#endif /* _ZCRYPT_MSGTYPE6_H_ */
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
index f2b71d8df01..d84816f144d 100644
--- a/drivers/s390/crypto/zcrypt_pcica.c
+++ b/drivers/s390/crypto/zcrypt_pcica.c
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_pcica.c
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2006
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
@@ -51,11 +53,13 @@ static struct ap_device_id zcrypt_pcica_ids[] = {
         { /* end of list */ },
 };
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 MODULE_DEVICE_TABLE(ap, zcrypt_pcica_ids);
 MODULE_AUTHOR("IBM Corporation");
 MODULE_DESCRIPTION("PCICA Cryptographic Coprocessor device driver, "
-                   "Copyright IBM Corp. 2001, 2006");
+                   "Copyright 2001, 2006 IBM Corporation");
 MODULE_LICENSE("GPL");
+#endif
 
 static int zcrypt_pcica_probe(struct ap_device *ap_dev);
 static void zcrypt_pcica_remove(struct ap_device *ap_dev);
@@ -65,6 +69,7 @@ static void zcrypt_pcica_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcica_driver = {
         .probe = zcrypt_pcica_probe,
         .remove = zcrypt_pcica_remove,
+        .receive = zcrypt_pcica_receive,
         .ids = zcrypt_pcica_ids,
         .request_timeout = PCICA_CLEANUP_TIME,
 };
@@ -281,7 +286,6 @@ static long zcrypt_pcica_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
-        ap_msg.receive = zcrypt_pcica_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
@@ -320,7 +324,6 @@ static long zcrypt_pcica_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
-        ap_msg.receive = zcrypt_pcica_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
@@ -405,5 +408,7 @@ void zcrypt_pcica_exit(void)
         ap_driver_unregister(&zcrypt_pcica_driver);
 }
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 module_init(zcrypt_pcica_init);
 module_exit(zcrypt_pcica_exit);
+#endif
diff --git a/drivers/s390/crypto/zcrypt_pcica.h b/drivers/s390/crypto/zcrypt_pcica.h
index 9a59155cad5..3be11187f6d 100644
--- a/drivers/s390/crypto/zcrypt_pcica.h
+++ b/drivers/s390/crypto/zcrypt_pcica.h
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_pcica.h
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2006
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index 0d90a433405..bdbdbe19299 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_pcicc.c
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2006
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
@@ -63,11 +65,13 @@ static struct ap_device_id zcrypt_pcicc_ids[] = {
         { /* end of list */ },
 };
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 MODULE_DEVICE_TABLE(ap, zcrypt_pcicc_ids);
 MODULE_AUTHOR("IBM Corporation");
 MODULE_DESCRIPTION("PCICC Cryptographic Coprocessor device driver, "
-                   "Copyright IBM Corp. 2001, 2006");
+                   "Copyright 2001, 2006 IBM Corporation");
 MODULE_LICENSE("GPL");
+#endif
 
 static int zcrypt_pcicc_probe(struct ap_device *ap_dev);
 static void zcrypt_pcicc_remove(struct ap_device *ap_dev);
@@ -77,6 +81,7 @@ static void zcrypt_pcicc_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcicc_driver = {
         .probe = zcrypt_pcicc_probe,
         .remove = zcrypt_pcicc_remove,
+        .receive = zcrypt_pcicc_receive,
         .ids = zcrypt_pcicc_ids,
         .request_timeout = PCICC_CLEANUP_TIME,
 };
@@ -485,7 +490,6 @@ static long zcrypt_pcicc_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
-        ap_msg.receive = zcrypt_pcicc_receive;
         ap_msg.length = PAGE_SIZE;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
@@ -525,7 +529,6 @@ static long zcrypt_pcicc_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
-        ap_msg.receive = zcrypt_pcicc_receive;
         ap_msg.length = PAGE_SIZE;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
@@ -611,5 +614,7 @@ void zcrypt_pcicc_exit(void)
         ap_driver_unregister(&zcrypt_pcicc_driver);
 }
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 module_init(zcrypt_pcicc_init);
 module_exit(zcrypt_pcicc_exit);
+#endif
diff --git a/drivers/s390/crypto/zcrypt_pcicc.h b/drivers/s390/crypto/zcrypt_pcicc.h
index 7fe27e15075..6d4454846c8 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.h
+++ b/drivers/s390/crypto/zcrypt_pcicc.h
@@ -1,7 +1,9 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_pcicc.h
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2006
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index 899ffa19f5e..dd4737808e0 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -1,14 +1,15 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_pcixcc.c
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2012
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
  *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
  *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
  *                                Ralph Wuerthner <rwuerthn@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +37,7 @@
 #include "ap_bus.h"
 #include "zcrypt_api.h"
 #include "zcrypt_error.h"
-#include "zcrypt_msgtype6.h"
+#include "zcrypt_pcicc.h"
 #include "zcrypt_pcixcc.h"
 #include "zcrypt_cca_key.h"
 
@@ -55,6 +56,11 @@
 #define PCIXCC_MAX_ICA_RESPONSE_SIZE 0x77c /* max size type86 v2 reply      */
 
 #define PCIXCC_MAX_XCRB_MESSAGE_SIZE (12*1024)
+#define PCIXCC_MAX_XCRB_RESPONSE_SIZE PCIXCC_MAX_XCRB_MESSAGE_SIZE
+#define PCIXCC_MAX_XCRB_DATA_SIZE (11*1024)
+#define PCIXCC_MAX_XCRB_REPLY_SIZE (5*1024)
+
+#define PCIXCC_MAX_RESPONSE_SIZE PCIXCC_MAX_XCRB_RESPONSE_SIZE
 
 #define PCIXCC_CLEANUP_TIME     (15*HZ)
 
@@ -74,23 +80,791 @@ static struct ap_device_id zcrypt_pcixcc_ids[] = {
         { /* end of list */ },
 };
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 MODULE_DEVICE_TABLE(ap, zcrypt_pcixcc_ids);
 MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("PCIXCC Cryptographic Coprocessor device driver, " \
-                   "Copyright IBM Corp. 2001, 2012");
+MODULE_DESCRIPTION("PCIXCC Cryptographic Coprocessor device driver, "
+                   "Copyright 2001, 2006 IBM Corporation");
 MODULE_LICENSE("GPL");
+#endif
 
 static int zcrypt_pcixcc_probe(struct ap_device *ap_dev);
 static void zcrypt_pcixcc_remove(struct ap_device *ap_dev);
+static void zcrypt_pcixcc_receive(struct ap_device *, struct ap_message *,
+                                 struct ap_message *);
 
 static struct ap_driver zcrypt_pcixcc_driver = {
         .probe = zcrypt_pcixcc_probe,
         .remove = zcrypt_pcixcc_remove,
+        .receive = zcrypt_pcixcc_receive,
         .ids = zcrypt_pcixcc_ids,
         .request_timeout = PCIXCC_CLEANUP_TIME,
 };
 
 /**
+ * The following is used to initialize the CPRBX passed to the PCIXCC/CEX2C
+ * card in a type6 message. The 3 fields that must be filled in at execution
+ * time are  req_parml, rpl_parml and usage_domain.
+ * Everything about this interface is ascii/big-endian, since the
+ * device does *not* have 'Intel inside'.
+ *
+ * The CPRBX is followed immediately by the parm block.
+ * The parm block contains:
+ * - function code ('PD' 0x5044 or 'PK' 0x504B)
+ * - rule block (one of:)
+ *   + 0x000A 'PKCS-1.2' (MCL2 'PD')
+ *   + 0x000A 'ZERO-PAD' (MCL2 'PK')
+ *   + 0x000A 'ZERO-PAD' (MCL3 'PD' or CEX2C 'PD')
+ *   + 0x000A 'MRP     ' (MCL3 'PK' or CEX2C 'PK')
+ * - VUD block
+ */
+static struct CPRBX static_cprbx = {
+        .cprb_len       =  0x00DC,
+        .cprb_ver_id    =  0x02,
+        .func_id        = {0x54,0x32},
+};
+
+/**
+ * Convert a ICAMEX message to a type6 MEX message.
+ *
+ * @zdev: crypto device pointer
+ * @ap_msg: pointer to AP message
+ * @mex: pointer to user input data
+ *
+ * Returns 0 on success or -EFAULT.
+ */
+static int ICAMEX_msg_to_type6MEX_msgX(struct zcrypt_device *zdev,
+                                       struct ap_message *ap_msg,
+                                       struct ica_rsa_modexpo *mex)
+{
+        static struct type6_hdr static_type6_hdrX = {
+                .type           =  0x06,
+                .offset1        =  0x00000058,
+                .agent_id       = {'C','A',},
+                .function_code  = {'P','K'},
+        };
+        static struct function_and_rules_block static_pke_fnr = {
+                .function_code  = {'P','K'},
+                .ulen           = 10,
+                .only_rule      = {'M','R','P',' ',' ',' ',' ',' '}
+        };
+        static struct function_and_rules_block static_pke_fnr_MCL2 = {
+                .function_code  = {'P','K'},
+                .ulen           = 10,
+                .only_rule      = {'Z','E','R','O','-','P','A','D'}
+        };
+        struct {
+                struct type6_hdr hdr;
+                struct CPRBX cprbx;
+                struct function_and_rules_block fr;
+                unsigned short length;
+                char text[0];
+        } __attribute__((packed)) *msg = ap_msg->message;
+        int size;
+
+        /* VUD.ciphertext */
+        msg->length = mex->inputdatalength + 2;
+        if (copy_from_user(msg->text, mex->inputdata, mex->inputdatalength))
+                return -EFAULT;
+
+        /* Set up key which is located after the variable length text. */
+        size = zcrypt_type6_mex_key_en(mex, msg->text+mex->inputdatalength, 1);
+        if (size < 0)
+                return size;
+        size += sizeof(*msg) + mex->inputdatalength;
+
+        /* message header, cprbx and f&r */
+        msg->hdr = static_type6_hdrX;
+        msg->hdr.ToCardLen1 = size - sizeof(msg->hdr);
+        msg->hdr.FromCardLen1 = PCIXCC_MAX_ICA_RESPONSE_SIZE - sizeof(msg->hdr);
+
+        msg->cprbx = static_cprbx;
+        msg->cprbx.domain = AP_QID_QUEUE(zdev->ap_dev->qid);
+        msg->cprbx.rpl_msgbl = msg->hdr.FromCardLen1;
+
+        msg->fr = (zdev->user_space_type == ZCRYPT_PCIXCC_MCL2) ?
+                static_pke_fnr_MCL2 : static_pke_fnr;
+
+        msg->cprbx.req_parml = size - sizeof(msg->hdr) - sizeof(msg->cprbx);
+
+        ap_msg->length = size;
+        return 0;
+}
+
+/**
+ * Convert a ICACRT message to a type6 CRT message.
+ *
+ * @zdev: crypto device pointer
+ * @ap_msg: pointer to AP message
+ * @crt: pointer to user input data
+ *
+ * Returns 0 on success or -EFAULT.
+ */
+static int ICACRT_msg_to_type6CRT_msgX(struct zcrypt_device *zdev,
+                                       struct ap_message *ap_msg,
+                                       struct ica_rsa_modexpo_crt *crt)
+{
+        static struct type6_hdr static_type6_hdrX = {
+                .type           =  0x06,
+                .offset1        =  0x00000058,
+                .agent_id       = {'C','A',},
+                .function_code  = {'P','D'},
+        };
+        static struct function_and_rules_block static_pkd_fnr = {
+                .function_code  = {'P','D'},
+                .ulen           = 10,
+                .only_rule      = {'Z','E','R','O','-','P','A','D'}
+        };
+
+        static struct function_and_rules_block static_pkd_fnr_MCL2 = {
+                .function_code  = {'P','D'},
+                .ulen           = 10,
+                .only_rule      = {'P','K','C','S','-','1','.','2'}
+        };
+        struct {
+                struct type6_hdr hdr;
+                struct CPRBX cprbx;
+                struct function_and_rules_block fr;
+                unsigned short length;
+                char text[0];
+        } __attribute__((packed)) *msg = ap_msg->message;
+        int size;
+
+        /* VUD.ciphertext */
+        msg->length = crt->inputdatalength + 2;
+        if (copy_from_user(msg->text, crt->inputdata, crt->inputdatalength))
+                return -EFAULT;
+
+        /* Set up key which is located after the variable length text. */
+        size = zcrypt_type6_crt_key(crt, msg->text + crt->inputdatalength, 1);
+        if (size < 0)
+                return size;
+        size += sizeof(*msg) + crt->inputdatalength;    /* total size of msg */
+
+        /* message header, cprbx and f&r */
+        msg->hdr = static_type6_hdrX;
+        msg->hdr.ToCardLen1 = size -  sizeof(msg->hdr);
+        msg->hdr.FromCardLen1 = PCIXCC_MAX_ICA_RESPONSE_SIZE - sizeof(msg->hdr);
+
+        msg->cprbx = static_cprbx;
+        msg->cprbx.domain = AP_QID_QUEUE(zdev->ap_dev->qid);
+        msg->cprbx.req_parml = msg->cprbx.rpl_msgbl =
+                size - sizeof(msg->hdr) - sizeof(msg->cprbx);
+
+        msg->fr = (zdev->user_space_type == ZCRYPT_PCIXCC_MCL2) ?
+                static_pkd_fnr_MCL2 : static_pkd_fnr;
+
+        ap_msg->length = size;
+        return 0;
+}
+
+/**
+ * Convert a XCRB message to a type6 CPRB message.
+ *
+ * @zdev: crypto device pointer
+ * @ap_msg: pointer to AP message
+ * @xcRB: pointer to user input data
+ *
+ * Returns 0 on success or -EFAULT.
+ */
+struct type86_fmt2_msg {
+        struct type86_hdr hdr;
+        struct type86_fmt2_ext fmt2;
+} __attribute__((packed));
+
+static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,
+                                       struct ap_message *ap_msg,
+                                       struct ica_xcRB *xcRB)
+{
+        static struct type6_hdr static_type6_hdrX = {
+                .type           =  0x06,
+                .offset1        =  0x00000058,
+        };
+        struct {
+                struct type6_hdr hdr;
+                struct CPRBX cprbx;
+        } __attribute__((packed)) *msg = ap_msg->message;
+
+        int rcblen = CEIL4(xcRB->request_control_blk_length);
+        int replylen;
+        char *req_data = ap_msg->message + sizeof(struct type6_hdr) + rcblen;
+        char *function_code;
+
+        /* length checks */
+        ap_msg->length = sizeof(struct type6_hdr) +
+                CEIL4(xcRB->request_control_blk_length) +
+                xcRB->request_data_length;
+        if (ap_msg->length > PCIXCC_MAX_XCRB_MESSAGE_SIZE)
+                return -EFAULT;
+        if (CEIL4(xcRB->reply_control_blk_length) > PCIXCC_MAX_XCRB_REPLY_SIZE)
+                return -EFAULT;
+        if (CEIL4(xcRB->reply_data_length) > PCIXCC_MAX_XCRB_DATA_SIZE)
+                return -EFAULT;
+        replylen = CEIL4(xcRB->reply_control_blk_length) +
+                CEIL4(xcRB->reply_data_length) +
+                sizeof(struct type86_fmt2_msg);
+        if (replylen > PCIXCC_MAX_XCRB_RESPONSE_SIZE) {
+                xcRB->reply_control_blk_length = PCIXCC_MAX_XCRB_RESPONSE_SIZE -
+                        (sizeof(struct type86_fmt2_msg) +
+                            CEIL4(xcRB->reply_data_length));
+        }
+
+        /* prepare type6 header */
+        msg->hdr = static_type6_hdrX;
+        memcpy(msg->hdr.agent_id , &(xcRB->agent_ID), sizeof(xcRB->agent_ID));
+        msg->hdr.ToCardLen1 = xcRB->request_control_blk_length;
+        if (xcRB->request_data_length) {
+                msg->hdr.offset2 = msg->hdr.offset1 + rcblen;
+                msg->hdr.ToCardLen2 = xcRB->request_data_length;
+        }
+        msg->hdr.FromCardLen1 = xcRB->reply_control_blk_length;
+        msg->hdr.FromCardLen2 = xcRB->reply_data_length;
+
+        /* prepare CPRB */
+        if (copy_from_user(&(msg->cprbx), xcRB->request_control_blk_addr,
+                    xcRB->request_control_blk_length))
+                return -EFAULT;
+        if (msg->cprbx.cprb_len + sizeof(msg->hdr.function_code) >
+            xcRB->request_control_blk_length)
+                return -EFAULT;
+        function_code = ((unsigned char *)&msg->cprbx) + msg->cprbx.cprb_len;
+        memcpy(msg->hdr.function_code, function_code, sizeof(msg->hdr.function_code));
+
+        if (memcmp(function_code, "US", 2) == 0)
+                ap_msg->special = 1;
+        else
+                ap_msg->special = 0;
+
+        /* copy data block */
+        if (xcRB->request_data_length &&
+            copy_from_user(req_data, xcRB->request_data_address,
+                xcRB->request_data_length))
+                return -EFAULT;
+        return 0;
+}
+
+/**
+ * Prepare a type6 CPRB message for random number generation
+ *
+ * @ap_dev: AP device pointer
+ * @ap_msg: pointer to AP message
+ */
+static void rng_type6CPRB_msgX(struct ap_device *ap_dev,
+                               struct ap_message *ap_msg,
+                               unsigned random_number_length)
+{
+        struct {
+                struct type6_hdr hdr;
+                struct CPRBX cprbx;
+                char function_code[2];
+                short int rule_length;
+                char rule[8];
+                short int verb_length;
+                short int key_length;
+        } __attribute__((packed)) *msg = ap_msg->message;
+        static struct type6_hdr static_type6_hdrX = {
+                .type           = 0x06,
+                .offset1        = 0x00000058,
+                .agent_id       = {'C', 'A'},
+                .function_code  = {'R', 'L'},
+                .ToCardLen1     = sizeof *msg - sizeof(msg->hdr),
+                .FromCardLen1   = sizeof *msg - sizeof(msg->hdr),
+        };
+        static struct CPRBX local_cprbx = {
+                .cprb_len       = 0x00dc,
+                .cprb_ver_id    = 0x02,
+                .func_id        = {0x54, 0x32},
+                .req_parml      = sizeof *msg - sizeof(msg->hdr) -
+                                  sizeof(msg->cprbx),
+                .rpl_msgbl      = sizeof *msg - sizeof(msg->hdr),
+        };
+
+        msg->hdr = static_type6_hdrX;
+        msg->hdr.FromCardLen2 = random_number_length,
+        msg->cprbx = local_cprbx;
+        msg->cprbx.rpl_datal = random_number_length,
+        msg->cprbx.domain = AP_QID_QUEUE(ap_dev->qid);
+        memcpy(msg->function_code, msg->hdr.function_code, 0x02);
+        msg->rule_length = 0x0a;
+        memcpy(msg->rule, "RANDOM  ", 8);
+        msg->verb_length = 0x02;
+        msg->key_length = 0x02;
+        ap_msg->length = sizeof *msg;
+}
+
+/**
+ * Copy results from a type 86 ICA reply message back to user space.
+ *
+ * @zdev: crypto device pointer
+ * @reply: reply AP message.
+ * @data: pointer to user output data
+ * @length: size of user output data
+ *
+ * Returns 0 on success or -EINVAL, -EFAULT, -EAGAIN in case of an error.
+ */
+struct type86x_reply {
+        struct type86_hdr hdr;
+        struct type86_fmt2_ext fmt2;
+        struct CPRBX cprbx;
+        unsigned char pad[4];   /* 4 byte function code/rules block ? */
+        unsigned short length;
+        char text[0];
+} __attribute__((packed));
+
+static int convert_type86_ica(struct zcrypt_device *zdev,
+                          struct ap_message *reply,
+                          char __user *outputdata,
+                          unsigned int outputdatalength)
+{
+        static unsigned char static_pad[] = {
+                0x00,0x02,
+                0x1B,0x7B,0x5D,0xB5,0x75,0x01,0x3D,0xFD,
+                0x8D,0xD1,0xC7,0x03,0x2D,0x09,0x23,0x57,
+                0x89,0x49,0xB9,0x3F,0xBB,0x99,0x41,0x5B,
+                0x75,0x21,0x7B,0x9D,0x3B,0x6B,0x51,0x39,
+                0xBB,0x0D,0x35,0xB9,0x89,0x0F,0x93,0xA5,
+                0x0B,0x47,0xF1,0xD3,0xBB,0xCB,0xF1,0x9D,
+                0x23,0x73,0x71,0xFF,0xF3,0xF5,0x45,0xFB,
+                0x61,0x29,0x23,0xFD,0xF1,0x29,0x3F,0x7F,
+                0x17,0xB7,0x1B,0xA9,0x19,0xBD,0x57,0xA9,
+                0xD7,0x95,0xA3,0xCB,0xED,0x1D,0xDB,0x45,
+                0x7D,0x11,0xD1,0x51,0x1B,0xED,0x71,0xE9,
+                0xB1,0xD1,0xAB,0xAB,0x21,0x2B,0x1B,0x9F,
+                0x3B,0x9F,0xF7,0xF7,0xBD,0x63,0xEB,0xAD,
+                0xDF,0xB3,0x6F,0x5B,0xDB,0x8D,0xA9,0x5D,
+                0xE3,0x7D,0x77,0x49,0x47,0xF5,0xA7,0xFD,
+                0xAB,0x2F,0x27,0x35,0x77,0xD3,0x49,0xC9,
+                0x09,0xEB,0xB1,0xF9,0xBF,0x4B,0xCB,0x2B,
+                0xEB,0xEB,0x05,0xFF,0x7D,0xC7,0x91,0x8B,
+                0x09,0x83,0xB9,0xB9,0x69,0x33,0x39,0x6B,
+                0x79,0x75,0x19,0xBF,0xBB,0x07,0x1D,0xBD,
+                0x29,0xBF,0x39,0x95,0x93,0x1D,0x35,0xC7,
+                0xC9,0x4D,0xE5,0x97,0x0B,0x43,0x9B,0xF1,
+                0x16,0x93,0x03,0x1F,0xA5,0xFB,0xDB,0xF3,
+                0x27,0x4F,0x27,0x61,0x05,0x1F,0xB9,0x23,
+                0x2F,0xC3,0x81,0xA9,0x23,0x71,0x55,0x55,
+                0xEB,0xED,0x41,0xE5,0xF3,0x11,0xF1,0x43,
+                0x69,0x03,0xBD,0x0B,0x37,0x0F,0x51,0x8F,
+                0x0B,0xB5,0x89,0x5B,0x67,0xA9,0xD9,0x4F,
+                0x01,0xF9,0x21,0x77,0x37,0x73,0x79,0xC5,
+                0x7F,0x51,0xC1,0xCF,0x97,0xA1,0x75,0xAD,
+                0x35,0x9D,0xD3,0xD3,0xA7,0x9D,0x5D,0x41,
+                0x6F,0x65,0x1B,0xCF,0xA9,0x87,0x91,0x09
+        };
+        struct type86x_reply *msg = reply->message;
+        unsigned short service_rc, service_rs;
+        unsigned int reply_len, pad_len;
+        char *data;
+
+        service_rc = msg->cprbx.ccp_rtcode;
+        if (unlikely(service_rc != 0)) {
+                service_rs = msg->cprbx.ccp_rscode;
+                if (service_rc == 8 && service_rs == 66)
+                        return -EINVAL;
+                if (service_rc == 8 && service_rs == 65)
+                        return -EINVAL;
+                if (service_rc == 8 && service_rs == 770)
+                        return -EINVAL;
+                if (service_rc == 8 && service_rs == 783) {
+                        zdev->min_mod_size = PCIXCC_MIN_MOD_SIZE_OLD;
+                        return -EAGAIN;
+                }
+                if (service_rc == 12 && service_rs == 769)
+                        return -EINVAL;
+                if (service_rc == 8 && service_rs == 72)
+                        return -EINVAL;
+                zdev->online = 0;
+                return -EAGAIN; /* repeat the request on a different device. */
+        }
+        data = msg->text;
+        reply_len = msg->length - 2;
+        if (reply_len > outputdatalength)
+                return -EINVAL;
+        /*
+         * For all encipher requests, the length of the ciphertext (reply_len)
+         * will always equal the modulus length. For MEX decipher requests
+         * the output needs to get padded. Minimum pad size is 10.
+         *
+         * Currently, the cases where padding will be added is for:
+         * - PCIXCC_MCL2 using a CRT form token (since PKD didn't support
+         *   ZERO-PAD and CRT is only supported for PKD requests)
+         * - PCICC, always
+         */
+        pad_len = outputdatalength - reply_len;
+        if (pad_len > 0) {
+                if (pad_len < 10)
+                        return -EINVAL;
+                /* 'restore' padding left in the PCICC/PCIXCC card. */
+                if (copy_to_user(outputdata, static_pad, pad_len - 1))
+                        return -EFAULT;
+                if (put_user(0, outputdata + pad_len - 1))
+                        return -EFAULT;
+        }
+        /* Copy the crypto response to user space. */
+        if (copy_to_user(outputdata + pad_len, data, reply_len))
+                return -EFAULT;
+        return 0;
+}
+
+/**
+ * Copy results from a type 86 XCRB reply message back to user space.
+ *
+ * @zdev: crypto device pointer
+ * @reply: reply AP message.
+ * @xcRB: pointer to XCRB
+ *
+ * Returns 0 on success or -EINVAL, -EFAULT, -EAGAIN in case of an error.
+ */
+static int convert_type86_xcrb(struct zcrypt_device *zdev,
+                               struct ap_message *reply,
+                               struct ica_xcRB *xcRB)
+{
+        struct type86_fmt2_msg *msg = reply->message;
+        char *data = reply->message;
+
+        /* Copy CPRB to user */
+        if (copy_to_user(xcRB->reply_control_blk_addr,
+                data + msg->fmt2.offset1, msg->fmt2.count1))
+                return -EFAULT;
+        xcRB->reply_control_blk_length = msg->fmt2.count1;
+
+        /* Copy data buffer to user */
+        if (msg->fmt2.count2)
+                if (copy_to_user(xcRB->reply_data_addr,
+                        data + msg->fmt2.offset2, msg->fmt2.count2))
+                        return -EFAULT;
+        xcRB->reply_data_length = msg->fmt2.count2;
+        return 0;
+}
+
+static int convert_type86_rng(struct zcrypt_device *zdev,
+                          struct ap_message *reply,
+                          char *buffer)
+{
+        struct {
+                struct type86_hdr hdr;
+                struct type86_fmt2_ext fmt2;
+                struct CPRBX cprbx;
+        } __attribute__((packed)) *msg = reply->message;
+        char *data = reply->message;
+
+        if (msg->cprbx.ccp_rtcode != 0 || msg->cprbx.ccp_rscode != 0)
+                return -EINVAL;
+        memcpy(buffer, data + msg->fmt2.offset2, msg->fmt2.count2);
+        return msg->fmt2.count2;
+}
+
+static int convert_response_ica(struct zcrypt_device *zdev,
+                            struct ap_message *reply,
+                            char __user *outputdata,
+                            unsigned int outputdatalength)
+{
+        struct type86x_reply *msg = reply->message;
+
+        /* Response type byte is the second byte in the response. */
+        switch (((unsigned char *) reply->message)[1]) {
+        case TYPE82_RSP_CODE:
+        case TYPE88_RSP_CODE:
+                return convert_error(zdev, reply);
+        case TYPE86_RSP_CODE:
+                if (msg->cprbx.ccp_rtcode &&
+                   (msg->cprbx.ccp_rscode == 0x14f) &&
+                   (outputdatalength > 256)) {
+                        if (zdev->max_exp_bit_length <= 17) {
+                                zdev->max_exp_bit_length = 17;
+                                return -EAGAIN;
+                        } else
+                                return -EINVAL;
+                }
+                if (msg->hdr.reply_code)
+                        return convert_error(zdev, reply);
+                if (msg->cprbx.cprb_ver_id == 0x02)
+                        return convert_type86_ica(zdev, reply,
+                                                  outputdata, outputdatalength);
+                /* Fall through, no break, incorrect cprb version is an unknown
+                 * response */
+        default: /* Unknown response type, this should NEVER EVER happen */
+                zdev->online = 0;
+                return -EAGAIN; /* repeat the request on a different device. */
+        }
+}
+
+static int convert_response_xcrb(struct zcrypt_device *zdev,
+                            struct ap_message *reply,
+                            struct ica_xcRB *xcRB)
+{
+        struct type86x_reply *msg = reply->message;
+
+        /* Response type byte is the second byte in the response. */
+        switch (((unsigned char *) reply->message)[1]) {
+        case TYPE82_RSP_CODE:
+        case TYPE88_RSP_CODE:
+                xcRB->status = 0x0008044DL; /* HDD_InvalidParm */
+                return convert_error(zdev, reply);
+        case TYPE86_RSP_CODE:
+                if (msg->hdr.reply_code) {
+                        memcpy(&(xcRB->status), msg->fmt2.apfs, sizeof(u32));
+                        return convert_error(zdev, reply);
+                }
+                if (msg->cprbx.cprb_ver_id == 0x02)
+                        return convert_type86_xcrb(zdev, reply, xcRB);
+                /* Fall through, no break, incorrect cprb version is an unknown
+                 * response */
+        default: /* Unknown response type, this should NEVER EVER happen */
+                xcRB->status = 0x0008044DL; /* HDD_InvalidParm */
+                zdev->online = 0;
+                return -EAGAIN; /* repeat the request on a different device. */
+        }
+}
+
+static int convert_response_rng(struct zcrypt_device *zdev,
+                                 struct ap_message *reply,
+                                 char *data)
+{
+        struct type86x_reply *msg = reply->message;
+
+        switch (msg->hdr.type) {
+        case TYPE82_RSP_CODE:
+        case TYPE88_RSP_CODE:
+                return -EINVAL;
+        case TYPE86_RSP_CODE:
+                if (msg->hdr.reply_code)
+                        return -EINVAL;
+                if (msg->cprbx.cprb_ver_id == 0x02)
+                        return convert_type86_rng(zdev, reply, data);
+                /* Fall through, no break, incorrect cprb version is an unknown
+                 * response */
+        default: /* Unknown response type, this should NEVER EVER happen */
+                zdev->online = 0;
+                return -EAGAIN; /* repeat the request on a different device. */
+        }
+}
+
+/**
+ * This function is called from the AP bus code after a crypto request
+ * "msg" has finished with the reply message "reply".
+ * It is called from tasklet context.
+ * @ap_dev: pointer to the AP device
+ * @msg: pointer to the AP message
+ * @reply: pointer to the AP reply message
+ */
+static void zcrypt_pcixcc_receive(struct ap_device *ap_dev,
+                                  struct ap_message *msg,
+                                  struct ap_message *reply)
+{
+        static struct error_hdr error_reply = {
+                .type = TYPE82_RSP_CODE,
+                .reply_code = REP82_ERROR_MACHINE_FAILURE,
+        };
+        struct response_type *resp_type =
+                (struct response_type *) msg->private;
+        struct type86x_reply *t86r;
+        int length;
+
+        /* Copy the reply message to the request message buffer. */
+        if (IS_ERR(reply)) {
+                memcpy(msg->message, &error_reply, sizeof(error_reply));
+                goto out;
+        }
+        t86r = reply->message;
+        if (t86r->hdr.type == TYPE86_RSP_CODE &&
+                 t86r->cprbx.cprb_ver_id == 0x02) {
+                switch (resp_type->type) {
+                case PCIXCC_RESPONSE_TYPE_ICA:
+                        length = sizeof(struct type86x_reply)
+                                + t86r->length - 2;
+                        length = min(PCIXCC_MAX_ICA_RESPONSE_SIZE, length);
+                        memcpy(msg->message, reply->message, length);
+                        break;
+                case PCIXCC_RESPONSE_TYPE_XCRB:
+                        length = t86r->fmt2.offset2 + t86r->fmt2.count2;
+                        length = min(PCIXCC_MAX_XCRB_RESPONSE_SIZE, length);
+                        memcpy(msg->message, reply->message, length);
+                        break;
+                default:
+                        memcpy(msg->message, &error_reply, sizeof error_reply);
+                }
+        } else
+                memcpy(msg->message, reply->message, sizeof error_reply);
+out:
+        complete(&(resp_type->work));
+}
+
+static atomic_t zcrypt_step = ATOMIC_INIT(0);
+
+/**
+ * The request distributor calls this function if it picked the PCIXCC/CEX2C
+ * device to handle a modexpo request.
+ * @zdev: pointer to zcrypt_device structure that identifies the
+ *        PCIXCC/CEX2C device to the request distributor
+ * @mex: pointer to the modexpo request buffer
+ */
+static long zcrypt_pcixcc_modexpo(struct zcrypt_device *zdev,
+                                  struct ica_rsa_modexpo *mex)
+{
+        struct ap_message ap_msg;
+        struct response_type resp_type = {
+                .type = PCIXCC_RESPONSE_TYPE_ICA,
+        };
+        int rc;
+
+        ap_init_message(&ap_msg);
+        ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
+        if (!ap_msg.message)
+                return -ENOMEM;
+        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
+                                atomic_inc_return(&zcrypt_step);
+        ap_msg.private = &resp_type;
+        rc = ICAMEX_msg_to_type6MEX_msgX(zdev, &ap_msg, mex);
+        if (rc)
+                goto out_free;
+        init_completion(&resp_type.work);
+        ap_queue_message(zdev->ap_dev, &ap_msg);
+        rc = wait_for_completion_interruptible(&resp_type.work);
+        if (rc == 0)
+                rc = convert_response_ica(zdev, &ap_msg, mex->outputdata,
+                                          mex->outputdatalength);
+        else
+                /* Signal pending. */
+                ap_cancel_message(zdev->ap_dev, &ap_msg);
+out_free:
+        free_page((unsigned long) ap_msg.message);
+        return rc;
+}
+
+/**
+ * The request distributor calls this function if it picked the PCIXCC/CEX2C
+ * device to handle a modexpo_crt request.
+ * @zdev: pointer to zcrypt_device structure that identifies the
+ *        PCIXCC/CEX2C device to the request distributor
+ * @crt: pointer to the modexpoc_crt request buffer
+ */
+static long zcrypt_pcixcc_modexpo_crt(struct zcrypt_device *zdev,
+                                      struct ica_rsa_modexpo_crt *crt)
+{
+        struct ap_message ap_msg;
+        struct response_type resp_type = {
+                .type = PCIXCC_RESPONSE_TYPE_ICA,
+        };
+        int rc;
+
+        ap_init_message(&ap_msg);
+        ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
+        if (!ap_msg.message)
+                return -ENOMEM;
+        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
+                                atomic_inc_return(&zcrypt_step);
+        ap_msg.private = &resp_type;
+        rc = ICACRT_msg_to_type6CRT_msgX(zdev, &ap_msg, crt);
+        if (rc)
+                goto out_free;
+        init_completion(&resp_type.work);
+        ap_queue_message(zdev->ap_dev, &ap_msg);
+        rc = wait_for_completion_interruptible(&resp_type.work);
+        if (rc == 0)
+                rc = convert_response_ica(zdev, &ap_msg, crt->outputdata,
+                                          crt->outputdatalength);
+        else
+                /* Signal pending. */
+                ap_cancel_message(zdev->ap_dev, &ap_msg);
+out_free:
+        free_page((unsigned long) ap_msg.message);
+        return rc;
+}
+
+/**
+ * The request distributor calls this function if it picked the PCIXCC/CEX2C
+ * device to handle a send_cprb request.
+ * @zdev: pointer to zcrypt_device structure that identifies the
+ *        PCIXCC/CEX2C device to the request distributor
+ * @xcRB: pointer to the send_cprb request buffer
+ */
+static long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev,
+                                    struct ica_xcRB *xcRB)
+{
+        struct ap_message ap_msg;
+        struct response_type resp_type = {
+                .type = PCIXCC_RESPONSE_TYPE_XCRB,
+        };
+        int rc;
+
+        ap_init_message(&ap_msg);
+        ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
+        if (!ap_msg.message)
+                return -ENOMEM;
+        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
+                                atomic_inc_return(&zcrypt_step);
+        ap_msg.private = &resp_type;
+        rc = XCRB_msg_to_type6CPRB_msgX(zdev, &ap_msg, xcRB);
+        if (rc)
+                goto out_free;
+        init_completion(&resp_type.work);
+        ap_queue_message(zdev->ap_dev, &ap_msg);
+        rc = wait_for_completion_interruptible(&resp_type.work);
+        if (rc == 0)
+                rc = convert_response_xcrb(zdev, &ap_msg, xcRB);
+        else
+                /* Signal pending. */
+                ap_cancel_message(zdev->ap_dev, &ap_msg);
+out_free:
+        kzfree(ap_msg.message);
+        return rc;
+}
+
+/**
+ * The request distributor calls this function if it picked the PCIXCC/CEX2C
+ * device to generate random data.
+ * @zdev: pointer to zcrypt_device structure that identifies the
+ *        PCIXCC/CEX2C device to the request distributor
+ * @buffer: pointer to a memory page to return random data
+ */
+
+static long zcrypt_pcixcc_rng(struct zcrypt_device *zdev,
+                                    char *buffer)
+{
+        struct ap_message ap_msg;
+        struct response_type resp_type = {
+                .type = PCIXCC_RESPONSE_TYPE_XCRB,
+        };
+        int rc;
+
+        ap_init_message(&ap_msg);
+        ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
+        if (!ap_msg.message)
+                return -ENOMEM;
+        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
+                                atomic_inc_return(&zcrypt_step);
+        ap_msg.private = &resp_type;
+        rng_type6CPRB_msgX(zdev->ap_dev, &ap_msg, ZCRYPT_RNG_BUFFER_SIZE);
+        init_completion(&resp_type.work);
+        ap_queue_message(zdev->ap_dev, &ap_msg);
+        rc = wait_for_completion_interruptible(&resp_type.work);
+        if (rc == 0)
+                rc = convert_response_rng(zdev, &ap_msg, buffer);
+        else
+                /* Signal pending. */
+                ap_cancel_message(zdev->ap_dev, &ap_msg);
+        kfree(ap_msg.message);
+        return rc;
+}
+
+/**
+ * The crypto operations for a PCIXCC/CEX2C card.
+ */
+static struct zcrypt_ops zcrypt_pcixcc_ops = {
+        .rsa_modexpo = zcrypt_pcixcc_modexpo,
+        .rsa_modexpo_crt = zcrypt_pcixcc_modexpo_crt,
+        .send_cprb = zcrypt_pcixcc_send_cprb,
+};
+
+static struct zcrypt_ops zcrypt_pcixcc_with_rng_ops = {
+        .rsa_modexpo = zcrypt_pcixcc_modexpo,
+        .rsa_modexpo_crt = zcrypt_pcixcc_modexpo_crt,
+        .send_cprb = zcrypt_pcixcc_send_cprb,
+        .rng = zcrypt_pcixcc_rng,
+};
+
+/**
  * Micro-code detection function. Its sends a message to a pcixcc card
  * to find out the microcode level.
  * @ap_dev: pointer to the AP device.
@@ -269,7 +1043,7 @@ static int zcrypt_pcixcc_probe(struct ap_device *ap_dev)
         struct zcrypt_device *zdev;
         int rc = 0;
 
-        zdev = zcrypt_device_alloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE);
+        zdev = zcrypt_device_alloc(PCIXCC_MAX_RESPONSE_SIZE);
         if (!zdev)
                 return -ENOMEM;
         zdev->ap_dev = ap_dev;
@@ -322,11 +1096,9 @@ static int zcrypt_pcixcc_probe(struct ap_device *ap_dev)
                 return rc;
         }
         if (rc)
-                zdev->ops = zcrypt_msgtype_request(MSGTYPE06_NAME,
-                                                   MSGTYPE06_VARIANT_DEFAULT);
+                zdev->ops = &zcrypt_pcixcc_with_rng_ops;
         else
-                zdev->ops = zcrypt_msgtype_request(MSGTYPE06_NAME,
-                                                   MSGTYPE06_VARIANT_NORNG);
+                zdev->ops = &zcrypt_pcixcc_ops;
         ap_dev->reply = &zdev->reply;
         ap_dev->private = zdev;
         rc = zcrypt_device_register(zdev);
@@ -336,7 +1108,6 @@ static int zcrypt_pcixcc_probe(struct ap_device *ap_dev)
 
  out_free:
         ap_dev->private = NULL;
-        zcrypt_msgtype_release(zdev->ops);
         zcrypt_device_free(zdev);
         return rc;
 }
@@ -348,10 +1119,8 @@ static int zcrypt_pcixcc_probe(struct ap_device *ap_dev)
 static void zcrypt_pcixcc_remove(struct ap_device *ap_dev)
 {
         struct zcrypt_device *zdev = ap_dev->private;
-        struct zcrypt_ops *zops = zdev->ops;
 
         zcrypt_device_unregister(zdev);
-        zcrypt_msgtype_release(zops);
 }
 
 int __init zcrypt_pcixcc_init(void)
@@ -364,5 +1133,7 @@ void zcrypt_pcixcc_exit(void)
         ap_driver_unregister(&zcrypt_pcixcc_driver);
 }
 
+#ifndef CONFIG_ZCRYPT_MONOLITHIC
 module_init(zcrypt_pcixcc_init);
 module_exit(zcrypt_pcixcc_exit);
+#endif
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.h b/drivers/s390/crypto/zcrypt_pcixcc.h
index eacafc8962f..8cb7d7a6973 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.h
+++ b/drivers/s390/crypto/zcrypt_pcixcc.h
@@ -1,13 +1,14 @@
 /*
+ *  linux/drivers/s390/crypto/zcrypt_pcixcc.h
+ *
  *  zcrypt 2.1.0
  *
- *  Copyright IBM Corp. 2001, 2012
+ *  Copyright (C)  2001, 2006 IBM Corporation
  *  Author(s): Robert Burroughs
  *             Eric Rossman (edrossma@us.ibm.com)
  *
  *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
  *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *  MSGTYPE restruct:             Holger Dengler <hd@linux.vnet.ibm.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 8491111aec1..aec60d55b10 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -1,5 +1,5 @@
 /*
- * virtio for kvm on s390
+ * kvm_virtio.c - virtio for kvm on s390
  *
  * Copyright IBM Corp. 2008
  *
@@ -20,12 +20,10 @@
 #include <linux/virtio_console.h>
 #include <linux/interrupt.h>
 #include <linux/virtio_ring.h>
-#include <linux/export.h>
 #include <linux/pfn.h>
 #include <asm/io.h>
 #include <asm/kvm_para.h>
 #include <asm/kvm_virtio.h>
-#include <asm/sclp.h>
 #include <asm/setup.h>
 #include <asm/irq.h>
 
@@ -35,7 +33,7 @@
  * The pointer to our (page) of device descriptions.
  */
 static void *kvm_devices;
-static struct work_struct hotplug_work;
+struct work_struct hotplug_work;
 
 struct kvm_device {
         struct virtio_device vdev;
@@ -190,9 +188,6 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev,
         if (index >= kdev->desc->num_vq)
                 return ERR_PTR(-ENOENT);
 
-        if (!name)
-                return NULL;
-
         config = kvm_vq_config(kdev->desc)+index;
 
         err = vmem_add_mapping(config->address,
@@ -201,8 +196,8 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev,
         if (err)
                 goto out;
 
-        vq = vring_new_virtqueue(index, config->num, KVM_S390_VIRTIO_RING_ALIGN,
-                                 vdev, true, (void *) config->address,
+        vq = vring_new_virtqueue(config->num, KVM_S390_VIRTIO_RING_ALIGN,
+                                 vdev, (void *) config->address,
                                  kvm_notify, callback, name);
         if (!vq) {
                 err = -ENOMEM;
@@ -267,11 +262,6 @@ error:
         return PTR_ERR(vqs[i]);
 }
 
-static const char *kvm_bus_name(struct virtio_device *vdev)
-{
-        return "";
-}
-
 /*
  * The config ops structure as defined by virtio config
  */
@@ -285,7 +275,6 @@ static struct virtio_config_ops kvm_vq_configspace_ops = {
         .reset = kvm_reset,
         .find_vqs = kvm_find_vqs,
         .del_vqs = kvm_del_vqs,
-        .bus_name = kvm_bus_name,
 };
 
 /*
@@ -345,10 +334,10 @@ static void scan_devices(void)
  */
 static int match_desc(struct device *dev, void *data)
 {
-        struct virtio_device *vdev = dev_to_virtio(dev);
-        struct kvm_device *kdev = to_kvmdev(vdev);
+        if ((ulong)to_kvmdev(dev_to_virtio(dev))->desc == (ulong)data)
+                return 1;
 
-        return kdev->desc == data;
+        return 0;
 }
 
 /*
@@ -384,15 +373,17 @@ static void hotplug_devices(struct work_struct *dummy)
 /*
  * we emulate the request_irq behaviour on top of s390 extints
  */
-static void kvm_extint_handler(struct ext_code ext_code,
+static void kvm_extint_handler(unsigned int ext_int_code,
                                unsigned int param32, unsigned long param64)
 {
         struct virtqueue *vq;
+        u16 subcode;
         u32 param;
 
-        if ((ext_code.subcode & 0xff00) != VIRTIO_SUBCODE_64)
+        subcode = ext_int_code >> 16;
+        if ((subcode & 0xff00) != VIRTIO_SUBCODE_64)
                 return;
-        inc_irq_stat(IRQEXT_VRT);
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_VRT]++;
 
         /* The LSB might be overloaded, we have to mask it */
         vq = (struct virtqueue *)(param64 & ~1UL);
@@ -472,7 +463,7 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
 
 static int __init s390_virtio_console_init(void)
 {
-        if (sclp_has_vt220() || sclp_has_linemode())
+        if (!MACHINE_IS_KVM)
                 return -ENODEV;
         return virtio_cons_early_init(early_put_chars);
 }
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index dfda748c400..fa80ba1f034 100644
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -4,10 +4,11 @@ menu "S/390 network device drivers"
 config LCS
         def_tristate m
         prompt "Lan Channel Station Interface"
-        depends on CCW && NETDEVICES && (ETHERNET || FDDI)
+        depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)
         help
            Select this option if you want to use LCS networking on IBM System z.
-           This device driver supports FDDI (IEEE 802.7) and Ethernet.
+           This device driver supports Token Ring (IEEE 802.5),
+           FDDI (IEEE 802.7) and Ethernet.
            To compile as a module, choose M. The module name is lcs.
            If you do not know what it is, it's safe to choose Y.
 
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 83bc9c5fa0c..f1fa2483ae6 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -1,4 +1,5 @@
 /*
+ *  drivers/s390/net/claw.c
  *    ESCON CLAW network driver
  *
  *  Linux for zSeries version
@@ -62,6 +63,7 @@
 
 #define KMSG_COMPONENT "claw"
 
+#include <linux/kernel_stat.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 #include <asm/debug.h>
@@ -135,6 +137,7 @@ static inline void
 claw_set_busy(struct net_device *dev)
 {
  ((struct claw_privbk *)dev->ml_priv)->tbusy = 1;
+ eieio();
 }
 
 static inline void
@@ -142,11 +145,13 @@ claw_clear_busy(struct net_device *dev)
 {
         clear_bit(0, &(((struct claw_privbk *) dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
+        eieio();
 }
 
 static inline int
 claw_check_busy(struct net_device *dev)
 {
+        eieio();
         return ((struct claw_privbk *) dev->ml_priv)->tbusy;
 }
 
@@ -229,6 +234,8 @@ static ssize_t claw_rbuff_show(struct device *dev,
 static ssize_t claw_rbuff_write(struct device *dev,
         struct device_attribute *attr,
         const char *buf, size_t count);
+static int claw_add_files(struct device *dev);
+static void claw_remove_files(struct device *dev);
 
 /*   Functions for System Validate  */
 static int claw_process_control( struct net_device *dev, struct ccwbk * p_ccw);
@@ -261,10 +268,12 @@ static struct ccwgroup_driver claw_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = "claw",
         },
-        .setup       = claw_probe,
-        .remove      = claw_remove_device,
-        .set_online  = claw_new_device,
-        .set_offline = claw_shutdown_device,
+        .max_slaves  = 2,
+        .driver_id   = 0xC3D3C1E6,
+        .probe       = claw_probe,
+        .remove      = claw_remove_device,
+        .set_online  = claw_new_device,
+        .set_offline = claw_shutdown_device,
         .prepare     = claw_pm_prepare,
 };
 
@@ -282,27 +291,32 @@ static struct ccw_driver claw_ccw_driver = {
         .ids    = claw_ids,
         .probe  = ccwgroup_probe_ccwdev,
         .remove = ccwgroup_remove_ccwdev,
-        .int_class = IRQIO_CLW,
 };
 
-static ssize_t claw_driver_group_store(struct device_driver *ddrv,
-                                       const char *buf, size_t count)
+static ssize_t
+claw_driver_group_store(struct device_driver *ddrv, const char *buf,
+                        size_t count)
 {
         int err;
-        err = ccwgroup_create_dev(claw_root_dev, &claw_group_driver, 2, buf);
+        err = ccwgroup_create_from_string(claw_root_dev,
+                                          claw_group_driver.driver_id,
+                                          &claw_ccw_driver, 2, buf);
         return err ? err : count;
 }
+
 static DRIVER_ATTR(group, 0200, NULL, claw_driver_group_store);
 
-static struct attribute *claw_drv_attrs[] = {
+static struct attribute *claw_group_attrs[] = {
         &driver_attr_group.attr,
         NULL,
 };
-static struct attribute_group claw_drv_attr_group = {
-        .attrs = claw_drv_attrs,
+
+static struct attribute_group claw_group_attr_group = {
+        .attrs = claw_group_attrs,
 };
-static const struct attribute_group *claw_drv_attr_groups[] = {
-        &claw_drv_attr_group,
+
+static const struct attribute_group *claw_group_attr_groups[] = {
+        &claw_group_attr_group,
         NULL,
 };
 
@@ -310,6 +324,60 @@ static const struct attribute_group *claw_drv_attr_groups[] = {
 *       Key functions
 */
 
+/*----------------------------------------------------------------*
+ *   claw_probe                                                   *
+ *      this function is called for each CLAW device.             *
+ *----------------------------------------------------------------*/
+static int
+claw_probe(struct ccwgroup_device *cgdev)
+{
+        int             rc;
+        struct claw_privbk *privptr=NULL;
+
+        CLAW_DBF_TEXT(2, setup, "probe");
+        if (!get_device(&cgdev->dev))
+                return -ENODEV;
+        privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL);
+        dev_set_drvdata(&cgdev->dev, privptr);
+        if (privptr == NULL) {
+                probe_error(cgdev);
+                put_device(&cgdev->dev);
+                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
+                return -ENOMEM;
+        }
+        privptr->p_mtc_envelope= kzalloc( MAX_ENVELOPE_SIZE, GFP_KERNEL);
+        privptr->p_env = kzalloc(sizeof(struct claw_env), GFP_KERNEL);
+        if ((privptr->p_mtc_envelope==NULL) || (privptr->p_env==NULL)) {
+                probe_error(cgdev);
+                put_device(&cgdev->dev);
+                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
+                return -ENOMEM;
+        }
+        memcpy(privptr->p_env->adapter_name,WS_NAME_NOT_DEF,8);
+        memcpy(privptr->p_env->host_name,WS_NAME_NOT_DEF,8);
+        memcpy(privptr->p_env->api_type,WS_NAME_NOT_DEF,8);
+        privptr->p_env->packing = 0;
+        privptr->p_env->write_buffers = 5;
+        privptr->p_env->read_buffers = 5;
+        privptr->p_env->read_size = CLAW_FRAME_SIZE;
+        privptr->p_env->write_size = CLAW_FRAME_SIZE;
+        rc = claw_add_files(&cgdev->dev);
+        if (rc) {
+                probe_error(cgdev);
+                put_device(&cgdev->dev);
+                dev_err(&cgdev->dev, "Creating the /proc files for a new"
+                " CLAW device failed\n");
+                CLAW_DBF_TEXT_(2, setup, "probex%d", rc);
+                return rc;
+        }
+        privptr->p_env->p_priv = privptr;
+        cgdev->cdev[0]->handler = claw_irq_handler;
+        cgdev->cdev[1]->handler = claw_irq_handler;
+        CLAW_DBF_TEXT(2, setup, "prbext 0");
+
+        return 0;
+}  /*  end of claw_probe       */
+
 /*-------------------------------------------------------------------*
  *   claw_tx                                                         *
  *-------------------------------------------------------------------*/
@@ -577,6 +645,7 @@ claw_irq_handler(struct ccw_device *cdev,
         struct claw_env  *p_env;
         struct chbk *p_ch_r=NULL;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_CLW]++;
         CLAW_DBF_TEXT(4, trace, "clawirq");
         /* Bypass all 'unsolicited interrupts' */
         privptr = dev_get_drvdata(&cdev->dev);
@@ -3018,11 +3087,14 @@ claw_remove_device(struct ccwgroup_device *cgdev)
 {
         struct claw_privbk *priv;
 
+        BUG_ON(!cgdev);
         CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
         priv = dev_get_drvdata(&cgdev->dev);
+        BUG_ON(!priv);
         dev_info(&cgdev->dev, " will be removed.\n");
         if (cgdev->state == CCWGROUP_ONLINE)
                 claw_shutdown_device(cgdev);
+        claw_remove_files(&cgdev->dev);
         kfree(priv->p_mtc_envelope);
         priv->p_mtc_envelope=NULL;
         kfree(priv->p_env);
@@ -3250,6 +3322,7 @@ claw_rbuff_write(struct device *dev, struct device_attribute *attr,
         CLAW_DBF_TEXT_(2, setup, "RB=%d", p_env->read_buffers);
         return count;
 }
+
 static DEVICE_ATTR(read_buffer, 0644, claw_rbuff_show, claw_rbuff_write);
 
 static struct attribute *claw_attr[] = {
@@ -3260,73 +3333,40 @@ static struct attribute *claw_attr[] = {
         &dev_attr_host_name.attr,
         NULL,
 };
+
 static struct attribute_group claw_attr_group = {
         .attrs = claw_attr,
 };
-static const struct attribute_group *claw_attr_groups[] = {
-        &claw_attr_group,
-        NULL,
-};
-static const struct device_type claw_devtype = {
-        .name = "claw",
-        .groups = claw_attr_groups,
-};
 
-/*----------------------------------------------------------------*
- *   claw_probe                                                   *
- *      this function is called for each CLAW device.             *
- *----------------------------------------------------------------*/
-static int claw_probe(struct ccwgroup_device *cgdev)
+static int
+claw_add_files(struct device *dev)
 {
-        struct claw_privbk *privptr = NULL;
-
-        CLAW_DBF_TEXT(2, setup, "probe");
-        if (!get_device(&cgdev->dev))
-                return -ENODEV;
-        privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL);
-        dev_set_drvdata(&cgdev->dev, privptr);
-        if (privptr == NULL) {
-                probe_error(cgdev);
-                put_device(&cgdev->dev);
-                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
-                return -ENOMEM;
-        }
-        privptr->p_mtc_envelope = kzalloc(MAX_ENVELOPE_SIZE, GFP_KERNEL);
-        privptr->p_env = kzalloc(sizeof(struct claw_env), GFP_KERNEL);
-        if ((privptr->p_mtc_envelope == NULL) || (privptr->p_env == NULL)) {
-                probe_error(cgdev);
-                put_device(&cgdev->dev);
-                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
-                return -ENOMEM;
-        }
-        memcpy(privptr->p_env->adapter_name, WS_NAME_NOT_DEF, 8);
-        memcpy(privptr->p_env->host_name, WS_NAME_NOT_DEF, 8);
-        memcpy(privptr->p_env->api_type, WS_NAME_NOT_DEF, 8);
-        privptr->p_env->packing = 0;
-        privptr->p_env->write_buffers = 5;
-        privptr->p_env->read_buffers = 5;
-        privptr->p_env->read_size = CLAW_FRAME_SIZE;
-        privptr->p_env->write_size = CLAW_FRAME_SIZE;
-        privptr->p_env->p_priv = privptr;
-        cgdev->cdev[0]->handler = claw_irq_handler;
-        cgdev->cdev[1]->handler = claw_irq_handler;
-        cgdev->dev.type = &claw_devtype;
-        CLAW_DBF_TEXT(2, setup, "prbext 0");
+        CLAW_DBF_TEXT(2, setup, "add_file");
+        return sysfs_create_group(&dev->kobj, &claw_attr_group);
+}
 
-        return 0;
-}  /*  end of claw_probe       */
+static void
+claw_remove_files(struct device *dev)
+{
+        CLAW_DBF_TEXT(2, setup, "rem_file");
+        sysfs_remove_group(&dev->kobj, &claw_attr_group);
+}
 
 /*--------------------------------------------------------------------*
 *    claw_init  and cleanup                                           *
 *---------------------------------------------------------------------*/
 
-static void __exit claw_cleanup(void)
+static void __exit
+claw_cleanup(void)
 {
+        driver_remove_file(&claw_group_driver.driver,
+                           &driver_attr_group);
         ccwgroup_driver_unregister(&claw_group_driver);
         ccw_driver_unregister(&claw_ccw_driver);
         root_device_unregister(claw_root_dev);
         claw_unregister_debug_facility();
         pr_info("Driver unloaded\n");
+
 }
 
 /**
@@ -3335,7 +3375,8 @@ static void __exit claw_cleanup(void)
  *
  * @return 0 on success, !0 on error.
  */
-static int __init claw_init(void)
+static int __init
+claw_init(void)
 {
         int ret = 0;
 
@@ -3354,7 +3395,7 @@ static int __init claw_init(void)
         ret = ccw_driver_register(&claw_ccw_driver);
         if (ret)
                 goto ccw_err;
-        claw_group_driver.driver.groups = claw_drv_attr_groups;
+        claw_group_driver.driver.groups = claw_group_attr_groups;
         ret = ccwgroup_driver_register(&claw_group_driver);
         if (ret)
                 goto ccwgroup_err;
@@ -3377,5 +3418,5 @@ module_exit(claw_cleanup);
 
 MODULE_AUTHOR("Andy Richter <richtera@us.ibm.com>");
 MODULE_DESCRIPTION("Linux for System z CLAW Driver\n" \
-                        "Copyright IBM Corp. 2000, 2008\n");
+                        "Copyright 2000,2008 IBM Corporation\n");
 MODULE_LICENSE("GPL");
diff --git a/drivers/s390/net/ctcm_dbug.c b/drivers/s390/net/ctcm_dbug.c
index 6514e1cb3f1..d962fd741a2 100644
--- a/drivers/s390/net/ctcm_dbug.c
+++ b/drivers/s390/net/ctcm_dbug.c
@@ -1,4 +1,6 @@
 /*
+ *      drivers/s390/net/ctcm_dbug.c
+ *
  *      Copyright IBM Corp. 2001, 2007
  *      Authors:        Peter Tiedemann (ptiedem@de.ibm.com)
  *
diff --git a/drivers/s390/net/ctcm_dbug.h b/drivers/s390/net/ctcm_dbug.h
index 47bf0501995..26966d0b9ab 100644
--- a/drivers/s390/net/ctcm_dbug.h
+++ b/drivers/s390/net/ctcm_dbug.h
@@ -1,4 +1,6 @@
 /*
+ *      drivers/s390/net/ctcm_dbug.h
+ *
  *      Copyright IBM Corp. 2001, 2007
  *      Authors:        Peter Tiedemann (ptiedem@de.ibm.com)
  *
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index fb92524d24e..2d602207541 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -1,4 +1,6 @@
 /*
+ * drivers/s390/net/ctcm_fsms.c
+ *
  * Copyright IBM Corp. 2001, 2007
  * Authors:     Fritz Elfert (felfert@millenux.com)
  *              Peter Tiedemann (ptiedem@de.ibm.com)
@@ -1339,12 +1341,6 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)
 
         spin_unlock(&ch->collect_lock);
         clear_normalized_cda(&ch->ccw[1]);
-
-        CTCM_PR_DBGDATA("ccwcda=0x%p data=0x%p\n",
-                        (void *)(unsigned long)ch->ccw[1].cda,
-                        ch->trans_skb->data);
-        ch->ccw[1].count = ch->max_bufsize;
-
         if (set_normalized_cda(&ch->ccw[1], ch->trans_skb->data)) {
                 dev_kfree_skb_any(ch->trans_skb);
                 ch->trans_skb = NULL;
@@ -1354,11 +1350,6 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)
                 fsm_event(priv->mpcg->fsm, MPCG_EVENT_INOP, dev);
                 return;
         }
-
-        CTCM_PR_DBGDATA("ccwcda=0x%p data=0x%p\n",
-                        (void *)(unsigned long)ch->ccw[1].cda,
-                        ch->trans_skb->data);
-
         ch->ccw[1].count = ch->trans_skb->len;
         fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch);
         ch->prof.send_stamp = current_kernel_time(); /* xtime */
@@ -1523,7 +1514,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg)
                                 goto done;
         default:
                 break;
-        }
+        };
 
         fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == CTCM_READ)
                      ? CTC_STATE_RXINIT : CTC_STATE_TXINIT);
diff --git a/drivers/s390/net/ctcm_fsms.h b/drivers/s390/net/ctcm_fsms.h
index c963d04799c..046d077fabb 100644
--- a/drivers/s390/net/ctcm_fsms.h
+++ b/drivers/s390/net/ctcm_fsms.h
@@ -1,4 +1,6 @@
 /*
+ * drivers/s390/net/ctcm_fsms.h
+ *
  * Copyright IBM Corp. 2001, 2007
  * Authors:     Fritz Elfert (felfert@millenux.com)
  *              Peter Tiedemann (ptiedem@de.ibm.com)
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 676f12049a3..426787efc49 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1,4 +1,6 @@
 /*
+ * drivers/s390/net/ctcm_main.c
+ *
  * Copyright IBM Corp. 2001, 2009
  * Author(s):
  *      Original CTC driver(s):
@@ -22,6 +24,7 @@
 #define KMSG_COMPONENT "ctcm"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -560,9 +563,6 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)
                 skb_queue_tail(&ch->io_queue, skb);
                 ccw_idx = 3;
         }
-        if (do_debug_ccw)
-                ctcmpc_dumpit((char *)&ch->ccw[ccw_idx],
-                                        sizeof(struct ccw1) * 3);
         ch->retry = 0;
         fsm_newstate(ch->fsm, CTC_STATE_TX);
         fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch);
@@ -1203,6 +1203,7 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
         int cstat;
         int dstat;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_CTC]++;
         CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,
                 "Enter %s(%s)", CTCM_FUNTAIL, dev_name(&cdev->dev));
 
@@ -1294,11 +1295,6 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
 
 }
 
-static const struct device_type ctcm_devtype = {
-        .name = "ctcm",
-        .groups = ctcm_attr_groups,
-};
-
 /**
  * Add ctcm specific attributes.
  * Add ctcm private data.
@@ -1310,6 +1306,7 @@ static const struct device_type ctcm_devtype = {
 static int ctcm_probe_device(struct ccwgroup_device *cgdev)
 {
         struct ctcm_priv *priv;
+        int rc;
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
                         "%s %p",
@@ -1326,11 +1323,17 @@ static int ctcm_probe_device(struct ccwgroup_device *cgdev)
                 put_device(&cgdev->dev);
                 return -ENOMEM;
         }
+
+        rc = ctcm_add_files(&cgdev->dev);
+        if (rc) {
+                kfree(priv);
+                put_device(&cgdev->dev);
+                return rc;
+        }
         priv->buffer_size = CTCM_BUFSIZE_DEFAULT;
         cgdev->cdev[0]->handler = ctcm_irq_handler;
         cgdev->cdev[1]->handler = ctcm_irq_handler;
         dev_set_drvdata(&cgdev->dev, priv);
-        cgdev->dev.type = &ctcm_devtype;
 
         return 0;
 }
@@ -1454,7 +1457,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
                                 ch_fsm_len, GFP_KERNEL);
         }
         if (ch->fsm == NULL)
-                                goto nomem_return;
+                                goto free_return;
 
         fsm_newstate(ch->fsm, CTC_STATE_IDLE);
 
@@ -1607,6 +1610,11 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
                 goto out_dev;
         }
 
+        if (ctcm_add_attributes(&cgdev->dev)) {
+                result = -ENODEV;
+                goto out_unregister;
+        }
+
         strlcpy(priv->fsm->name, dev->name, sizeof(priv->fsm->name));
 
         dev_info(&dev->dev,
@@ -1620,6 +1628,8 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
                         priv->channel[CTCM_WRITE]->id, priv->protocol);
 
         return 0;
+out_unregister:
+        unregister_netdev(dev);
 out_dev:
         ctcm_free_netdevice(dev);
 out_ccw2:
@@ -1658,6 +1668,7 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev)
                 /* Close the device */
                 ctcm_close(dev);
                 dev->flags &= ~IFF_RUNNING;
+                ctcm_remove_attributes(&cgdev->dev);
                 channel_free(priv->channel[CTCM_READ]);
         } else
                 dev = NULL;
@@ -1691,12 +1702,15 @@ static void ctcm_remove_device(struct ccwgroup_device *cgdev)
 {
         struct ctcm_priv *priv = dev_get_drvdata(&cgdev->dev);
 
+        BUG_ON(priv == NULL);
+
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
                         "removing device %p, proto : %d",
                         cgdev, priv->protocol);
 
         if (cgdev->state == CCWGROUP_ONLINE)
                 ctcm_shutdown_device(cgdev);
+        ctcm_remove_files(&cgdev->dev);
         dev_set_drvdata(&cgdev->dev, NULL);
         kfree(priv);
         put_device(&cgdev->dev);
@@ -1755,7 +1769,6 @@ static struct ccw_driver ctcm_ccw_driver = {
         .ids    = ctcm_ids,
         .probe  = ccwgroup_probe_ccwdev,
         .remove = ccwgroup_remove_ccwdev,
-        .int_class = IRQIO_CTC,
 };
 
 static struct ccwgroup_driver ctcm_group_driver = {
@@ -1763,7 +1776,9 @@ static struct ccwgroup_driver ctcm_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = CTC_DRIVER_NAME,
         },
-        .setup       = ctcm_probe_device,
+        .max_slaves  = 2,
+        .driver_id   = 0xC3E3C3D4,      /* CTCM */
+        .probe       = ctcm_probe_device,
         .remove      = ctcm_remove_device,
         .set_online  = ctcm_new_device,
         .set_offline = ctcm_shutdown_device,
@@ -1772,25 +1787,31 @@ static struct ccwgroup_driver ctcm_group_driver = {
         .restore     = ctcm_pm_resume,
 };
 
-static ssize_t ctcm_driver_group_store(struct device_driver *ddrv,
-                                       const char *buf, size_t count)
+static ssize_t
+ctcm_driver_group_store(struct device_driver *ddrv, const char *buf,
+                        size_t count)
 {
         int err;
 
-        err = ccwgroup_create_dev(ctcm_root_dev, &ctcm_group_driver, 2, buf);
+        err = ccwgroup_create_from_string(ctcm_root_dev,
+                                          ctcm_group_driver.driver_id,
+                                          &ctcm_ccw_driver, 2, buf);
         return err ? err : count;
 }
+
 static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store);
 
-static struct attribute *ctcm_drv_attrs[] = {
+static struct attribute *ctcm_group_attrs[] = {
         &driver_attr_group.attr,
         NULL,
 };
-static struct attribute_group ctcm_drv_attr_group = {
-        .attrs = ctcm_drv_attrs,
+
+static struct attribute_group ctcm_group_attr_group = {
+        .attrs = ctcm_group_attrs,
 };
-static const struct attribute_group *ctcm_drv_attr_groups[] = {
-        &ctcm_drv_attr_group,
+
+static const struct attribute_group *ctcm_group_attr_groups[] = {
+        &ctcm_group_attr_group,
         NULL,
 };
 
@@ -1806,6 +1827,7 @@ static const struct attribute_group *ctcm_drv_attr_groups[] = {
  */
 static void __exit ctcm_exit(void)
 {
+        driver_remove_file(&ctcm_group_driver.driver, &driver_attr_group);
         ccwgroup_driver_unregister(&ctcm_group_driver);
         ccw_driver_unregister(&ctcm_ccw_driver);
         root_device_unregister(ctcm_root_dev);
@@ -1843,7 +1865,7 @@ static int __init ctcm_init(void)
         ret = ccw_driver_register(&ctcm_ccw_driver);
         if (ret)
                 goto ccw_err;
-        ctcm_group_driver.driver.groups = ctcm_drv_attr_groups;
+        ctcm_group_driver.driver.groups = ctcm_group_attr_groups;
         ret = ccwgroup_driver_register(&ctcm_group_driver);
         if (ret)
                 goto ccwgroup_err;
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index 477c933685f..24d5215eb0c 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -1,4 +1,6 @@
 /*
+ *      drivers/s390/net/ctcm_main.h
+ *
  *      Copyright IBM Corp. 2001, 2007
  *      Authors:        Fritz Elfert (felfert@millenux.com)
  *                      Peter Tiedemann (ptiedem@de.ibm.com)
@@ -223,7 +225,13 @@ struct ctcm_priv {
 int ctcm_open(struct net_device *dev);
 int ctcm_close(struct net_device *dev);
 
-extern const struct attribute_group *ctcm_attr_groups[];
+/*
+ * prototypes for non-static sysfs functions
+ */
+int ctcm_add_attributes(struct device *dev);
+void ctcm_remove_attributes(struct device *dev);
+int ctcm_add_files(struct device *dev);
+void ctcm_remove_files(struct device *dev);
 
 /*
  * Compatibility macros for busy handling
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 2dbc77b5137..da4c747335e 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -1,4 +1,6 @@
 /*
+ *      drivers/s390/net/ctcm_mpc.c
+ *
  *      Copyright IBM Corp. 2004, 2007
  *      Authors:        Belinda Thompson (belindat@us.ibm.com)
  *                      Andy Richter (richtera@us.ibm.com)
@@ -51,8 +53,8 @@
 #include <linux/moduleparam.h>
 #include <asm/idals.h>
 
-#include "ctcm_main.h"
 #include "ctcm_mpc.h"
+#include "ctcm_main.h"
 #include "ctcm_fsms.h"
 
 static const struct xid2 init_xid = {
@@ -130,7 +132,7 @@ void ctcmpc_dumpit(char *buf, int len)
         __u32   ct, sw, rm, dup;
         char    *ptr, *rptr;
         char    tbuf[82], tdup[82];
-        #ifdef CONFIG_64BIT
+        #if (UTS_MACHINE == s390x)
         char    addr[22];
         #else
         char    addr[12];
@@ -147,8 +149,8 @@ void ctcmpc_dumpit(char *buf, int len)
 
         for (ct = 0; ct < len; ct++, ptr++, rptr++) {
                 if (sw == 0) {
-                        #ifdef CONFIG_64BIT
-                        sprintf(addr, "%16.16llx", (__u64)rptr);
+                        #if (UTS_MACHINE == s390x)
+                        sprintf(addr, "%16.16lx", (__u64)rptr);
                         #else
                         sprintf(addr, "%8.8X", (__u32)rptr);
                         #endif
@@ -162,8 +164,8 @@ void ctcmpc_dumpit(char *buf, int len)
                 if (sw == 8)
                         strcat(bhex, "  ");
 
-                #if CONFIG_64BIT
-                sprintf(tbuf, "%2.2llX", (__u64)*ptr);
+                #if (UTS_MACHINE == s390x)
+                sprintf(tbuf, "%2.2lX", (__u64)*ptr);
                 #else
                 sprintf(tbuf, "%2.2X", (__u32)*ptr);
                 #endif
@@ -1367,6 +1369,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)
         struct mpc_group *grp;
         struct channel *wch;
 
+        BUG_ON(dev == NULL);
         CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name);
 
         priv  = dev->ml_priv;
@@ -1471,6 +1474,8 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg)
         struct channel *wch;
         struct channel *rch;
 
+        BUG_ON(dev == NULL);
+
         priv = dev->ml_priv;
         grp = priv->mpcg;
         wch = priv->channel[CTCM_WRITE];
diff --git a/drivers/s390/net/ctcm_mpc.h b/drivers/s390/net/ctcm_mpc.h
index bd1b1cc54ff..1fa07b0c11c 100644
--- a/drivers/s390/net/ctcm_mpc.h
+++ b/drivers/s390/net/ctcm_mpc.h
@@ -1,4 +1,6 @@
 /*
+ * drivers/s390/net/ctcm_mpc.h
+ *
  * Copyright IBM Corp. 2007
  * Authors:     Peter Tiedemann (ptiedem@de.ibm.com)
  *
diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c
index 985b5dcbdac..8305319b2a8 100644
--- a/drivers/s390/net/ctcm_sysfs.c
+++ b/drivers/s390/net/ctcm_sysfs.c
@@ -1,4 +1,6 @@
 /*
+ * drivers/s390/net/ctcm_sysfs.c
+ *
  * Copyright IBM Corp. 2007, 2007
  * Authors:     Peter Tiedemann (ptiedem@de.ibm.com)
  *
@@ -11,7 +13,6 @@
 #define KMSG_COMPONENT "ctcm"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/device.h>
 #include <linux/sysfs.h>
 #include <linux/slab.h>
 #include "ctcm_main.h"
@@ -107,12 +108,10 @@ static void ctcm_print_statistics(struct ctcm_priv *priv)
 }
 
 static ssize_t stats_show(struct device *dev,
-                          struct device_attribute *attr, char *buf)
+                                struct device_attribute *attr, char *buf)
 {
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
         struct ctcm_priv *priv = dev_get_drvdata(dev);
-
-        if (!priv || gdev->state != CCWGROUP_ONLINE)
+        if (!priv)
                 return -ENODEV;
         ctcm_print_statistics(priv);
         return sprintf(buf, "0\n");
@@ -160,7 +159,7 @@ static ssize_t ctcm_proto_store(struct device *dev,
         return count;
 }
 
-static const char *ctcm_type[] = {
+const char *ctcm_type[] = {
         "not a channel",
         "CTC/A",
         "FICON channel",
@@ -191,14 +190,34 @@ static struct attribute *ctcm_attr[] = {
         &dev_attr_protocol.attr,
         &dev_attr_type.attr,
         &dev_attr_buffer.attr,
-        &dev_attr_stats.attr,
         NULL,
 };
 
 static struct attribute_group ctcm_attr_group = {
         .attrs = ctcm_attr,
 };
-const struct attribute_group *ctcm_attr_groups[] = {
-        &ctcm_attr_group,
-        NULL,
-};
+
+int ctcm_add_attributes(struct device *dev)
+{
+        int rc;
+
+        rc = device_create_file(dev, &dev_attr_stats);
+
+        return rc;
+}
+
+void ctcm_remove_attributes(struct device *dev)
+{
+        device_remove_file(dev, &dev_attr_stats);
+}
+
+int ctcm_add_files(struct device *dev)
+{
+        return sysfs_create_group(&dev->kobj, &ctcm_attr_group);
+}
+
+void ctcm_remove_files(struct device *dev)
+{
+        sysfs_remove_group(&dev->kobj, &ctcm_attr_group);
+}
+
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index c645dc9e98a..c3b8064a102 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -26,10 +26,12 @@
 #define KMSG_COMPONENT          "lcs"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/if.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/trdevice.h>
 #include <linux/fddidevice.h>
 #include <linux/inetdevice.h>
 #include <linux/in.h>
@@ -49,7 +51,8 @@
 #include "lcs.h"
 
 
-#if !defined(CONFIG_ETHERNET) && !defined(CONFIG_FDDI)
+#if !defined(CONFIG_NET_ETHERNET) && \
+    !defined(CONFIG_TR) && !defined(CONFIG_FDDI)
 #error Cannot compile lcs.c without some net devices switched on.
 #endif
 
@@ -282,7 +285,7 @@ lcs_setup_write_ccws(struct lcs_card *card)
 
         LCS_DBF_TEXT(3, setup, "iwritccw");
         /* Setup write ccws. */
-        memset(card->write.ccws, 0, sizeof(struct ccw1) * (LCS_NUM_BUFFS + 1));
+        memset(card->write.ccws, 0, sizeof(struct ccw1) * LCS_NUM_BUFFS + 1);
         for (cnt = 0; cnt < LCS_NUM_BUFFS; cnt++) {
                 card->write.ccws[cnt].cmd_code = LCS_CCW_WRITE;
                 card->write.ccws[cnt].count = 0;
@@ -1164,7 +1167,10 @@ static void
 lcs_get_mac_for_ipm(__be32 ipm, char *mac, struct net_device *dev)
 {
         LCS_DBF_TEXT(4,trace, "getmac");
-        ip_eth_mc_map(ipm, mac);
+        if (dev->type == ARPHRD_IEEE802_TR)
+                ip_tr_mc_map(ipm, mac);
+        else
+                ip_eth_mc_map(ipm, mac);
 }
 
 /**
@@ -1393,6 +1399,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         int rc, index;
         int cstat, dstat;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_LCS]++;
         if (lcs_check_irb_error(cdev, irb))
                 return;
 
@@ -1629,13 +1636,19 @@ lcs_startlan_auto(struct lcs_card *card)
         int rc;
 
         LCS_DBF_TEXT(2, trace, "strtauto");
-#ifdef CONFIG_ETHERNET
+#ifdef CONFIG_NET_ETHERNET
         card->lan_type = LCS_FRAME_TYPE_ENET;
         rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
         if (rc == 0)
                 return 0;
 
 #endif
+#ifdef CONFIG_TR
+        card->lan_type = LCS_FRAME_TYPE_TR;
+        rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
+        if (rc == 0)
+                return 0;
+#endif
 #ifdef CONFIG_FDDI
         card->lan_type = LCS_FRAME_TYPE_FDDI;
         rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
@@ -1959,7 +1972,7 @@ lcs_portno_store (struct device *dev, struct device_attribute *attr, const char
 
 static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store);
 
-static const char *lcs_type[] = {
+const char *lcs_type[] = {
         "not a channel",
         "2216 parallel",
         "2216 channel",
@@ -2040,17 +2053,10 @@ static struct attribute * lcs_attrs[] = {
         &dev_attr_recover.attr,
         NULL,
 };
+
 static struct attribute_group lcs_attr_group = {
         .attrs = lcs_attrs,
 };
-static const struct attribute_group *lcs_attr_groups[] = {
-        &lcs_attr_group,
-        NULL,
-};
-static const struct device_type lcs_devtype = {
-        .name = "lcs",
-        .groups = lcs_attr_groups,
-};
 
 /**
  * lcs_probe_device is called on establishing a new ccwgroup_device.
@@ -2059,6 +2065,7 @@ static int
 lcs_probe_device(struct ccwgroup_device *ccwgdev)
 {
         struct lcs_card *card;
+        int ret;
 
         if (!get_device(&ccwgdev->dev))
                 return -ENODEV;
@@ -2070,6 +2077,12 @@ lcs_probe_device(struct ccwgroup_device *ccwgdev)
                 put_device(&ccwgdev->dev);
                 return -ENOMEM;
         }
+        ret = sysfs_create_group(&ccwgdev->dev.kobj, &lcs_attr_group);
+        if (ret) {
+                lcs_free_card(card);
+                put_device(&ccwgdev->dev);
+                return ret;
+        }
         dev_set_drvdata(&ccwgdev->dev, card);
         ccwgdev->cdev[0]->handler = lcs_irq;
         ccwgdev->cdev[1]->handler = lcs_irq;
@@ -2078,9 +2091,7 @@ lcs_probe_device(struct ccwgroup_device *ccwgdev)
         card->thread_start_mask = 0;
         card->thread_allowed_mask = 0;
         card->thread_running_mask = 0;
-        ccwgdev->dev.type = &lcs_devtype;
-
-        return 0;
+        return 0;
 }
 
 static int
@@ -2111,7 +2122,7 @@ static const struct net_device_ops lcs_mc_netdev_ops = {
         .ndo_stop               = lcs_stop_device,
         .ndo_get_stats          = lcs_getstats,
         .ndo_start_xmit         = lcs_start_xmit,
-        .ndo_set_rx_mode        = lcs_set_multicast_list,
+        .ndo_set_multicast_list = lcs_set_multicast_list,
 };
 
 static int
@@ -2157,12 +2168,18 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
                 goto netdev_out;
         }
         switch (card->lan_type) {
-#ifdef CONFIG_ETHERNET
+#ifdef CONFIG_NET_ETHERNET
         case LCS_FRAME_TYPE_ENET:
                 card->lan_type_trans = eth_type_trans;
                 dev = alloc_etherdev(0);
                 break;
 #endif
+#ifdef CONFIG_TR
+        case LCS_FRAME_TYPE_TR:
+                card->lan_type_trans = tr_type_trans;
+                dev = alloc_trdev(0);
+                break;
+#endif
 #ifdef CONFIG_FDDI
         case LCS_FRAME_TYPE_FDDI:
                 card->lan_type_trans = fddi_type_trans;
@@ -2225,7 +2242,7 @@ __lcs_shutdown_device(struct ccwgroup_device *ccwgdev, int recovery_mode)
 {
         struct lcs_card *card;
         enum lcs_dev_states recover_state;
-        int ret = 0, ret2 = 0, ret3 = 0;
+        int ret;
 
         LCS_DBF_TEXT(3, setup, "shtdndev");
         card = dev_get_drvdata(&ccwgdev->dev);
@@ -2240,15 +2257,13 @@ __lcs_shutdown_device(struct ccwgroup_device *ccwgdev, int recovery_mode)
         recover_state = card->state;
 
         ret = lcs_stop_device(card->dev);
-        ret2 = ccw_device_set_offline(card->read.ccwdev);
-        ret3 = ccw_device_set_offline(card->write.ccwdev);
-        if (!ret)
-                ret = (ret2) ? ret2 : ret3;
-        if (ret)
-                LCS_DBF_TEXT_(3, setup, "1err:%d", ret);
+        ret = ccw_device_set_offline(card->read.ccwdev);
+        ret = ccw_device_set_offline(card->write.ccwdev);
         if (recover_state == DEV_STATE_UP) {
                 card->state = DEV_STATE_RECOVER;
         }
+        if (ret)
+                return ret;
         return 0;
 }
 
@@ -2308,9 +2323,9 @@ lcs_remove_device(struct ccwgroup_device *ccwgdev)
         }
         if (card->dev)
                 unregister_netdev(card->dev);
+        sysfs_remove_group(&ccwgdev->dev.kobj, &lcs_attr_group);
         lcs_cleanup_card(card);
         lcs_free_card(card);
-        dev_set_drvdata(&ccwgdev->dev, NULL);
         put_device(&ccwgdev->dev);
 }
 
@@ -2384,7 +2399,6 @@ static struct ccw_driver lcs_ccw_driver = {
         .ids    = lcs_ids,
         .probe  = ccwgroup_probe_ccwdev,
         .remove = ccwgroup_remove_ccwdev,
-        .int_class = IRQIO_LCS,
 };
 
 /**
@@ -2395,7 +2409,9 @@ static struct ccwgroup_driver lcs_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = "lcs",
         },
-        .setup       = lcs_probe_device,
+        .max_slaves  = 2,
+        .driver_id   = 0xD3C3E2,
+        .probe       = lcs_probe_device,
         .remove      = lcs_remove_device,
         .set_online  = lcs_new_device,
         .set_offline = lcs_shutdown_device,
@@ -2406,24 +2422,30 @@ static struct ccwgroup_driver lcs_group_driver = {
         .restore     = lcs_restore,
 };
 
-static ssize_t lcs_driver_group_store(struct device_driver *ddrv,
-                                      const char *buf, size_t count)
+static ssize_t
+lcs_driver_group_store(struct device_driver *ddrv, const char *buf,
+                       size_t count)
 {
         int err;
-        err = ccwgroup_create_dev(lcs_root_dev, &lcs_group_driver, 2, buf);
+        err = ccwgroup_create_from_string(lcs_root_dev,
+                                          lcs_group_driver.driver_id,
+                                          &lcs_ccw_driver, 2, buf);
         return err ? err : count;
 }
+
 static DRIVER_ATTR(group, 0200, NULL, lcs_driver_group_store);
 
-static struct attribute *lcs_drv_attrs[] = {
+static struct attribute *lcs_group_attrs[] = {
         &driver_attr_group.attr,
         NULL,
 };
-static struct attribute_group lcs_drv_attr_group = {
-        .attrs = lcs_drv_attrs,
+
+static struct attribute_group lcs_group_attr_group = {
+        .attrs = lcs_group_attrs,
 };
-static const struct attribute_group *lcs_drv_attr_groups[] = {
-        &lcs_drv_attr_group,
+
+static const struct attribute_group *lcs_group_attr_groups[] = {
+        &lcs_group_attr_group,
         NULL,
 };
 
@@ -2447,7 +2469,7 @@ __init lcs_init_module(void)
         rc = ccw_driver_register(&lcs_ccw_driver);
         if (rc)
                 goto ccw_err;
-        lcs_group_driver.driver.groups = lcs_drv_attr_groups;
+        lcs_group_driver.driver.groups = lcs_group_attr_groups;
         rc = ccwgroup_driver_register(&lcs_group_driver);
         if (rc)
                 goto ccwgroup_err;
@@ -2473,6 +2495,8 @@ __exit lcs_cleanup_module(void)
 {
         pr_info("Terminating lcs module.\n");
         LCS_DBF_TEXT(0, trace, "cleanup");
+        driver_remove_file(&lcs_group_driver.driver,
+                           &driver_attr_group);
         ccwgroup_driver_unregister(&lcs_group_driver);
         ccw_driver_unregister(&lcs_ccw_driver);
         root_device_unregister(lcs_root_dev);
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 4ffa66c87ea..3251333a23d 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -63,7 +63,6 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/ebcdic.h>
 
 #include <net/iucv/iucv.h>
 #include "fsm.h"
@@ -76,7 +75,7 @@ MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver");
  * Debug Facility stuff
  */
 #define IUCV_DBF_SETUP_NAME "iucv_setup"
-#define IUCV_DBF_SETUP_LEN 64
+#define IUCV_DBF_SETUP_LEN 32
 #define IUCV_DBF_SETUP_PAGES 2
 #define IUCV_DBF_SETUP_NR_AREAS 1
 #define IUCV_DBF_SETUP_LEVEL 3
@@ -227,7 +226,6 @@ struct iucv_connection {
         struct net_device         *netdev;
         struct connection_profile prof;
         char                      userid[9];
-        char                      userdata[17];
 };
 
 /**
@@ -265,7 +263,7 @@ struct ll_header {
 };
 
 #define NETIUCV_HDRLEN           (sizeof(struct ll_header))
-#define NETIUCV_BUFSIZE_MAX      65537
+#define NETIUCV_BUFSIZE_MAX      32768
 #define NETIUCV_BUFSIZE_DEFAULT  NETIUCV_BUFSIZE_MAX
 #define NETIUCV_MTU_MAX          (NETIUCV_BUFSIZE_MAX - NETIUCV_HDRLEN)
 #define NETIUCV_MTU_DEFAULT      9216
@@ -290,12 +288,7 @@ static inline int netiucv_test_and_set_busy(struct net_device *dev)
         return test_and_set_bit(0, &priv->tbusy);
 }
 
-static u8 iucvMagic_ascii[16] = {
-        0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-        0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-};
-
-static u8 iucvMagic_ebcdic[16] = {
+static u8 iucvMagic[16] = {
         0xF0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
         0xF0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40
 };
@@ -308,38 +301,18 @@ static u8 iucvMagic_ebcdic[16] = {
  *
  * @returns The printable string (static data!!)
  */
-static char *netiucv_printname(char *name, int len)
+static char *netiucv_printname(char *name)
 {
-        static char tmp[17];
+        static char tmp[9];
         char *p = tmp;
-        memcpy(tmp, name, len);
-        tmp[len] = '\0';
-        while (*p && ((p - tmp) < len) && (!isspace(*p)))
+        memcpy(tmp, name, 8);
+        tmp[8] = '\0';
+        while (*p && (!isspace(*p)))
                 p++;
         *p = '\0';
         return tmp;
 }
 
-static char *netiucv_printuser(struct iucv_connection *conn)
-{
-        static char tmp_uid[9];
-        static char tmp_udat[17];
-        static char buf[100];
-
-        if (memcmp(conn->userdata, iucvMagic_ebcdic, 16)) {
-                tmp_uid[8] = '\0';
-                tmp_udat[16] = '\0';
-                memcpy(tmp_uid, conn->userid, 8);
-                memcpy(tmp_uid, netiucv_printname(tmp_uid, 8), 8);
-                memcpy(tmp_udat, conn->userdata, 16);
-                EBCASC(tmp_udat, 16);
-                memcpy(tmp_udat, netiucv_printname(tmp_udat, 16), 16);
-                sprintf(buf, "%s.%s", tmp_uid, tmp_udat);
-                return buf;
-        } else
-                return netiucv_printname(conn->userid, 8);
-}
-
 /**
  * States of the interface statemachine.
  */
@@ -590,18 +563,15 @@ static int netiucv_callback_connreq(struct iucv_path *path,
 {
         struct iucv_connection *conn = path->private;
         struct iucv_event ev;
-        static char tmp_user[9];
-        static char tmp_udat[17];
         int rc;
 
+        if (memcmp(iucvMagic, ipuser, 16))
+                /* ipuser must match iucvMagic. */
+                return -EINVAL;
         rc = -EINVAL;
-        memcpy(tmp_user, netiucv_printname(ipvmid, 8), 8);
-        memcpy(tmp_udat, ipuser, 16);
-        EBCASC(tmp_udat, 16);
         read_lock_bh(&iucv_connection_rwlock);
         list_for_each_entry(conn, &iucv_connection_list, list) {
-                if (strncmp(ipvmid, conn->userid, 8) ||
-                    strncmp(ipuser, conn->userdata, 16))
+                if (strncmp(ipvmid, conn->userid, 8))
                         continue;
                 /* Found a matching connection for this path. */
                 conn->path = path;
@@ -610,8 +580,6 @@ static int netiucv_callback_connreq(struct iucv_path *path,
                 fsm_event(conn->fsm, CONN_EVENT_CONN_REQ, &ev);
                 rc = 0;
         }
-        IUCV_DBF_TEXT_(setup, 2, "Connection requested for %s.%s\n",
-                       tmp_user, netiucv_printname(tmp_udat, 16));
         read_unlock_bh(&iucv_connection_rwlock);
         return rc;
 }
@@ -848,7 +816,7 @@ static void conn_action_connaccept(fsm_instance *fi, int event, void *arg)
         conn->path = path;
         path->msglim = NETIUCV_QUEUELEN_DEFAULT;
         path->flags = 0;
-        rc = iucv_path_accept(path, &netiucv_handler, conn->userdata , conn);
+        rc = iucv_path_accept(path, &netiucv_handler, NULL, conn);
         if (rc) {
                 IUCV_DBF_TEXT_(setup, 2, "rc %d from iucv_accept", rc);
                 return;
@@ -886,7 +854,7 @@ static void conn_action_conntimsev(fsm_instance *fi, int event, void *arg)
 
         IUCV_DBF_TEXT(trace, 3, __func__);
         fsm_deltimer(&conn->timer);
-        iucv_path_sever(conn->path, conn->userdata);
+        iucv_path_sever(conn->path, NULL);
         fsm_newstate(fi, CONN_STATE_STARTWAIT);
 }
 
@@ -899,9 +867,9 @@ static void conn_action_connsever(fsm_instance *fi, int event, void *arg)
         IUCV_DBF_TEXT(trace, 3, __func__);
 
         fsm_deltimer(&conn->timer);
-        iucv_path_sever(conn->path, conn->userdata);
-        dev_info(privptr->dev, "The peer z/VM guest %s has closed the "
-                               "connection\n", netiucv_printuser(conn));
+        iucv_path_sever(conn->path, NULL);
+        dev_info(privptr->dev, "The peer interface of the IUCV device"
+                " has closed the connection\n");
         IUCV_DBF_TEXT(data, 2,
                       "conn_action_connsever: Remote dropped connection\n");
         fsm_newstate(fi, CONN_STATE_STARTWAIT);
@@ -918,6 +886,8 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)
         IUCV_DBF_TEXT(trace, 3, __func__);
 
         fsm_newstate(fi, CONN_STATE_STARTWAIT);
+        IUCV_DBF_TEXT_(setup, 2, "%s('%s'): connecting ...\n",
+                netdev->name, conn->userid);
 
         /*
          * We must set the state before calling iucv_connect because the
@@ -927,11 +897,8 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)
 
         fsm_newstate(fi, CONN_STATE_SETUPWAIT);
         conn->path = iucv_path_alloc(NETIUCV_QUEUELEN_DEFAULT, 0, GFP_KERNEL);
-        IUCV_DBF_TEXT_(setup, 2, "%s: connecting to %s ...\n",
-                netdev->name, netiucv_printuser(conn));
-
         rc = iucv_path_connect(conn->path, &netiucv_handler, conn->userid,
-                               NULL, conn->userdata, conn);
+                               NULL, iucvMagic, conn);
         switch (rc) {
         case 0:
                 netdev->tx_queue_len = conn->path->msglim;
@@ -941,13 +908,13 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)
         case 11:
                 dev_warn(privptr->dev,
                         "The IUCV device failed to connect to z/VM guest %s\n",
-                        netiucv_printname(conn->userid, 8));
+                        netiucv_printname(conn->userid));
                 fsm_newstate(fi, CONN_STATE_STARTWAIT);
                 break;
         case 12:
                 dev_warn(privptr->dev,
                         "The IUCV device failed to connect to the peer on z/VM"
-                        " guest %s\n", netiucv_printname(conn->userid, 8));
+                        " guest %s\n", netiucv_printname(conn->userid));
                 fsm_newstate(fi, CONN_STATE_STARTWAIT);
                 break;
         case 13:
@@ -960,7 +927,7 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)
                 dev_err(privptr->dev,
                         "z/VM guest %s has too many IUCV connections"
                         " to connect with the IUCV device\n",
-                        netiucv_printname(conn->userid, 8));
+                        netiucv_printname(conn->userid));
                 fsm_newstate(fi, CONN_STATE_CONNERR);
                 break;
         case 15:
@@ -1005,7 +972,7 @@ static void conn_action_stop(fsm_instance *fi, int event, void *arg)
         netiucv_purge_skb_queue(&conn->collect_queue);
         if (conn->path) {
                 IUCV_DBF_TEXT(trace, 5, "calling iucv_path_sever\n");
-                iucv_path_sever(conn->path, conn->userdata);
+                iucv_path_sever(conn->path, iucvMagic);
                 kfree(conn->path);
                 conn->path = NULL;
         }
@@ -1123,8 +1090,7 @@ dev_action_connup(fsm_instance *fi, int event, void *arg)
                         fsm_newstate(fi, DEV_STATE_RUNNING);
                         dev_info(privptr->dev,
                                 "The IUCV device has been connected"
-                                " successfully to %s\n",
-                                netiucv_printuser(privptr->conn));
+                                " successfully to %s\n", privptr->conn->userid);
                         IUCV_DBF_TEXT(setup, 3,
                                 "connection is up and running\n");
                         break;
@@ -1486,72 +1452,45 @@ static ssize_t user_show(struct device *dev, struct device_attribute *attr,
         struct netiucv_priv *priv = dev_get_drvdata(dev);
 
         IUCV_DBF_TEXT(trace, 5, __func__);
-        return sprintf(buf, "%s\n", netiucv_printuser(priv->conn));
+        return sprintf(buf, "%s\n", netiucv_printname(priv->conn->userid));
 }
 
-static int netiucv_check_user(const char *buf, size_t count, char *username,
-                              char *userdata)
+static ssize_t user_write(struct device *dev, struct device_attribute *attr,
+                          const char *buf, size_t count)
 {
-        const char *p;
-        int i;
+        struct netiucv_priv *priv = dev_get_drvdata(dev);
+        struct net_device *ndev = priv->conn->netdev;
+        char    *p;
+        char    *tmp;
+        char    username[9];
+        int     i;
+        struct iucv_connection *cp;
 
-        p = strchr(buf, '.');
-        if ((p && ((count > 26) ||
-                   ((p - buf) > 8) ||
-                   (buf + count - p > 18))) ||
-            (!p && (count > 9))) {
-                IUCV_DBF_TEXT(setup, 2, "conn_write: too long\n");
+        IUCV_DBF_TEXT(trace, 3, __func__);
+        if (count > 9) {
+                IUCV_DBF_TEXT_(setup, 2,
+                               "%d is length of username\n", (int) count);
                 return -EINVAL;
         }
 
-        for (i = 0, p = buf; i < 8 && *p && *p != '.'; i++, p++) {
-                if (isalnum(*p) || *p == '$') {
-                        username[i] = toupper(*p);
+        tmp = strsep((char **) &buf, "\n");
+        for (i = 0, p = tmp; i < 8 && *p; i++, p++) {
+                if (isalnum(*p) || (*p == '$')) {
+                        username[i]= toupper(*p);
                         continue;
                 }
-                if (*p == '\n')
+                if (*p == '\n') {
                         /* trailing lf, grr */
                         break;
+                }
                 IUCV_DBF_TEXT_(setup, 2,
-                               "conn_write: invalid character %02x\n", *p);
+                               "username: invalid character %c\n", *p);
                 return -EINVAL;
         }
         while (i < 8)
                 username[i++] = ' ';
         username[8] = '\0';
 
-        if (*p == '.') {
-                p++;
-                for (i = 0; i < 16 && *p; i++, p++) {
-                        if (*p == '\n')
-                                break;
-                        userdata[i] = toupper(*p);
-                }
-                while (i > 0 && i < 16)
-                        userdata[i++] = ' ';
-        } else
-                memcpy(userdata, iucvMagic_ascii, 16);
-        userdata[16] = '\0';
-        ASCEBC(userdata, 16);
-
-        return 0;
-}
-
-static ssize_t user_write(struct device *dev, struct device_attribute *attr,
-                          const char *buf, size_t count)
-{
-        struct netiucv_priv *priv = dev_get_drvdata(dev);
-        struct net_device *ndev = priv->conn->netdev;
-        char    username[9];
-        char    userdata[17];
-        int     rc;
-        struct iucv_connection *cp;
-
-        IUCV_DBF_TEXT(trace, 3, __func__);
-        rc = netiucv_check_user(buf, count, username, userdata);
-        if (rc)
-                return rc;
-
         if (memcmp(username, priv->conn->userid, 9) &&
             (ndev->flags & (IFF_UP | IFF_RUNNING))) {
                 /* username changed while the interface is active. */
@@ -1560,17 +1499,15 @@ static ssize_t user_write(struct device *dev, struct device_attribute *attr,
         }
         read_lock_bh(&iucv_connection_rwlock);
         list_for_each_entry(cp, &iucv_connection_list, list) {
-                if (!strncmp(username, cp->userid, 9) &&
-                   !strncmp(userdata, cp->userdata, 17) && cp->netdev != ndev) {
+                if (!strncmp(username, cp->userid, 9) && cp->netdev != ndev) {
                         read_unlock_bh(&iucv_connection_rwlock);
-                        IUCV_DBF_TEXT_(setup, 2, "user_write: Connection to %s "
-                                "already exists\n", netiucv_printuser(cp));
+                        IUCV_DBF_TEXT_(setup, 2, "user_write: Connection "
+                                "to %s already exists\n", username);
                         return -EEXIST;
                 }
         }
         read_unlock_bh(&iucv_connection_rwlock);
         memcpy(priv->conn->userid, username, 9);
-        memcpy(priv->conn->userdata, userdata, 17);
         return count;
 }
 
@@ -1600,8 +1537,7 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr,
         bs1 = simple_strtoul(buf, &e, 0);
 
         if (e && (!isspace(*e))) {
-                IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %02x\n",
-                        *e);
+                IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %c\n", *e);
                 return -EINVAL;
         }
         if (bs1 > NETIUCV_BUFSIZE_MAX) {
@@ -1854,11 +1790,26 @@ static struct attribute_group netiucv_stat_attr_group = {
         .attrs = netiucv_stat_attrs,
 };
 
-static const struct attribute_group *netiucv_attr_groups[] = {
-        &netiucv_stat_attr_group,
-        &netiucv_attr_group,
-        NULL,
-};
+static int netiucv_add_files(struct device *dev)
+{
+        int ret;
+
+        IUCV_DBF_TEXT(trace, 3, __func__);
+        ret = sysfs_create_group(&dev->kobj, &netiucv_attr_group);
+        if (ret)
+                return ret;
+        ret = sysfs_create_group(&dev->kobj, &netiucv_stat_attr_group);
+        if (ret)
+                sysfs_remove_group(&dev->kobj, &netiucv_attr_group);
+        return ret;
+}
+
+static void netiucv_remove_files(struct device *dev)
+{
+        IUCV_DBF_TEXT(trace, 3, __func__);
+        sysfs_remove_group(&dev->kobj, &netiucv_stat_attr_group);
+        sysfs_remove_group(&dev->kobj, &netiucv_attr_group);
+}
 
 static int netiucv_register_device(struct net_device *ndev)
 {
@@ -1872,7 +1823,6 @@ static int netiucv_register_device(struct net_device *ndev)
                 dev_set_name(dev, "net%s", ndev->name);
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
-                dev->groups = netiucv_attr_groups;
                 /*
                  * The release function could be called after the
                  * module has been unloaded. It's _only_ task is to
@@ -1890,14 +1840,22 @@ static int netiucv_register_device(struct net_device *ndev)
                 put_device(dev);
                 return ret;
         }
+        ret = netiucv_add_files(dev);
+        if (ret)
+                goto out_unreg;
         priv->dev = dev;
         dev_set_drvdata(dev, priv);
         return 0;
+
+out_unreg:
+        device_unregister(dev);
+        return ret;
 }
 
 static void netiucv_unregister_device(struct device *dev)
 {
         IUCV_DBF_TEXT(trace, 3, __func__);
+        netiucv_remove_files(dev);
         device_unregister(dev);
 }
 
@@ -1906,8 +1864,7 @@ static void netiucv_unregister_device(struct device *dev)
  * Add it to the list of netiucv connections;
  */
 static struct iucv_connection *netiucv_new_connection(struct net_device *dev,
-                                                      char *username,
-                                                      char *userdata)
+                                                      char *username)
 {
         struct iucv_connection *conn;
 
@@ -1936,8 +1893,6 @@ static struct iucv_connection *netiucv_new_connection(struct net_device *dev,
         fsm_settimer(conn->fsm, &conn->timer);
         fsm_newstate(conn->fsm, CONN_STATE_INVALID);
 
-        if (userdata)
-                memcpy(conn->userdata, userdata, 17);
         if (username) {
                 memcpy(conn->userid, username, 9);
                 fsm_newstate(conn->fsm, CONN_STATE_STOPPED);
@@ -1964,7 +1919,6 @@ out:
  */
 static void netiucv_remove_connection(struct iucv_connection *conn)
 {
-
         IUCV_DBF_TEXT(trace, 3, __func__);
         write_lock_bh(&iucv_connection_rwlock);
         list_del_init(&conn->list);
@@ -1972,7 +1926,7 @@ static void netiucv_remove_connection(struct iucv_connection *conn)
         fsm_deltimer(&conn->timer);
         netiucv_purge_skb_queue(&conn->collect_queue);
         if (conn->path) {
-                iucv_path_sever(conn->path, conn->userdata);
+                iucv_path_sever(conn->path, iucvMagic);
                 kfree(conn->path);
                 conn->path = NULL;
         }
@@ -2031,7 +1985,7 @@ static void netiucv_setup_netdevice(struct net_device *dev)
 /**
  * Allocate and initialize everything of a net device.
  */
-static struct net_device *netiucv_init_netdevice(char *username, char *userdata)
+static struct net_device *netiucv_init_netdevice(char *username)
 {
         struct netiucv_priv *privptr;
         struct net_device *dev;
@@ -2040,8 +1994,6 @@ static struct net_device *netiucv_init_netdevice(char *username, char *userdata)
                            netiucv_setup_netdevice);
         if (!dev)
                 return NULL;
-        if (dev_alloc_name(dev, dev->name) < 0)
-                goto out_netdev;
 
         privptr = netdev_priv(dev);
         privptr->fsm = init_fsm("netiucvdev", dev_state_names,
@@ -2050,7 +2002,7 @@ static struct net_device *netiucv_init_netdevice(char *username, char *userdata)
         if (!privptr->fsm)
                 goto out_netdev;
 
-        privptr->conn = netiucv_new_connection(dev, username, userdata);
+        privptr->conn = netiucv_new_connection(dev, username);
         if (!privptr->conn) {
                 IUCV_DBF_TEXT(setup, 2, "NULL from netiucv_new_connection\n");
                 goto out_fsm;
@@ -2068,31 +2020,47 @@ out_netdev:
 static ssize_t conn_write(struct device_driver *drv,
                           const char *buf, size_t count)
 {
+        const char *p;
         char username[9];
-        char userdata[17];
-        int rc;
+        int i, rc;
         struct net_device *dev;
         struct netiucv_priv *priv;
         struct iucv_connection *cp;
 
         IUCV_DBF_TEXT(trace, 3, __func__);
-        rc = netiucv_check_user(buf, count, username, userdata);
-        if (rc)
-                return rc;
+        if (count>9) {
+                IUCV_DBF_TEXT(setup, 2, "conn_write: too long\n");
+                return -EINVAL;
+        }
+
+        for (i = 0, p = buf; i < 8 && *p; i++, p++) {
+                if (isalnum(*p) || *p == '$') {
+                        username[i] = toupper(*p);
+                        continue;
+                }
+                if (*p == '\n')
+                        /* trailing lf, grr */
+                        break;
+                IUCV_DBF_TEXT_(setup, 2,
+                               "conn_write: invalid character %c\n", *p);
+                return -EINVAL;
+        }
+        while (i < 8)
+                username[i++] = ' ';
+        username[8] = '\0';
 
         read_lock_bh(&iucv_connection_rwlock);
         list_for_each_entry(cp, &iucv_connection_list, list) {
-                if (!strncmp(username, cp->userid, 9) &&
-                    !strncmp(userdata, cp->userdata, 17)) {
+                if (!strncmp(username, cp->userid, 9)) {
                         read_unlock_bh(&iucv_connection_rwlock);
-                        IUCV_DBF_TEXT_(setup, 2, "conn_write: Connection to %s "
-                                "already exists\n", netiucv_printuser(cp));
+                        IUCV_DBF_TEXT_(setup, 2, "conn_write: Connection "
+                                "to %s already exists\n", username);
                         return -EEXIST;
                 }
         }
         read_unlock_bh(&iucv_connection_rwlock);
 
-        dev = netiucv_init_netdevice(username, userdata);
+        dev = netiucv_init_netdevice(username);
         if (!dev) {
                 IUCV_DBF_TEXT(setup, 2, "NULL from netiucv_init_netdevice\n");
                 return -ENODEV;
@@ -2113,9 +2081,8 @@ static ssize_t conn_write(struct device_driver *drv,
         if (rc)
                 goto out_unreg;
 
-        dev_info(priv->dev, "The IUCV interface to %s has been established "
-                            "successfully\n",
-                netiucv_printuser(priv->conn));
+        dev_info(priv->dev, "The IUCV interface to %s has been"
+                " established successfully\n", netiucv_printname(username));
 
         return count;
 
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 480fbeab025..26a4110eeb2 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_core.h
+ *
  *    Copyright IBM Corp. 2007
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *               Frank Pavlic <fpavlic@de.ibm.com>,
@@ -11,6 +13,8 @@
 
 #include <linux/if.h>
 #include <linux/if_arp.h>
+#include <linux/if_tr.h>
+#include <linux/trdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
 #include <linux/ctype.h>
@@ -106,10 +110,6 @@ struct qeth_perf_stats {
 
         unsigned int sc_dp_p;
         unsigned int sc_p_dp;
-        /* qdio_cq_handler: number of times called, time spent in */
-        __u64 cq_start_time;
-        unsigned int cq_cnt;
-        unsigned int cq_time;
         /* qdio_input_handler: number of times called, time spent in */
         __u64 inbound_start_time;
         unsigned int inbound_cnt;
@@ -213,7 +213,6 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa,
  */
 #define QETH_TX_TIMEOUT         100 * HZ
 #define QETH_RCD_TIMEOUT        60 * HZ
-#define QETH_RECLAIM_WORK_TIME  HZ
 #define QETH_HEADER_SIZE        32
 #define QETH_MAX_PORTNO         15
 
@@ -232,7 +231,7 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa,
 #define QETH_IN_BUF_COUNT_MAX 128
 #define QETH_MAX_BUFFER_ELEMENTS(card) ((card)->qdio.in_buf_size >> 12)
 #define QETH_IN_BUF_REQUEUE_THRESHOLD(card) \
-                 ((card)->qdio.in_buf_pool.buf_count / 2)
+                ((card)->qdio.in_buf_pool.buf_count / 2)
 
 /* buffers we have to be behind before we get a PCI */
 #define QETH_PCI_THRESHOLD_A(card) ((card)->qdio.in_buf_pool.buf_count+1)
@@ -261,7 +260,6 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa,
 
 /* large receive scatter gather copy break */
 #define QETH_RX_SG_CB (PAGE_SIZE >> 1)
-#define QETH_RX_PULL_LEN 256
 
 struct qeth_hdr_layer3 {
         __u8  id;
@@ -377,21 +375,6 @@ enum qeth_qdio_buffer_states {
          * outbound: filled by driver; owned by hardware in order to be sent
          */
         QETH_QDIO_BUF_PRIMED,
-        /*
-         * inbound: not applicable
-         * outbound: identified to be pending in TPQ
-         */
-        QETH_QDIO_BUF_PENDING,
-        /*
-         * inbound: not applicable
-         * outbound: found in completion queue
-         */
-        QETH_QDIO_BUF_IN_CQ,
-        /*
-         * inbound: not applicable
-         * outbound: handled via transfer pending / completion queue
-         */
-        QETH_QDIO_BUF_HANDLED_DELAYED,
 };
 
 enum qeth_qdio_info_states {
@@ -416,7 +399,6 @@ struct qeth_qdio_buffer {
         struct qdio_buffer *buffer;
         /* the buffer pool entry currently associated to this buffer */
         struct qeth_buffer_pool_entry *pool_entry;
-        struct sk_buff *rx_skb;
 };
 
 struct qeth_qdio_q {
@@ -430,11 +412,8 @@ struct qeth_qdio_out_buffer {
         atomic_t state;
         int next_element_to_fill;
         struct sk_buff_head skb_list;
+        struct list_head ctx_list;
         int is_header[16];
-
-        struct qaob *aob;
-        struct qeth_qdio_out_q *q;
-        struct qeth_qdio_out_buffer *next_pending;
 };
 
 struct qeth_card;
@@ -447,8 +426,7 @@ enum qeth_out_q_states {
 
 struct qeth_qdio_out_q {
         struct qdio_buffer qdio_bufs[QDIO_MAX_BUFFERS_PER_Q];
-        struct qeth_qdio_out_buffer *bufs[QDIO_MAX_BUFFERS_PER_Q];
-        struct qdio_outbuf_state *bufstates; /* convenience pointer */
+        struct qeth_qdio_out_buffer bufs[QDIO_MAX_BUFFERS_PER_Q];
         int queue_no;
         struct qeth_card *card;
         atomic_t state;
@@ -469,9 +447,7 @@ struct qeth_qdio_out_q {
 struct qeth_qdio_info {
         atomic_t state;
         /* input */
-        int no_in_queues;
         struct qeth_qdio_q *in_q;
-        struct qeth_qdio_q *c_q;
         struct qeth_qdio_buffer_pool in_buf_pool;
         struct qeth_qdio_buffer_pool init_pool;
         int in_buf_size;
@@ -479,7 +455,6 @@ struct qeth_qdio_info {
         /* output */
         int no_out_queues;
         struct qeth_qdio_out_q **out_qs;
-        struct qdio_outbuf_state *out_bufstates;
 
         /* priority queueing */
         int do_prio_queueing;
@@ -551,12 +526,6 @@ enum qeth_cmd_buffer_state {
         BUF_STATE_PROCESSED,
 };
 
-enum qeth_cq {
-        QETH_CQ_DISABLED = 0,
-        QETH_CQ_ENABLED = 1,
-        QETH_CQ_NOTAVAILABLE = 2,
-};
-
 struct qeth_ipato {
         int enabled;
         int invert4;
@@ -672,6 +641,8 @@ struct qeth_card_options {
         struct qeth_ipa_info adp; /*Adapter parameters*/
         struct qeth_routing_info route6;
         struct qeth_ipa_info ipa6;
+        int broadcast_mode;
+        int macaddr_mode;
         int fake_broadcast;
         int add_hhlen;
         int layer2;
@@ -679,8 +650,6 @@ struct qeth_card_options {
         int rx_sg_cb;
         enum qeth_ipa_isolation_modes isolation;
         int sniffer;
-        enum qeth_cq cq;
-        char hsuid[9];
 };
 
 /*
@@ -705,16 +674,7 @@ struct qeth_discipline {
         qdio_handler_t *input_handler;
         qdio_handler_t *output_handler;
         int (*recover)(void *ptr);
-        int (*setup) (struct ccwgroup_device *);
-        void (*remove) (struct ccwgroup_device *);
-        int (*set_online) (struct ccwgroup_device *);
-        int (*set_offline) (struct ccwgroup_device *);
-        void (*shutdown)(struct ccwgroup_device *);
-        int (*prepare) (struct ccwgroup_device *);
-        void (*complete) (struct ccwgroup_device *);
-        int (*freeze)(struct ccwgroup_device *);
-        int (*thaw) (struct ccwgroup_device *);
-        int (*restore)(struct ccwgroup_device *);
+        struct ccwgroup_driver *ccwgdriver;
 };
 
 struct qeth_vlan_vid {
@@ -778,7 +738,7 @@ struct qeth_card {
         struct qeth_perf_stats perf_stats;
         int read_or_write_problem;
         struct qeth_osn_info osn_info;
-        struct qeth_discipline *discipline;
+        struct qeth_discipline discipline;
         atomic_t force_alloc_skb;
         struct service_level qeth_service_level;
         struct qdio_ssqd_desc ssqd;
@@ -787,8 +747,6 @@ struct qeth_card {
         struct mutex discipline_mutex;
         struct napi_struct napi;
         struct qeth_rx rx;
-        struct delayed_work buffer_reclaim_work;
-        int reclaim_index;
 };
 
 struct qeth_card_list_struct {
@@ -844,16 +802,16 @@ static inline int qeth_is_diagass_supported(struct qeth_card *card,
         return card->info.diagass_support & (__u32)cmd;
 }
 
-extern struct qeth_discipline qeth_l2_discipline;
-extern struct qeth_discipline qeth_l3_discipline;
-extern const struct attribute_group *qeth_generic_attr_groups[];
-extern const struct attribute_group *qeth_osn_attr_groups[];
-
+extern struct ccwgroup_driver qeth_l2_ccwgroup_driver;
+extern struct ccwgroup_driver qeth_l3_ccwgroup_driver;
 const char *qeth_get_cardname_short(struct qeth_card *);
 int qeth_realloc_buffer_pool(struct qeth_card *, int);
 int qeth_core_load_discipline(struct qeth_card *, enum qeth_discipline_id);
 void qeth_core_free_discipline(struct qeth_card *);
-void qeth_buffer_reclaim_work(struct work_struct *);
+int qeth_core_create_device_attributes(struct device *);
+void qeth_core_remove_device_attributes(struct device *);
+int qeth_core_create_osn_attributes(struct device *);
+void qeth_core_remove_osn_attributes(struct device *);
 
 /* exports for qeth discipline device drivers */
 extern struct qeth_card_list_struct qeth_core_card_list;
@@ -882,7 +840,7 @@ int qeth_check_qdio_errors(struct qeth_card *, struct qdio_buffer *,
                 unsigned int, const char *);
 void qeth_queue_input_buffer(struct qeth_card *, int);
 struct sk_buff *qeth_core_get_next_skb(struct qeth_card *,
-                struct qeth_qdio_buffer *, struct qdio_buffer_element **, int *,
+                struct qdio_buffer *, struct qdio_buffer_element **, int *,
                 struct qeth_hdr **);
 void qeth_schedule_recovery(struct qeth_card *);
 void qeth_qdio_start_poll(struct ccw_device *, int, unsigned long);
@@ -908,7 +866,6 @@ void qeth_prepare_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *, char);
 struct qeth_cmd_buffer *qeth_wait_for_buffer(struct qeth_channel *);
 int qeth_mdio_read(struct net_device *, int, int);
 int qeth_snmp_command(struct qeth_card *, char __user *);
-int qeth_query_oat_command(struct qeth_card *, char __user *);
 struct qeth_cmd_buffer *qeth_get_adapter_cmd(struct qeth_card *, __u32, __u32);
 int qeth_default_setadapterparms_cb(struct qeth_card *, struct qeth_reply *,
                                         unsigned long);
@@ -930,10 +887,8 @@ void qeth_dbf_longtext(debug_info_t *id, int level, char *text, ...);
 int qeth_core_ethtool_get_settings(struct net_device *, struct ethtool_cmd *);
 int qeth_set_access_ctrl_online(struct qeth_card *card);
 int qeth_hdr_chk_and_bounce(struct sk_buff *, int);
-int qeth_configure_cq(struct qeth_card *, enum qeth_cq);
 int qeth_hw_trap(struct qeth_card *, enum qeth_diags_trap_action);
 int qeth_query_ipassists(struct qeth_card *, enum qeth_prot_versions prot);
-void qeth_trace_features(struct qeth_card *);
 
 /* exports for OSN */
 int qeth_osn_assist(struct net_device *, void *, int);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 638a57f4d8a..4550573c25e 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_core_main.c
+ *
  *    Copyright IBM Corp. 2007, 2009
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *               Frank Pavlic <fpavlic@de.ibm.com>,
@@ -19,12 +21,10 @@
 #include <linux/mii.h>
 #include <linux/kthread.h>
 #include <linux/slab.h>
-#include <net/iucv/af_iucv.h>
 
 #include <asm/ebcdic.h>
 #include <asm/io.h>
 #include <asm/sysinfo.h>
-#include <asm/compat.h>
 
 #include "qeth_core.h"
 
@@ -44,12 +44,10 @@ struct qeth_card_list_struct qeth_core_card_list;
 EXPORT_SYMBOL_GPL(qeth_core_card_list);
 struct kmem_cache *qeth_core_header_cache;
 EXPORT_SYMBOL_GPL(qeth_core_header_cache);
-static struct kmem_cache *qeth_qdio_outbuf_cache;
 
 static struct device *qeth_core_root_dev;
 static unsigned int known_devices[][6] = QETH_MODELLIST_ARRAY;
 static struct lock_class_key qdio_out_skb_queue_key;
-static struct mutex qeth_mod_mutex;
 
 static void qeth_send_control_data_cb(struct qeth_channel *,
                         struct qeth_cmd_buffer *);
@@ -58,28 +56,20 @@ static struct qeth_cmd_buffer *qeth_get_buffer(struct qeth_channel *);
 static void qeth_setup_ccw(struct qeth_channel *, unsigned char *, __u32);
 static void qeth_free_buffer_pool(struct qeth_card *);
 static int qeth_qdio_establish(struct qeth_card *);
-static void qeth_free_qdio_buffers(struct qeth_card *);
-static void qeth_notify_skbs(struct qeth_qdio_out_q *queue,
-                struct qeth_qdio_out_buffer *buf,
-                enum iucv_tx_notify notification);
-static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf);
-static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
-                struct qeth_qdio_out_buffer *buf,
-                enum qeth_qdio_buffer_states newbufstate);
-static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int);
+
 
 static inline const char *qeth_get_cardname(struct qeth_card *card)
 {
         if (card->info.guestlan) {
                 switch (card->info.type) {
                 case QETH_CARD_TYPE_OSD:
-                        return " Virtual NIC QDIO";
+                        return " Guest LAN QDIO";
                 case QETH_CARD_TYPE_IQD:
-                        return " Virtual NIC Hiper";
+                        return " Guest LAN Hiper";
                 case QETH_CARD_TYPE_OSM:
-                        return " Virtual NIC QDIO - OSM";
+                        return " Guest LAN QDIO - OSM";
                 case QETH_CARD_TYPE_OSX:
-                        return " Virtual NIC QDIO - OSX";
+                        return " Guest LAN QDIO - OSX";
                 default:
                         return " unknown";
                 }
@@ -108,13 +98,13 @@ const char *qeth_get_cardname_short(struct qeth_card *card)
         if (card->info.guestlan) {
                 switch (card->info.type) {
                 case QETH_CARD_TYPE_OSD:
-                        return "Virt.NIC QDIO";
+                        return "GuestLAN QDIO";
                 case QETH_CARD_TYPE_IQD:
-                        return "Virt.NIC Hiper";
+                        return "GuestLAN Hiper";
                 case QETH_CARD_TYPE_OSM:
-                        return "Virt.NIC OSM";
+                        return "GuestLAN OSM";
                 case QETH_CARD_TYPE_OSX:
-                        return "Virt.NIC OSX";
+                        return "GuestLAN OSX";
                 default:
                         return "unknown";
                 }
@@ -209,7 +199,7 @@ static int qeth_alloc_buffer_pool(struct qeth_card *card)
 
         QETH_CARD_TEXT(card, 5, "alocpool");
         for (i = 0; i < card->qdio.init_pool.buf_count; ++i) {
-                pool_entry = kzalloc(sizeof(*pool_entry), GFP_KERNEL);
+                pool_entry = kmalloc(sizeof(*pool_entry), GFP_KERNEL);
                 if (!pool_entry) {
                         qeth_free_buffer_pool(card);
                         return -ENOMEM;
@@ -249,205 +239,6 @@ int qeth_realloc_buffer_pool(struct qeth_card *card, int bufcnt)
 }
 EXPORT_SYMBOL_GPL(qeth_realloc_buffer_pool);
 
-static inline int qeth_cq_init(struct qeth_card *card)
-{
-        int rc;
-
-        if (card->options.cq == QETH_CQ_ENABLED) {
-                QETH_DBF_TEXT(SETUP, 2, "cqinit");
-                memset(card->qdio.c_q->qdio_bufs, 0,
-                       QDIO_MAX_BUFFERS_PER_Q * sizeof(struct qdio_buffer));
-                card->qdio.c_q->next_buf_to_init = 127;
-                rc = do_QDIO(CARD_DDEV(card), QDIO_FLAG_SYNC_INPUT,
-                             card->qdio.no_in_queues - 1, 0,
-                             127);
-                if (rc) {
-                        QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                        goto out;
-                }
-        }
-        rc = 0;
-out:
-        return rc;
-}
-
-static inline int qeth_alloc_cq(struct qeth_card *card)
-{
-        int rc;
-
-        if (card->options.cq == QETH_CQ_ENABLED) {
-                int i;
-                struct qdio_outbuf_state *outbuf_states;
-
-                QETH_DBF_TEXT(SETUP, 2, "cqon");
-                card->qdio.c_q = kzalloc(sizeof(struct qeth_qdio_q),
-                                         GFP_KERNEL);
-                if (!card->qdio.c_q) {
-                        rc = -1;
-                        goto kmsg_out;
-                }
-                QETH_DBF_HEX(SETUP, 2, &card->qdio.c_q, sizeof(void *));
-
-                for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i) {
-                        card->qdio.c_q->bufs[i].buffer =
-                                &card->qdio.c_q->qdio_bufs[i];
-                }
-
-                card->qdio.no_in_queues = 2;
-
-                card->qdio.out_bufstates = (struct qdio_outbuf_state *)
-                        kzalloc(card->qdio.no_out_queues *
-                                QDIO_MAX_BUFFERS_PER_Q *
-                                sizeof(struct qdio_outbuf_state), GFP_KERNEL);
-                outbuf_states = card->qdio.out_bufstates;
-                if (outbuf_states == NULL) {
-                        rc = -1;
-                        goto free_cq_out;
-                }
-                for (i = 0; i < card->qdio.no_out_queues; ++i) {
-                        card->qdio.out_qs[i]->bufstates = outbuf_states;
-                        outbuf_states += QDIO_MAX_BUFFERS_PER_Q;
-                }
-        } else {
-                QETH_DBF_TEXT(SETUP, 2, "nocq");
-                card->qdio.c_q = NULL;
-                card->qdio.no_in_queues = 1;
-        }
-        QETH_DBF_TEXT_(SETUP, 2, "iqc%d", card->qdio.no_in_queues);
-        rc = 0;
-out:
-        return rc;
-free_cq_out:
-        kfree(card->qdio.c_q);
-        card->qdio.c_q = NULL;
-kmsg_out:
-        dev_err(&card->gdev->dev, "Failed to create completion queue\n");
-        goto out;
-}
-
-static inline void qeth_free_cq(struct qeth_card *card)
-{
-        if (card->qdio.c_q) {
-                --card->qdio.no_in_queues;
-                kfree(card->qdio.c_q);
-                card->qdio.c_q = NULL;
-        }
-        kfree(card->qdio.out_bufstates);
-        card->qdio.out_bufstates = NULL;
-}
-
-static inline enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15,
-        int delayed) {
-        enum iucv_tx_notify n;
-
-        switch (sbalf15) {
-        case 0:
-                n = delayed ? TX_NOTIFY_DELAYED_OK : TX_NOTIFY_OK;
-                break;
-        case 4:
-        case 16:
-        case 17:
-        case 18:
-                n = delayed ? TX_NOTIFY_DELAYED_UNREACHABLE :
-                        TX_NOTIFY_UNREACHABLE;
-                break;
-        default:
-                n = delayed ? TX_NOTIFY_DELAYED_GENERALERROR :
-                        TX_NOTIFY_GENERALERROR;
-                break;
-        }
-
-        return n;
-}
-
-static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q,
-        int bidx, int forced_cleanup)
-{
-        if (q->card->options.cq != QETH_CQ_ENABLED)
-                return;
-
-        if (q->bufs[bidx]->next_pending != NULL) {
-                struct qeth_qdio_out_buffer *head = q->bufs[bidx];
-                struct qeth_qdio_out_buffer *c = q->bufs[bidx]->next_pending;
-
-                while (c) {
-                        if (forced_cleanup ||
-                            atomic_read(&c->state) ==
-                              QETH_QDIO_BUF_HANDLED_DELAYED) {
-                                struct qeth_qdio_out_buffer *f = c;
-                                QETH_CARD_TEXT(f->q->card, 5, "fp");
-                                QETH_CARD_TEXT_(f->q->card, 5, "%lx", (long) f);
-                                /* release here to avoid interleaving between
-                                   outbound tasklet and inbound tasklet
-                                   regarding notifications and lifecycle */
-                                qeth_release_skbs(c);
-
-                                c = f->next_pending;
-                                WARN_ON_ONCE(head->next_pending != f);
-                                head->next_pending = c;
-                                kmem_cache_free(qeth_qdio_outbuf_cache, f);
-                        } else {
-                                head = c;
-                                c = c->next_pending;
-                        }
-
-                }
-        }
-        if (forced_cleanup && (atomic_read(&(q->bufs[bidx]->state)) ==
-                                        QETH_QDIO_BUF_HANDLED_DELAYED)) {
-                /* for recovery situations */
-                q->bufs[bidx]->aob = q->bufstates[bidx].aob;
-                qeth_init_qdio_out_buf(q, bidx);
-                QETH_CARD_TEXT(q->card, 2, "clprecov");
-        }
-}
-
-
-static inline void qeth_qdio_handle_aob(struct qeth_card *card,
-                unsigned long phys_aob_addr) {
-        struct qaob *aob;
-        struct qeth_qdio_out_buffer *buffer;
-        enum iucv_tx_notify notification;
-
-        aob = (struct qaob *) phys_to_virt(phys_aob_addr);
-        QETH_CARD_TEXT(card, 5, "haob");
-        QETH_CARD_TEXT_(card, 5, "%lx", phys_aob_addr);
-        buffer = (struct qeth_qdio_out_buffer *) aob->user1;
-        QETH_CARD_TEXT_(card, 5, "%lx", aob->user1);
-
-        if (atomic_cmpxchg(&buffer->state, QETH_QDIO_BUF_PRIMED,
-                           QETH_QDIO_BUF_IN_CQ) == QETH_QDIO_BUF_PRIMED) {
-                notification = TX_NOTIFY_OK;
-        } else {
-                WARN_ON_ONCE(atomic_read(&buffer->state) !=
-                                                        QETH_QDIO_BUF_PENDING);
-                atomic_set(&buffer->state, QETH_QDIO_BUF_IN_CQ);
-                notification = TX_NOTIFY_DELAYED_OK;
-        }
-
-        if (aob->aorc != 0)  {
-                QETH_CARD_TEXT_(card, 2, "aorc%02X", aob->aorc);
-                notification = qeth_compute_cq_notification(aob->aorc, 1);
-        }
-        qeth_notify_skbs(buffer->q, buffer, notification);
-
-        buffer->aob = NULL;
-        qeth_clear_output_buffer(buffer->q, buffer,
-                                 QETH_QDIO_BUF_HANDLED_DELAYED);
-
-        /* from here on: do not touch buffer anymore */
-        qdio_release_aob(aob);
-}
-
-static inline int qeth_is_cq(struct qeth_card *card, unsigned int queue)
-{
-        return card->options.cq == QETH_CQ_ENABLED &&
-            card->qdio.c_q != NULL &&
-            queue != 0 &&
-            queue == card->qdio.no_in_queues - 1;
-}
-
-
 static int qeth_issue_next_read(struct qeth_card *card)
 {
         int rc;
@@ -488,7 +279,7 @@ static struct qeth_reply *qeth_alloc_reply(struct qeth_card *card)
                 atomic_set(&reply->refcnt, 1);
                 atomic_set(&reply->received, 0);
                 reply->card = card;
-        }
+        };
         return reply;
 }
 
@@ -676,7 +467,6 @@ void qeth_release_buffer(struct qeth_channel *channel,
         iob->callback = qeth_send_control_data_cb;
         iob->rc = 0;
         spin_unlock_irqrestore(&channel->iob_lock, flags);
-        wake_up(&channel->wait_q);
 }
 EXPORT_SYMBOL_GPL(qeth_release_buffer);
 
@@ -799,7 +589,7 @@ static int qeth_setup_channel(struct qeth_channel *channel)
         QETH_DBF_TEXT(SETUP, 2, "setupch");
         for (cnt = 0; cnt < QETH_CMD_BUFFER_NO; cnt++) {
                 channel->iob[cnt].data =
-                        kzalloc(QETH_BUFSIZE, GFP_DMA|GFP_KERNEL);
+                        kmalloc(QETH_BUFSIZE, GFP_DMA|GFP_KERNEL);
                 if (channel->iob[cnt].data == NULL)
                         break;
                 channel->iob[cnt].state = BUF_STATE_FREE;
@@ -1093,74 +883,22 @@ out:
         return;
 }
 
-static void qeth_notify_skbs(struct qeth_qdio_out_q *q,
-                struct qeth_qdio_out_buffer *buf,
-                enum iucv_tx_notify notification)
-{
-        struct sk_buff *skb;
-
-        if (skb_queue_empty(&buf->skb_list))
-                goto out;
-        skb = skb_peek(&buf->skb_list);
-        while (skb) {
-                QETH_CARD_TEXT_(q->card, 5, "skbn%d", notification);
-                QETH_CARD_TEXT_(q->card, 5, "%lx", (long) skb);
-                if (skb->protocol == ETH_P_AF_IUCV) {
-                        if (skb->sk) {
-                                struct iucv_sock *iucv = iucv_sk(skb->sk);
-                                iucv->sk_txnotify(skb, notification);
-                        }
-                }
-                if (skb_queue_is_last(&buf->skb_list, skb))
-                        skb = NULL;
-                else
-                        skb = skb_queue_next(&buf->skb_list, skb);
-        }
-out:
-        return;
-}
-
-static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf)
+static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
+                struct qeth_qdio_out_buffer *buf)
 {
+        int i;
         struct sk_buff *skb;
-        struct iucv_sock *iucv;
-        int notify_general_error = 0;
-
-        if (atomic_read(&buf->state) == QETH_QDIO_BUF_PENDING)
-                notify_general_error = 1;
 
-        /* release may never happen from within CQ tasklet scope */
-        WARN_ON_ONCE(atomic_read(&buf->state) == QETH_QDIO_BUF_IN_CQ);
+        /* is PCI flag set on buffer? */
+        if (buf->buffer->element[0].sflags & SBAL_SFLAGS0_PCI_REQ)
+                atomic_dec(&queue->set_pci_flags_count);
 
         skb = skb_dequeue(&buf->skb_list);
         while (skb) {
-                QETH_CARD_TEXT(buf->q->card, 5, "skbr");
-                QETH_CARD_TEXT_(buf->q->card, 5, "%lx", (long) skb);
-                if (notify_general_error && skb->protocol == ETH_P_AF_IUCV) {
-                        if (skb->sk) {
-                                iucv = iucv_sk(skb->sk);
-                                iucv->sk_txnotify(skb, TX_NOTIFY_GENERALERROR);
-                        }
-                }
                 atomic_dec(&skb->users);
                 dev_kfree_skb_any(skb);
                 skb = skb_dequeue(&buf->skb_list);
         }
-}
-
-static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
-                struct qeth_qdio_out_buffer *buf,
-                enum qeth_qdio_buffer_states newbufstate)
-{
-        int i;
-
-        /* is PCI flag set on buffer? */
-        if (buf->buffer->element[0].sflags & SBAL_SFLAGS0_PCI_REQ)
-                atomic_dec(&queue->set_pci_flags_count);
-
-        if (newbufstate == QETH_QDIO_BUF_EMPTY) {
-                qeth_release_skbs(buf);
-        }
         for (i = 0; i < QETH_MAX_BUFFER_ELEMENTS(queue->card); ++i) {
                 if (buf->buffer->element[i].addr && buf->is_header[i])
                         kmem_cache_free(qeth_core_header_cache,
@@ -1174,36 +912,21 @@ static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
         buf->buffer->element[15].eflags = 0;
         buf->buffer->element[15].sflags = 0;
         buf->next_element_to_fill = 0;
-        atomic_set(&buf->state, newbufstate);
-}
-
-static void qeth_clear_outq_buffers(struct qeth_qdio_out_q *q, int free)
-{
-        int j;
-
-        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) {
-                if (!q->bufs[j])
-                        continue;
-                qeth_cleanup_handled_pending(q, j, 1);
-                qeth_clear_output_buffer(q, q->bufs[j], QETH_QDIO_BUF_EMPTY);
-                if (free) {
-                        kmem_cache_free(qeth_qdio_outbuf_cache, q->bufs[j]);
-                        q->bufs[j] = NULL;
-                }
-        }
+        atomic_set(&buf->state, QETH_QDIO_BUF_EMPTY);
 }
 
 void qeth_clear_qdio_buffers(struct qeth_card *card)
 {
-        int i;
+        int i, j;
 
         QETH_CARD_TEXT(card, 2, "clearqdbf");
         /* clear outbound buffers to free skbs */
-        for (i = 0; i < card->qdio.no_out_queues; ++i) {
+        for (i = 0; i < card->qdio.no_out_queues; ++i)
                 if (card->qdio.out_qs[i]) {
-                        qeth_clear_outq_buffers(card->qdio.out_qs[i], 0);
+                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
+                                qeth_clear_output_buffer(card->qdio.out_qs[i],
+                                                &card->qdio.out_qs[i]->bufs[j]);
                 }
-        }
 }
 EXPORT_SYMBOL_GPL(qeth_clear_qdio_buffers);
 
@@ -1227,11 +950,6 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)
         if (atomic_xchg(&card->qdio.state, QETH_QDIO_UNINITIALIZED) ==
                 QETH_QDIO_UNINITIALIZED)
                 return;
-
-        qeth_free_cq(card);
-        cancel_delayed_work_sync(&card->buffer_reclaim_work);
-        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
-                dev_kfree_skb_any(card->qdio.in_q->bufs[j].rx_skb);
         kfree(card->qdio.in_q);
         card->qdio.in_q = NULL;
         /* inbound buffer pool */
@@ -1239,7 +957,9 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)
         /* free outbound qdio_qs */
         if (card->qdio.out_qs) {
                 for (i = 0; i < card->qdio.no_out_queues; ++i) {
-                        qeth_clear_outq_buffers(card->qdio.out_qs[i], 1);
+                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
+                                qeth_clear_output_buffer(card->qdio.out_qs[i],
+                                                &card->qdio.out_qs[i]->bufs[j]);
                         kfree(card->qdio.out_qs[i]);
                 }
                 kfree(card->qdio.out_qs);
@@ -1256,30 +976,7 @@ static void qeth_clean_channel(struct qeth_channel *channel)
                 kfree(channel->iob[cnt].data);
 }
 
-static void qeth_set_single_write_queues(struct qeth_card *card)
-{
-        if ((atomic_read(&card->qdio.state) != QETH_QDIO_UNINITIALIZED) &&
-            (card->qdio.no_out_queues == 4))
-                qeth_free_qdio_buffers(card);
-
-        card->qdio.no_out_queues = 1;
-        if (card->qdio.default_out_queue != 0)
-                dev_info(&card->gdev->dev, "Priority Queueing not supported\n");
-
-        card->qdio.default_out_queue = 0;
-}
-
-static void qeth_set_multiple_write_queues(struct qeth_card *card)
-{
-        if ((atomic_read(&card->qdio.state) != QETH_QDIO_UNINITIALIZED) &&
-            (card->qdio.no_out_queues == 1)) {
-                qeth_free_qdio_buffers(card);
-                card->qdio.default_out_queue = 2;
-        }
-        card->qdio.no_out_queues = 4;
-}
-
-static void qeth_update_from_chp_desc(struct qeth_card *card)
+static void qeth_get_channel_path_desc(struct qeth_card *card)
 {
         struct ccw_device *ccwdev;
         struct channelPath_dsc {
@@ -1296,23 +993,36 @@ static void qeth_update_from_chp_desc(struct qeth_card *card)
         QETH_DBF_TEXT(SETUP, 2, "chp_desc");
 
         ccwdev = card->data.ccwdev;
-        chp_dsc = ccw_device_get_chp_desc(ccwdev, 0);
-        if (!chp_dsc)
-                goto out;
-
-        card->info.func_level = 0x4100 + chp_dsc->desc;
-        if (card->info.type == QETH_CARD_TYPE_IQD)
-                goto out;
-
-        /* CHPP field bit 6 == 1 -> single queue */
-        if ((chp_dsc->chpp & 0x02) == 0x02)
-                qeth_set_single_write_queues(card);
-        else
-                qeth_set_multiple_write_queues(card);
-out:
-        kfree(chp_dsc);
+        chp_dsc = (struct channelPath_dsc *)ccw_device_get_chp_desc(ccwdev, 0);
+        if (chp_dsc != NULL) {
+                /* CHPP field bit 6 == 1 -> single queue */
+                if ((chp_dsc->chpp & 0x02) == 0x02) {
+                        if ((atomic_read(&card->qdio.state) !=
+                                QETH_QDIO_UNINITIALIZED) &&
+                            (card->qdio.no_out_queues == 4))
+                                /* change from 4 to 1 outbound queues */
+                                qeth_free_qdio_buffers(card);
+                        card->qdio.no_out_queues = 1;
+                        if (card->qdio.default_out_queue != 0)
+                                dev_info(&card->gdev->dev,
+                                        "Priority Queueing not supported\n");
+                        card->qdio.default_out_queue = 0;
+                } else {
+                        if ((atomic_read(&card->qdio.state) !=
+                                QETH_QDIO_UNINITIALIZED) &&
+                            (card->qdio.no_out_queues == 1)) {
+                                /* change from 1 to 4 outbound queues */
+                                qeth_free_qdio_buffers(card);
+                                card->qdio.default_out_queue = 2;
+                        }
+                        card->qdio.no_out_queues = 4;
+                }
+                card->info.func_level = 0x4100 + chp_dsc->desc;
+                kfree(chp_dsc);
+        }
         QETH_DBF_TEXT_(SETUP, 2, "nr:%x", card->qdio.no_out_queues);
         QETH_DBF_TEXT_(SETUP, 2, "lvl:%02x", card->info.func_level);
+        return;
 }
 
 static void qeth_init_qdio_info(struct qeth_card *card)
@@ -1334,12 +1044,13 @@ static void qeth_set_intial_options(struct qeth_card *card)
 {
         card->options.route4.type = NO_ROUTER;
         card->options.route6.type = NO_ROUTER;
+        card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS;
+        card->options.macaddr_mode = QETH_TR_MACADDR_NONCANONICAL;
         card->options.fake_broadcast = 0;
         card->options.add_hhlen = DEFAULT_ADD_HHLEN;
         card->options.performance_stats = 0;
         card->options.rx_sg_cb = QETH_RX_SG_CB;
         card->options.isolation = ISOLATION_MODE_NONE;
-        card->options.cq = QETH_CQ_DISABLED;
 }
 
 static int qeth_do_start_thread(struct qeth_card *card, unsigned long thread)
@@ -1359,7 +1070,6 @@ static int qeth_do_start_thread(struct qeth_card *card, unsigned long thread)
 
 static void qeth_start_kernel_thread(struct work_struct *work)
 {
-        struct task_struct *ts;
         struct qeth_card *card = container_of(work, struct qeth_card,
                                         kernel_thread_starter);
         QETH_CARD_TEXT(card , 2, "strthrd");
@@ -1367,15 +1077,9 @@ static void qeth_start_kernel_thread(struct work_struct *work)
         if (card->read.state != CH_STATE_UP &&
             card->write.state != CH_STATE_UP)
                 return;
-        if (qeth_do_start_thread(card, QETH_RECOVER_THREAD)) {
-                ts = kthread_run(card->discipline->recover, (void *)card,
+        if (qeth_do_start_thread(card, QETH_RECOVER_THREAD))
+                kthread_run(card->discipline.recover, (void *) card,
                                 "qeth_recover");
-                if (IS_ERR(ts)) {
-                        qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
-                        qeth_clear_thread_running_bit(card,
-                                QETH_RECOVER_THREAD);
-                }
-        }
 }
 
 static int qeth_setup_card(struct qeth_card *card)
@@ -1415,7 +1119,6 @@ static int qeth_setup_card(struct qeth_card *card)
         card->ipato.invert6 = 0;
         /* init QDIO stuff */
         qeth_init_qdio_info(card);
-        INIT_DELAYED_WORK(&card->buffer_reclaim_work, qeth_buffer_reclaim_work);
         return 0;
 }
 
@@ -1437,7 +1140,7 @@ static struct qeth_card *qeth_alloc_card(void)
         if (!card)
                 goto out;
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
-        card->ip_tbd_list = kzalloc(sizeof(struct list_head), GFP_KERNEL);
+        card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_KERNEL);
         if (!card->ip_tbd_list) {
                 QETH_DBF_TEXT(SETUP, 0, "iptbdnom");
                 goto out_card;
@@ -1477,10 +1180,9 @@ static int qeth_determine_card_type(struct qeth_card *card)
                         card->info.type = known_devices[i][QETH_DEV_MODEL_IND];
                         card->qdio.no_out_queues =
                                 known_devices[i][QETH_QUEUE_NO_IND];
-                        card->qdio.no_in_queues = 1;
                         card->info.is_multicast_different =
                                 known_devices[i][QETH_MULTICAST_IND];
-                        qeth_update_from_chp_desc(card);
+                        qeth_get_channel_path_desc(card);
                         return 0;
                 }
                 i++;
@@ -1675,8 +1377,7 @@ static void qeth_configure_blkt_default(struct qeth_card *card, char *prcd)
 {
         QETH_DBF_TEXT(SETUP, 2, "cfgblkt");
 
-        if (prcd[74] == 0xF0 && prcd[75] == 0xF0 &&
-            (prcd[76] == 0xF5 || prcd[76] == 0xF6)) {
+        if (prcd[74] == 0xF0 && prcd[75] == 0xF0 && prcd[76] == 0xF5) {
                 card->info.blkt.time_total = 250;
                 card->info.blkt.inter_packet = 5;
                 card->info.blkt.inter_packet_jumbo = 15;
@@ -2036,7 +1737,7 @@ int qeth_send_control_data(struct qeth_card *card, int len,
                         if (time_after(jiffies, timeout))
                                 goto time_err;
                         cpu_relax();
-                }
+                };
         }
 
         if (reply->rc == -EIO)
@@ -2279,6 +1980,7 @@ static int qeth_ulp_setup_cb(struct qeth_card *card, struct qeth_reply *reply,
                 unsigned long data)
 {
         struct qeth_cmd_buffer *iob;
+        int rc = 0;
 
         QETH_DBF_TEXT(SETUP, 2, "ulpstpcb");
 
@@ -2294,7 +1996,7 @@ static int qeth_ulp_setup_cb(struct qeth_card *card, struct qeth_reply *reply,
                 iob->rc = -EMLINK;
         }
         QETH_DBF_TEXT_(SETUP, 2, "  rc%d", iob->rc);
-        return 0;
+        return rc;
 }
 
 static int qeth_ulp_setup(struct qeth_card *card)
@@ -2325,37 +2027,6 @@ static int qeth_ulp_setup(struct qeth_card *card)
         return rc;
 }
 
-static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *q, int bidx)
-{
-        int rc;
-        struct qeth_qdio_out_buffer *newbuf;
-
-        rc = 0;
-        newbuf = kmem_cache_zalloc(qeth_qdio_outbuf_cache, GFP_ATOMIC);
-        if (!newbuf) {
-                rc = -ENOMEM;
-                goto out;
-        }
-        newbuf->buffer = &q->qdio_bufs[bidx];
-        skb_queue_head_init(&newbuf->skb_list);
-        lockdep_set_class(&newbuf->skb_list.lock, &qdio_out_skb_queue_key);
-        newbuf->q = q;
-        newbuf->aob = NULL;
-        newbuf->next_pending = q->bufs[bidx];
-        atomic_set(&newbuf->state, QETH_QDIO_BUF_EMPTY);
-        q->bufs[bidx] = newbuf;
-        if (q->bufstates) {
-                q->bufstates[bidx].user = newbuf;
-                QETH_CARD_TEXT_(q->card, 2, "nbs%d", bidx);
-                QETH_CARD_TEXT_(q->card, 2, "%lx", (long) newbuf);
-                QETH_CARD_TEXT_(q->card, 2, "%lx",
-                                (long) newbuf->next_pending);
-        }
-out:
-        return rc;
-}
-
-
 static int qeth_alloc_qdio_buffers(struct qeth_card *card)
 {
         int i, j;
@@ -2366,63 +2037,52 @@ static int qeth_alloc_qdio_buffers(struct qeth_card *card)
                 QETH_QDIO_ALLOCATED) != QETH_QDIO_UNINITIALIZED)
                 return 0;
 
-        card->qdio.in_q = kzalloc(sizeof(struct qeth_qdio_q),
-                                   GFP_KERNEL);
+        card->qdio.in_q = kmalloc(sizeof(struct qeth_qdio_q),
+                                  GFP_KERNEL);
         if (!card->qdio.in_q)
                 goto out_nomem;
         QETH_DBF_TEXT(SETUP, 2, "inq");
         QETH_DBF_HEX(SETUP, 2, &card->qdio.in_q, sizeof(void *));
         memset(card->qdio.in_q, 0, sizeof(struct qeth_qdio_q));
         /* give inbound qeth_qdio_buffers their qdio_buffers */
-        for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i) {
+        for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i)
                 card->qdio.in_q->bufs[i].buffer =
                         &card->qdio.in_q->qdio_bufs[i];
-                card->qdio.in_q->bufs[i].rx_skb = NULL;
-        }
         /* inbound buffer pool */
         if (qeth_alloc_buffer_pool(card))
                 goto out_freeinq;
-
         /* outbound */
         card->qdio.out_qs =
-                kzalloc(card->qdio.no_out_queues *
+                kmalloc(card->qdio.no_out_queues *
                         sizeof(struct qeth_qdio_out_q *), GFP_KERNEL);
         if (!card->qdio.out_qs)
                 goto out_freepool;
         for (i = 0; i < card->qdio.no_out_queues; ++i) {
-                card->qdio.out_qs[i] = kzalloc(sizeof(struct qeth_qdio_out_q),
+                card->qdio.out_qs[i] = kmalloc(sizeof(struct qeth_qdio_out_q),
                                                GFP_KERNEL);
                 if (!card->qdio.out_qs[i])
                         goto out_freeoutq;
                 QETH_DBF_TEXT_(SETUP, 2, "outq %i", i);
                 QETH_DBF_HEX(SETUP, 2, &card->qdio.out_qs[i], sizeof(void *));
+                memset(card->qdio.out_qs[i], 0, sizeof(struct qeth_qdio_out_q));
                 card->qdio.out_qs[i]->queue_no = i;
                 /* give outbound qeth_qdio_buffers their qdio_buffers */
                 for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) {
-                        WARN_ON(card->qdio.out_qs[i]->bufs[j] != NULL);
-                        if (qeth_init_qdio_out_buf(card->qdio.out_qs[i], j))
-                                goto out_freeoutqbufs;
+                        card->qdio.out_qs[i]->bufs[j].buffer =
+                                &card->qdio.out_qs[i]->qdio_bufs[j];
+                        skb_queue_head_init(&card->qdio.out_qs[i]->bufs[j].
+                                            skb_list);
+                        lockdep_set_class(
+                                &card->qdio.out_qs[i]->bufs[j].skb_list.lock,
+                                &qdio_out_skb_queue_key);
+                        INIT_LIST_HEAD(&card->qdio.out_qs[i]->bufs[j].ctx_list);
                 }
         }
-
-        /* completion */
-        if (qeth_alloc_cq(card))
-                goto out_freeoutq;
-
         return 0;
 
-out_freeoutqbufs:
-        while (j > 0) {
-                --j;
-                kmem_cache_free(qeth_qdio_outbuf_cache,
-                                card->qdio.out_qs[i]->bufs[j]);
-                card->qdio.out_qs[i]->bufs[j] = NULL;
-        }
 out_freeoutq:
-        while (i > 0) {
+        while (i > 0)
                 kfree(card->qdio.out_qs[--i]);
-                qeth_clear_outq_buffers(card->qdio.out_qs[i], 1);
-        }
         kfree(card->qdio.out_qs);
         card->qdio.out_qs = NULL;
 out_freepool:
@@ -2693,12 +2353,6 @@ static int qeth_init_input_buffer(struct qeth_card *card,
         struct qeth_buffer_pool_entry *pool_entry;
         int i;
 
-        if ((card->options.cq == QETH_CQ_ENABLED) && (!buf->rx_skb)) {
-                buf->rx_skb = dev_alloc_skb(QETH_RX_PULL_LEN + ETH_HLEN);
-                if (!buf->rx_skb)
-                        return 1;
-        }
-
         pool_entry = qeth_find_free_buffer_pool_entry(card);
         if (!pool_entry)
                 return 1;
@@ -2745,21 +2399,13 @@ int qeth_init_qdio_queues(struct qeth_card *card)
                 QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
                 return rc;
         }
-
-        /* completion */
-        rc = qeth_cq_init(card);
-        if (rc) {
-                return rc;
-        }
-
         /* outbound queue */
         for (i = 0; i < card->qdio.no_out_queues; ++i) {
                 memset(card->qdio.out_qs[i]->qdio_bufs, 0,
                        QDIO_MAX_BUFFERS_PER_Q * sizeof(struct qdio_buffer));
                 for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) {
                         qeth_clear_output_buffer(card->qdio.out_qs[i],
-                                        card->qdio.out_qs[i]->bufs[j],
-                                        QETH_QDIO_BUF_EMPTY);
+                                        &card->qdio.out_qs[i]->bufs[j]);
                 }
                 card->qdio.out_qs[i]->card = card;
                 card->qdio.out_qs[i]->next_buf_to_fill = 0;
@@ -2940,33 +2586,16 @@ static int qeth_query_ipassists_cb(struct qeth_card *card,
         QETH_DBF_TEXT(SETUP, 2, "qipasscb");
 
         cmd = (struct qeth_ipa_cmd *) data;
-
-        switch (cmd->hdr.return_code) {
-        case IPA_RC_NOTSUPP:
-        case IPA_RC_L2_UNSUPPORTED_CMD:
-                QETH_DBF_TEXT(SETUP, 2, "ipaunsup");
-                card->options.ipa4.supported_funcs |= IPA_SETADAPTERPARMS;
-                card->options.ipa6.supported_funcs |= IPA_SETADAPTERPARMS;
-                return -0;
-        default:
-                if (cmd->hdr.return_code) {
-                        QETH_DBF_MESSAGE(1, "%s IPA_CMD_QIPASSIST: Unhandled "
-                                                "rc=%d\n",
-                                                dev_name(&card->gdev->dev),
-                                                cmd->hdr.return_code);
-                        return 0;
-                }
-        }
-
         if (cmd->hdr.prot_version == QETH_PROT_IPV4) {
                 card->options.ipa4.supported_funcs = cmd->hdr.ipa_supported;
                 card->options.ipa4.enabled_funcs = cmd->hdr.ipa_enabled;
-        } else if (cmd->hdr.prot_version == QETH_PROT_IPV6) {
+        } else {
                 card->options.ipa6.supported_funcs = cmd->hdr.ipa_supported;
                 card->options.ipa6.enabled_funcs = cmd->hdr.ipa_enabled;
-        } else
-                QETH_DBF_MESSAGE(1, "%s IPA_CMD_QIPASSIST: Flawed LIC detected"
-                                        "\n", dev_name(&card->gdev->dev));
+        }
+        QETH_DBF_TEXT(SETUP, 2, "suppenbl");
+        QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_supported);
+        QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_enabled);
         return 0;
 }
 
@@ -3016,7 +2645,7 @@ static void qeth_get_trap_id(struct qeth_card *card, struct qeth_trap_id *tid)
         struct sysinfo_2_2_2 *info222 = (struct sysinfo_2_2_2 *)info;
         struct sysinfo_3_2_2 *info322 = (struct sysinfo_3_2_2 *)info;
         struct ccw_dev_id ccwid;
-        int level;
+        int level, rc;
 
         tid->chpid = card->info.chpid;
         ccw_device_get_id(CARD_RDEV(card), &ccwid);
@@ -3024,10 +2653,17 @@ static void qeth_get_trap_id(struct qeth_card *card, struct qeth_trap_id *tid)
         tid->devno = ccwid.devno;
         if (!info)
                 return;
-        level = stsi(NULL, 0, 0, 0);
-        if ((level >= 2) && (stsi(info222, 2, 2, 2) == 0))
+
+        rc = stsi(NULL, 0, 0, 0);
+        if (rc == -ENOSYS)
+                level = rc;
+        else
+                level = (((unsigned int) rc) >> 28);
+
+        if ((level >= 2) && (stsi(info222, 2, 2, 2) != -ENOSYS))
                 tid->lparnr = info222->lpar_number;
-        if ((level >= 3) && (stsi(info322, 3, 2, 2) == 0)) {
+
+        if ((level >= 3) && (stsi(info322, 3, 2, 2) != -ENOSYS)) {
                 EBCASC(info322->vm[0].name, sizeof(info322->vm[0].name));
                 memcpy(tid->vmname, info322->vm[0].name, sizeof(tid->vmname));
         }
@@ -3098,19 +2734,9 @@ int qeth_check_qdio_errors(struct qeth_card *card, struct qdio_buffer *buf,
 }
 EXPORT_SYMBOL_GPL(qeth_check_qdio_errors);
 
-void qeth_buffer_reclaim_work(struct work_struct *work)
-{
-        struct qeth_card *card = container_of(work, struct qeth_card,
-                buffer_reclaim_work.work);
-
-        QETH_CARD_TEXT_(card, 2, "brw:%x", card->reclaim_index);
-        qeth_queue_input_buffer(card, card->reclaim_index);
-}
-
 void qeth_queue_input_buffer(struct qeth_card *card, int index)
 {
         struct qeth_qdio_q *queue = card->qdio.in_q;
-        struct list_head *lh;
         int count;
         int i;
         int rc;
@@ -3142,20 +2768,6 @@ void qeth_queue_input_buffer(struct qeth_card *card, int index)
                         atomic_add_unless(&card->force_alloc_skb, -1, 0);
                 }
 
-                if (!count) {
-                        i = 0;
-                        list_for_each(lh, &card->qdio.in_buf_pool.entry_list)
-                                i++;
-                        if (i == card->qdio.in_buf_pool.buf_count) {
-                                QETH_CARD_TEXT(card, 2, "qsarbw");
-                                card->reclaim_index = index;
-                                schedule_delayed_work(
-                                        &card->buffer_reclaim_work,
-                                        QETH_RECLAIM_WORK_TIME);
-                        }
-                        return;
-                }
-
                 /*
                  * according to old code it should be avoided to requeue all
                  * 128 buffers in order to benefit from PCI avoidance.
@@ -3175,6 +2787,8 @@ void qeth_queue_input_buffer(struct qeth_card *card, int index)
                                 qeth_get_micros() -
                                 card->perf_stats.inbound_do_qdio_start_time;
                 if (rc) {
+                        dev_warn(&card->gdev->dev,
+                                "QDIO reported an error, rc=%i\n", rc);
                         QETH_CARD_TEXT(card, 2, "qinberr");
                 }
                 queue->next_buf_to_init = (queue->next_buf_to_init + count) %
@@ -3248,12 +2862,12 @@ static int qeth_switch_to_nonpacking_if_needed(struct qeth_qdio_out_q *queue)
                                 queue->card->perf_stats.sc_p_dp++;
                         queue->do_pack = 0;
                         /* flush packing buffers */
-                        buffer = queue->bufs[queue->next_buf_to_fill];
+                        buffer = &queue->bufs[queue->next_buf_to_fill];
                         if ((atomic_read(&buffer->state) ==
                                                 QETH_QDIO_BUF_EMPTY) &&
                             (buffer->next_element_to_fill > 0)) {
                                 atomic_set(&buffer->state,
-                                           QETH_QDIO_BUF_PRIMED);
+                                                QETH_QDIO_BUF_PRIMED);
                                 flush_count++;
                                 queue->next_buf_to_fill =
                                         (queue->next_buf_to_fill + 1) %
@@ -3264,7 +2878,6 @@ static int qeth_switch_to_nonpacking_if_needed(struct qeth_qdio_out_q *queue)
         return flush_count;
 }
 
-
 /*
  * Called to flush a packing buffer if no more pci flags are on the queue.
  * Checks if there is a packing buffer and prepares it to be flushed.
@@ -3274,7 +2887,7 @@ static int qeth_flush_buffers_on_no_pci(struct qeth_qdio_out_q *queue)
 {
         struct qeth_qdio_out_buffer *buffer;
 
-        buffer = queue->bufs[queue->next_buf_to_fill];
+        buffer = &queue->bufs[queue->next_buf_to_fill];
         if ((atomic_read(&buffer->state) == QETH_QDIO_BUF_EMPTY) &&
            (buffer->next_element_to_fill > 0)) {
                 /* it's a packing buffer */
@@ -3295,14 +2908,10 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,
         unsigned int qdio_flags;
 
         for (i = index; i < index + count; ++i) {
-                int bidx = i % QDIO_MAX_BUFFERS_PER_Q;
-                buf = queue->bufs[bidx];
+                buf = &queue->bufs[i % QDIO_MAX_BUFFERS_PER_Q];
                 buf->buffer->element[buf->next_element_to_fill - 1].eflags |=
                                 SBAL_EFLAGS_LAST_ENTRY;
 
-                if (queue->bufstates)
-                        queue->bufstates[bidx].user = buf;
-
                 if (queue->card->info.type == QETH_CARD_TYPE_IQD)
                         continue;
 
@@ -3351,12 +2960,9 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,
         if (rc) {
                 queue->card->stats.tx_errors += count;
                 /* ignore temporary SIGA errors without busy condition */
-                if (rc == -ENOBUFS)
+                if (rc == QDIO_ERROR_SIGA_TARGET)
                         return;
                 QETH_CARD_TEXT(queue->card, 2, "flushbuf");
-                QETH_CARD_TEXT_(queue->card, 2, " q%d", queue->queue_no);
-                QETH_CARD_TEXT_(queue->card, 2, " idx%d", index);
-                QETH_CARD_TEXT_(queue->card, 2, " c%d", count);
                 QETH_CARD_TEXT_(queue->card, 2, " err%d", rc);
 
                 /* this must not happen under normal circumstances. if it
@@ -3418,120 +3024,14 @@ void qeth_qdio_start_poll(struct ccw_device *ccwdev, int queue,
 }
 EXPORT_SYMBOL_GPL(qeth_qdio_start_poll);
 
-int qeth_configure_cq(struct qeth_card *card, enum qeth_cq cq)
-{
-        int rc;
-
-        if (card->options.cq ==  QETH_CQ_NOTAVAILABLE) {
-                rc = -1;
-                goto out;
-        } else {
-                if (card->options.cq == cq) {
-                        rc = 0;
-                        goto out;
-                }
-
-                if (card->state != CARD_STATE_DOWN &&
-                    card->state != CARD_STATE_RECOVER) {
-                        rc = -1;
-                        goto out;
-                }
-
-                qeth_free_qdio_buffers(card);
-                card->options.cq = cq;
-                rc = 0;
-        }
-out:
-        return rc;
-
-}
-EXPORT_SYMBOL_GPL(qeth_configure_cq);
-
-
-static void qeth_qdio_cq_handler(struct qeth_card *card,
-                unsigned int qdio_err,
-                unsigned int queue, int first_element, int count) {
-        struct qeth_qdio_q *cq = card->qdio.c_q;
-        int i;
-        int rc;
-
-        if (!qeth_is_cq(card, queue))
-                goto out;
-
-        QETH_CARD_TEXT_(card, 5, "qcqhe%d", first_element);
-        QETH_CARD_TEXT_(card, 5, "qcqhc%d", count);
-        QETH_CARD_TEXT_(card, 5, "qcqherr%d", qdio_err);
-
-        if (qdio_err) {
-                netif_stop_queue(card->dev);
-                qeth_schedule_recovery(card);
-                goto out;
-        }
-
-        if (card->options.performance_stats) {
-                card->perf_stats.cq_cnt++;
-                card->perf_stats.cq_start_time = qeth_get_micros();
-        }
-
-        for (i = first_element; i < first_element + count; ++i) {
-                int bidx = i % QDIO_MAX_BUFFERS_PER_Q;
-                struct qdio_buffer *buffer = &cq->qdio_bufs[bidx];
-                int e;
-
-                e = 0;
-                while (buffer->element[e].addr) {
-                        unsigned long phys_aob_addr;
-
-                        phys_aob_addr = (unsigned long) buffer->element[e].addr;
-                        qeth_qdio_handle_aob(card, phys_aob_addr);
-                        buffer->element[e].addr = NULL;
-                        buffer->element[e].eflags = 0;
-                        buffer->element[e].sflags = 0;
-                        buffer->element[e].length = 0;
-
-                        ++e;
-                }
-
-                buffer->element[15].eflags = 0;
-                buffer->element[15].sflags = 0;
-        }
-        rc = do_QDIO(CARD_DDEV(card), QDIO_FLAG_SYNC_INPUT, queue,
-                    card->qdio.c_q->next_buf_to_init,
-                    count);
-        if (rc) {
-                dev_warn(&card->gdev->dev,
-                        "QDIO reported an error, rc=%i\n", rc);
-                QETH_CARD_TEXT(card, 2, "qcqherr");
-        }
-        card->qdio.c_q->next_buf_to_init = (card->qdio.c_q->next_buf_to_init
-                                   + count) % QDIO_MAX_BUFFERS_PER_Q;
-
-        netif_wake_queue(card->dev);
-
-        if (card->options.performance_stats) {
-                int delta_t = qeth_get_micros();
-                delta_t -= card->perf_stats.cq_start_time;
-                card->perf_stats.cq_time += delta_t;
-        }
-out:
-        return;
-}
-
 void qeth_qdio_input_handler(struct ccw_device *ccwdev, unsigned int qdio_err,
-                unsigned int queue, int first_elem, int count,
+                unsigned int queue, int first_element, int count,
                 unsigned long card_ptr)
 {
         struct qeth_card *card = (struct qeth_card *)card_ptr;
 
-        QETH_CARD_TEXT_(card, 2, "qihq%d", queue);
-        QETH_CARD_TEXT_(card, 2, "qiec%d", qdio_err);
-
-        if (qeth_is_cq(card, queue))
-                qeth_qdio_cq_handler(card, qdio_err, queue, first_elem, count);
-        else if (qdio_err)
+        if (qdio_err)
                 qeth_schedule_recovery(card);
-
-
 }
 EXPORT_SYMBOL_GPL(qeth_qdio_input_handler);
 
@@ -3545,7 +3045,7 @@ void qeth_qdio_output_handler(struct ccw_device *ccwdev,
         int i;
 
         QETH_CARD_TEXT(card, 6, "qdouhdl");
-        if (qdio_error & QDIO_ERROR_FATAL) {
+        if (qdio_error & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) {
                 QETH_CARD_TEXT(card, 2, "achkcond");
                 netif_stop_queue(card->dev);
                 qeth_schedule_recovery(card);
@@ -3557,44 +3057,9 @@ void qeth_qdio_output_handler(struct ccw_device *ccwdev,
                         qeth_get_micros();
         }
         for (i = first_element; i < (first_element + count); ++i) {
-                int bidx = i % QDIO_MAX_BUFFERS_PER_Q;
-                buffer = queue->bufs[bidx];
+                buffer = &queue->bufs[i % QDIO_MAX_BUFFERS_PER_Q];
                 qeth_handle_send_error(card, buffer, qdio_error);
-
-                if (queue->bufstates &&
-                    (queue->bufstates[bidx].flags &
-                     QDIO_OUTBUF_STATE_FLAG_PENDING) != 0) {
-                        WARN_ON_ONCE(card->options.cq != QETH_CQ_ENABLED);
-
-                        if (atomic_cmpxchg(&buffer->state,
-                                           QETH_QDIO_BUF_PRIMED,
-                                           QETH_QDIO_BUF_PENDING) ==
-                                QETH_QDIO_BUF_PRIMED) {
-                                qeth_notify_skbs(queue, buffer,
-                                                 TX_NOTIFY_PENDING);
-                        }
-                        buffer->aob = queue->bufstates[bidx].aob;
-                        QETH_CARD_TEXT_(queue->card, 5, "pel%d", bidx);
-                        QETH_CARD_TEXT(queue->card, 5, "aob");
-                        QETH_CARD_TEXT_(queue->card, 5, "%lx",
-                                        virt_to_phys(buffer->aob));
-                        if (qeth_init_qdio_out_buf(queue, bidx)) {
-                                QETH_CARD_TEXT(card, 2, "outofbuf");
-                                qeth_schedule_recovery(card);
-                        }
-                } else {
-                        if (card->options.cq == QETH_CQ_ENABLED) {
-                                enum iucv_tx_notify n;
-
-                                n = qeth_compute_cq_notification(
-                                        buffer->buffer->element[15].sflags, 0);
-                                qeth_notify_skbs(queue, buffer, n);
-                        }
-
-                        qeth_clear_output_buffer(queue, buffer,
-                                                QETH_QDIO_BUF_EMPTY);
-                }
-                qeth_cleanup_handled_pending(queue, bidx, 0);
+                qeth_clear_output_buffer(queue, buffer);
         }
         atomic_sub(count, &queue->used_buffers);
         /* check if we need to do something on this outbound queue */
@@ -3739,8 +3204,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
 
         for (cnt = 0; cnt < skb_shinfo(skb)->nr_frags; cnt++) {
                 frag = &skb_shinfo(skb)->frags[cnt];
-                buffer->element[element].addr = (char *)
-                        page_to_phys(skb_frag_page(frag))
+                buffer->element[element].addr = (char *)page_to_phys(frag->page)
                         + frag->page_offset;
                 buffer->element[element].length = frag->size;
                 buffer->element[element].eflags = SBAL_EFLAGS_MIDDLE_FRAG;
@@ -3827,7 +3291,7 @@ int qeth_do_send_packet_fast(struct qeth_card *card,
                               QETH_OUT_Q_LOCKED) != QETH_OUT_Q_UNLOCKED);
         /* ... now we've got the queue */
         index = queue->next_buf_to_fill;
-        buffer = queue->bufs[queue->next_buf_to_fill];
+        buffer = &queue->bufs[queue->next_buf_to_fill];
         /*
          * check if buffer is empty to make sure that we do not 'overtake'
          * ourselves and try to fill a buffer that is already primed
@@ -3861,7 +3325,7 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
         while (atomic_cmpxchg(&queue->state, QETH_OUT_Q_UNLOCKED,
                               QETH_OUT_Q_LOCKED) != QETH_OUT_Q_UNLOCKED);
         start_index = queue->next_buf_to_fill;
-        buffer = queue->bufs[queue->next_buf_to_fill];
+        buffer = &queue->bufs[queue->next_buf_to_fill];
         /*
          * check if buffer is empty to make sure that we do not 'overtake'
          * ourselves and try to fill a buffer that is already primed
@@ -3883,7 +3347,7 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
                         queue->next_buf_to_fill =
                                 (queue->next_buf_to_fill + 1) %
                                 QDIO_MAX_BUFFERS_PER_Q;
-                        buffer = queue->bufs[queue->next_buf_to_fill];
+                        buffer = &queue->bufs[queue->next_buf_to_fill];
                         /* we did a step forward, so check buffer state
                          * again */
                         if (atomic_read(&buffer->state) !=
@@ -4334,7 +3798,7 @@ static int qeth_snmp_command_cb(struct qeth_card *card,
         /* check if there is enough room in userspace */
         if ((qinfo->udata_len - qinfo->udata_offset) < data_len) {
                 QETH_CARD_TEXT_(card, 4, "scer3%i", -ENOMEM);
-                cmd->hdr.return_code = IPA_RC_ENOMEM;
+                cmd->hdr.return_code = -ENOMEM;
                 return 0;
         }
         QETH_CARD_TEXT_(card, 4, "snore%i",
@@ -4417,104 +3881,6 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)
 }
 EXPORT_SYMBOL_GPL(qeth_snmp_command);
 
-static int qeth_setadpparms_query_oat_cb(struct qeth_card *card,
-                struct qeth_reply *reply, unsigned long data)
-{
-        struct qeth_ipa_cmd *cmd;
-        struct qeth_qoat_priv *priv;
-        char *resdata;
-        int resdatalen;
-
-        QETH_CARD_TEXT(card, 3, "qoatcb");
-
-        cmd = (struct qeth_ipa_cmd *)data;
-        priv = (struct qeth_qoat_priv *)reply->param;
-        resdatalen = cmd->data.setadapterparms.hdr.cmdlength;
-        resdata = (char *)data + 28;
-
-        if (resdatalen > (priv->buffer_len - priv->response_len)) {
-                cmd->hdr.return_code = IPA_RC_FFFF;
-                return 0;
-        }
-
-        memcpy((priv->buffer + priv->response_len), resdata,
-                resdatalen);
-        priv->response_len += resdatalen;
-
-        if (cmd->data.setadapterparms.hdr.seq_no <
-            cmd->data.setadapterparms.hdr.used_total)
-                return 1;
-        return 0;
-}
-
-int qeth_query_oat_command(struct qeth_card *card, char __user *udata)
-{
-        int rc = 0;
-        struct qeth_cmd_buffer *iob;
-        struct qeth_ipa_cmd *cmd;
-        struct qeth_query_oat *oat_req;
-        struct qeth_query_oat_data oat_data;
-        struct qeth_qoat_priv priv;
-        void __user *tmp;
-
-        QETH_CARD_TEXT(card, 3, "qoatcmd");
-
-        if (!qeth_adp_supported(card, IPA_SETADP_QUERY_OAT)) {
-                rc = -EOPNOTSUPP;
-                goto out;
-        }
-
-        if (copy_from_user(&oat_data, udata,
-            sizeof(struct qeth_query_oat_data))) {
-                        rc = -EFAULT;
-                        goto out;
-        }
-
-        priv.buffer_len = oat_data.buffer_len;
-        priv.response_len = 0;
-        priv.buffer =  kzalloc(oat_data.buffer_len, GFP_KERNEL);
-        if (!priv.buffer) {
-                rc = -ENOMEM;
-                goto out;
-        }
-
-        iob = qeth_get_adapter_cmd(card, IPA_SETADP_QUERY_OAT,
-                                   sizeof(struct qeth_ipacmd_setadpparms_hdr) +
-                                   sizeof(struct qeth_query_oat));
-        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
-        oat_req = &cmd->data.setadapterparms.data.query_oat;
-        oat_req->subcmd_code = oat_data.command;
-
-        rc = qeth_send_ipa_cmd(card, iob, qeth_setadpparms_query_oat_cb,
-                               &priv);
-        if (!rc) {
-                if (is_compat_task())
-                        tmp = compat_ptr(oat_data.ptr);
-                else
-                        tmp = (void __user *)(unsigned long)oat_data.ptr;
-
-                if (copy_to_user(tmp, priv.buffer,
-                    priv.response_len)) {
-                        rc = -EFAULT;
-                        goto out_free;
-                }
-
-                oat_data.response_len = priv.response_len;
-
-                if (copy_to_user(udata, &oat_data,
-                    sizeof(struct qeth_query_oat_data)))
-                        rc = -EFAULT;
-        } else
-                if (rc == IPA_RC_FFFF)
-                        rc = -EFAULT;
-
-out_free:
-        kfree(priv.buffer);
-out:
-        return rc;
-}
-EXPORT_SYMBOL_GPL(qeth_query_oat_command);
-
 static inline int qeth_get_qdio_q_format(struct qeth_card *card)
 {
         switch (card->info.type) {
@@ -4552,28 +3918,13 @@ static void qeth_determine_capabilities(struct qeth_card *card)
                 goto out_offline;
         }
         qeth_configure_unitaddr(card, prcd);
-        if (ddev_offline)
-                qeth_configure_blkt_default(card, prcd);
+        qeth_configure_blkt_default(card, prcd);
         kfree(prcd);
 
         rc = qdio_get_ssqd_desc(ddev, &card->ssqd);
         if (rc)
                 QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
 
-        QETH_DBF_TEXT_(SETUP, 2, "qfmt%d", card->ssqd.qfmt);
-        QETH_DBF_TEXT_(SETUP, 2, "%d", card->ssqd.qdioac1);
-        QETH_DBF_TEXT_(SETUP, 2, "%d", card->ssqd.qdioac3);
-        QETH_DBF_TEXT_(SETUP, 2, "icnt%d", card->ssqd.icnt);
-        if (!((card->ssqd.qfmt != QDIO_IQDIO_QFMT) ||
-            ((card->ssqd.qdioac1 & CHSC_AC1_INITIATE_INPUTQ) == 0) ||
-            ((card->ssqd.qdioac3 & CHSC_AC3_FORMAT2_CQ_AVAILABLE) == 0))) {
-                dev_info(&card->gdev->dev,
-                        "Completion Queueing supported\n");
-        } else {
-                card->options.cq = QETH_CQ_NOTAVAILABLE;
-        }
-
-
 out_offline:
         if (ddev_offline == 1)
                 ccw_device_set_offline(ddev);
@@ -4581,30 +3932,11 @@ out:
         return;
 }
 
-static inline void qeth_qdio_establish_cq(struct qeth_card *card,
-        struct qdio_buffer **in_sbal_ptrs,
-        void (**queue_start_poll) (struct ccw_device *, int, unsigned long)) {
-        int i;
-
-        if (card->options.cq == QETH_CQ_ENABLED) {
-                int offset = QDIO_MAX_BUFFERS_PER_Q *
-                             (card->qdio.no_in_queues - 1);
-                i = QDIO_MAX_BUFFERS_PER_Q * (card->qdio.no_in_queues - 1);
-                for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i) {
-                        in_sbal_ptrs[offset + i] = (struct qdio_buffer *)
-                                virt_to_phys(card->qdio.c_q->bufs[i].buffer);
-                }
-
-                queue_start_poll[card->qdio.no_in_queues - 1] = NULL;
-        }
-}
-
 static int qeth_qdio_establish(struct qeth_card *card)
 {
         struct qdio_initialize init_data;
         char *qib_param_field;
         struct qdio_buffer **in_sbal_ptrs;
-        void (**queue_start_poll) (struct ccw_device *, int, unsigned long);
         struct qdio_buffer **out_sbal_ptrs;
         int i, j, k;
         int rc = 0;
@@ -4613,48 +3945,34 @@ static int qeth_qdio_establish(struct qeth_card *card)
 
         qib_param_field = kzalloc(QDIO_MAX_BUFFERS_PER_Q * sizeof(char),
                               GFP_KERNEL);
-        if (!qib_param_field) {
-                rc =  -ENOMEM;
-                goto out_free_nothing;
-        }
+        if (!qib_param_field)
+                return -ENOMEM;
 
         qeth_create_qib_param_field(card, qib_param_field);
         qeth_create_qib_param_field_blkt(card, qib_param_field);
 
-        in_sbal_ptrs = kzalloc(card->qdio.no_in_queues *
-                               QDIO_MAX_BUFFERS_PER_Q * sizeof(void *),
+        in_sbal_ptrs = kmalloc(QDIO_MAX_BUFFERS_PER_Q * sizeof(void *),
                                GFP_KERNEL);
         if (!in_sbal_ptrs) {
-                rc = -ENOMEM;
-                goto out_free_qib_param;
+                kfree(qib_param_field);
+                return -ENOMEM;
         }
-        for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i) {
+        for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; ++i)
                 in_sbal_ptrs[i] = (struct qdio_buffer *)
                         virt_to_phys(card->qdio.in_q->bufs[i].buffer);
-        }
-
-        queue_start_poll = kzalloc(sizeof(void *) * card->qdio.no_in_queues,
-                                   GFP_KERNEL);
-        if (!queue_start_poll) {
-                rc = -ENOMEM;
-                goto out_free_in_sbals;
-        }
-        for (i = 0; i < card->qdio.no_in_queues; ++i)
-                queue_start_poll[i] = card->discipline->start_poll;
-
-        qeth_qdio_establish_cq(card, in_sbal_ptrs, queue_start_poll);
 
         out_sbal_ptrs =
-                kzalloc(card->qdio.no_out_queues * QDIO_MAX_BUFFERS_PER_Q *
+                kmalloc(card->qdio.no_out_queues * QDIO_MAX_BUFFERS_PER_Q *
                         sizeof(void *), GFP_KERNEL);
         if (!out_sbal_ptrs) {
-                rc = -ENOMEM;
-                goto out_free_queue_start_poll;
+                kfree(in_sbal_ptrs);
+                kfree(qib_param_field);
+                return -ENOMEM;
         }
         for (i = 0, k = 0; i < card->qdio.no_out_queues; ++i)
                 for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j, ++k) {
                         out_sbal_ptrs[k] = (struct qdio_buffer *)virt_to_phys(
-                                card->qdio.out_qs[i]->bufs[j]->buffer);
+                                card->qdio.out_qs[i]->bufs[j].buffer);
                 }
 
         memset(&init_data, 0, sizeof(struct qdio_initialize));
@@ -4662,15 +3980,14 @@ static int qeth_qdio_establish(struct qeth_card *card)
         init_data.q_format               = qeth_get_qdio_q_format(card);
         init_data.qib_param_field_format = 0;
         init_data.qib_param_field        = qib_param_field;
-        init_data.no_input_qs            = card->qdio.no_in_queues;
+        init_data.no_input_qs            = 1;
         init_data.no_output_qs           = card->qdio.no_out_queues;
-        init_data.input_handler          = card->discipline->input_handler;
-        init_data.output_handler         = card->discipline->output_handler;
-        init_data.queue_start_poll_array = queue_start_poll;
+        init_data.input_handler          = card->discipline.input_handler;
+        init_data.output_handler         = card->discipline.output_handler;
+        init_data.queue_start_poll       = card->discipline.start_poll;
         init_data.int_parm               = (unsigned long) card;
         init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;
         init_data.output_sbal_addr_array = (void **) out_sbal_ptrs;
-        init_data.output_sbal_state_array = card->qdio.out_bufstates;
         init_data.scan_threshold =
                 (card->info.type == QETH_CARD_TYPE_IQD) ? 8 : 32;
 
@@ -4687,26 +4004,10 @@ static int qeth_qdio_establish(struct qeth_card *card)
                         qdio_free(CARD_DDEV(card));
                 }
         }
-
-        switch (card->options.cq) {
-        case QETH_CQ_ENABLED:
-                dev_info(&card->gdev->dev, "Completion Queue support enabled");
-                break;
-        case QETH_CQ_DISABLED:
-                dev_info(&card->gdev->dev, "Completion Queue support disabled");
-                break;
-        default:
-                break;
-        }
 out:
         kfree(out_sbal_ptrs);
-out_free_queue_start_poll:
-        kfree(queue_start_poll);
-out_free_in_sbals:
         kfree(in_sbal_ptrs);
-out_free_qib_param:
         kfree(qib_param_field);
-out_free_nothing:
         return rc;
 }
 
@@ -4725,19 +4026,6 @@ static void qeth_core_free_card(struct qeth_card *card)
         kfree(card);
 }
 
-void qeth_trace_features(struct qeth_card *card)
-{
-        QETH_CARD_TEXT(card, 2, "features");
-        QETH_CARD_TEXT_(card, 2, "%x", card->options.ipa4.supported_funcs);
-        QETH_CARD_TEXT_(card, 2, "%x", card->options.ipa4.enabled_funcs);
-        QETH_CARD_TEXT_(card, 2, "%x", card->options.ipa6.supported_funcs);
-        QETH_CARD_TEXT_(card, 2, "%x", card->options.ipa6.enabled_funcs);
-        QETH_CARD_TEXT_(card, 2, "%x", card->options.adp.supported_funcs);
-        QETH_CARD_TEXT_(card, 2, "%x", card->options.adp.enabled_funcs);
-        QETH_CARD_TEXT_(card, 2, "%x", card->info.diagass_support);
-}
-EXPORT_SYMBOL_GPL(qeth_trace_features);
-
 static struct ccw_device_id qeth_ids[] = {
         {CCW_DEVICE_DEVTYPE(0x1731, 0x01, 0x1732, 0x01),
                                         .driver_info = QETH_CARD_TYPE_OSD},
@@ -4763,6 +4051,13 @@ static struct ccw_driver qeth_ccw_driver = {
         .remove = ccwgroup_remove_ccwdev,
 };
 
+static int qeth_core_driver_group(const char *buf, struct device *root_dev,
+                                unsigned long driver_id)
+{
+        return ccwgroup_create_from_string(root_dev, driver_id,
+                                           &qeth_ccw_driver, 3, buf);
+}
+
 int qeth_core_hardsetup_card(struct qeth_card *card)
 {
         int retries = 0;
@@ -4770,7 +4065,7 @@ int qeth_core_hardsetup_card(struct qeth_card *card)
 
         QETH_DBF_TEXT(SETUP, 2, "hrdsetup");
         atomic_set(&card->force_alloc_skb, 0);
-        qeth_update_from_chp_desc(card);
+        qeth_get_channel_path_desc(card);
 retry:
         if (retries)
                 QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",
@@ -4849,36 +4144,29 @@ out:
 }
 EXPORT_SYMBOL_GPL(qeth_core_hardsetup_card);
 
-static inline int qeth_create_skb_frag(struct qeth_qdio_buffer *qethbuffer,
-                struct qdio_buffer_element *element,
+static inline int qeth_create_skb_frag(struct qdio_buffer_element *element,
                 struct sk_buff **pskb, int offset, int *pfrag, int data_len)
 {
         struct page *page = virt_to_page(element->addr);
         if (*pskb == NULL) {
-                if (qethbuffer->rx_skb) {
-                        /* only if qeth_card.options.cq == QETH_CQ_ENABLED */
-                        *pskb = qethbuffer->rx_skb;
-                        qethbuffer->rx_skb = NULL;
-                } else {
-                        *pskb = dev_alloc_skb(QETH_RX_PULL_LEN + ETH_HLEN);
-                        if (!(*pskb))
-                                return -ENOMEM;
-                }
-
+                /* the upper protocol layers assume that there is data in the
+                 * skb itself. Copy a small amount (64 bytes) to make them
+                 * happy. */
+                *pskb = dev_alloc_skb(64 + ETH_HLEN);
+                if (!(*pskb))
+                        return -ENOMEM;
                 skb_reserve(*pskb, ETH_HLEN);
-                if (data_len <= QETH_RX_PULL_LEN) {
+                if (data_len <= 64) {
                         memcpy(skb_put(*pskb, data_len), element->addr + offset,
                                 data_len);
                 } else {
                         get_page(page);
-                        memcpy(skb_put(*pskb, QETH_RX_PULL_LEN),
-                               element->addr + offset, QETH_RX_PULL_LEN);
-                        skb_fill_page_desc(*pskb, *pfrag, page,
-                                offset + QETH_RX_PULL_LEN,
-                                data_len - QETH_RX_PULL_LEN);
-                        (*pskb)->data_len += data_len - QETH_RX_PULL_LEN;
-                        (*pskb)->len      += data_len - QETH_RX_PULL_LEN;
-                        (*pskb)->truesize += data_len - QETH_RX_PULL_LEN;
+                        memcpy(skb_put(*pskb, 64), element->addr + offset, 64);
+                        skb_fill_page_desc(*pskb, *pfrag, page, offset + 64,
+                                data_len - 64);
+                        (*pskb)->data_len += data_len - 64;
+                        (*pskb)->len      += data_len - 64;
+                        (*pskb)->truesize += data_len - 64;
                         (*pfrag)++;
                 }
         } else {
@@ -4889,18 +4177,15 @@ static inline int qeth_create_skb_frag(struct qeth_qdio_buffer *qethbuffer,
                 (*pskb)->truesize += data_len;
                 (*pfrag)++;
         }
-
-
         return 0;
 }
 
 struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
-                struct qeth_qdio_buffer *qethbuffer,
+                struct qdio_buffer *buffer,
                 struct qdio_buffer_element **__element, int *__offset,
                 struct qeth_hdr **hdr)
 {
         struct qdio_buffer_element *element = *__element;
-        struct qdio_buffer *buffer = qethbuffer->buffer;
         int offset = *__offset;
         struct sk_buff *skb = NULL;
         int skb_len = 0;
@@ -4928,7 +4213,11 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
                 break;
         case QETH_HEADER_TYPE_LAYER3:
                 skb_len = (*hdr)->hdr.l3.length;
-                headroom = ETH_HLEN;
+                if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) ||
+                    (card->info.link_type == QETH_LINK_TYPE_HSTR))
+                        headroom = TR_HLEN;
+                else
+                        headroom = ETH_HLEN;
                 break;
         case QETH_HEADER_TYPE_OSN:
                 skb_len = (*hdr)->hdr.osn.pdu_length;
@@ -4941,10 +4230,9 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
         if (!skb_len)
                 return NULL;
 
-        if (((skb_len >= card->options.rx_sg_cb) &&
-             (!(card->info.type == QETH_CARD_TYPE_OSN)) &&
-             (!atomic_read(&card->force_alloc_skb))) ||
-            (card->options.cq == QETH_CQ_ENABLED)) {
+        if ((skb_len >= card->options.rx_sg_cb) &&
+            (!(card->info.type == QETH_CARD_TYPE_OSN)) &&
+            (!atomic_read(&card->force_alloc_skb))) {
                 use_rx_sg = 1;
         } else {
                 skb = dev_alloc_skb(skb_len + headroom);
@@ -4959,8 +4247,8 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
                 data_len = min(skb_len, (int)(element->length - offset));
                 if (data_len) {
                         if (use_rx_sg) {
-                                if (qeth_create_skb_frag(qethbuffer, element,
-                                    &skb, offset, &frag, data_len))
+                                if (qeth_create_skb_frag(element, &skb, offset,
+                                    &frag, data_len))
                                         goto no_mem;
                         } else {
                                 memcpy(skb_put(skb, data_len), data_ptr,
@@ -5056,44 +4344,35 @@ int qeth_core_load_discipline(struct qeth_card *card,
                 enum qeth_discipline_id discipline)
 {
         int rc = 0;
-        mutex_lock(&qeth_mod_mutex);
         switch (discipline) {
         case QETH_DISCIPLINE_LAYER3:
-                card->discipline = try_then_request_module(
-                        symbol_get(qeth_l3_discipline), "qeth_l3");
+                card->discipline.ccwgdriver = try_then_request_module(
+                        symbol_get(qeth_l3_ccwgroup_driver),
+                        "qeth_l3");
                 break;
         case QETH_DISCIPLINE_LAYER2:
-                card->discipline = try_then_request_module(
-                        symbol_get(qeth_l2_discipline), "qeth_l2");
+                card->discipline.ccwgdriver = try_then_request_module(
+                        symbol_get(qeth_l2_ccwgroup_driver),
+                        "qeth_l2");
                 break;
         }
-        if (!card->discipline) {
+        if (!card->discipline.ccwgdriver) {
                 dev_err(&card->gdev->dev, "There is no kernel module to "
                         "support discipline %d\n", discipline);
                 rc = -EINVAL;
         }
-        mutex_unlock(&qeth_mod_mutex);
         return rc;
 }
 
 void qeth_core_free_discipline(struct qeth_card *card)
 {
         if (card->options.layer2)
-                symbol_put(qeth_l2_discipline);
+                symbol_put(qeth_l2_ccwgroup_driver);
         else
-                symbol_put(qeth_l3_discipline);
-        card->discipline = NULL;
+                symbol_put(qeth_l3_ccwgroup_driver);
+        card->discipline.ccwgdriver = NULL;
 }
 
-static const struct device_type qeth_generic_devtype = {
-        .name = "qeth_generic",
-        .groups = qeth_generic_attr_groups,
-};
-static const struct device_type qeth_osn_devtype = {
-        .name = "qeth_osn",
-        .groups = qeth_osn_attr_groups,
-};
-
 static int qeth_core_probe_device(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card;
@@ -5148,17 +4427,18 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
         }
 
         if (card->info.type == QETH_CARD_TYPE_OSN)
-                gdev->dev.type = &qeth_osn_devtype;
+                rc = qeth_core_create_osn_attributes(dev);
         else
-                gdev->dev.type = &qeth_generic_devtype;
-
+                rc = qeth_core_create_device_attributes(dev);
+        if (rc)
+                goto err_dbf;
         switch (card->info.type) {
         case QETH_CARD_TYPE_OSN:
         case QETH_CARD_TYPE_OSM:
                 rc = qeth_core_load_discipline(card, QETH_DISCIPLINE_LAYER2);
                 if (rc)
-                        goto err_dbf;
-                rc = card->discipline->setup(card->gdev);
+                        goto err_attr;
+                rc = card->discipline.ccwgdriver->probe(card->gdev);
                 if (rc)
                         goto err_disc;
         case QETH_CARD_TYPE_OSD:
@@ -5176,6 +4456,11 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
 
 err_disc:
         qeth_core_free_discipline(card);
+err_attr:
+        if (card->info.type == QETH_CARD_TYPE_OSN)
+                qeth_core_remove_osn_attributes(dev);
+        else
+                qeth_core_remove_device_attributes(dev);
 err_dbf:
         debug_unregister(card->debug);
 err_card:
@@ -5192,8 +4477,14 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev)
 
         QETH_DBF_TEXT(SETUP, 2, "removedv");
 
-        if (card->discipline) {
-                card->discipline->remove(gdev);
+        if (card->info.type == QETH_CARD_TYPE_OSN) {
+                qeth_core_remove_osn_attributes(&gdev->dev);
+        } else {
+                qeth_core_remove_device_attributes(&gdev->dev);
+        }
+
+        if (card->discipline.ccwgdriver) {
+                card->discipline.ccwgdriver->remove(gdev);
                 qeth_core_free_discipline(card);
         }
 
@@ -5213,7 +4504,7 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev)
         int rc = 0;
         int def_discipline;
 
-        if (!card->discipline) {
+        if (!card->discipline.ccwgdriver) {
                 if (card->info.type == QETH_CARD_TYPE_IQD)
                         def_discipline = QETH_DISCIPLINE_LAYER3;
                 else
@@ -5221,11 +4512,11 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev)
                 rc = qeth_core_load_discipline(card, def_discipline);
                 if (rc)
                         goto err;
-                rc = card->discipline->setup(card->gdev);
+                rc = card->discipline.ccwgdriver->probe(card->gdev);
                 if (rc)
                         goto err;
         }
-        rc = card->discipline->set_online(gdev);
+        rc = card->discipline.ccwgdriver->set_online(gdev);
 err:
         return rc;
 }
@@ -5233,52 +4524,58 @@ err:
 static int qeth_core_set_offline(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        return card->discipline->set_offline(gdev);
+        return card->discipline.ccwgdriver->set_offline(gdev);
 }
 
 static void qeth_core_shutdown(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline && card->discipline->shutdown)
-                card->discipline->shutdown(gdev);
+        if (card->discipline.ccwgdriver &&
+            card->discipline.ccwgdriver->shutdown)
+                card->discipline.ccwgdriver->shutdown(gdev);
 }
 
 static int qeth_core_prepare(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline && card->discipline->prepare)
-                return card->discipline->prepare(gdev);
+        if (card->discipline.ccwgdriver &&
+            card->discipline.ccwgdriver->prepare)
+                return card->discipline.ccwgdriver->prepare(gdev);
         return 0;
 }
 
 static void qeth_core_complete(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline && card->discipline->complete)
-                card->discipline->complete(gdev);
+        if (card->discipline.ccwgdriver &&
+            card->discipline.ccwgdriver->complete)
+                card->discipline.ccwgdriver->complete(gdev);
 }
 
 static int qeth_core_freeze(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline && card->discipline->freeze)
-                return card->discipline->freeze(gdev);
+        if (card->discipline.ccwgdriver &&
+            card->discipline.ccwgdriver->freeze)
+                return card->discipline.ccwgdriver->freeze(gdev);
         return 0;
 }
 
 static int qeth_core_thaw(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline && card->discipline->thaw)
-                return card->discipline->thaw(gdev);
+        if (card->discipline.ccwgdriver &&
+            card->discipline.ccwgdriver->thaw)
+                return card->discipline.ccwgdriver->thaw(gdev);
         return 0;
 }
 
 static int qeth_core_restore(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline && card->discipline->restore)
-                return card->discipline->restore(gdev);
+        if (card->discipline.ccwgdriver &&
+            card->discipline.ccwgdriver->restore)
+                return card->discipline.ccwgdriver->restore(gdev);
         return 0;
 }
 
@@ -5287,7 +4584,8 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
                 .owner = THIS_MODULE,
                 .name = "qeth",
         },
-        .setup = qeth_core_probe_device,
+        .driver_id = 0xD8C5E3C8,
+        .probe = qeth_core_probe_device,
         .remove = qeth_core_remove_device,
         .set_online = qeth_core_set_online,
         .set_offline = qeth_core_set_offline,
@@ -5299,29 +4597,20 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
         .restore = qeth_core_restore,
 };
 
-static ssize_t qeth_core_driver_group_store(struct device_driver *ddrv,
-                                            const char *buf, size_t count)
+static ssize_t
+qeth_core_driver_group_store(struct device_driver *ddrv, const char *buf,
+                           size_t count)
 {
         int err;
-
-        err = ccwgroup_create_dev(qeth_core_root_dev,
-                                  &qeth_core_ccwgroup_driver, 3, buf);
-
-        return err ? err : count;
+        err = qeth_core_driver_group(buf, qeth_core_root_dev,
+                                        qeth_core_ccwgroup_driver.driver_id);
+        if (err)
+                return err;
+        else
+                return count;
 }
-static DRIVER_ATTR(group, 0200, NULL, qeth_core_driver_group_store);
 
-static struct attribute *qeth_drv_attrs[] = {
-        &driver_attr_group.attr,
-        NULL,
-};
-static struct attribute_group qeth_drv_attr_group = {
-        .attrs = qeth_drv_attrs,
-};
-static const struct attribute_group *qeth_drv_attr_groups[] = {
-        &qeth_drv_attr_group,
-        NULL,
-};
+static DRIVER_ATTR(group, 0200, NULL, qeth_core_driver_group_store);
 
 static struct {
         const char str[ETH_GSTRING_LEN];
@@ -5361,8 +4650,6 @@ static struct {
         {"tx do_QDIO count"},
         {"tx csum"},
         {"tx lin"},
-        {"cq handler count"},
-        {"cq handler time"}
 };
 
 int qeth_core_get_sset_count(struct net_device *dev, int stringset)
@@ -5421,8 +4708,6 @@ void qeth_core_get_ethtool_stats(struct net_device *dev,
         data[32] = card->perf_stats.outbound_do_qdio_cnt;
         data[33] = card->perf_stats.tx_csum;
         data[34] = card->perf_stats.tx_lin;
-        data[35] = card->perf_stats.cq_cnt;
-        data[36] = card->perf_stats.cq_time;
 }
 EXPORT_SYMBOL_GPL(qeth_core_get_ethtool_stats);
 
@@ -5555,46 +4840,44 @@ static int __init qeth_core_init(void)
         pr_info("loading core functions\n");
         INIT_LIST_HEAD(&qeth_core_card_list.list);
         rwlock_init(&qeth_core_card_list.rwlock);
-        mutex_init(&qeth_mod_mutex);
 
         rc = qeth_register_dbf_views();
         if (rc)
                 goto out_err;
+        rc = ccw_driver_register(&qeth_ccw_driver);
+        if (rc)
+                goto ccw_err;
+        rc = ccwgroup_driver_register(&qeth_core_ccwgroup_driver);
+        if (rc)
+                goto ccwgroup_err;
+        rc = driver_create_file(&qeth_core_ccwgroup_driver.driver,
+                                &driver_attr_group);
+        if (rc)
+                goto driver_err;
         qeth_core_root_dev = root_device_register("qeth");
         rc = IS_ERR(qeth_core_root_dev) ? PTR_ERR(qeth_core_root_dev) : 0;
         if (rc)
                 goto register_err;
+
         qeth_core_header_cache = kmem_cache_create("qeth_hdr",
                         sizeof(struct qeth_hdr) + ETH_HLEN, 64, 0, NULL);
         if (!qeth_core_header_cache) {
                 rc = -ENOMEM;
                 goto slab_err;
         }
-        qeth_qdio_outbuf_cache = kmem_cache_create("qeth_buf",
-                        sizeof(struct qeth_qdio_out_buffer), 0, 0, NULL);
-        if (!qeth_qdio_outbuf_cache) {
-                rc = -ENOMEM;
-                goto cqslab_err;
-        }
-        rc = ccw_driver_register(&qeth_ccw_driver);
-        if (rc)
-                goto ccw_err;
-        qeth_core_ccwgroup_driver.driver.groups = qeth_drv_attr_groups;
-        rc = ccwgroup_driver_register(&qeth_core_ccwgroup_driver);
-        if (rc)
-                goto ccwgroup_err;
 
         return 0;
-
-ccwgroup_err:
-        ccw_driver_unregister(&qeth_ccw_driver);
-ccw_err:
-        kmem_cache_destroy(qeth_qdio_outbuf_cache);
-cqslab_err:
-        kmem_cache_destroy(qeth_core_header_cache);
 slab_err:
         root_device_unregister(qeth_core_root_dev);
 register_err:
+        driver_remove_file(&qeth_core_ccwgroup_driver.driver,
+                           &driver_attr_group);
+driver_err:
+        ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);
+ccwgroup_err:
+        ccw_driver_unregister(&qeth_ccw_driver);
+ccw_err:
+        QETH_DBF_MESSAGE(2, "Initialization failed with code %d\n", rc);
         qeth_unregister_dbf_views();
 out_err:
         pr_err("Initializing the qeth device driver failed\n");
@@ -5603,11 +4886,12 @@ out_err:
 
 static void __exit qeth_core_exit(void)
 {
+        root_device_unregister(qeth_core_root_dev);
+        driver_remove_file(&qeth_core_ccwgroup_driver.driver,
+                           &driver_attr_group);
         ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);
         ccw_driver_unregister(&qeth_ccw_driver);
-        kmem_cache_destroy(qeth_qdio_outbuf_cache);
         kmem_cache_destroy(qeth_core_header_cache);
-        root_device_unregister(qeth_core_root_dev);
         qeth_unregister_dbf_views();
         pr_info("core functions removed\n");
 }
diff --git a/drivers/s390/net/qeth_core_mpc.c b/drivers/s390/net/qeth_core_mpc.c
index 5cebfddb86b..ec24901c802 100644
--- a/drivers/s390/net/qeth_core_mpc.c
+++ b/drivers/s390/net/qeth_core_mpc.c
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_core_mpc.c
+ *
  *    Copyright IBM Corp. 2007
  *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>,
  *               Thomas Spatzier <tspat@de.ibm.com>,
@@ -205,7 +207,6 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = {
         {IPA_RC_MC_ADDR_ALREADY_DEFINED, "Multicast address already defined"},
         {IPA_RC_LAN_OFFLINE,            "STRTLAN_LAN_DISABLED - LAN offline"},
         {IPA_RC_INVALID_IP_VERSION2,    "Invalid IP version"},
-        {IPA_RC_ENOMEM,                 "Memory problem"},
         {IPA_RC_FFFF,                   "Unknown Error"}
 };
 
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h
index 3690bbf2cb3..e5a9d1c0383 100644
--- a/drivers/s390/net/qeth_core_mpc.h
+++ b/drivers/s390/net/qeth_core_mpc.h
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_core_mpc.h
+ *
  *    Copyright IBM Corp. 2007
  *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>,
  *               Thomas Spatzier <tspat@de.ibm.com>,
@@ -68,6 +70,16 @@ enum qeth_link_types {
         QETH_LINK_TYPE_ATM_NATIVE   = 0x90,
 };
 
+enum qeth_tr_macaddr_modes {
+        QETH_TR_MACADDR_NONCANONICAL = 0,
+        QETH_TR_MACADDR_CANONICAL    = 1,
+};
+
+enum qeth_tr_broadcast_modes {
+        QETH_TR_BROADCAST_ALLRINGS = 0,
+        QETH_TR_BROADCAST_LOCAL    = 1,
+};
+
 /*
  * Routing stuff
  */
@@ -178,7 +190,6 @@ enum qeth_ipa_return_codes {
         IPA_RC_MC_ADDR_ALREADY_DEFINED  = 0xe013,
         IPA_RC_LAN_OFFLINE              = 0xe080,
         IPA_RC_INVALID_IP_VERSION2      = 0xf001,
-        IPA_RC_ENOMEM                   = 0xfffe,
         IPA_RC_FFFF                     = 0xffff
 };
 /* for DELIP */
@@ -238,7 +249,6 @@ enum qeth_ipa_setadp_cmd {
         IPA_SETADP_SET_PROMISC_MODE             = 0x00000800L,
         IPA_SETADP_SET_DIAG_ASSIST              = 0x00002000L,
         IPA_SETADP_SET_ACCESS_CONTROL           = 0x00010000L,
-        IPA_SETADP_QUERY_OAT                    = 0x00080000L,
 };
 enum qeth_ipa_mac_ops {
         CHANGE_ADDR_READ_MAC            = 0,
@@ -388,17 +398,6 @@ struct qeth_set_access_ctrl {
         __u32 subcmd_code;
 } __attribute__((packed));
 
-struct qeth_query_oat {
-        __u32 subcmd_code;
-        __u8 reserved[12];
-} __packed;
-
-struct qeth_qoat_priv {
-        __u32 buffer_len;
-        __u32 response_len;
-        char *buffer;
-};
-
 struct qeth_ipacmd_setadpparms_hdr {
         __u32 supp_hw_cmds;
         __u32 reserved1;
@@ -418,7 +417,6 @@ struct qeth_ipacmd_setadpparms {
                 struct qeth_change_addr change_addr;
                 struct qeth_snmp_cmd snmp;
                 struct qeth_set_access_ctrl set_access_ctrl;
-                struct qeth_query_oat query_oat;
                 __u32 mode;
         } data;
 } __attribute__ ((packed));
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 9655dc0ea0e..0a8e86c1b0e 100644
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_core_sys.c
+ *
  *    Copyright IBM Corp. 2007
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *               Frank Pavlic <fpavlic@de.ibm.com>,
@@ -432,8 +434,8 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
                 goto out;
         else {
                 card->info.mac_bits  = 0;
-                if (card->discipline) {
-                        card->discipline->remove(card->gdev);
+                if (card->discipline.ccwgdriver) {
+                        card->discipline.ccwgdriver->remove(card->gdev);
                         qeth_core_free_discipline(card);
                 }
         }
@@ -442,7 +444,7 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
         if (rc)
                 goto out;
 
-        rc = card->discipline->setup(card->gdev);
+        rc = card->discipline.ccwgdriver->probe(card->gdev);
 out:
         mutex_unlock(&card->discipline_mutex);
         return rc ? rc : count;
@@ -691,6 +693,7 @@ static struct attribute *qeth_blkt_device_attrs[] = {
         &dev_attr_inter_jumbo.attr,
         NULL,
 };
+
 static struct attribute_group qeth_device_blkt_group = {
         .name = "blkt",
         .attrs = qeth_blkt_device_attrs,
@@ -713,16 +716,11 @@ static struct attribute *qeth_device_attrs[] = {
         &dev_attr_hw_trap.attr,
         NULL,
 };
+
 static struct attribute_group qeth_device_attr_group = {
         .attrs = qeth_device_attrs,
 };
 
-const struct attribute_group *qeth_generic_attr_groups[] = {
-        &qeth_device_attr_group,
-        &qeth_device_blkt_group,
-        NULL,
-};
-
 static struct attribute *qeth_osn_device_attrs[] = {
         &dev_attr_state.attr,
         &dev_attr_chpid.attr,
@@ -732,10 +730,37 @@ static struct attribute *qeth_osn_device_attrs[] = {
         &dev_attr_recover.attr,
         NULL,
 };
+
 static struct attribute_group qeth_osn_device_attr_group = {
         .attrs = qeth_osn_device_attrs,
 };
-const struct attribute_group *qeth_osn_attr_groups[] = {
-        &qeth_osn_device_attr_group,
-        NULL,
-};
+
+int qeth_core_create_device_attributes(struct device *dev)
+{
+        int ret;
+        ret = sysfs_create_group(&dev->kobj, &qeth_device_attr_group);
+        if (ret)
+                return ret;
+        ret = sysfs_create_group(&dev->kobj, &qeth_device_blkt_group);
+        if (ret)
+                sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
+
+        return 0;
+}
+
+void qeth_core_remove_device_attributes(struct device *dev)
+{
+        sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
+        sysfs_remove_group(&dev->kobj, &qeth_device_blkt_group);
+}
+
+int qeth_core_create_osn_attributes(struct device *dev)
+{
+        return sysfs_create_group(&dev->kobj, &qeth_osn_device_attr_group);
+}
+
+void qeth_core_remove_osn_attributes(struct device *dev)
+{
+        sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group);
+        return;
+}
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 73195553f84..b70b47fbd6c 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_l2_main.c
+ *
  *    Copyright IBM Corp. 2007, 2009
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *               Frank Pavlic <fpavlic@de.ibm.com>,
@@ -73,9 +75,6 @@ static int qeth_l2_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                         mii_data->val_out = qeth_mdio_read(dev,
                                 mii_data->phy_id, mii_data->reg_num);
                 break;
-        case SIOC_QETH_QUERY_OAT:
-                rc = qeth_query_oat_command(card, rq->ifr_ifru.ifru_data);
-                break;
         default:
                 rc = -EOPNOTSUPP;
         }
@@ -302,21 +301,21 @@ static void qeth_l2_process_vlans(struct qeth_card *card)
         spin_unlock_bh(&card->vlanlock);
 }
 
-static int qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 {
         struct qeth_card *card = dev->ml_priv;
         struct qeth_vlan_vid *id;
 
         QETH_CARD_TEXT_(card, 4, "aid:%d", vid);
         if (!vid)
-                return 0;
+                return;
         if (card->info.type == QETH_CARD_TYPE_OSM) {
                 QETH_CARD_TEXT(card, 3, "aidOSM");
-                return 0;
+                return;
         }
         if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
                 QETH_CARD_TEXT(card, 3, "aidREC");
-                return 0;
+                return;
         }
         id = kmalloc(sizeof(struct qeth_vlan_vid), GFP_ATOMIC);
         if (id) {
@@ -325,13 +324,10 @@ static int qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
                 spin_lock_bh(&card->vlanlock);
                 list_add_tail(&id->list, &card->vid_list);
                 spin_unlock_bh(&card->vlanlock);
-        } else {
-                return -ENOMEM;
         }
-        return 0;
 }
 
-static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 {
         struct qeth_vlan_vid *id, *tmpid = NULL;
         struct qeth_card *card = dev->ml_priv;
@@ -339,11 +335,11 @@ static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
         QETH_CARD_TEXT_(card, 4, "kid:%d", vid);
         if (card->info.type == QETH_CARD_TYPE_OSM) {
                 QETH_CARD_TEXT(card, 3, "kidOSM");
-                return 0;
+                return;
         }
         if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
                 QETH_CARD_TEXT(card, 3, "kidREC");
-                return 0;
+                return;
         }
         spin_lock_bh(&card->vlanlock);
         list_for_each_entry(id, &card->vid_list, list) {
@@ -359,7 +355,6 @@ static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
                 kfree(tmpid);
         }
         qeth_l2_set_multicast_list(card->dev);
-        return 0;
 }
 
 static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)
@@ -411,10 +406,10 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card,
         unsigned int len;
 
         *done = 0;
-        WARN_ON_ONCE(!budget);
+        BUG_ON(!budget);
         while (budget) {
                 skb = qeth_core_get_next_skb(card,
-                        &card->qdio.in_q->bufs[card->rx.b_index],
+                        card->qdio.in_q->bufs[card->rx.b_index].buffer,
                         &card->rx.b_element, &card->rx.e_offset, &hdr);
                 if (!skb) {
                         *done = 1;
@@ -574,6 +569,7 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
                 default:
                         break;
                 }
+                cmd->hdr.return_code = -EIO;
         } else {
                 card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;
                 memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac,
@@ -602,6 +598,7 @@ static int qeth_l2_send_delmac_cb(struct qeth_card *card,
         cmd = (struct qeth_ipa_cmd *) data;
         if (cmd->hdr.return_code) {
                 QETH_CARD_TEXT_(card, 2, "err%d", cmd->hdr.return_code);
+                cmd->hdr.return_code = -EIO;
                 return 0;
         }
         card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
@@ -626,13 +623,10 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
         QETH_DBF_TEXT(SETUP, 2, "doL2init");
         QETH_DBF_TEXT_(SETUP, 2, "doL2%s", CARD_BUS_ID(card));
 
-        if (qeth_is_supported(card, IPA_SETADAPTERPARMS)) {
-                rc = qeth_query_setadapterparms(card);
-                if (rc) {
-                        QETH_DBF_MESSAGE(2, "could not query adapter "
-                                "parameters on device %s: x%x\n",
-                                CARD_BUS_ID(card), rc);
-                }
+        rc = qeth_query_setadapterparms(card);
+        if (rc) {
+                QETH_DBF_MESSAGE(2, "could not query adapter parameters on "
+                        "device %s: x%x\n", CARD_BUS_ID(card), rc);
         }
 
         if (card->info.type == QETH_CARD_TYPE_IQD ||
@@ -648,7 +642,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
                 }
                 QETH_DBF_HEX(SETUP, 2, card->dev->dev_addr, OSA_ADDR_LEN);
         } else {
-                eth_random_addr(card->dev->dev_addr);
+                random_ether_addr(card->dev->dev_addr);
                 memcpy(card->dev->dev_addr, vendor_pre, 3);
         }
         return 0;
@@ -679,9 +673,9 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
                 return -ERESTARTSYS;
         }
         rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]);
-        if (!rc || (rc == IPA_RC_L2_MAC_NOT_FOUND))
+        if (!rc)
                 rc = qeth_l2_send_setmac(card, addr->sa_data);
-        return rc ? -EINVAL : 0;
+        return rc;
 }
 
 static void qeth_l2_set_multicast_list(struct net_device *dev)
@@ -883,6 +877,12 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
         INIT_LIST_HEAD(&card->mc_list);
         card->options.layer2 = 1;
         card->info.hwtrap = 0;
+        card->discipline.start_poll = qeth_qdio_start_poll;
+        card->discipline.input_handler = (qdio_handler_t *)
+                qeth_qdio_input_handler;
+        card->discipline.output_handler = (qdio_handler_t *)
+                qeth_qdio_output_handler;
+        card->discipline.recover = qeth_l2_recover;
         return 0;
 }
 
@@ -925,7 +925,7 @@ static const struct net_device_ops qeth_l2_netdev_ops = {
         .ndo_get_stats          = qeth_get_stats,
         .ndo_start_xmit         = qeth_l2_hard_start_xmit,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_rx_mode        = qeth_l2_set_multicast_list,
+        .ndo_set_multicast_list = qeth_l2_set_multicast_list,
         .ndo_do_ioctl           = qeth_l2_do_ioctl,
         .ndo_set_mac_address    = qeth_l2_set_mac_address,
         .ndo_change_mtu         = qeth_change_mtu,
@@ -973,6 +973,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         int rc = 0;
         enum qeth_card_states recover_flag;
 
+        BUG_ON(!card);
         mutex_lock(&card->discipline_mutex);
         mutex_lock(&card->conf_mutex);
         QETH_DBF_TEXT(SETUP, 2, "setonlin");
@@ -985,7 +986,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 rc = -ENODEV;
                 goto out_remove;
         }
-        qeth_trace_features(card);
 
         if (!card->dev && qeth_l2_setup_netdev(card)) {
                 rc = -ENODEV;
@@ -1144,12 +1144,11 @@ static int qeth_l2_recover(void *ptr)
                 dev_info(&card->gdev->dev,
                         "Device successfully recovered!\n");
         else {
-                if (rtnl_trylock()) {
-                        dev_close(card->dev);
-                        rtnl_unlock();
-                        dev_warn(&card->gdev->dev, "The qeth device driver "
-                                "failed to recover an error on the device\n");
-                }
+                rtnl_lock();
+                dev_close(card->dev);
+                rtnl_unlock();
+                dev_warn(&card->gdev->dev, "The qeth device driver "
+                        "failed to recover an error on the device\n");
         }
         qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
         qeth_clear_thread_running_bit(card, QETH_RECOVER_THREAD);
@@ -1170,7 +1169,6 @@ static void __exit qeth_l2_exit(void)
 static void qeth_l2_shutdown(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        qeth_set_allowed_threads(card, 0, 1);
         if ((gdev->state == CCWGROUP_ONLINE) && card->info.hwtrap)
                 qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
         qeth_qdio_clear_card(card, 0);
@@ -1223,12 +1221,8 @@ out:
         return rc;
 }
 
-struct qeth_discipline qeth_l2_discipline = {
-        .start_poll = qeth_qdio_start_poll,
-        .input_handler = (qdio_handler_t *) qeth_qdio_input_handler,
-        .output_handler = (qdio_handler_t *) qeth_qdio_output_handler,
-        .recover = qeth_l2_recover,
-        .setup = qeth_l2_probe_device,
+struct ccwgroup_driver qeth_l2_ccwgroup_driver = {
+        .probe = qeth_l2_probe_device,
         .remove = qeth_l2_remove_device,
         .set_online = qeth_l2_set_online,
         .set_offline = qeth_l2_set_offline,
@@ -1237,7 +1231,7 @@ struct qeth_discipline qeth_l2_discipline = {
         .thaw = qeth_l2_pm_resume,
         .restore = qeth_l2_pm_resume,
 };
-EXPORT_SYMBOL_GPL(qeth_l2_discipline);
+EXPORT_SYMBOL_GPL(qeth_l2_ccwgroup_driver);
 
 static int qeth_osn_send_control_data(struct qeth_card *card, int len,
                            struct qeth_cmd_buffer *iob)
diff --git a/drivers/s390/net/qeth_l3.h b/drivers/s390/net/qeth_l3.h
index 29c1c00e3a0..14a43aeb0c2 100644
--- a/drivers/s390/net/qeth_l3.h
+++ b/drivers/s390/net/qeth_l3.h
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_l3.h
+ *
  *    Copyright IBM Corp. 2007
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *               Frank Pavlic <fpavlic@de.ibm.com>,
@@ -61,9 +63,5 @@ int qeth_l3_add_rxip(struct qeth_card *, enum qeth_prot_versions, const u8 *);
 void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions,
                         const u8 *);
 int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *, struct qeth_ipaddr *);
-struct qeth_ipaddr *qeth_l3_get_addr_buffer(enum qeth_prot_versions);
-int qeth_l3_add_ip(struct qeth_card *, struct qeth_ipaddr *);
-int qeth_l3_delete_ip(struct qeth_card *, struct qeth_ipaddr *);
-void qeth_l3_set_ip_addr_list(struct qeth_card *);
 
 #endif /* __QETH_L3_H__ */
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 6e5eef01e66..c74e8670fab 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_l3_main.c
+ *
  *    Copyright IBM Corp. 2007, 2009
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *               Frank Pavlic <fpavlic@de.ibm.com>,
@@ -26,10 +28,7 @@
 
 #include <net/ip.h>
 #include <net/arp.h>
-#include <net/route.h>
-#include <net/ip6_fib.h>
 #include <net/ip6_checksum.h>
-#include <net/iucv/af_iucv.h>
 
 #include "qeth_l3.h"
 
@@ -268,7 +267,7 @@ static int __qeth_l3_insert_ip_todo(struct qeth_card *card,
         }
 }
 
-int qeth_l3_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
+static int qeth_l3_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
 {
         unsigned long flags;
         int rc = 0;
@@ -287,7 +286,7 @@ int qeth_l3_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
         return rc;
 }
 
-int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
+static int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
 {
         unsigned long flags;
         int rc = 0;
@@ -306,7 +305,7 @@ int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
 }
 
 
-struct qeth_ipaddr *qeth_l3_get_addr_buffer(
+static struct qeth_ipaddr *qeth_l3_get_addr_buffer(
                                 enum qeth_prot_versions prot)
 {
         struct qeth_ipaddr *addr;
@@ -422,7 +421,7 @@ again:
         list_splice(&fail_list, &card->ip_list);
 }
 
-void qeth_l3_set_ip_addr_list(struct qeth_card *card)
+static void qeth_l3_set_ip_addr_list(struct qeth_card *card)
 {
         struct list_head *tbd_list;
         struct qeth_ipaddr *todo, *addr;
@@ -439,7 +438,7 @@ void qeth_l3_set_ip_addr_list(struct qeth_card *card)
 
         spin_lock_irqsave(&card->ip_lock, flags);
         tbd_list = card->ip_tbd_list;
-        card->ip_tbd_list = kzalloc(sizeof(struct list_head), GFP_ATOMIC);
+        card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_ATOMIC);
         if (!card->ip_tbd_list) {
                 QETH_CARD_TEXT(card, 0, "silnomem");
                 card->ip_tbd_list = tbd_list;
@@ -794,7 +793,6 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto,
                 rc = -EEXIST;
         spin_unlock_irqrestore(&card->ip_lock, flags);
         if (rc) {
-                kfree(ipaddr);
                 return rc;
         }
         if (!qeth_l3_add_ip(card, ipaddr))
@@ -859,7 +857,6 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto,
                 rc = -EEXIST;
         spin_unlock_irqrestore(&card->ip_lock, flags);
         if (rc) {
-                kfree(ipaddr);
                 return rc;
         }
         if (!qeth_l3_add_ip(card, ipaddr))
@@ -976,6 +973,57 @@ static inline u8 qeth_l3_get_qeth_hdr_flags6(int cast_type)
         return ct | QETH_CAST_UNICAST;
 }
 
+static int qeth_l3_send_setadp_mode(struct qeth_card *card, __u32 command,
+                                        __u32 mode)
+{
+        int rc;
+        struct qeth_cmd_buffer *iob;
+        struct qeth_ipa_cmd *cmd;
+
+        QETH_CARD_TEXT(card, 4, "adpmode");
+
+        iob = qeth_get_adapter_cmd(card, command,
+                                   sizeof(struct qeth_ipacmd_setadpparms));
+        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
+        cmd->data.setadapterparms.data.mode = mode;
+        rc = qeth_send_ipa_cmd(card, iob, qeth_default_setadapterparms_cb,
+                               NULL);
+        return rc;
+}
+
+static int qeth_l3_setadapter_hstr(struct qeth_card *card)
+{
+        int rc;
+
+        QETH_CARD_TEXT(card, 4, "adphstr");
+
+        if (qeth_adp_supported(card, IPA_SETADP_SET_BROADCAST_MODE)) {
+                rc = qeth_l3_send_setadp_mode(card,
+                                        IPA_SETADP_SET_BROADCAST_MODE,
+                                        card->options.broadcast_mode);
+                if (rc)
+                        QETH_DBF_MESSAGE(2, "couldn't set broadcast mode on "
+                                   "device %s: x%x\n",
+                                   CARD_BUS_ID(card), rc);
+                rc = qeth_l3_send_setadp_mode(card,
+                                        IPA_SETADP_ALTER_MAC_ADDRESS,
+                                        card->options.macaddr_mode);
+                if (rc)
+                        QETH_DBF_MESSAGE(2, "couldn't set macaddr mode on "
+                                   "device %s: x%x\n", CARD_BUS_ID(card), rc);
+                return rc;
+        }
+        if (card->options.broadcast_mode == QETH_TR_BROADCAST_LOCAL)
+                QETH_DBF_MESSAGE(2, "set adapter parameters not available "
+                           "to set broadcast mode, using ALLRINGS "
+                           "on device %s:\n", CARD_BUS_ID(card));
+        if (card->options.macaddr_mode == QETH_TR_MACADDR_CANONICAL)
+                QETH_DBF_MESSAGE(2, "set adapter parameters not available "
+                           "to set macaddr mode, using NONCANONICAL "
+                           "on device %s:\n", CARD_BUS_ID(card));
+        return 0;
+}
+
 static int qeth_l3_setadapter_parms(struct qeth_card *card)
 {
         int rc;
@@ -1001,6 +1049,10 @@ static int qeth_l3_setadapter_parms(struct qeth_card *card)
                                 " address failed\n");
         }
 
+        if ((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+            (card->info.link_type == QETH_LINK_TYPE_LANE_TR))
+                rc = qeth_l3_setadapter_hstr(card);
+
         return rc;
 }
 
@@ -1362,7 +1414,7 @@ static int qeth_l3_send_checksum_command(struct qeth_card *card)
         return 0;
 }
 
-static int qeth_l3_set_rx_csum(struct qeth_card *card, int on)
+int qeth_l3_set_rx_csum(struct qeth_card *card, int on)
 {
         int rc = 0;
 
@@ -1473,7 +1525,7 @@ static int qeth_l3_iqd_read_initial_mac_cb(struct qeth_card *card,
                 memcpy(card->dev->dev_addr,
                         cmd->data.create_destroy_addr.unique_id, ETH_ALEN);
         else
-                eth_random_addr(card->dev->dev_addr);
+                random_ether_addr(card->dev->dev_addr);
 
         return 0;
 }
@@ -1616,7 +1668,10 @@ qeth_diags_trace(struct qeth_card *card, enum qeth_diags_trace_cmds diags_cmd)
 static void qeth_l3_get_mac_for_ipm(__u32 ipm, char *mac,
                                 struct net_device *dev)
 {
-        ip_eth_mc_map(ipm, mac);
+        if (dev->type == ARPHRD_IEEE802_TR)
+                ip_tr_mc_map(ipm, mac);
+        else
+                ip_eth_mc_map(ipm, mac);
 }
 
 static void qeth_l3_add_mc(struct qeth_card *card, struct in_device *in4_dev)
@@ -1760,8 +1815,6 @@ static void qeth_l3_free_vlan_addresses4(struct qeth_card *card,
         QETH_CARD_TEXT(card, 4, "frvaddr4");
 
         netdev = __vlan_find_dev_deep(card->dev, vid);
-        if (!netdev)
-                return;
         in_dev = in_dev_get(netdev);
         if (!in_dev)
                 return;
@@ -1790,8 +1843,6 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card,
         QETH_CARD_TEXT(card, 4, "frvaddr6");
 
         netdev = __vlan_find_dev_deep(card->dev, vid);
-        if (!netdev)
-                return;
         in6_dev = in6_dev_get(netdev);
         if (!in6_dev)
                 return;
@@ -1817,15 +1868,15 @@ static void qeth_l3_free_vlan_addresses(struct qeth_card *card,
         qeth_l3_free_vlan_addresses6(card, vid);
 }
 
-static int qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static void qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 {
         struct qeth_card *card = dev->ml_priv;
 
         set_bit(vid, card->active_vlans);
-        return 0;
+        return;
 }
 
-static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 {
         struct qeth_card *card = dev->ml_priv;
         unsigned long flags;
@@ -1833,7 +1884,7 @@ static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
         QETH_CARD_TEXT_(card, 4, "kid:%d", vid);
         if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
                 QETH_CARD_TEXT(card, 3, "kidREC");
-                return 0;
+                return;
         }
         spin_lock_irqsave(&card->vlanlock, flags);
         /* unregister IP addresses of vlan device */
@@ -1841,7 +1892,6 @@ static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
         clear_bit(vid, card->active_vlans);
         spin_unlock_irqrestore(&card->vlanlock, flags);
         qeth_l3_set_multicast_list(card->dev);
-        return 0;
 }
 
 static inline int qeth_l3_rebuild_skb(struct qeth_card *card,
@@ -1868,6 +1918,8 @@ static inline int qeth_l3_rebuild_skb(struct qeth_card *card,
 #endif
                         case __constant_htons(ETH_P_IP):
                                 ip_hdr = (struct iphdr *)skb->data;
+                                (card->dev->type == ARPHRD_IEEE802_TR) ?
+                                ip_tr_mc_map(ip_hdr->daddr, tg_addr):
                                 ip_eth_mc_map(ip_hdr->daddr, tg_addr);
                                 break;
                         default:
@@ -1903,7 +1955,12 @@ static inline int qeth_l3_rebuild_skb(struct qeth_card *card,
                                 tg_addr, "FAKELL", card->dev->addr_len);
         }
 
-        skb->protocol = eth_type_trans(skb, card->dev);
+#ifdef CONFIG_TR
+        if (card->dev->type == ARPHRD_IEEE802_TR)
+                skb->protocol = tr_type_trans(skb, card->dev);
+        else
+#endif
+                skb->protocol = eth_type_trans(skb, card->dev);
 
         if (hdr->hdr.l3.ext_flags &
             (QETH_HDR_EXT_VLAN_FRAME | QETH_HDR_EXT_INCLUDE_VLAN_TAG)) {
@@ -1936,13 +1993,12 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
         __u16 vlan_tag = 0;
         int is_vlan;
         unsigned int len;
-        __u16 magic;
 
         *done = 0;
-        WARN_ON_ONCE(!budget);
+        BUG_ON(!budget);
         while (budget) {
                 skb = qeth_core_get_next_skb(card,
-                        &card->qdio.in_q->bufs[card->rx.b_index],
+                        card->qdio.in_q->bufs[card->rx.b_index].buffer,
                         &card->rx.b_element, &card->rx.e_offset, &hdr);
                 if (!skb) {
                         *done = 1;
@@ -1951,26 +2007,12 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
                 skb->dev = card->dev;
                 switch (hdr->hdr.l3.id) {
                 case QETH_HEADER_TYPE_LAYER3:
-                        magic = *(__u16 *)skb->data;
-                        if ((card->info.type == QETH_CARD_TYPE_IQD) &&
-                            (magic == ETH_P_AF_IUCV)) {
-                                skb->protocol = ETH_P_AF_IUCV;
-                                skb->pkt_type = PACKET_HOST;
-                                skb->mac_header = NET_SKB_PAD;
-                                skb->dev = card->dev;
-                                len = skb->len;
-                                card->dev->header_ops->create(skb, card->dev, 0,
-                                        card->dev->dev_addr, "FAKELL",
-                                        card->dev->addr_len);
-                                netif_receive_skb(skb);
-                        } else {
-                                is_vlan = qeth_l3_rebuild_skb(card, skb, hdr,
+                        is_vlan = qeth_l3_rebuild_skb(card, skb, hdr,
                                                       &vlan_tag);
-                                len = skb->len;
-                                if (is_vlan && !card->options.sniffer)
-                                        __vlan_hwaccel_put_tag(skb, vlan_tag);
-                                napi_gro_receive(&card->napi, skb);
-                        }
+                        len = skb->len;
+                        if (is_vlan && !card->options.sniffer)
+                                __vlan_hwaccel_put_tag(skb, vlan_tag);
+                        napi_gro_receive(&card->napi, skb);
                         break;
                 case QETH_HEADER_TYPE_LAYER2: /* for HiperSockets sniffer */
                         skb->pkt_type = PACKET_HOST;
@@ -2077,7 +2119,7 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev,
                 struct net_device *netdev;
 
                 rcu_read_lock();
-                netdev = __vlan_find_dev_deep(card->dev, vid);
+                netdev = __vlan_find_dev_deep(dev, vid);
                 rcu_read_unlock();
                 if (netdev == dev) {
                         rc = QETH_VLAN_CARD;
@@ -2369,7 +2411,7 @@ static int qeth_l3_arp_query_cb(struct qeth_card *card,
 
                 if ((qinfo->udata_len - qinfo->udata_offset) < esize) {
                         QETH_CARD_TEXT_(card, 4, "qaer3%i", -ENOMEM);
-                        cmd->hdr.return_code = IPA_RC_ENOMEM;
+                        cmd->hdr.return_code = -ENOMEM;
                         goto out_error;
                 }
 
@@ -2684,9 +2726,6 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                                         mii_data->phy_id,
                                                         mii_data->reg_num);
                 break;
-        case SIOC_QETH_QUERY_OAT:
-                rc = qeth_query_oat_command(card, rq->ifr_ifru.ifru_data);
-                break;
         default:
                 rc = -EOPNOTSUPP;
         }
@@ -2704,11 +2743,10 @@ int inline qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb)
         rcu_read_lock();
         dst = skb_dst(skb);
         if (dst)
-                n = dst_neigh_lookup_skb(dst, skb);
+                n = dst_get_neighbour(dst);
         if (n) {
                 cast_type = n->type;
                 rcu_read_unlock();
-                neigh_release(n);
                 if ((cast_type == RTN_BROADCAST) ||
                     (cast_type == RTN_MULTICAST) ||
                     (cast_type == RTN_ANYCAST))
@@ -2750,33 +2788,10 @@ int inline qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb)
         return cast_type;
 }
 
-static void qeth_l3_fill_af_iucv_hdr(struct qeth_card *card,
-                struct qeth_hdr *hdr, struct sk_buff *skb)
-{
-        char daddr[16];
-        struct af_iucv_trans_hdr *iucv_hdr;
-
-        skb_pull(skb, 14);
-        card->dev->header_ops->create(skb, card->dev, 0,
-                                      card->dev->dev_addr, card->dev->dev_addr,
-                                      card->dev->addr_len);
-        skb_pull(skb, 14);
-        iucv_hdr = (struct af_iucv_trans_hdr *)skb->data;
-        memset(hdr, 0, sizeof(struct qeth_hdr));
-        hdr->hdr.l3.id = QETH_HEADER_TYPE_LAYER3;
-        hdr->hdr.l3.ext_flags = 0;
-        hdr->hdr.l3.length = skb->len;
-        hdr->hdr.l3.flags = QETH_HDR_IPV6 | QETH_CAST_UNICAST;
-        memset(daddr, 0, sizeof(daddr));
-        daddr[0] = 0xfe;
-        daddr[1] = 0x80;
-        memcpy(&daddr[8], iucv_hdr->destUserID, 8);
-        memcpy(hdr->hdr.l3.dest_addr, daddr, 16);
-}
-
 static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
                 struct sk_buff *skb, int ipv, int cast_type)
 {
+        struct neighbour *n = NULL;
         struct dst_entry *dst;
 
         memset(hdr, 0, sizeof(struct qeth_hdr));
@@ -2799,31 +2814,41 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
 
         rcu_read_lock();
         dst = skb_dst(skb);
+        if (dst)
+                n = dst_get_neighbour(dst);
         if (ipv == 4) {
-                struct rtable *rt = (struct rtable *) dst;
-                __be32 *pkey = &ip_hdr(skb)->daddr;
-
-                if (rt->rt_gateway)
-                        pkey = &rt->rt_gateway;
-
                 /* IPv4 */
                 hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags4(cast_type);
                 memset(hdr->hdr.l3.dest_addr, 0, 12);
-                *((__be32 *) (&hdr->hdr.l3.dest_addr[12])) = *pkey;
+                if (n) {
+                        *((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
+                            *((u32 *) n->primary_key);
+                } else {
+                        /* fill in destination address used in ip header */
+                        *((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
+                                                        ip_hdr(skb)->daddr;
+                }
         } else if (ipv == 6) {
-                struct rt6_info *rt = (struct rt6_info *) dst;
-                struct in6_addr *pkey = &ipv6_hdr(skb)->daddr;
-
-                if (!ipv6_addr_any(&rt->rt6i_gateway))
-                        pkey = &rt->rt6i_gateway;
-
                 /* IPv6 */
                 hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags6(cast_type);
                 if (card->info.type == QETH_CARD_TYPE_IQD)
                         hdr->hdr.l3.flags &= ~QETH_HDR_PASSTHRU;
-                memcpy(hdr->hdr.l3.dest_addr, pkey, 16);
+                if (n) {
+                        memcpy(hdr->hdr.l3.dest_addr,
+                               n->primary_key, 16);
+                } else {
+                        /* fill in destination address used in ip header */
+                        memcpy(hdr->hdr.l3.dest_addr,
+                               &ipv6_hdr(skb)->daddr, 16);
+                }
         } else {
-                if (!memcmp(skb->data + sizeof(struct qeth_hdr),
+                /* passthrough */
+                if ((skb->dev->type == ARPHRD_IEEE802_TR) &&
+                        !memcmp(skb->data + sizeof(struct qeth_hdr) +
+                        sizeof(__u16), skb->dev->broadcast, 6)) {
+                        hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
+                                                QETH_HDR_PASSTHRU;
+                } else if (!memcmp(skb->data + sizeof(struct qeth_hdr),
                             skb->dev->broadcast, 6)) {
                         /* broadcast? */
                         hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
@@ -2918,11 +2943,8 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         int data_offset = -1;
         int nr_frags;
 
-        if (((card->info.type == QETH_CARD_TYPE_IQD) &&
-             (((card->options.cq != QETH_CQ_ENABLED) && !ipv) ||
-              ((card->options.cq == QETH_CQ_ENABLED) &&
-               (skb->protocol != ETH_P_AF_IUCV)))) ||
-            card->options.sniffer)
+        if (((card->info.type == QETH_CARD_TYPE_IQD) && (!ipv)) ||
+             card->options.sniffer)
                         goto tx_drop;
 
         if ((card->state != CARD_STATE_UP) || !card->lan_online) {
@@ -2944,10 +2966,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if ((card->info.type == QETH_CARD_TYPE_IQD) && (!large_send) &&
             (skb_shinfo(skb)->nr_frags == 0)) {
                 new_skb = skb;
-                if (new_skb->protocol == ETH_P_AF_IUCV)
-                        data_offset = 0;
-                else
-                        data_offset = ETH_HLEN;
+                data_offset = ETH_HLEN;
                 hdr = kmem_cache_alloc(qeth_core_header_cache, GFP_ATOMIC);
                 if (!hdr)
                         goto tx_drop;
@@ -2965,7 +2984,10 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         skb_pull(new_skb, ETH_HLEN);
         } else {
                 if (ipv == 4) {
-                        skb_pull(new_skb, ETH_HLEN);
+                        if (card->dev->type == ARPHRD_IEEE802_TR)
+                                skb_pull(new_skb, TR_HLEN);
+                        else
+                                skb_pull(new_skb, ETH_HLEN);
                 }
 
                 if (ipv != 4 && vlan_tx_tag_present(new_skb)) {
@@ -2978,6 +3000,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         tag = (u16 *)(new_skb->data + 12);
                         *tag = __constant_htons(ETH_P_8021Q);
                         *(tag + 1) = htons(vlan_tx_tag_get(new_skb));
+                        new_skb->vlan_tci = 0;
                 }
         }
 
@@ -3009,13 +3032,9 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         qeth_l3_fill_header(card, hdr, new_skb, ipv,
                                                 cast_type);
                 } else {
-                        if (new_skb->protocol == ETH_P_AF_IUCV)
-                                qeth_l3_fill_af_iucv_hdr(card, hdr, new_skb);
-                        else {
-                                qeth_l3_fill_header(card, hdr, new_skb, ipv,
-                                                        cast_type);
-                                hdr->hdr.l3.length = new_skb->len - data_offset;
-                        }
+                        qeth_l3_fill_header(card, hdr, new_skb, ipv,
+                                                cast_type);
+                        hdr->hdr.l3.length = new_skb->len - data_offset;
                 }
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL)
@@ -3141,8 +3160,7 @@ static int qeth_l3_stop(struct net_device *dev)
         return 0;
 }
 
-static netdev_features_t qeth_l3_fix_features(struct net_device *dev,
-        netdev_features_t features)
+static u32 qeth_l3_fix_features(struct net_device *dev, u32 features)
 {
         struct qeth_card *card = dev->ml_priv;
 
@@ -3156,8 +3174,7 @@ static netdev_features_t qeth_l3_fix_features(struct net_device *dev,
         return features;
 }
 
-static int qeth_l3_set_features(struct net_device *dev,
-        netdev_features_t features)
+static int qeth_l3_set_features(struct net_device *dev, u32 features)
 {
         struct qeth_card *card = dev->ml_priv;
         u32 changed = dev->features ^ features;
@@ -3216,7 +3233,7 @@ static const struct net_device_ops qeth_l3_netdev_ops = {
         .ndo_get_stats          = qeth_get_stats,
         .ndo_start_xmit         = qeth_l3_hard_start_xmit,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_rx_mode        = qeth_l3_set_multicast_list,
+        .ndo_set_multicast_list = qeth_l3_set_multicast_list,
         .ndo_do_ioctl           = qeth_l3_do_ioctl,
         .ndo_change_mtu         = qeth_change_mtu,
         .ndo_fix_features       = qeth_l3_fix_features,
@@ -3232,7 +3249,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = {
         .ndo_get_stats          = qeth_get_stats,
         .ndo_start_xmit         = qeth_l3_hard_start_xmit,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_rx_mode        = qeth_l3_set_multicast_list,
+        .ndo_set_multicast_list = qeth_l3_set_multicast_list,
         .ndo_do_ioctl           = qeth_l3_do_ioctl,
         .ndo_change_mtu         = qeth_change_mtu,
         .ndo_fix_features       = qeth_l3_fix_features,
@@ -3249,8 +3266,12 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
             card->info.type == QETH_CARD_TYPE_OSX) {
                 if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) ||
                     (card->info.link_type == QETH_LINK_TYPE_HSTR)) {
-                        pr_info("qeth_l3: ignoring TR device\n");
-                        return -ENODEV;
+#ifdef CONFIG_TR
+                        card->dev = alloc_trdev(0);
+#endif
+                        if (!card->dev)
+                                return -ENODEV;
+                        card->dev->netdev_ops = &qeth_l3_netdev_ops;
                 } else {
                         card->dev = alloc_etherdev(0);
                         if (!card->dev)
@@ -3276,8 +3297,6 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
                 card->dev->flags |= IFF_NOARP;
                 card->dev->netdev_ops = &qeth_l3_netdev_ops;
                 qeth_l3_iqd_read_initial_mac(card);
-                if (card->options.hsuid[0])
-                        memcpy(card->dev->perm_addr, card->options.hsuid, 9);
         } else
                 return -ENODEV;
 
@@ -3303,6 +3322,12 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
         qeth_l3_create_device_attributes(&gdev->dev);
         card->options.layer2 = 0;
         card->info.hwtrap = 0;
+        card->discipline.start_poll = qeth_qdio_start_poll;
+        card->discipline.input_handler = (qdio_handler_t *)
+                qeth_qdio_input_handler;
+        card->discipline.output_handler = (qdio_handler_t *)
+                qeth_qdio_output_handler;
+        card->discipline.recover = qeth_l3_recover;
         return 0;
 }
 
@@ -3334,6 +3359,7 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         int rc = 0;
         enum qeth_card_states recover_flag;
 
+        BUG_ON(!card);
         mutex_lock(&card->discipline_mutex);
         mutex_lock(&card->conf_mutex);
         QETH_DBF_TEXT(SETUP, 2, "setonlin");
@@ -3346,7 +3372,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 rc = -ENODEV;
                 goto out_remove;
         }
-        qeth_trace_features(card);
 
         if (!card->dev && qeth_l3_setup_netdev(card)) {
                 rc = -ENODEV;
@@ -3413,13 +3438,14 @@ contin:
         else
                 netif_carrier_off(card->dev);
         if (recover_flag == CARD_STATE_RECOVER) {
-                rtnl_lock();
                 if (recovery_mode)
                         __qeth_l3_open(card->dev);
-                else
+                else {
+                        rtnl_lock();
                         dev_open(card->dev);
+                        rtnl_unlock();
+                }
                 qeth_l3_set_multicast_list(card->dev);
-                rtnl_unlock();
         }
         /* let user_space know that device is online */
         kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
@@ -3465,11 +3491,6 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
                 card->info.hwtrap = 1;
         }
         qeth_l3_stop_card(card, recovery_mode);
-        if ((card->options.cq == QETH_CQ_ENABLED) && card->dev) {
-                rtnl_lock();
-                call_netdevice_notifiers(NETDEV_REBOOT, card->dev);
-                rtnl_unlock();
-        }
         rc  = ccw_device_set_offline(CARD_DDEV(card));
         rc2 = ccw_device_set_offline(CARD_WDEV(card));
         rc3 = ccw_device_set_offline(CARD_RDEV(card));
@@ -3510,12 +3531,11 @@ static int qeth_l3_recover(void *ptr)
                 dev_info(&card->gdev->dev,
                         "Device successfully recovered!\n");
         else {
-                if (rtnl_trylock()) {
-                        dev_close(card->dev);
-                        rtnl_unlock();
-                        dev_warn(&card->gdev->dev, "The qeth device driver "
-                                "failed to recover an error on the device\n");
-                }
+                rtnl_lock();
+                dev_close(card->dev);
+                rtnl_unlock();
+                dev_warn(&card->gdev->dev, "The qeth device driver "
+                        "failed to recover an error on the device\n");
         }
         qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
         qeth_clear_thread_running_bit(card, QETH_RECOVER_THREAD);
@@ -3525,7 +3545,6 @@ static int qeth_l3_recover(void *ptr)
 static void qeth_l3_shutdown(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        qeth_set_allowed_threads(card, 0, 1);
         if ((gdev->state == CCWGROUP_ONLINE) && card->info.hwtrap)
                 qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
         qeth_qdio_clear_card(card, 0);
@@ -3578,12 +3597,8 @@ out:
         return rc;
 }
 
-struct qeth_discipline qeth_l3_discipline = {
-        .start_poll = qeth_qdio_start_poll,
-        .input_handler = (qdio_handler_t *) qeth_qdio_input_handler,
-        .output_handler = (qdio_handler_t *) qeth_qdio_output_handler,
-        .recover = qeth_l3_recover,
-        .setup = qeth_l3_probe_device,
+struct ccwgroup_driver qeth_l3_ccwgroup_driver = {
+        .probe = qeth_l3_probe_device,
         .remove = qeth_l3_remove_device,
         .set_online = qeth_l3_set_online,
         .set_offline = qeth_l3_set_offline,
@@ -3592,7 +3607,7 @@ struct qeth_discipline qeth_l3_discipline = {
         .thaw = qeth_l3_pm_resume,
         .restore = qeth_l3_pm_resume,
 };
-EXPORT_SYMBOL_GPL(qeth_l3_discipline);
+EXPORT_SYMBOL_GPL(qeth_l3_ccwgroup_driver);
 
 static int qeth_l3_ip_event(struct notifier_block *this,
                             unsigned long event, void *ptr)
@@ -3606,9 +3621,9 @@ static int qeth_l3_ip_event(struct notifier_block *this,
                 return NOTIFY_DONE;
 
         card = qeth_l3_get_card_from_dev(dev);
+        QETH_CARD_TEXT(card, 3, "ipevent");
         if (!card)
                 return NOTIFY_DONE;
-        QETH_CARD_TEXT(card, 3, "ipevent");
 
         addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
         if (addr != NULL) {
@@ -3652,6 +3667,7 @@ static int qeth_l3_ip6_event(struct notifier_block *this,
         struct qeth_ipaddr *addr;
         struct qeth_card *card;
 
+
         card = qeth_l3_get_card_from_dev(dev);
         if (!card)
                 return NOTIFY_DONE;
@@ -3714,9 +3730,9 @@ static void qeth_l3_unregister_notifiers(void)
 {
 
         QETH_DBF_TEXT(SETUP, 5, "unregnot");
-        WARN_ON(unregister_inetaddr_notifier(&qeth_l3_ip_notifier));
+        BUG_ON(unregister_inetaddr_notifier(&qeth_l3_ip_notifier));
 #ifdef CONFIG_QETH_IPV6
-        WARN_ON(unregister_inet6addr_notifier(&qeth_l3_ip6_notifier));
+        BUG_ON(unregister_inet6addr_notifier(&qeth_l3_ip6_notifier));
 #endif /* QETH_IPV6 */
 }
 
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index ebc37948626..cd99210296e 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -1,4 +1,6 @@
 /*
+ *  drivers/s390/net/qeth_l3_sys.c
+ *
  *    Copyright IBM Corp. 2007
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *               Frank Pavlic <fpavlic@de.ibm.com>,
@@ -7,7 +9,7 @@
  */
 
 #include <linux/slab.h>
-#include <asm/ebcdic.h>
+
 #include "qeth_l3.h"
 
 #define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \
@@ -173,32 +175,33 @@ out:
 static DEVICE_ATTR(fake_broadcast, 0644, qeth_l3_dev_fake_broadcast_show,
                    qeth_l3_dev_fake_broadcast_store);
 
-static ssize_t qeth_l3_dev_sniffer_show(struct device *dev,
-                struct device_attribute *attr, char *buf)
+static ssize_t qeth_l3_dev_broadcast_mode_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
 
         if (!card)
                 return -EINVAL;
 
-        return sprintf(buf, "%i\n", card->options.sniffer ? 1 : 0);
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR)))
+                return sprintf(buf, "n/a\n");
+
+        return sprintf(buf, "%s\n", (card->options.broadcast_mode ==
+                                     QETH_TR_BROADCAST_ALLRINGS)?
+                       "all rings":"local");
 }
 
-static ssize_t qeth_l3_dev_sniffer_store(struct device *dev,
+static ssize_t qeth_l3_dev_broadcast_mode_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
         int rc = 0;
-        unsigned long i;
 
         if (!card)
                 return -EINVAL;
 
-        if (card->info.type != QETH_CARD_TYPE_IQD)
-                return -EPERM;
-        if (card->options.cq == QETH_CQ_ENABLED)
-                return -EPERM;
-
         mutex_lock(&card->conf_mutex);
         if ((card->state != CARD_STATE_DOWN) &&
             (card->state != CARD_STATE_RECOVER)) {
@@ -206,148 +209,151 @@ static ssize_t qeth_l3_dev_sniffer_store(struct device *dev,
                 goto out;
         }
 
-        rc = strict_strtoul(buf, 16, &i);
-        if (rc) {
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) {
                 rc = -EINVAL;
                 goto out;
         }
-        switch (i) {
-        case 0:
-                card->options.sniffer = i;
-                break;
-        case 1:
-                qdio_get_ssqd_desc(CARD_DDEV(card), &card->ssqd);
-                if (card->ssqd.qdioac2 & QETH_SNIFF_AVAIL) {
-                        card->options.sniffer = i;
-                        if (card->qdio.init_pool.buf_count !=
-                                        QETH_IN_BUF_COUNT_MAX)
-                                qeth_realloc_buffer_pool(card,
-                                        QETH_IN_BUF_COUNT_MAX);
-                } else
-                        rc = -EPERM;
-                break;
-        default:
+
+        tmp = strsep((char **) &buf, "\n");
+
+        if (!strcmp(tmp, "local"))
+                card->options.broadcast_mode = QETH_TR_BROADCAST_LOCAL;
+        else if (!strcmp(tmp, "all_rings"))
+                card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS;
+        else
                 rc = -EINVAL;
-        }
 out:
         mutex_unlock(&card->conf_mutex);
         return rc ? rc : count;
 }
 
-static DEVICE_ATTR(sniffer, 0644, qeth_l3_dev_sniffer_show,
-                qeth_l3_dev_sniffer_store);
+static DEVICE_ATTR(broadcast_mode, 0644, qeth_l3_dev_broadcast_mode_show,
+                   qeth_l3_dev_broadcast_mode_store);
 
-
-static ssize_t qeth_l3_dev_hsuid_show(struct device *dev,
-                struct device_attribute *attr, char *buf)
+static ssize_t qeth_l3_dev_canonical_macaddr_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
-        char tmp_hsuid[9];
 
         if (!card)
                 return -EINVAL;
 
-        if (card->info.type != QETH_CARD_TYPE_IQD)
-                return -EPERM;
-
-        if (card->state == CARD_STATE_DOWN)
-                return -EPERM;
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR)))
+                return sprintf(buf, "n/a\n");
 
-        memcpy(tmp_hsuid, card->options.hsuid, sizeof(tmp_hsuid));
-        EBCASC(tmp_hsuid, 8);
-        return sprintf(buf, "%s\n", tmp_hsuid);
+        return sprintf(buf, "%i\n", (card->options.macaddr_mode ==
+                                     QETH_TR_MACADDR_CANONICAL)? 1:0);
 }
 
-static ssize_t qeth_l3_dev_hsuid_store(struct device *dev,
+static ssize_t qeth_l3_dev_canonical_macaddr_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
-        struct qeth_ipaddr *addr;
         char *tmp;
-        int i;
+        int i, rc = 0;
 
         if (!card)
                 return -EINVAL;
 
-        if (card->info.type != QETH_CARD_TYPE_IQD)
-                return -EPERM;
-        if (card->state != CARD_STATE_DOWN &&
-            card->state != CARD_STATE_RECOVER)
-                return -EPERM;
-        if (card->options.sniffer)
-                return -EPERM;
-        if (card->options.cq == QETH_CQ_NOTAVAILABLE)
-                return -EPERM;
+        mutex_lock(&card->conf_mutex);
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER)) {
+                rc = -EPERM;
+                goto out;
+        }
+
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) {
+                rc = -EINVAL;
+                goto out;
+        }
 
-        tmp = strsep((char **)&buf, "\n");
-        if (strlen(tmp) > 8)
+        i = simple_strtoul(buf, &tmp, 16);
+        if ((i == 0) || (i == 1))
+                card->options.macaddr_mode = i?
+                        QETH_TR_MACADDR_CANONICAL :
+                        QETH_TR_MACADDR_NONCANONICAL;
+        else
+                rc = -EINVAL;
+out:
+        mutex_unlock(&card->conf_mutex);
+        return rc ? rc : count;
+}
+
+static DEVICE_ATTR(canonical_macaddr, 0644, qeth_l3_dev_canonical_macaddr_show,
+                   qeth_l3_dev_canonical_macaddr_store);
+
+static ssize_t qeth_l3_dev_sniffer_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
                 return -EINVAL;
 
-        if (card->options.hsuid[0]) {
-                /* delete old ip address */
-                addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV6);
-                if (addr != NULL) {
-                        addr->u.a6.addr.s6_addr32[0] = 0xfe800000;
-                        addr->u.a6.addr.s6_addr32[1] = 0x00000000;
-                        for (i = 8; i < 16; i++)
-                                addr->u.a6.addr.s6_addr[i] =
-                                        card->options.hsuid[i - 8];
-                        addr->u.a6.pfxlen = 0;
-                        addr->type = QETH_IP_TYPE_NORMAL;
-                } else
-                        return -ENOMEM;
-                if (!qeth_l3_delete_ip(card, addr))
-                        kfree(addr);
-                qeth_l3_set_ip_addr_list(card);
-        }
+        return sprintf(buf, "%i\n", card->options.sniffer ? 1 : 0);
+}
 
-        if (strlen(tmp) == 0) {
-                /* delete ip address only */
-                card->options.hsuid[0] = '\0';
-                if (card->dev)
-                        memcpy(card->dev->perm_addr, card->options.hsuid, 9);
-                qeth_configure_cq(card, QETH_CQ_DISABLED);
-                return count;
-        }
+static ssize_t qeth_l3_dev_sniffer_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        int rc = 0;
+        unsigned long i;
 
-        if (qeth_configure_cq(card, QETH_CQ_ENABLED))
+        if (!card)
+                return -EINVAL;
+
+        if (card->info.type != QETH_CARD_TYPE_IQD)
                 return -EPERM;
 
-        for (i = 0; i < 8; i++)
-                card->options.hsuid[i] = ' ';
-        card->options.hsuid[8] = '\0';
-        strncpy(card->options.hsuid, tmp, strlen(tmp));
-        ASCEBC(card->options.hsuid, 8);
-        if (card->dev)
-                memcpy(card->dev->perm_addr, card->options.hsuid, 9);
-
-        addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV6);
-        if (addr != NULL) {
-                addr->u.a6.addr.s6_addr32[0] = 0xfe800000;
-                addr->u.a6.addr.s6_addr32[1] = 0x00000000;
-                for (i = 8; i < 16; i++)
-                        addr->u.a6.addr.s6_addr[i] = card->options.hsuid[i - 8];
-                addr->u.a6.pfxlen = 0;
-                addr->type = QETH_IP_TYPE_NORMAL;
-        } else
-                return -ENOMEM;
-        if (!qeth_l3_add_ip(card, addr))
-                kfree(addr);
-        qeth_l3_set_ip_addr_list(card);
+        mutex_lock(&card->conf_mutex);
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER)) {
+                rc = -EPERM;
+                goto out;
+        }
 
-        return count;
+        rc = strict_strtoul(buf, 16, &i);
+        if (rc) {
+                rc = -EINVAL;
+                goto out;
+        }
+        switch (i) {
+        case 0:
+                card->options.sniffer = i;
+                break;
+        case 1:
+                qdio_get_ssqd_desc(CARD_DDEV(card), &card->ssqd);
+                if (card->ssqd.qdioac2 & QETH_SNIFF_AVAIL) {
+                        card->options.sniffer = i;
+                        if (card->qdio.init_pool.buf_count !=
+                                        QETH_IN_BUF_COUNT_MAX)
+                                qeth_realloc_buffer_pool(card,
+                                        QETH_IN_BUF_COUNT_MAX);
+                        break;
+                } else
+                        rc = -EPERM;
+        default:   /* fall through */
+                rc = -EINVAL;
+        }
+out:
+        mutex_unlock(&card->conf_mutex);
+        return rc ? rc : count;
 }
 
-static DEVICE_ATTR(hsuid, 0644, qeth_l3_dev_hsuid_show,
-                   qeth_l3_dev_hsuid_store);
-
+static DEVICE_ATTR(sniffer, 0644, qeth_l3_dev_sniffer_show,
+                qeth_l3_dev_sniffer_store);
 
 static struct attribute *qeth_l3_device_attrs[] = {
         &dev_attr_route4.attr,
         &dev_attr_route6.attr,
         &dev_attr_fake_broadcast.attr,
+        &dev_attr_broadcast_mode.attr,
+        &dev_attr_canonical_macaddr.attr,
         &dev_attr_sniffer.attr,
-        &dev_attr_hsuid.attr,
         NULL,
 };
 
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index d8f990b6b33..207b7d74244 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -157,7 +157,7 @@ static int smsg_pm_restore_thaw(struct device *dev)
 #ifdef CONFIG_PM_DEBUG
         printk(KERN_WARNING "smsg_pm_restore_thaw\n");
 #endif
-        if (smsg_path && !iucv_path_connected) {
+        if (smsg_path && iucv_path_connected) {
                 memset(smsg_path, 0, sizeof(*smsg_path));
                 smsg_path->msglim = 255;
                 smsg_path->flags = 0;
diff --git a/drivers/s390/net/smsgiucv.h b/drivers/s390/net/smsgiucv.h
index 45bc925928c..149a1151608 100644
--- a/drivers/s390/net/smsgiucv.h
+++ b/drivers/s390/net/smsgiucv.h
@@ -1,7 +1,7 @@
 /*
  * IUCV special message driver
  *
- * Copyright IBM Corp. 2003
+ * Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
  * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
 
diff --git a/drivers/s390/net/smsgiucv_app.c b/drivers/s390/net/smsgiucv_app.c
index 32515a201bb..4d2ea400042 100644
--- a/drivers/s390/net/smsgiucv_app.c
+++ b/drivers/s390/net/smsgiucv_app.c
@@ -168,7 +168,7 @@ static int __init smsgiucv_app_init(void)
         rc = dev_set_name(smsg_app_dev, KMSG_COMPONENT);
         if (rc) {
                 kfree(smsg_app_dev);
-                goto fail;
+                goto fail_put_driver;
         }
         smsg_app_dev->bus = &iucv_bus;
         smsg_app_dev->parent = iucv_root;
@@ -177,7 +177,7 @@ static int __init smsgiucv_app_init(void)
         rc = device_register(smsg_app_dev);
         if (rc) {
                 put_device(smsg_app_dev);
-                goto fail;
+                goto fail_put_driver;
         }
 
         /* convert sender to uppercase characters */
@@ -191,11 +191,12 @@ static int __init smsgiucv_app_init(void)
         rc = smsg_register_callback(SMSG_PREFIX, smsg_app_callback);
         if (rc) {
                 device_unregister(smsg_app_dev);
-                goto fail;
+                goto fail_put_driver;
         }
 
         rc = 0;
-fail:
+fail_put_driver:
+        put_driver(smsgiucv_drv);
         return rc;
 }
 module_init(smsgiucv_app_init);
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index f6adde44f22..645b0fcbb37 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -3,7 +3,7 @@
  *
  * Module interface and handling of zfcp data structures.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 /*
@@ -31,7 +31,6 @@
 #include <linux/miscdevice.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include "zfcp_ext.h"
 #include "zfcp_fc.h"
 #include "zfcp_reqlist.h"
@@ -519,7 +518,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
 
         rwlock_init(&port->unit_list_lock);
         INIT_LIST_HEAD(&port->unit_list);
-        atomic_set(&port->units, 0);
 
         INIT_WORK(&port->gid_pn_work, zfcp_fc_port_did_lookup);
         INIT_WORK(&port->test_link_work, zfcp_fc_link_test_work);
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index f2dd3a0a39e..e8b7cee6204 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -3,13 +3,12 @@
  *
  * Registration and callback for the s390 common I/O layer.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/module.h>
 #include "zfcp_ext.h"
 #include "zfcp_reqlist.h"
 
@@ -39,25 +38,19 @@ void zfcp_ccw_adapter_put(struct zfcp_adapter *adapter)
         spin_unlock_irqrestore(&zfcp_ccw_adapter_ref_lock, flags);
 }
 
-/**
- * zfcp_ccw_activate - activate adapter and wait for it to finish
- * @cdev: pointer to belonging ccw device
- * @clear: Status flags to clear.
- * @tag: s390dbf trace record tag
- */
-static int zfcp_ccw_activate(struct ccw_device *cdev, int clear, char *tag)
+static int zfcp_ccw_activate(struct ccw_device *cdev)
+
 {
         struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev);
 
         if (!adapter)
                 return 0;
 
-        zfcp_erp_clear_adapter_status(adapter, clear);
         zfcp_erp_set_adapter_status(adapter, ZFCP_STATUS_COMMON_RUNNING);
         zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,
-                                tag);
+                                "ccresu2");
         zfcp_erp_wait(adapter);
-        flush_work(&adapter->scan_work); /* ok to call even if nothing queued */
+        flush_work(&adapter->scan_work);
 
         zfcp_ccw_adapter_put(adapter);
 
@@ -170,34 +163,26 @@ static int zfcp_ccw_set_online(struct ccw_device *cdev)
         BUG_ON(!zfcp_reqlist_isempty(adapter->req_list));
         adapter->req_no = 0;
 
-        zfcp_ccw_activate(cdev, 0, "ccsonl1");
-        /* scan for remote ports
-           either at the end of any successful adapter recovery
-           or only after the adapter recovery for setting a device online */
-        zfcp_fc_inverse_conditional_port_scan(adapter);
-        flush_work(&adapter->scan_work); /* ok to call even if nothing queued */
+        zfcp_ccw_activate(cdev);
         zfcp_ccw_adapter_put(adapter);
         return 0;
 }
 
 /**
- * zfcp_ccw_offline_sync - shut down adapter and wait for it to finish
+ * zfcp_ccw_set_offline - set_offline function of zfcp driver
  * @cdev: pointer to belonging ccw device
- * @set: Status flags to set.
- * @tag: s390dbf trace record tag
  *
  * This function gets called by the common i/o layer and sets an adapter
  * into state offline.
  */
-static int zfcp_ccw_offline_sync(struct ccw_device *cdev, int set, char *tag)
+static int zfcp_ccw_set_offline(struct ccw_device *cdev)
 {
         struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev);
 
         if (!adapter)
                 return 0;
 
-        zfcp_erp_set_adapter_status(adapter, set);
-        zfcp_erp_adapter_shutdown(adapter, 0, tag);
+        zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1");
         zfcp_erp_wait(adapter);
 
         zfcp_ccw_adapter_put(adapter);
@@ -205,18 +190,6 @@ static int zfcp_ccw_offline_sync(struct ccw_device *cdev, int set, char *tag)
 }
 
 /**
- * zfcp_ccw_set_offline - set_offline function of zfcp driver
- * @cdev: pointer to belonging ccw device
- *
- * This function gets called by the common i/o layer and sets an adapter
- * into state offline.
- */
-static int zfcp_ccw_set_offline(struct ccw_device *cdev)
-{
-        return zfcp_ccw_offline_sync(cdev, 0, "ccsoff1");
-}
-
-/**
  * zfcp_ccw_notify - ccw notify function
  * @cdev: pointer to belonging ccw device
  * @event: indicates if adapter was detached or attached
@@ -233,11 +206,6 @@ static int zfcp_ccw_notify(struct ccw_device *cdev, int event)
 
         switch (event) {
         case CIO_GONE:
-                if (atomic_read(&adapter->status) &
-                    ZFCP_STATUS_ADAPTER_SUSPENDED) { /* notification ignore */
-                        zfcp_dbf_hba_basic("ccnigo1", adapter);
-                        break;
-                }
                 dev_warn(&cdev->dev, "The FCP device has been detached\n");
                 zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1");
                 break;
@@ -247,11 +215,6 @@ static int zfcp_ccw_notify(struct ccw_device *cdev, int event)
                 zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2");
                 break;
         case CIO_OPER:
-                if (atomic_read(&adapter->status) &
-                    ZFCP_STATUS_ADAPTER_SUSPENDED) { /* notification ignore */
-                        zfcp_dbf_hba_basic("ccniop1", adapter);
-                        break;
-                }
                 dev_info(&cdev->dev, "The FCP device is operational again\n");
                 zfcp_erp_set_adapter_status(adapter,
                                             ZFCP_STATUS_COMMON_RUNNING);
@@ -287,28 +250,6 @@ static void zfcp_ccw_shutdown(struct ccw_device *cdev)
         zfcp_ccw_adapter_put(adapter);
 }
 
-static int zfcp_ccw_suspend(struct ccw_device *cdev)
-{
-        zfcp_ccw_offline_sync(cdev, ZFCP_STATUS_ADAPTER_SUSPENDED, "ccsusp1");
-        return 0;
-}
-
-static int zfcp_ccw_thaw(struct ccw_device *cdev)
-{
-        /* trace records for thaw and final shutdown during suspend
-           can only be found in system dump until the end of suspend
-           but not after resume because it's based on the memory image
-           right after the very first suspend (freeze) callback */
-        zfcp_ccw_activate(cdev, 0, "ccthaw1");
-        return 0;
-}
-
-static int zfcp_ccw_resume(struct ccw_device *cdev)
-{
-        zfcp_ccw_activate(cdev, ZFCP_STATUS_ADAPTER_SUSPENDED, "ccresu1");
-        return 0;
-}
-
 struct ccw_driver zfcp_ccw_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
@@ -321,7 +262,7 @@ struct ccw_driver zfcp_ccw_driver = {
         .set_offline = zfcp_ccw_set_offline,
         .notify      = zfcp_ccw_notify,
         .shutdown    = zfcp_ccw_shutdown,
-        .freeze      = zfcp_ccw_suspend,
-        .thaw        = zfcp_ccw_thaw,
-        .restore     = zfcp_ccw_resume,
+        .freeze      = zfcp_ccw_set_offline,
+        .thaw        = zfcp_ccw_activate,
+        .restore     = zfcp_ccw_activate,
 };
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c
index 49b82e46629..303dde09d29 100644
--- a/drivers/s390/scsi/zfcp_cfdc.c
+++ b/drivers/s390/scsi/zfcp_cfdc.c
@@ -5,13 +5,12 @@
  * Access Control Lists / Control File Data Channel;
  * handling of response code and states for ports and LUNs.
  *
- * Copyright IBM Corp. 2008, 2010
+ * Copyright IBM Corporation 2008, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/compat.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/miscdevice.h>
@@ -293,7 +292,7 @@ void zfcp_cfdc_adapter_access_changed(struct zfcp_adapter *adapter)
         }
         read_unlock_irqrestore(&adapter->port_list_lock, flags);
 
-        shost_for_each_device(sdev, adapter->scsi_host) {
+        shost_for_each_device(sdev, port->adapter->scsi_host) {
                 zfcp_sdev = sdev_to_zfcp(sdev);
                 status = atomic_read(&zfcp_sdev->status);
                 if ((status & ZFCP_STATUS_COMMON_ACCESS_DENIED) ||
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index e1a8cc2526e..96d1462e0bf 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -3,13 +3,12 @@
  *
  * Debug traces for zfcp.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <asm/debug.h>
@@ -164,62 +163,6 @@ void zfcp_dbf_hba_bit_err(char *tag, struct zfcp_fsf_req *req)
         spin_unlock_irqrestore(&dbf->hba_lock, flags);
 }
 
-/**
- * zfcp_dbf_hba_def_err - trace event for deferred error messages
- * @adapter: pointer to struct zfcp_adapter
- * @req_id: request id which caused the deferred error message
- * @scount: number of sbals incl. the signaling sbal
- * @pl: array of all involved sbals
- */
-void zfcp_dbf_hba_def_err(struct zfcp_adapter *adapter, u64 req_id, u16 scount,
-                          void **pl)
-{
-        struct zfcp_dbf *dbf = adapter->dbf;
-        struct zfcp_dbf_pay *payload = &dbf->pay_buf;
-        unsigned long flags;
-        u16 length;
-
-        if (!pl)
-                return;
-
-        spin_lock_irqsave(&dbf->pay_lock, flags);
-        memset(payload, 0, sizeof(*payload));
-
-        memcpy(payload->area, "def_err", 7);
-        payload->fsf_req_id = req_id;
-        payload->counter = 0;
-        length = min((u16)sizeof(struct qdio_buffer),
-                     (u16)ZFCP_DBF_PAY_MAX_REC);
-
-        while (payload->counter < scount && (char *)pl[payload->counter]) {
-                memcpy(payload->data, (char *)pl[payload->counter], length);
-                debug_event(dbf->pay, 1, payload, zfcp_dbf_plen(length));
-                payload->counter++;
-        }
-
-        spin_unlock_irqrestore(&dbf->pay_lock, flags);
-}
-
-/**
- * zfcp_dbf_hba_basic - trace event for basic adapter events
- * @adapter: pointer to struct zfcp_adapter
- */
-void zfcp_dbf_hba_basic(char *tag, struct zfcp_adapter *adapter)
-{
-        struct zfcp_dbf *dbf = adapter->dbf;
-        struct zfcp_dbf_hba *rec = &dbf->hba_buf;
-        unsigned long flags;
-
-        spin_lock_irqsave(&dbf->hba_lock, flags);
-        memset(rec, 0, sizeof(*rec));
-
-        memcpy(rec->tag, tag, ZFCP_DBF_TAG_LEN);
-        rec->id = ZFCP_DBF_HBA_BASIC;
-
-        debug_event(dbf->hba, 1, rec, sizeof(*rec));
-        spin_unlock_irqrestore(&dbf->hba_lock, flags);
-}
-
 static void zfcp_dbf_set_common(struct zfcp_dbf_rec *rec,
                                 struct zfcp_adapter *adapter,
                                 struct zfcp_port *port,
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h
index 3ac7a4b30dd..714f087eb7a 100644
--- a/drivers/s390/scsi/zfcp_dbf.h
+++ b/drivers/s390/scsi/zfcp_dbf.h
@@ -154,7 +154,6 @@ enum zfcp_dbf_hba_id {
         ZFCP_DBF_HBA_RES        = 1,
         ZFCP_DBF_HBA_USS        = 2,
         ZFCP_DBF_HBA_BIT        = 3,
-        ZFCP_DBF_HBA_BASIC      = 4,
 };
 
 /**
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 1305955cbf5..527ba48eea5 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -3,7 +3,7 @@
  *
  * Global definitions for the zfcp device driver.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #ifndef ZFCP_DEF_H
@@ -72,12 +72,10 @@ struct zfcp_reqlist;
 #define ZFCP_STATUS_COMMON_NOESC                0x00200000
 
 /* adapter status */
-#define ZFCP_STATUS_ADAPTER_MB_ACT              0x00000001
 #define ZFCP_STATUS_ADAPTER_QDIOUP              0x00000002
 #define ZFCP_STATUS_ADAPTER_SIOSL_ISSUED        0x00000004
 #define ZFCP_STATUS_ADAPTER_XCONFIG_OK          0x00000008
 #define ZFCP_STATUS_ADAPTER_HOST_CON_INIT       0x00000010
-#define ZFCP_STATUS_ADAPTER_SUSPENDED           0x00000040
 #define ZFCP_STATUS_ADAPTER_ERP_PENDING         0x00000100
 #define ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED      0x00000200
 #define ZFCP_STATUS_ADAPTER_DATA_DIV_ENABLED    0x00000400
@@ -205,7 +203,6 @@ struct zfcp_port {
         struct zfcp_adapter    *adapter;       /* adapter used to access port */
         struct list_head        unit_list;      /* head of logical unit list */
         rwlock_t                unit_list_lock; /* unit list lock */
-        atomic_t                units;         /* zfcp_unit count */
         atomic_t               status;         /* status of this remote port */
         u64                    wwnn;           /* WWNN if known */
         u64                    wwpn;           /* WWPN */
@@ -317,10 +314,4 @@ struct zfcp_fsf_req {
         void                    (*handler)(struct zfcp_fsf_req *);
 };
 
-static inline
-int zfcp_adapter_multi_buffer_active(struct zfcp_adapter *adapter)
-{
-        return atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_MB_ACT;
-}
-
 #endif /* ZFCP_DEF_H */
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 4133ab6e20f..e1b4f800e22 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -3,7 +3,7 @@
  *
  * Error Recovery Procedures (ERP).
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
@@ -1230,7 +1230,7 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)
         case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
                 if (result == ZFCP_ERP_SUCCEEDED) {
                         register_service_level(&adapter->service_level);
-                        zfcp_fc_conditional_port_scan(adapter);
+                        queue_work(adapter->work_queue, &adapter->scan_work);
                         queue_work(adapter->work_queue, &adapter->ns_up_work);
                 } else
                         unregister_service_level(&adapter->service_level);
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index 1d3dd3f7d69..03627cfd81c 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -3,7 +3,7 @@
  *
  * External function declarations.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #ifndef ZFCP_EXT_H
@@ -53,8 +53,6 @@ extern void zfcp_dbf_hba_fsf_uss(char *, struct zfcp_fsf_req *);
 extern void zfcp_dbf_hba_fsf_res(char *, struct zfcp_fsf_req *);
 extern void zfcp_dbf_hba_bit_err(char *, struct zfcp_fsf_req *);
 extern void zfcp_dbf_hba_berr(struct zfcp_dbf *, struct zfcp_fsf_req *);
-extern void zfcp_dbf_hba_def_err(struct zfcp_adapter *, u64, u16, void **);
-extern void zfcp_dbf_hba_basic(char *, struct zfcp_adapter *);
 extern void zfcp_dbf_san_req(char *, struct zfcp_fsf_req *, u32);
 extern void zfcp_dbf_san_res(char *, struct zfcp_fsf_req *);
 extern void zfcp_dbf_san_in_els(char *, struct zfcp_fsf_req *);
@@ -99,8 +97,6 @@ extern void zfcp_fc_gs_destroy(struct zfcp_adapter *);
 extern int zfcp_fc_exec_bsg_job(struct fc_bsg_job *);
 extern int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *);
 extern void zfcp_fc_sym_name_update(struct work_struct *);
-extern void zfcp_fc_conditional_port_scan(struct zfcp_adapter *);
-extern void zfcp_fc_inverse_conditional_port_scan(struct zfcp_adapter *);
 
 /* zfcp_fsf.c */
 extern struct kmem_cache *zfcp_fsf_qtcb_cache;
@@ -161,7 +157,6 @@ extern void zfcp_scsi_dif_sense_error(struct scsi_cmnd *, int);
 extern struct attribute_group zfcp_sysfs_unit_attrs;
 extern struct attribute_group zfcp_sysfs_adapter_attrs;
 extern struct attribute_group zfcp_sysfs_port_attrs;
-extern struct mutex zfcp_sysfs_port_units_mutex;
 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 ff598cd68b2..297e6b71ce9 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -3,7 +3,7 @@
  *
  * Fibre Channel related functions for the zfcp device driver.
  *
- * Copyright IBM Corp. 2008, 2010
+ * Copyright IBM Corporation 2008, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
@@ -26,27 +26,6 @@ static u32 zfcp_fc_rscn_range_mask[] = {
         [ELS_ADDR_FMT_FAB]              = 0x000000,
 };
 
-static bool no_auto_port_rescan;
-module_param_named(no_auto_port_rescan, no_auto_port_rescan, bool, 0600);
-MODULE_PARM_DESC(no_auto_port_rescan,
-                 "no automatic port_rescan (default off)");
-
-void zfcp_fc_conditional_port_scan(struct zfcp_adapter *adapter)
-{
-        if (no_auto_port_rescan)
-                return;
-
-        queue_work(adapter->work_queue, &adapter->scan_work);
-}
-
-void zfcp_fc_inverse_conditional_port_scan(struct zfcp_adapter *adapter)
-{
-        if (!no_auto_port_rescan)
-                return;
-
-        queue_work(adapter->work_queue, &adapter->scan_work);
-}
-
 /**
  * zfcp_fc_post_event - post event to userspace via fc_transport
  * @work: work struct with enqueued events
@@ -227,7 +206,7 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)
                 zfcp_fc_enqueue_event(fsf_req->adapter, FCH_EVT_RSCN,
                                       *(u32 *)page);
         }
-        zfcp_fc_conditional_port_scan(fsf_req->adapter);
+        queue_work(fsf_req->adapter->work_queue, &fsf_req->adapter->scan_work);
 }
 
 static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, u64 wwpn)
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h
index b1d2024ed51..4561f3bf730 100644
--- a/drivers/s390/scsi/zfcp_fc.h
+++ b/drivers/s390/scsi/zfcp_fc.h
@@ -4,7 +4,7 @@
  * Fibre Channel related definitions and inline functions for the zfcp
  * device driver
  *
- * Copyright IBM Corp. 2009
+ * Copyright IBM Corporation 2009
  */
 
 #ifndef ZFCP_FC_H
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index c96320d79fb..022fb6a8cb8 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -3,7 +3,7 @@
  *
  * Implementation of FSF commands.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
@@ -219,7 +219,7 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)
                 return;
         }
 
-        zfcp_dbf_hba_fsf_uss("fssrh_4", req);
+        zfcp_dbf_hba_fsf_uss("fssrh_2", req);
 
         switch (sr_buf->status_type) {
         case FSF_STATUS_READ_PORT_CLOSED:
@@ -257,7 +257,7 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)
                 if (sr_buf->status_subtype & FSF_STATUS_READ_SUB_ACT_UPDATED)
                         zfcp_cfdc_adapter_access_changed(adapter);
                 if (sr_buf->status_subtype & FSF_STATUS_READ_SUB_INCOMING_ELS)
-                        zfcp_fc_conditional_port_scan(adapter);
+                        queue_work(adapter->work_queue, &adapter->scan_work);
                 break;
         case FSF_STATUS_READ_CFDC_UPDATED:
                 zfcp_cfdc_adapter_access_changed(adapter);
@@ -437,34 +437,6 @@ void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *adapter)
         }
 }
 
-#define ZFCP_FSF_PORTSPEED_1GBIT        (1 <<  0)
-#define ZFCP_FSF_PORTSPEED_2GBIT        (1 <<  1)
-#define ZFCP_FSF_PORTSPEED_4GBIT        (1 <<  2)
-#define ZFCP_FSF_PORTSPEED_10GBIT       (1 <<  3)
-#define ZFCP_FSF_PORTSPEED_8GBIT        (1 <<  4)
-#define ZFCP_FSF_PORTSPEED_16GBIT       (1 <<  5)
-#define ZFCP_FSF_PORTSPEED_NOT_NEGOTIATED (1 << 15)
-
-static u32 zfcp_fsf_convert_portspeed(u32 fsf_speed)
-{
-        u32 fdmi_speed = 0;
-        if (fsf_speed & ZFCP_FSF_PORTSPEED_1GBIT)
-                fdmi_speed |= FC_PORTSPEED_1GBIT;
-        if (fsf_speed & ZFCP_FSF_PORTSPEED_2GBIT)
-                fdmi_speed |= FC_PORTSPEED_2GBIT;
-        if (fsf_speed & ZFCP_FSF_PORTSPEED_4GBIT)
-                fdmi_speed |= FC_PORTSPEED_4GBIT;
-        if (fsf_speed & ZFCP_FSF_PORTSPEED_10GBIT)
-                fdmi_speed |= FC_PORTSPEED_10GBIT;
-        if (fsf_speed & ZFCP_FSF_PORTSPEED_8GBIT)
-                fdmi_speed |= FC_PORTSPEED_8GBIT;
-        if (fsf_speed & ZFCP_FSF_PORTSPEED_16GBIT)
-                fdmi_speed |= FC_PORTSPEED_16GBIT;
-        if (fsf_speed & ZFCP_FSF_PORTSPEED_NOT_NEGOTIATED)
-                fdmi_speed |= FC_PORTSPEED_NOT_NEGOTIATED;
-        return fdmi_speed;
-}
-
 static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
 {
         struct fsf_qtcb_bottom_config *bottom = &req->qtcb->bottom.config;
@@ -484,8 +456,7 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
         fc_host_port_name(shost) = nsp->fl_wwpn;
         fc_host_node_name(shost) = nsp->fl_wwnn;
         fc_host_port_id(shost) = ntoh24(bottom->s_id);
-        fc_host_speed(shost) =
-                zfcp_fsf_convert_portspeed(bottom->fc_link_speed);
+        fc_host_speed(shost) = bottom->fc_link_speed;
         fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3;
 
         adapter->hydra_version = bottom->adapter_type;
@@ -609,8 +580,7 @@ static void zfcp_fsf_exchange_port_evaluate(struct zfcp_fsf_req *req)
         } else
                 fc_host_permanent_port_name(shost) = fc_host_port_name(shost);
         fc_host_maxframe_size(shost) = bottom->maximum_frame_size;
-        fc_host_supported_speeds(shost) =
-                zfcp_fsf_convert_portspeed(bottom->supported_speed);
+        fc_host_supported_speeds(shost) = bottom->supported_speed;
         memcpy(fc_host_supported_fc4s(shost), bottom->supported_fc4_types,
                FC_FC4_LIST_SIZE);
         memcpy(fc_host_active_fc4s(shost), bottom->active_fc4_types,
@@ -801,14 +771,12 @@ out:
 static void zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *req)
 {
         struct scsi_device *sdev = req->data;
-        struct zfcp_scsi_dev *zfcp_sdev;
+        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
         union fsf_status_qual *fsq = &req->qtcb->header.fsf_status_qual;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
                 return;
 
-        zfcp_sdev = sdev_to_zfcp(sdev);
-
         switch (req->qtcb->header.fsf_status) {
         case FSF_PORT_HANDLE_NOT_VALID:
                 if (fsq->word[0] == fsq->word[1]) {
@@ -917,7 +885,7 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)
 
         switch (header->fsf_status) {
         case FSF_GOOD:
-                zfcp_dbf_san_res("fsscth2", req);
+                zfcp_dbf_san_res("fsscth1", req);
                 ct->status = 0;
                 break;
         case FSF_SERVICE_CLASS_NOT_SUPPORTED:
@@ -968,47 +936,39 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,
                                        struct scatterlist *sg_resp)
 {
         struct zfcp_adapter *adapter = req->adapter;
-        struct zfcp_qdio *qdio = adapter->qdio;
-        struct fsf_qtcb *qtcb = req->qtcb;
         u32 feat = adapter->adapter_features;
+        int bytes;
 
-        if (zfcp_adapter_multi_buffer_active(adapter)) {
-                if (zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, sg_req))
-                        return -EIO;
-                if (zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, sg_resp))
-                        return -EIO;
+        if (!(feat & FSF_FEATURE_ELS_CT_CHAINED_SBALS)) {
+                if (!zfcp_qdio_sg_one_sbale(sg_req) ||
+                    !zfcp_qdio_sg_one_sbale(sg_resp))
+                        return -EOPNOTSUPP;
 
-                zfcp_qdio_set_data_div(qdio, &req->qdio_req,
-                                        zfcp_qdio_sbale_count(sg_req));
-                zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);
-                zfcp_qdio_set_scount(qdio, &req->qdio_req);
+                zfcp_fsf_setup_ct_els_unchained(adapter->qdio, &req->qdio_req,
+                                                sg_req, sg_resp);
                 return 0;
         }
 
         /* use single, unchained SBAL if it can hold the request */
         if (zfcp_qdio_sg_one_sbale(sg_req) && zfcp_qdio_sg_one_sbale(sg_resp)) {
-                zfcp_fsf_setup_ct_els_unchained(qdio, &req->qdio_req,
+                zfcp_fsf_setup_ct_els_unchained(adapter->qdio, &req->qdio_req,
                                                 sg_req, sg_resp);
                 return 0;
         }
 
-        if (!(feat & FSF_FEATURE_ELS_CT_CHAINED_SBALS))
-                return -EOPNOTSUPP;
-
-        if (zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, sg_req))
+        bytes = zfcp_qdio_sbals_from_sg(adapter->qdio, &req->qdio_req, sg_req);
+        if (bytes <= 0)
                 return -EIO;
+        zfcp_qdio_set_sbale_last(adapter->qdio, &req->qdio_req);
+        req->qtcb->bottom.support.req_buf_length = bytes;
+        zfcp_qdio_skip_to_last_sbale(&req->qdio_req);
 
-        qtcb->bottom.support.req_buf_length = zfcp_qdio_real_bytes(sg_req);
-
-        zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);
-        zfcp_qdio_skip_to_last_sbale(qdio, &req->qdio_req);
-
-        if (zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, sg_resp))
+        bytes = zfcp_qdio_sbals_from_sg(adapter->qdio, &req->qdio_req,
+                                        sg_resp);
+        req->qtcb->bottom.support.resp_buf_length = bytes;
+        if (bytes <= 0)
                 return -EIO;
-
-        qtcb->bottom.support.resp_buf_length = zfcp_qdio_real_bytes(sg_resp);
-
-        zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);
+        zfcp_qdio_set_sbale_last(adapter->qdio, &req->qdio_req);
 
         return 0;
 }
@@ -1159,8 +1119,7 @@ int zfcp_fsf_send_els(struct zfcp_adapter *adapter, u32 d_id,
 
         req->status |= ZFCP_STATUS_FSFREQ_CLEANUP;
 
-        if (!zfcp_adapter_multi_buffer_active(adapter))
-                zfcp_qdio_sbal_limit(qdio, &req->qdio_req, 2);
+        zfcp_qdio_sbal_limit(qdio, &req->qdio_req, 2);
 
         ret = zfcp_fsf_setup_ct_els(req, els->req, els->resp, timeout);
 
@@ -1771,15 +1730,13 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req)
 {
         struct zfcp_adapter *adapter = req->adapter;
         struct scsi_device *sdev = req->data;
-        struct zfcp_scsi_dev *zfcp_sdev;
+        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
         struct fsf_qtcb_header *header = &req->qtcb->header;
         struct fsf_qtcb_bottom_support *bottom = &req->qtcb->bottom.support;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
                 return;
 
-        zfcp_sdev = sdev_to_zfcp(sdev);
-
         atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
                           ZFCP_STATUS_COMMON_ACCESS_BOXED |
                           ZFCP_STATUS_LUN_SHARED |
@@ -1890,13 +1847,11 @@ out:
 static void zfcp_fsf_close_lun_handler(struct zfcp_fsf_req *req)
 {
         struct scsi_device *sdev = req->data;
-        struct zfcp_scsi_dev *zfcp_sdev;
+        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
                 return;
 
-        zfcp_sdev = sdev_to_zfcp(sdev);
-
         switch (req->qtcb->header.fsf_status) {
         case FSF_PORT_HANDLE_NOT_VALID:
                 zfcp_erp_adapter_reopen(zfcp_sdev->port->adapter, 0, "fscuh_1");
@@ -1986,7 +1941,7 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi)
 {
         struct fsf_qual_latency_info *lat_in;
         struct latency_cont *lat = NULL;
-        struct zfcp_scsi_dev *zfcp_sdev;
+        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scsi->device);
         struct zfcp_blk_drv_data blktrc;
         int ticks = req->adapter->timer_ticks;
 
@@ -2001,7 +1956,6 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi)
 
         if (req->adapter->adapter_features & FSF_FEATURE_MEASUREMENT_DATA &&
             !(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {
-                zfcp_sdev = sdev_to_zfcp(scsi->device);
                 blktrc.flags |= ZFCP_BLK_LAT_VALID;
                 blktrc.channel_lat = lat_in->channel_lat * ticks;
                 blktrc.fabric_lat = lat_in->fabric_lat * ticks;
@@ -2039,14 +1993,12 @@ static void zfcp_fsf_fcp_handler_common(struct zfcp_fsf_req *req)
 {
         struct scsi_cmnd *scmnd = req->data;
         struct scsi_device *sdev = scmnd->device;
-        struct zfcp_scsi_dev *zfcp_sdev;
+        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
         struct fsf_qtcb_header *header = &req->qtcb->header;
 
         if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR))
                 return;
 
-        zfcp_sdev = sdev_to_zfcp(sdev);
-
         switch (header->fsf_status) {
         case FSF_HANDLE_MISMATCH:
         case FSF_PORT_HANDLE_NOT_VALID:
@@ -2210,7 +2162,7 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd)
         struct zfcp_fsf_req *req;
         struct fcp_cmnd *fcp_cmnd;
         u8 sbtype = SBAL_SFLAGS0_TYPE_READ;
-        int retval = -EIO;
+        int real_bytes, retval = -EIO, dix_bytes = 0;
         struct scsi_device *sdev = scsi_cmnd->device;
         struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
         struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
@@ -2255,8 +2207,7 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd)
                 io->ref_tag_value = scsi_get_lba(scsi_cmnd) & 0xFFFFFFFF;
         }
 
-        if (zfcp_fsf_set_data_dir(scsi_cmnd, &io->data_direction))
-                goto failed_scsi_cmnd;
+        zfcp_fsf_set_data_dir(scsi_cmnd, &io->data_direction);
 
         fcp_cmnd = (struct fcp_cmnd *) &req->qtcb->bottom.io.fcp_cmnd;
         zfcp_fc_scsi_to_fcp(fcp_cmnd, scsi_cmnd, 0);
@@ -2264,22 +2215,18 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd)
         if (scsi_prot_sg_count(scsi_cmnd)) {
                 zfcp_qdio_set_data_div(qdio, &req->qdio_req,
                                        scsi_prot_sg_count(scsi_cmnd));
-                retval = zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req,
-                                                 scsi_prot_sglist(scsi_cmnd));
-                if (retval)
-                        goto failed_scsi_cmnd;
-                io->prot_data_length = zfcp_qdio_real_bytes(
+                dix_bytes = zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req,
                                                 scsi_prot_sglist(scsi_cmnd));
+                io->prot_data_length = dix_bytes;
         }
 
-        retval = zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req,
-                                         scsi_sglist(scsi_cmnd));
-        if (unlikely(retval))
+        real_bytes = zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req,
+                                             scsi_sglist(scsi_cmnd));
+
+        if (unlikely(real_bytes < 0) || unlikely(dix_bytes < 0))
                 goto failed_scsi_cmnd;
 
         zfcp_qdio_set_sbale_last(adapter->qdio, &req->qdio_req);
-        if (zfcp_adapter_multi_buffer_active(adapter))
-                zfcp_qdio_set_scount(qdio, &req->qdio_req);
 
         retval = zfcp_fsf_req_send(req);
         if (unlikely(retval))
@@ -2381,7 +2328,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
         struct zfcp_qdio *qdio = adapter->qdio;
         struct zfcp_fsf_req *req = NULL;
         struct fsf_qtcb_bottom_support *bottom;
-        int retval = -EIO;
+        int retval = -EIO, bytes;
         u8 direction;
 
         if (!(adapter->adapter_features & FSF_FEATURE_CFDC))
@@ -2414,17 +2361,13 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
         bottom->operation_subtype = FSF_CFDC_OPERATION_SUBTYPE;
         bottom->option = fsf_cfdc->option;
 
-        retval = zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, fsf_cfdc->sg);
+        bytes = zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, fsf_cfdc->sg);
 
-        if (retval ||
-                (zfcp_qdio_real_bytes(fsf_cfdc->sg) != ZFCP_CFDC_MAX_SIZE)) {
+        if (bytes != ZFCP_CFDC_MAX_SIZE) {
                 zfcp_fsf_req_free(req);
-                retval = -EIO;
                 goto out;
         }
-        zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);
-        if (zfcp_adapter_multi_buffer_active(adapter))
-                zfcp_qdio_set_scount(qdio, &req->qdio_req);
+        zfcp_qdio_set_sbale_last(adapter->qdio, &req->qdio_req);
 
         zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         retval = zfcp_fsf_req_send(req);
diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h
index 5e795b86931..db8c85382dc 100644
--- a/drivers/s390/scsi/zfcp_fsf.h
+++ b/drivers/s390/scsi/zfcp_fsf.h
@@ -3,7 +3,7 @@
  *
  * Interface to the FSF support functions.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #ifndef FSF_H
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 50b5615848f..d9c40ea73ee 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -3,23 +3,18 @@
  *
  * Setup and helper functions to access QDIO.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/slab.h>
-#include <linux/module.h>
 #include "zfcp_ext.h"
 #include "zfcp_qdio.h"
 
 #define QBUFF_PER_PAGE          (PAGE_SIZE / sizeof(struct qdio_buffer))
 
-static bool enable_multibuffer;
-module_param_named(datarouter, enable_multibuffer, bool, 0400);
-MODULE_PARM_DESC(datarouter, "Enable hardware data router support");
-
 static int zfcp_qdio_buffers_enqueue(struct qdio_buffer **sbal)
 {
         int pos;
@@ -42,11 +37,8 @@ static void zfcp_qdio_handler_error(struct zfcp_qdio *qdio, char *id,
 
         dev_warn(&adapter->ccw_device->dev, "A QDIO problem occurred\n");
 
-        if (qdio_err & QDIO_ERROR_SLSB_STATE) {
+        if (qdio_err & QDIO_ERROR_SLSB_STATE)
                 zfcp_qdio_siosl(adapter);
-                zfcp_erp_adapter_shutdown(adapter, 0, id);
-                return;
-        }
         zfcp_erp_adapter_reopen(adapter,
                                 ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
                                 ZFCP_STATUS_COMMON_ERP_FAILED, id);
@@ -101,31 +93,9 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,
                                unsigned long parm)
 {
         struct zfcp_qdio *qdio = (struct zfcp_qdio *) parm;
-        struct zfcp_adapter *adapter = qdio->adapter;
-        int sbal_no, sbal_idx;
+        int sbal_idx, sbal_no;
 
         if (unlikely(qdio_err)) {
-                if (zfcp_adapter_multi_buffer_active(adapter)) {
-                        void *pl[ZFCP_QDIO_MAX_SBALS_PER_REQ + 1];
-                        struct qdio_buffer_element *sbale;
-                        u64 req_id;
-                        u8 scount;
-
-                        memset(pl, 0,
-                               ZFCP_QDIO_MAX_SBALS_PER_REQ * sizeof(void *));
-                        sbale = qdio->res_q[idx]->element;
-                        req_id = (u64) sbale->addr;
-                        scount = min(sbale->scount + 1,
-                                     ZFCP_QDIO_MAX_SBALS_PER_REQ + 1);
-                                     /* incl. signaling SBAL */
-
-                        for (sbal_no = 0; sbal_no < scount; sbal_no++) {
-                                sbal_idx = (idx + sbal_no) %
-                                        QDIO_MAX_BUFFERS_PER_Q;
-                                pl[sbal_no] = qdio->res_q[sbal_idx];
-                        }
-                        zfcp_dbf_hba_def_err(adapter, req_id, scount, pl);
-                }
                 zfcp_qdio_handler_error(qdio, "qdires1", qdio_err);
                 return;
         }
@@ -185,7 +155,7 @@ zfcp_qdio_sbal_chain(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req)
 static struct qdio_buffer_element *
 zfcp_qdio_sbale_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req)
 {
-        if (q_req->sbale_curr == qdio->max_sbale_per_sbal - 1)
+        if (q_req->sbale_curr == ZFCP_QDIO_LAST_SBALE_PER_SBAL)
                 return zfcp_qdio_sbal_chain(qdio, q_req);
         q_req->sbale_curr++;
         return zfcp_qdio_sbale_curr(qdio, q_req);
@@ -197,12 +167,13 @@ zfcp_qdio_sbale_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req)
  * @q_req: pointer to struct zfcp_qdio_req
  * @sg: scatter-gather list
  * @max_sbals: upper bound for number of SBALs to be used
- * Returns: zero or -EINVAL on error
+ * Returns: number of bytes, or error (negativ)
  */
 int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
                             struct scatterlist *sg)
 {
         struct qdio_buffer_element *sbale;
+        int bytes = 0;
 
         /* set storage-block type for this request */
         sbale = zfcp_qdio_sbale_req(qdio, q_req);
@@ -216,10 +187,14 @@ int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
                                              q_req->sbal_number);
                         return -EINVAL;
                 }
+
                 sbale->addr = sg_virt(sg);
                 sbale->length = sg->length;
+
+                bytes += sg->length;
         }
-        return 0;
+
+        return bytes;
 }
 
 static int zfcp_qdio_sbal_check(struct zfcp_qdio *qdio)
@@ -308,8 +283,6 @@ static void zfcp_qdio_setup_init_data(struct qdio_initialize *id,
         memcpy(id->adapter_name, dev_name(&id->cdev->dev), 8);
         ASCEBC(id->adapter_name, 8);
         id->qib_rflags = QIB_RFLAGS_ENABLE_DATA_DIV;
-        if (enable_multibuffer)
-                id->qdr_ac |= QDR_AC_MULTI_BUFFER_ENABLE;
         id->no_input_qs = 1;
         id->no_output_qs = 1;
         id->input_handler = zfcp_qdio_int_resp;
@@ -405,17 +378,6 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio)
                 atomic_set_mask(ZFCP_STATUS_ADAPTER_DATA_DIV_ENABLED,
                                 &qdio->adapter->status);
 
-        if (ssqd.qdioac2 & CHSC_AC2_MULTI_BUFFER_ENABLED) {
-                atomic_set_mask(ZFCP_STATUS_ADAPTER_MB_ACT, &adapter->status);
-                qdio->max_sbale_per_sbal = QDIO_MAX_ELEMENTS_PER_BUFFER;
-        } else {
-                atomic_clear_mask(ZFCP_STATUS_ADAPTER_MB_ACT, &adapter->status);
-                qdio->max_sbale_per_sbal = QDIO_MAX_ELEMENTS_PER_BUFFER - 1;
-        }
-
-        qdio->max_sbale_per_req =
-                ZFCP_QDIO_MAX_SBALS_PER_REQ * qdio->max_sbale_per_sbal
-                - 2;
         if (qdio_activate(cdev))
                 goto failed_qdio;
 
@@ -435,11 +397,6 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio)
         atomic_set(&qdio->req_q_free, QDIO_MAX_BUFFERS_PER_Q);
         atomic_set_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &qdio->adapter->status);
 
-        if (adapter->scsi_host) {
-                adapter->scsi_host->sg_tablesize = qdio->max_sbale_per_req;
-                adapter->scsi_host->max_sectors = qdio->max_sbale_per_req * 8;
-        }
-
         return 0;
 
 failed_qdio:
diff --git a/drivers/s390/scsi/zfcp_qdio.h b/drivers/s390/scsi/zfcp_qdio.h
index 497cd379b0d..54e22ace012 100644
--- a/drivers/s390/scsi/zfcp_qdio.h
+++ b/drivers/s390/scsi/zfcp_qdio.h
@@ -3,7 +3,7 @@
  *
  * Header file for zfcp qdio interface
  *
- * Copyright IBM Corp. 2010
+ * Copyright IBM Corporation 2010
  */
 
 #ifndef ZFCP_QDIO_H
@@ -13,9 +13,20 @@
 
 #define ZFCP_QDIO_SBALE_LEN     PAGE_SIZE
 
+/* DMQ bug workaround: don't use last SBALE */
+#define ZFCP_QDIO_MAX_SBALES_PER_SBAL   (QDIO_MAX_ELEMENTS_PER_BUFFER - 1)
+
+/* index of last SBALE (with respect to DMQ bug workaround) */
+#define ZFCP_QDIO_LAST_SBALE_PER_SBAL   (ZFCP_QDIO_MAX_SBALES_PER_SBAL - 1)
+
 /* Max SBALS for chaining */
 #define ZFCP_QDIO_MAX_SBALS_PER_REQ     36
 
+/* max. number of (data buffer) SBALEs in largest SBAL chain
+ * request ID + QTCB in SBALE 0 + 1 of first SBAL in chain   */
+#define ZFCP_QDIO_MAX_SBALES_PER_REQ     \
+        (ZFCP_QDIO_MAX_SBALS_PER_REQ * ZFCP_QDIO_MAX_SBALES_PER_SBAL - 2)
+
 /**
  * struct zfcp_qdio - basic qdio data structure
  * @res_q: response queue
@@ -42,8 +53,6 @@ struct zfcp_qdio {
         atomic_t                req_q_full;
         wait_queue_head_t       req_q_wq;
         struct zfcp_adapter     *adapter;
-        u16                     max_sbale_per_sbal;
-        u16                     max_sbale_per_req;
 };
 
 /**
@@ -146,7 +155,7 @@ void zfcp_qdio_fill_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
 {
         struct qdio_buffer_element *sbale;
 
-        BUG_ON(q_req->sbale_curr == qdio->max_sbale_per_sbal - 1);
+        BUG_ON(q_req->sbale_curr == ZFCP_QDIO_LAST_SBALE_PER_SBAL);
         q_req->sbale_curr++;
         sbale = zfcp_qdio_sbale_curr(qdio, q_req);
         sbale->addr = data;
@@ -186,10 +195,9 @@ int zfcp_qdio_sg_one_sbale(struct scatterlist *sg)
  * @q_req: The current zfcp_qdio_req
  */
 static inline
-void zfcp_qdio_skip_to_last_sbale(struct zfcp_qdio *qdio,
-                                  struct zfcp_qdio_req *q_req)
+void zfcp_qdio_skip_to_last_sbale(struct zfcp_qdio_req *q_req)
 {
-        q_req->sbale_curr = qdio->max_sbale_per_sbal - 1;
+        q_req->sbale_curr = ZFCP_QDIO_LAST_SBALE_PER_SBAL;
 }
 
 /**
@@ -220,52 +228,8 @@ void zfcp_qdio_set_data_div(struct zfcp_qdio *qdio,
 {
         struct qdio_buffer_element *sbale;
 
-        sbale = qdio->req_q[q_req->sbal_first]->element;
+        sbale = &qdio->req_q[q_req->sbal_first]->element[0];
         sbale->length = count;
 }
 
-/**
- * zfcp_qdio_sbale_count - count sbale used
- * @sg: pointer to struct scatterlist
- */
-static inline
-unsigned int zfcp_qdio_sbale_count(struct scatterlist *sg)
-{
-        unsigned int count = 0;
-
-        for (; sg; sg = sg_next(sg))
-                count++;
-
-        return count;
-}
-
-/**
- * zfcp_qdio_real_bytes - count bytes used
- * @sg: pointer to struct scatterlist
- */
-static inline
-unsigned int zfcp_qdio_real_bytes(struct scatterlist *sg)
-{
-        unsigned int real_bytes = 0;
-
-        for (; sg; sg = sg_next(sg))
-                real_bytes += sg->length;
-
-        return real_bytes;
-}
-
-/**
- * zfcp_qdio_set_scount - set SBAL count value
- * @qdio: pointer to struct zfcp_qdio
- * @q_req: The current zfcp_qdio_req
- */
-static inline
-void zfcp_qdio_set_scount(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req)
-{
-        struct qdio_buffer_element *sbale;
-
-        sbale = qdio->req_q[q_req->sbal_first]->element;
-        sbale->scount = q_req->sbal_number - 1;
-}
-
 #endif /* ZFCP_QDIO_H */
diff --git a/drivers/s390/scsi/zfcp_reqlist.h b/drivers/s390/scsi/zfcp_reqlist.h
index 7c2c6194dfc..a72d1b730ab 100644
--- a/drivers/s390/scsi/zfcp_reqlist.h
+++ b/drivers/s390/scsi/zfcp_reqlist.h
@@ -4,7 +4,7 @@
  * Data structure and helper functions for tracking pending FSF
  * requests.
  *
- * Copyright IBM Corp. 2009
+ * Copyright IBM Corporation 2009
  */
 
 #ifndef ZFCP_REQLIST_H
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 7b31e3f403f..169ba7b7504 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -3,13 +3,12 @@
  *
  * Interface to Linux SCSI midlayer.
  *
- * Copyright IBM Corp. 2002, 2010
+ * Copyright IBM Corporation 2002, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <scsi/fc/fc_fcp.h>
@@ -25,8 +24,11 @@ module_param_named(queue_depth, default_depth, uint, 0600);
 MODULE_PARM_DESC(queue_depth, "Default queue depth for new SCSI devices");
 
 static bool enable_dif;
-module_param_named(dif, enable_dif, bool, 0400);
+
+#ifdef CONFIG_ZFCP_DIF
+module_param_named(dif, enable_dif, bool, 0600);
 MODULE_PARM_DESC(dif, "Enable DIF/DIX data integrity support");
+#endif
 
 static bool allow_lun_scan = 1;
 module_param(allow_lun_scan, bool, 0600);
@@ -311,8 +313,8 @@ static struct scsi_host_template zfcp_scsi_host_template = {
         .proc_name               = "zfcp",
         .can_queue               = 4096,
         .this_id                 = -1,
-        .sg_tablesize            = 1, /* adjusted later */
-        .max_sectors             = 8, /* adjusted later */
+        .sg_tablesize            = ZFCP_QDIO_MAX_SBALES_PER_REQ,
+        .max_sectors             = (ZFCP_QDIO_MAX_SBALES_PER_REQ * 8),
         .dma_boundary            = ZFCP_QDIO_SBALE_LEN - 1,
         .cmd_per_lun             = 1,
         .use_clustering          = 1,
@@ -670,9 +672,9 @@ void zfcp_scsi_set_prot(struct zfcp_adapter *adapter)
             adapter->adapter_features & FSF_FEATURE_DIX_PROT_TCPIP) {
                 mask |= SHOST_DIX_TYPE1_PROTECTION;
                 scsi_host_set_guard(shost, SHOST_DIX_GUARD_IP);
-                shost->sg_prot_tablesize = adapter->qdio->max_sbale_per_req / 2;
-                shost->sg_tablesize = adapter->qdio->max_sbale_per_req / 2;
-                shost->max_sectors = shost->sg_tablesize * 8;
+                shost->sg_prot_tablesize = ZFCP_QDIO_MAX_SBALES_PER_REQ / 2;
+                shost->sg_tablesize = ZFCP_QDIO_MAX_SBALES_PER_REQ / 2;
+                shost->max_sectors = ZFCP_QDIO_MAX_SBALES_PER_REQ * 8 / 2;
         }
 
         scsi_host_set_prot(shost, mask);
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 1e0eb089dfb..cdc4ff78a7b 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -3,7 +3,7 @@
  *
  * sysfs attributes.
  *
- * Copyright IBM Corp. 2008, 2010
+ * Copyright IBM Corporation 2008, 2010
  */
 
 #define KMSG_COMPONENT "zfcp"
@@ -227,8 +227,6 @@ static ssize_t zfcp_sysfs_port_rescan_store(struct device *dev,
 static ZFCP_DEV_ATTR(adapter, port_rescan, S_IWUSR, NULL,
                      zfcp_sysfs_port_rescan_store);
 
-DEFINE_MUTEX(zfcp_sysfs_port_units_mutex);
-
 static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
                                             struct device_attribute *attr,
                                             const char *buf, size_t count)
@@ -251,16 +249,6 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
         else
                 retval = 0;
 
-        mutex_lock(&zfcp_sysfs_port_units_mutex);
-        if (atomic_read(&port->units) > 0) {
-                retval = -EBUSY;
-                mutex_unlock(&zfcp_sysfs_port_units_mutex);
-                goto out;
-        }
-        /* port is about to be removed, so no more unit_add */
-        atomic_set(&port->units, -1);
-        mutex_unlock(&zfcp_sysfs_port_units_mutex);
-
         write_lock_irq(&adapter->port_list_lock);
         list_del(&port->list);
         write_unlock_irq(&adapter->port_list_lock);
@@ -301,14 +289,12 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
 {
         struct zfcp_port *port = container_of(dev, struct zfcp_port, dev);
         u64 fcp_lun;
-        int retval;
 
         if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))
                 return -EINVAL;
 
-        retval = zfcp_unit_add(port, fcp_lun);
-        if (retval)
-                return retval;
+        if (zfcp_unit_add(port, fcp_lun))
+                return -EINVAL;
 
         return count;
 }
diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c
index 1cd2b99ab25..20796ebc33c 100644
--- a/drivers/s390/scsi/zfcp_unit.c
+++ b/drivers/s390/scsi/zfcp_unit.c
@@ -4,7 +4,7 @@
  * Tracking of manually configured LUNs and helper functions to
  * register the LUNs with the SCSI midlayer.
  *
- * Copyright IBM Corp. 2010
+ * Copyright IBM Corporation 2010
  */
 
 #include "zfcp_def.h"
@@ -104,7 +104,7 @@ static void zfcp_unit_release(struct device *dev)
 {
         struct zfcp_unit *unit = container_of(dev, struct zfcp_unit, dev);
 
-        atomic_dec(&unit->port->units);
+        put_device(&unit->port->dev);
         kfree(unit);
 }
 
@@ -119,27 +119,16 @@ static void zfcp_unit_release(struct device *dev)
 int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun)
 {
         struct zfcp_unit *unit;
-        int retval = 0;
-
-        mutex_lock(&zfcp_sysfs_port_units_mutex);
-        if (atomic_read(&port->units) == -1) {
-                /* port is already gone */
-                retval = -ENODEV;
-                goto out;
-        }
 
         unit = zfcp_unit_find(port, fcp_lun);
         if (unit) {
                 put_device(&unit->dev);
-                retval = -EEXIST;
-                goto out;
+                return -EEXIST;
         }
 
         unit = kzalloc(sizeof(struct zfcp_unit), GFP_KERNEL);
-        if (!unit) {
-                retval = -ENOMEM;
-                goto out;
-        }
+        if (!unit)
+                return -ENOMEM;
 
         unit->port = port;
         unit->fcp_lun = fcp_lun;
@@ -150,33 +139,28 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun)
         if (dev_set_name(&unit->dev, "0x%016llx",
                          (unsigned long long) fcp_lun)) {
                 kfree(unit);
-                retval = -ENOMEM;
-                goto out;
+                return -ENOMEM;
         }
 
+        get_device(&port->dev);
+
         if (device_register(&unit->dev)) {
                 put_device(&unit->dev);
-                retval = -ENOMEM;
-                goto out;
+                return -ENOMEM;
         }
 
         if (sysfs_create_group(&unit->dev.kobj, &zfcp_sysfs_unit_attrs)) {
                 device_unregister(&unit->dev);
-                retval = -EINVAL;
-                goto out;
+                return -EINVAL;
         }
 
-        atomic_inc(&port->units); /* under zfcp_sysfs_port_units_mutex ! */
-
         write_lock_irq(&port->unit_list_lock);
         list_add_tail(&unit->list, &port->unit_list);
         write_unlock_irq(&port->unit_list_lock);
 
         zfcp_unit_scsi_scan(unit);
 
-out:
-        mutex_unlock(&zfcp_sysfs_port_units_mutex);
-        return retval;
+        return 0;
 }
 
 /**