Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (54 commits)
  [S390] Remove error checking from copy_oldmem_page()
  [S390] qdio: prevent dsci access without adapter interrupts
  [S390] irqstats: split IPI interrupt accounting
  [S390] add missing __tlb_flush_global() for !CONFIG_SMP
  [S390] sparse: fix sparse symbol shadow warning
  [S390] sparse: fix sparse NULL pointer warnings
  [S390] sparse: fix sparse warnings with __user pointers
  [S390] sparse: fix sparse warnings in math-emu
  [S390] sparse: fix sparse warnings about missing prototypes
  [S390] sparse: fix sparse ANSI-C warnings
  [S390] sparse: fix sparse static warnings
  [S390] sparse: fix access past end of array warnings
  [S390] dasd: prevent path verification before resume
  [S390] qdio: remove multicast polling
  [S390] qdio: reset outbound SBAL error states
  [S390] qdio: EQBS retry after CCQ 96
  [S390] qdio: add timestamp for last queue scan time
  [S390] Introduce get_clock_fast()
  [S390] kvm: Handle diagnose 0x10 (release pages)
  [S390] take mmap_sem when walking guest page table
  ...

31 files changed, 395 insertions, 350 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index a1d3ddba99cc..65894f05a801 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -11,7 +11,6 @@
 #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>
@@ -1594,7 +1593,6 @@ 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:
@@ -2061,13 +2059,14 @@ void dasd_add_request_tail(struct dasd_ccw_req *cqr)
 /*
  * Wakeup helper for the 'sleep_on' functions.
  */
-static void dasd_wakeup_cb(struct dasd_ccw_req *cqr, void *data)
+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)
 {
@@ -2167,7 +2166,9 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible)
                 } else
                         wait_event(generic_waitq, !(device->stopped));
 
-                cqr->callback = dasd_wakeup_cb;
+                if (!cqr->callback)
+                        cqr->callback = dasd_wakeup_cb;
+
                 cqr->callback_data = DASD_SLEEPON_START_TAG;
                 dasd_add_request_tail(cqr);
                 if (interruptible) {
@@ -2263,7 +2264,11 @@ 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;
-        list_add(&cqr->devlist, &device->ccw_queue);
+        /*
+         * add new request as second
+         * first the terminated cqr needs to be finished
+         */
+        list_add(&cqr->devlist, device->ccw_queue.next);
 
         /* let the bh start the request to keep them in order */
         dasd_schedule_device_bh(device);
@@ -3284,6 +3289,9 @@ 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);
 
@@ -3358,6 +3366,7 @@ 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;
 }
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 6e835c9fdfcb..6ab29680586a 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -844,6 +844,30 @@ 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,
@@ -863,6 +887,7 @@ 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;
 }
@@ -900,6 +925,7 @@ 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
@@ -1075,6 +1101,12 @@ static void do_path_verification_work(struct work_struct *work)
         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;
@@ -2021,9 +2053,13 @@ 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 and not in offline processing*/
+                /*
+                 * for alias only, not in offline processing
+                 * and only if not suspended
+                 */
                 if (!device->block && private->lcu &&
-                    !test_bit(DASD_FLAG_OFFLINE, &device->flags)) {
+                    !test_bit(DASD_FLAG_OFFLINE, &device->flags) &&
+                    !test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
                         /*
                          * the state change could be caused by an alias
                          * reassignment remove device from alias handling
@@ -2350,7 +2386,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 = 0;
+        idaw_dst = NULL;
         idaw_len = 0;
         rq_for_each_segment(bv, req, iter) {
                 dst = page_address(bv->bv_page) + bv->bv_offset;
@@ -2412,7 +2448,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 = 0;
+                                idaw_dst = NULL;
                                 idaw_len = 0;
                                 end_idaw = 0;
                         }
@@ -3998,6 +4034,7 @@ static struct ccw_driver dasd_eckd_driver = {
         .thaw        = dasd_generic_restore_device,
         .restore     = dasd_generic_restore_device,
         .uc_handler  = dasd_generic_uc_handler,
+        .int_class   = IOINT_DAS,
 };
 
 /*
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 4b71b1164868..a62a75358eb9 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -79,6 +79,7 @@ static struct ccw_driver dasd_fba_driver = {
         .freeze      = dasd_generic_pm_freeze,
         .thaw        = dasd_generic_restore_device,
         .restore     = dasd_generic_restore_device,
+        .int_class   = IOINT_DAS,
 };
 
 static void
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 1dd12bd85a69..afe8c33422ed 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -516,6 +516,7 @@ 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 */
 
 
 void dasd_put_device_wake(struct dasd_device *);
@@ -643,6 +644,7 @@ 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)
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 694464c65fcd..934458ad55e5 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -9,7 +9,6 @@
  *            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>
@@ -362,7 +361,6 @@ 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;
         cstat = irb->scsw.cmd.cstat;
@@ -776,6 +774,7 @@ static struct ccw_driver raw3215_ccw_driver = {
         .freeze         = &raw3215_pm_stop,
         .thaw           = &raw3215_pm_start,
         .restore        = &raw3215_pm_start,
+        .int_class      = IOINT_C15,
 };
 
 #ifdef CONFIG_TN3215_CONSOLE
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 810ac38631c3..e5cb9248a442 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -7,7 +7,6 @@
  *     Copyright IBM Corp. 2003, 2009
  */
 
-#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -330,7 +329,6 @@ 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;
@@ -1398,6 +1396,7 @@ static struct ccw_driver raw3270_ccw_driver = {
         .freeze         = &raw3270_pm_stop,
         .thaw           = &raw3270_pm_start,
         .restore        = &raw3270_pm_start,
+        .int_class      = IOINT_C70,
 };
 
 static int
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 837e010299a8..0b54a91f8dcd 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -61,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_BASE_BITS | PSW_MASK_EXT |
-                        PSW_MASK_WAIT | PSW_DEFAULT_KEY);
+        __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA |
+                        PSW_MASK_BA | PSW_MASK_EXT | PSW_MASK_WAIT);
         local_irq_disable();
 out:
         /* Contents of the sccb might have changed. */
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index a90a02c28d6a..87fc0ac11e67 100644
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -30,7 +30,8 @@ static void do_machine_quiesce(void)
         psw_t quiesce_psw;
 
         smp_send_stop();
-        quiesce_psw.mask = PSW_BASE_BITS | PSW_MASK_WAIT;
+        quiesce_psw.mask =
+                PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA | PSW_MASK_WAIT;
         quiesce_psw.addr = 0xfff;
         __load_psw(quiesce_psw);
 }
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 9eff2df70ddb..934ef33eb9a4 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -1330,6 +1330,7 @@ static struct ccw_driver tape_34xx_driver = {
         .set_online = tape_34xx_online,
         .set_offline = tape_generic_offline,
         .freeze = tape_generic_pm_suspend,
+        .int_class = IOINT_TAP,
 };
 
 static int
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index a7d570728882..49c6aab7ad78 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -1762,6 +1762,7 @@ static struct ccw_driver tape_3590_driver = {
         .set_offline = tape_generic_offline,
         .set_online = tape_3590_online,
         .freeze = tape_generic_pm_suspend,
+        .int_class = IOINT_TAP,
 };
 
 /*
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 7978a0adeaf3..b3a3e8e8656e 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -14,7 +14,6 @@
 #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
@@ -1115,7 +1114,6 @@ __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;
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index f6b00c3df425..d291a54acfad 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -11,7 +11,6 @@
 #define KMSG_COMPONENT "vmur"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/kernel_stat.h>
 #include <linux/cdev.h>
 #include <linux/slab.h>
 
@@ -74,6 +73,7 @@ static struct ccw_driver ur_driver = {
         .set_online     = ur_set_online,
         .set_offline    = ur_set_offline,
         .freeze         = ur_pm_suspend,
+        .int_class      = IOINT_VMR,
 };
 
 static DEFINE_MUTEX(vmur_mutex);
@@ -305,7 +305,6 @@ 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);
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 3b94044027c2..43068fbd0baa 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -16,6 +16,7 @@
 #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>
@@ -142,22 +143,6 @@ 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;
@@ -346,8 +331,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 = memcpy_real_user(buf + hdr_count + mem_offs, mem_start + mem_offs,
-                              size);
+        rc = copy_to_user_real(buf + hdr_count + mem_offs,
+                               (void *) mem_start + mem_offs, size);
         if (rc)
                 goto fail;
 
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 5c567414c4bb..4f1989d27b1f 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -29,31 +29,20 @@
 
 /* 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)
+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);
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *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];
@@ -63,7 +52,6 @@ __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
                 sysfs_remove_link(&gdev->dev.kobj, str);
                 sysfs_remove_link(&gdev->cdev[i]->dev.kobj, "group_device");
         }
-        
 }
 
 /*
@@ -87,6 +75,87 @@ static void __ccwgroup_remove_cdev_refs(struct ccwgroup_device *gdev)
         }
 }
 
+static int ccwgroup_set_online(struct ccwgroup_device *gdev)
+{
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
+        int ret = 0;
+
+        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;
+}
+
+static int ccwgroup_set_offline(struct ccwgroup_device *gdev)
+{
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
+        int ret = 0;
+
+        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;
+}
+
+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;
+}
+
+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);
+}
+
 /*
  * Provide an 'ungroup' attribute so the user can remove group devices no
  * longer needed or accidentially created. Saves memory :)
@@ -104,14 +173,13 @@ 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;
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
         int rc;
 
-        gdev = to_ccwgroupdev(dev);
-
         /* Prevent concurrent online/offline processing and ungrouping. */
         if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
                 return -EAGAIN;
@@ -132,24 +200,35 @@ out:
         }
         return count;
 }
-
 static DEVICE_ATTR(ungroup, 0200, NULL, ccwgroup_ungroup_store);
+static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store);
 
-static void
-ccwgroup_release (struct device *dev)
+static struct attribute *ccwgroup_attrs[] = {
+        &dev_attr_online.attr,
+        &dev_attr_ungroup.attr,
+        NULL,
+};
+static struct attribute_group ccwgroup_attr_group = {
+        .attrs = ccwgroup_attrs,
+};
+static const struct attribute_group *ccwgroup_attr_groups[] = {
+        &ccwgroup_attr_group,
+        NULL,
+};
+
+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,
@@ -159,8 +238,8 @@ __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);
@@ -293,26 +372,17 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
         }
 
         dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev));
-
+        gdev->dev.groups = ccwgroup_attr_groups;
         rc = device_add(&gdev->dev);
         if (rc)
                 goto error;
-        get_device(&gdev->dev);
-        rc = device_create_file(&gdev->dev, &dev_attr_ungroup);
-
+        rc = __ccwgroup_create_symlinks(gdev);
         if (rc) {
-                device_unregister(&gdev->dev);
+                device_del(&gdev->dev);
                 goto error;
         }
-
-        rc = __ccwgroup_create_symlinks(gdev);
-        if (!rc) {
-                mutex_unlock(&gdev->reg_mutex);
-                put_device(&gdev->dev);
-                return 0;
-        }
-        device_remove_file(&gdev->dev, &dev_attr_ungroup);
-        device_unregister(&gdev->dev);
+        mutex_unlock(&gdev->reg_mutex);
+        return 0;
 error:
         for (i = 0; i < num_devices; i++)
                 if (gdev->cdev[i]) {
@@ -330,7 +400,15 @@ error:
 EXPORT_SYMBOL(ccwgroup_create_from_string);
 
 static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
-                             void *data);
+                             void *data)
+{
+        struct device *dev = data;
+
+        if (action == BUS_NOTIFY_UNBIND_DRIVER)
+                device_schedule_callback(dev, ccwgroup_ungroup_callback);
+
+        return NOTIFY_OK;
+}
 
 static struct notifier_block ccwgroup_nb = {
         .notifier_call = ccwgroup_notifier
@@ -362,138 +440,21 @@ module_exit(cleanup_ccwgroup);
 
 /************************** driver stuff ******************************/
 
-static int
-ccwgroup_set_online(struct ccwgroup_device *gdev)
+static int ccwgroup_probe(struct device *dev)
 {
-        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 -ENODEV;
-
-        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 DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store);
-
-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);
-
-        if ((ret = device_create_file(dev, &dev_attr_online)))
-                return ret;
-
-        ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
-        if (ret)
-                device_remove_file(dev, &dev_attr_online);
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
 
-        return ret;
+        return gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
 }
 
-static int
-ccwgroup_remove (struct device *dev)
+static int ccwgroup_remove(struct device *dev)
 {
-        struct ccwgroup_device *gdev;
-        struct ccwgroup_driver *gdrv;
-
-        device_remove_file(dev, &dev_attr_online);
-        device_remove_file(dev, &dev_attr_ungroup);
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
 
         if (!dev->driver)
                 return 0;
-
-        gdev = to_ccwgroupdev(dev);
-        gdrv = to_ccwgroupdrv(dev->driver);
-
         if (gdrv->remove)
                 gdrv->remove(gdev);
 
@@ -502,15 +463,11 @@ ccwgroup_remove (struct device *dev)
 
 static void ccwgroup_shutdown(struct device *dev)
 {
-        struct ccwgroup_device *gdev;
-        struct ccwgroup_driver *gdrv;
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
+        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
 
         if (!dev->driver)
                 return;
-
-        gdev = to_ccwgroupdev(dev);
-        gdrv = to_ccwgroupdrv(dev->driver);
-
         if (gdrv->shutdown)
                 gdrv->shutdown(gdev);
 }
@@ -586,26 +543,12 @@ 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
@@ -619,9 +562,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;
 }
@@ -652,6 +595,7 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver)
         put_driver(&cdriver->driver);
         driver_unregister(&cdriver->driver);
 }
+EXPORT_SYMBOL(ccwgroup_driver_unregister);
 
 /**
  * ccwgroup_probe_ccwdev() - probe function for slave devices
@@ -666,6 +610,7 @@ int ccwgroup_probe_ccwdev(struct ccw_device *cdev)
 {
         return 0;
 }
+EXPORT_SYMBOL(ccwgroup_probe_ccwdev);
 
 /**
  * ccwgroup_remove_ccwdev() - remove function for slave devices
@@ -702,9 +647,5 @@ void ccwgroup_remove_ccwdev(struct ccw_device *cdev)
         /* Release ccwgroup device reference for local processing. */
         put_device(&gdev->dev);
 }
-
-MODULE_LICENSE("GPL");
-EXPORT_SYMBOL(ccwgroup_driver_register);
-EXPORT_SYMBOL(ccwgroup_driver_unregister);
-EXPORT_SYMBOL(ccwgroup_probe_ccwdev);
 EXPORT_SYMBOL(ccwgroup_remove_ccwdev);
+MODULE_LICENSE("GPL");
diff --git a/drivers/s390/cio/ccwreq.c b/drivers/s390/cio/ccwreq.c
index d15f8b4d78bd..5156264d0c74 100644
--- a/drivers/s390/cio/ccwreq.c
+++ b/drivers/s390/cio/ccwreq.c
@@ -1,10 +1,13 @@
 /*
  *  Handling of internal CCW device requests.
  *
- *    Copyright IBM Corp. 2009
+ *    Copyright IBM Corp. 2009, 2011
  *    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>
@@ -323,7 +326,21 @@ 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;
+        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]);
+        }
 
         if (!ccwreq_next_path(cdev)) {
                 /* set the final return code for this request */
@@ -342,7 +359,7 @@ err:
  * ccw_request_notoper - notoper handler for I/O request procedure
  * @cdev: ccw device
  *
- * Handle timeout during I/O request procedure.
+ * Handle notoper during I/O request procedure.
  */
 void ccw_request_notoper(struct ccw_device *cdev)
 {
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index e950f1ad4dd1..0c87b0fc7714 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -1,7 +1,7 @@
 /*
  * Driver for s390 chsc subchannels
  *
- * Copyright IBM Corp. 2008, 2009
+ * Copyright IBM Corp. 2008, 2011
  *
  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  *
@@ -12,6 +12,7 @@
 #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>
@@ -56,6 +57,8 @@ static void chsc_subchannel_irq(struct subchannel *sch)
 
         CHSC_LOG(4, "irb");
         CHSC_LOG_HEX(4, irb, sizeof(*irb));
+        kstat_cpu(smp_processor_id()).irqs[IOINT_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 eb3140ee821e..dc67c397449e 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -622,6 +622,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
                 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
                 if (!sch) {
                         /* Clear pending interrupt condition. */
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                         tsch(tpi_info->schid, irb);
                         continue;
                 }
@@ -634,7 +635,10 @@ 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
+                                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
+                } else
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 spin_unlock(sch->lock);
                 /*
                  * Are more interrupts pending?
@@ -667,18 +671,23 @@ static int cio_tpi(void)
         tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
         if (tpi(NULL) != 1)
                 return 0;
+        kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++;
         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(tpi_info->schid, irb) != 0)
+        if (tsch(tpi_info->schid, irb) != 0) {
                 /* Not status pending or not operational. */
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 return 1;
+        }
         sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
-        if (!sch)
+        if (!sch) {
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 return 1;
+        }
         irq_context = in_interrupt();
         if (!irq_context)
                 local_bh_disable();
@@ -687,6 +696,8 @@ static int cio_tpi(void)
         memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
         if (sch->driver && sch->driver->irq)
                 sch->driver->irq(sch);
+        else
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
         spin_unlock(sch->lock);
         irq_exit();
         if (!irq_context)
@@ -1058,7 +1069,7 @@ void reipl_ccw_dev(struct ccw_dev_id *devid)
 {
         struct subchannel_id schid;
 
-        s390_reset_system();
+        s390_reset_system(NULL, NULL);
         if (reipl_find_schid(devid, &schid) != 0)
                 panic("IPL Device not found\n");
         do_reipl_asm(*((__u32*)&schid));
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 80ebdddf7747..33bb4d891e16 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -133,6 +133,8 @@ 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 8e04c00cf0ad..d734f4a0ecac 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -21,6 +21,7 @@
 #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>
@@ -747,6 +748,7 @@ static int io_subchannel_initialize_dev(struct subchannel *sch,
                                         struct ccw_device *cdev)
 {
         cdev->private->cdev = cdev;
+        cdev->private->int_class = IOINT_CIO;
         atomic_set(&cdev->private->onoff, 0);
         cdev->dev.parent = &sch->dev;
         cdev->dev.release = ccw_device_release;
@@ -1010,6 +1012,8 @@ 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
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
 }
 
 void io_subchannel_init_config(struct subchannel *sch)
@@ -1621,6 +1625,7 @@ 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 = IOINT_CIO;
         ret = ccw_device_console_enable(&console_cdev, sch);
         if (ret) {
                 cio_release_console();
@@ -1702,11 +1707,18 @@ 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 = IOINT_CIO;
 
         ret = cdrv->probe ? cdrv->probe(cdev) : -ENODEV;
 
         if (ret) {
                 cdev->drv = NULL;
+                cdev->private->int_class = IOINT_CIO;
                 return ret;
         }
 
@@ -1740,6 +1752,7 @@ ccw_device_remove (struct device *dev)
         }
         ccw_device_set_timeout(cdev, 0);
         cdev->drv = NULL;
+        cdev->private->int_class = IOINT_CIO;
         return 0;
 }
 
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 0b7245c72d5e..179824b3082f 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -5,6 +5,7 @@
 #include <linux/atomic.h>
 #include <linux/wait.h>
 #include <linux/notifier.h>
+#include <linux/kernel_stat.h>
 #include "io_sch.h"
 
 /*
@@ -56,7 +57,17 @@ 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)
 {
-        dev_jumptable[cdev->private->state][dev_event](cdev, dev_event);
+        int state = cdev->private->state;
+
+        if (dev_event == DEV_EVENT_INTERRUPT) {
+                if (state == DEV_STATE_ONLINE)
+                        kstat_cpu(smp_processor_id()).
+                                irqs[cdev->private->int_class]++;
+                else if (state != DEV_STATE_CMFCHANGE &&
+                         state != DEV_STATE_CMFUPDATE)
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
+        }
+        dev_jumptable[state][dev_event](cdev, dev_event);
 }
 
 /*
diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index ba31ad88f4f7..2ebb492a5c17 100644
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -4,6 +4,7 @@
 #include <linux/types.h>
 #include <asm/schid.h>
 #include <asm/ccwdev.h>
+#include <asm/irq.h>
 #include "css.h"
 #include "orb.h"
 
@@ -157,6 +158,7 @@ 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/qdio.h b/drivers/s390/cio/qdio.h
index 3dd86441da3d..b962ffbc0803 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -18,14 +18,6 @@
 #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,
@@ -290,6 +282,9 @@ 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;
 
@@ -423,31 +418,7 @@ 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)
 
-#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 has_multiple_inq_on_dsci(struct qdio_irq *irq)
-{
-        return irq->nr_input_qs > 1;
-}
-
-static inline int references_shared_dsci(struct qdio_irq *irq)
-{
-        return irq->dsci == &q_indicators[TIQDIO_SHARED_IND].ind;
-}
-
-static inline int shared_ind(struct qdio_q *q)
-{
-        struct qdio_irq *i = q->irq_ptr;
-        return references_shared_dsci(i) || has_multiple_inq_on_dsci(i);
-}
+extern u64 last_ai_time;
 
 /* prototypes for thin interrupt */
 void qdio_setup_thinint(struct qdio_irq *irq_ptr);
@@ -460,7 +431,8 @@ 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);
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index aaf7f935bfd3..ed68245f9741 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -54,15 +54,17 @@ static int qstat_show(struct seq_file *m, void *v)
         if (!q)
                 return 0;
 
-        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",
+        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),
                    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, "IRQs disabled: %u\n",
+                seq_printf(m, "DSCI: %d   IRQs disabled: %u\n",
+                           *(u32 *)q->irq_ptr->dsci,
                            test_bit(QDIO_QUEUE_IRQS_DISABLED,
                            &q->u.in.queue_irq_state));
         }
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 6547ff469410..3ef8d071c64a 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -15,7 +15,6 @@
 #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>
@@ -105,9 +104,12 @@ 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;
-        /* not all buffers processed */
-        if (ccq == 96 || ccq == 97)
+        /* no buffer processed */
+        if (ccq == 97)
                 return 1;
+        /* not all buffers processed */
+        if (ccq == 96)
+                return 2;
         /* notify devices immediately */
         DBF_ERROR("%4x ccq:%3d", SCH_NO(q), ccq);
         return -EIO;
@@ -127,10 +129,8 @@ 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);
@@ -141,30 +141,34 @@ again:
         ccq = do_eqbs(q->irq_ptr->sch_token, state, nr, &tmp_start, &tmp_count,
                       auto_ack);
         rc = qdio_check_ccq(q, ccq);
-
-        /* 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)
+                return count - tmp_count;
 
         if (rc == 1) {
                 DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "EQBS again:%2d", ccq);
                 goto again;
         }
 
-        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,
-                           q->nr, q->first_to_kick, count,
-                           q->irq_ptr->int_parm);
-                return 0;
+        if (rc == 2) {
+                BUG_ON(tmp_count == count);
+                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;
         }
-        return count - tmp_count;
+
+        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;
 }
 
 /**
@@ -197,22 +201,22 @@ 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 == 1) {
+        if (!rc) {
+                WARN_ON(tmp_count);
+                return count - tmp_count;
+        }
+
+        if (rc == 1 || rc == 2) {
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "SQBS again:%2d", ccq);
                 qperf_inc(q, sqbs_partial);
                 goto again;
         }
-        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,
-                           q->nr, q->first_to_kick, count,
-                           q->irq_ptr->int_parm);
-                return 0;
-        }
-        WARN_ON(tmp_count);
-        return count - tmp_count;
+
+        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;
 }
 
 /* returns number of examined buffers and their common state in *state */
@@ -277,7 +281,7 @@ static inline int set_buf_state(struct qdio_q *q, int bufnr,
 }
 
 /* set slsb states to initial state */
-void qdio_init_buf_states(struct qdio_irq *irq_ptr)
+static void qdio_init_buf_states(struct qdio_irq *irq_ptr)
 {
         struct qdio_q *q;
         int i;
@@ -446,7 +450,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);
-                return;
+                goto set;
         }
 
         DBF_ERROR("%4x BUF ERROR", SCH_NO(q));
@@ -456,6 +460,7 @@ 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.
@@ -513,6 +518,8 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
+        q->timestamp = get_clock_fast();
+
         /*
          * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
          * would return 0.
@@ -782,6 +789,8 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
+        q->timestamp = get_clock_fast();
+
         if (need_siga_sync(q))
                 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
                     !pci_out_supported(q)) ||
@@ -912,21 +921,13 @@ 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 multicast. Make sure buffer switch from PRIMED to
-         * EMPTY is noticed and outbound_handler is called after some time.
+         * or HiperSockets. 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);
@@ -1128,7 +1129,6 @@ 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++;
 
@@ -1719,9 +1719,7 @@ int qdio_start_irq(struct ccw_device *cdev, int nr)
 
         WARN_ON(queue_irqs_enabled(q));
 
-        if (!shared_ind(q))
-                xchg(q->irq_ptr->dsci, 0);
-
+        clear_nonshared_ind(irq_ptr);
         qdio_stop_polling(q);
         clear_bit(QDIO_QUEUE_IRQS_DISABLED, &q->u.in.queue_irq_state);
 
@@ -1729,7 +1727,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 (!shared_ind(q) && *q->irq_ptr->dsci)
+        if (test_nonshared_ind(irq_ptr))
                 goto rescan;
         if (!qdio_inbound_q_done(q))
                 goto rescan;
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index a3e3949d7b69..011eadea3ee4 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -26,17 +26,24 @@
  */
 #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);
-DEFINE_MUTEX(tiq_list_lock);
+static DEFINE_MUTEX(tiq_list_lock);
 
 /* adapter local summary indicator */
 static u8 *tiqdio_alsi;
 
-struct indicator_t *q_indicators;
+static struct indicator_t *q_indicators;
 
-static u64 last_ai_time;
+u64 last_ai_time;
 
 /* returns addr for the device state change indicator */
 static u32 *get_indicator(void)
@@ -90,6 +97,43 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
         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);
+}
+
+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;
+}
+
 static inline u32 clear_shared_ind(void)
 {
         if (!atomic_read(&q_indicators[TIQDIO_SHARED_IND].count))
@@ -119,7 +163,7 @@ static inline void tiqdio_call_inq_handlers(struct qdio_irq *irq)
                         q->u.in.queue_start_poll(q->irq_ptr->cdev, q->nr,
                                                  q->irq_ptr->int_parm);
                 } else {
-                        if (!shared_ind(q))
+                        if (!shared_ind(q->irq_ptr))
                                 xchg(q->irq_ptr->dsci, 0);
 
                         /*
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index aec60d55b10d..3c2c923d5c0a 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -33,7 +33,7 @@
  * The pointer to our (page) of device descriptions.
  */
 static void *kvm_devices;
-struct work_struct hotplug_work;
+static struct work_struct hotplug_work;
 
 struct kvm_device {
         struct virtio_device vdev;
@@ -334,10 +334,10 @@ static void scan_devices(void)
  */
 static int match_desc(struct device *dev, void *data)
 {
-        if ((ulong)to_kvmdev(dev_to_virtio(dev))->desc == (ulong)data)
-                return 1;
+        struct virtio_device *vdev = dev_to_virtio(dev);
+        struct kvm_device *kdev = to_kvmdev(vdev);
 
-        return 0;
+        return kdev->desc == data;
 }
 
 /*
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index f1fa2483ae6b..b41fae37d3af 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -63,7 +63,6 @@
 
 #define KMSG_COMPONENT "claw"
 
-#include <linux/kernel_stat.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 #include <asm/debug.h>
@@ -291,6 +290,7 @@ static struct ccw_driver claw_ccw_driver = {
         .ids    = claw_ids,
         .probe  = ccwgroup_probe_ccwdev,
         .remove = ccwgroup_remove_ccwdev,
+        .int_class = IOINT_CLW,
 };
 
 static ssize_t
@@ -645,7 +645,6 @@ 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);
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 426787efc492..5cb93a8e3403 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -24,7 +24,6 @@
 #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>
@@ -1203,7 +1202,6 @@ 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));
 
@@ -1769,6 +1767,7 @@ static struct ccw_driver ctcm_ccw_driver = {
         .ids    = ctcm_ids,
         .probe  = ccwgroup_probe_ccwdev,
         .remove = ccwgroup_remove_ccwdev,
+        .int_class = IOINT_CTC,
 };
 
 static struct ccwgroup_driver ctcm_group_driver = {
diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c
index 8305319b2a84..650aec1839e9 100644
--- a/drivers/s390/net/ctcm_sysfs.c
+++ b/drivers/s390/net/ctcm_sysfs.c
@@ -159,7 +159,7 @@ static ssize_t ctcm_proto_store(struct device *dev,
         return count;
 }
 
-const char *ctcm_type[] = {
+static const char *ctcm_type[] = {
         "not a channel",
         "CTC/A",
         "FICON channel",
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index fb246b944b16..c28713da1ec5 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -26,7 +26,6 @@
 #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>
@@ -1399,7 +1398,6 @@ 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;
 
@@ -1972,7 +1970,7 @@ lcs_portno_store (struct device *dev, struct device_attribute *attr, const char
 
 static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store);
 
-const char *lcs_type[] = {
+static const char *lcs_type[] = {
         "not a channel",
         "2216 parallel",
         "2216 channel",
@@ -2399,6 +2397,7 @@ static struct ccw_driver lcs_ccw_driver = {
         .ids    = lcs_ids,
         .probe  = ccwgroup_probe_ccwdev,
         .remove = ccwgroup_remove_ccwdev,
+        .int_class = IOINT_LCS,
 };
 
 /**
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index ce735204d317..e4c1176ee25b 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1415,7 +1415,7 @@ static int qeth_l3_send_checksum_command(struct qeth_card *card)
         return 0;
 }
 
-int qeth_l3_set_rx_csum(struct qeth_card *card, int on)
+static int qeth_l3_set_rx_csum(struct qeth_card *card, int on)
 {
         int rc = 0;