24 files changed, 164 insertions, 121 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 451bf99582ff..f302efa937ef 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -698,10 +698,11 @@ static void dasd_profile_start(struct dasd_block *block,
         }
 
         spin_lock(&block->profile.lock);
-        if (block->profile.data)
+        if (block->profile.data) {
                 block->profile.data->dasd_io_nr_req[counter]++;
                 if (rq_data_dir(req) == READ)
                         block->profile.data->dasd_read_nr_req[counter]++;
+        }
         spin_unlock(&block->profile.lock);
 
         /*
@@ -2978,12 +2979,12 @@ static int dasd_alloc_queue(struct dasd_block *block)
 
         elevator_exit(block->request_queue->elevator);
         block->request_queue->elevator = NULL;
+        mutex_lock(&block->request_queue->sysfs_lock);
         rc = elevator_init(block->request_queue, "deadline");
-        if (rc) {
+        if (rc)
                 blk_cleanup_queue(block->request_queue);
-                return rc;
-        }
-        return 0;
+        mutex_unlock(&block->request_queue->sysfs_lock);
+        return rc;
 }
 
 /*
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 5adb2042e824..cee7e2708a1f 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2077,6 +2077,7 @@ dasd_eckd_build_format(struct dasd_device *base,
         int intensity = 0;
         int r0_perm;
         int nr_tracks;
+        int use_prefix;
 
         startdev = dasd_alias_get_start_dev(base);
         if (!startdev)
@@ -2106,28 +2107,46 @@ dasd_eckd_build_format(struct dasd_device *base,
                 intensity = fdata->intensity;
         }
 
+        use_prefix = base_priv->features.feature[8] & 0x01;
+
         switch (intensity) {
         case 0x00:      /* Normal format */
         case 0x08:      /* Normal format, use cdl. */
                 cplength = 2 + (rpt*nr_tracks);
-                datasize = sizeof(struct PFX_eckd_data) +
-                        sizeof(struct LO_eckd_data) +
-                        rpt * nr_tracks * sizeof(struct eckd_count);
+                if (use_prefix)
+                        datasize = sizeof(struct PFX_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
+                else
+                        datasize = sizeof(struct DE_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
                 break;
         case 0x01:      /* Write record zero and format track. */
         case 0x09:      /* Write record zero and format track, use cdl. */
                 cplength = 2 + rpt * nr_tracks;
-                datasize = sizeof(struct PFX_eckd_data) +
-                        sizeof(struct LO_eckd_data) +
-                        sizeof(struct eckd_count) +
-                        rpt * nr_tracks * sizeof(struct eckd_count);
+                if (use_prefix)
+                        datasize = sizeof(struct PFX_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
+                else
+                        datasize = sizeof(struct DE_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
                 break;
         case 0x04:      /* Invalidate track. */
         case 0x0c:      /* Invalidate track, use cdl. */
                 cplength = 3;
-                datasize = sizeof(struct PFX_eckd_data) +
-                        sizeof(struct LO_eckd_data) +
-                        sizeof(struct eckd_count);
+                if (use_prefix)
+                        datasize = sizeof(struct PFX_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count);
+                else
+                        datasize = sizeof(struct DE_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count);
                 break;
         default:
                 dev_warn(&startdev->cdev->dev,
@@ -2147,14 +2166,25 @@ dasd_eckd_build_format(struct dasd_device *base,
 
         switch (intensity & ~0x08) {
         case 0x00: /* Normal format. */
-                prefix(ccw++, (struct PFX_eckd_data *) data,
-                       fdata->start_unit, fdata->stop_unit,
-                       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
-                /* grant subsystem permission to format R0 */
-                if (r0_perm)
-                        ((struct PFX_eckd_data *)data)
-                                ->define_extent.ga_extended |= 0x04;
-                data += sizeof(struct PFX_eckd_data);
+                if (use_prefix) {
+                        prefix(ccw++, (struct PFX_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_CKD, base, startdev);
+                        /* grant subsystem permission to format R0 */
+                        if (r0_perm)
+                                ((struct PFX_eckd_data *)data)
+                                        ->define_extent.ga_extended |= 0x04;
+                        data += sizeof(struct PFX_eckd_data);
+                } else {
+                        define_extent(ccw++, (struct DE_eckd_data *) data,
+                                      fdata->start_unit, fdata->stop_unit,
+                                      DASD_ECKD_CCW_WRITE_CKD, startdev);
+                        /* grant subsystem permission to format R0 */
+                        if (r0_perm)
+                                ((struct DE_eckd_data *) data)
+                                        ->ga_extended |= 0x04;
+                        data += sizeof(struct DE_eckd_data);
+                }
                 ccw[-1].flags |= CCW_FLAG_CC;
                 locate_record(ccw++, (struct LO_eckd_data *) data,
                               fdata->start_unit, 0, rpt*nr_tracks,
@@ -2163,11 +2193,18 @@ dasd_eckd_build_format(struct dasd_device *base,
                 data += sizeof(struct LO_eckd_data);
                 break;
         case 0x01: /* Write record zero + format track. */
-                prefix(ccw++, (struct PFX_eckd_data *) data,
-                       fdata->start_unit, fdata->stop_unit,
-                       DASD_ECKD_CCW_WRITE_RECORD_ZERO,
-                       base, startdev);
-                data += sizeof(struct PFX_eckd_data);
+                if (use_prefix) {
+                        prefix(ccw++, (struct PFX_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_RECORD_ZERO,
+                               base, startdev);
+                        data += sizeof(struct PFX_eckd_data);
+                } else {
+                        define_extent(ccw++, (struct DE_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_RECORD_ZERO, startdev);
+                        data += sizeof(struct DE_eckd_data);
+                }
                 ccw[-1].flags |= CCW_FLAG_CC;
                 locate_record(ccw++, (struct LO_eckd_data *) data,
                               fdata->start_unit, 0, rpt * nr_tracks + 1,
@@ -2176,10 +2213,17 @@ dasd_eckd_build_format(struct dasd_device *base,
                 data += sizeof(struct LO_eckd_data);
                 break;
         case 0x04: /* Invalidate track. */
-                prefix(ccw++, (struct PFX_eckd_data *) data,
-                       fdata->start_unit, fdata->stop_unit,
-                       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
-                data += sizeof(struct PFX_eckd_data);
+                if (use_prefix) {
+                        prefix(ccw++, (struct PFX_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_CKD, base, startdev);
+                        data += sizeof(struct PFX_eckd_data);
+                } else {
+                        define_extent(ccw++, (struct DE_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_CKD, startdev);
+                        data += sizeof(struct DE_eckd_data);
+                }
                 ccw[-1].flags |= CCW_FLAG_CC;
                 locate_record(ccw++, (struct LO_eckd_data *) data,
                               fdata->start_unit, 0, 1,
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 5d73e6e49af6..548209a9c43c 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -223,8 +223,12 @@ static void scm_blk_request(struct request_queue *rq)
         int ret;
 
         while ((req = blk_peek_request(rq))) {
-                if (req->cmd_type != REQ_TYPE_FS)
+                if (req->cmd_type != REQ_TYPE_FS) {
+                        blk_start_request(req);
+                        blk_dump_rq_flags(req, KMSG_COMPONENT " bad request");
+                        blk_end_request_all(req, -EIO);
                         continue;
+                }
 
                 if (!scm_permit_request(bdev, req)) {
                         scm_ensure_queue_restart(bdev);
diff --git a/drivers/s390/block/scm_blk.h b/drivers/s390/block/scm_blk.h
index 8b387b32fd62..e59331e6c2e5 100644
--- a/drivers/s390/block/scm_blk.h
+++ b/drivers/s390/block/scm_blk.h
@@ -107,7 +107,7 @@ extern debug_info_t *scm_debug;
 
 static inline void SCM_LOG_HEX(int level, void *data, int length)
 {
-        if (level > scm_debug->level)
+        if (!debug_level_enabled(scm_debug, level))
                 return;
         while (length > 0) {
                 debug_event(scm_debug, level, data, length);
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 4600aa10a1c6..668b32b0dc1d 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -60,7 +60,7 @@ static int monwrite_diag(struct monwrite_hdr *myhdr, char *buffer, int fcn)
         struct appldata_product_id id;
         int rc;
 
-        strcpy(id.prod_nr, "LNXAPPL");
+        strncpy(id.prod_nr, "LNXAPPL", 7);
         id.prod_fn = myhdr->applid;
         id.record_nr = myhdr->record_num;
         id.version_nr = myhdr->version;
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 24a08e8f19e1..2cdec21e8924 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -615,10 +615,10 @@ raw3270_reset_device_cb(struct raw3270_request *rq, void *data)
 
         if (rp->state != RAW3270_STATE_RESET)
                 return;
-        if (rq && rq->rc) {
+        if (rq->rc) {
                 /* Reset command failed. */
                 rp->state = RAW3270_STATE_INIT;
-        } else if (0 && MACHINE_IS_VM) {
+        } else if (MACHINE_IS_VM) {
                 raw3270_size_device_vm(rp);
                 raw3270_size_device_done(rp);
         } else
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index a3aa374799dc..1fe264379e0d 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -486,7 +486,7 @@ sclp_sync_wait(void)
         timeout = 0;
         if (timer_pending(&sclp_request_timer)) {
                 /* Get timeout TOD value */
-                timeout = get_tod_clock() +
+                timeout = get_tod_clock_fast() +
                           sclp_tod_from_jiffies(sclp_request_timer.expires -
                                                 jiffies);
         }
@@ -508,7 +508,7 @@ sclp_sync_wait(void)
         while (sclp_running_state != sclp_running_state_idle) {
                 /* Check for expired request timer */
                 if (timer_pending(&sclp_request_timer) &&
-                    get_tod_clock() > timeout &&
+                    get_tod_clock_fast() > timeout &&
                     del_timer(&sclp_request_timer))
                         sclp_request_timer.function(sclp_request_timer.data);
                 cpu_relax();
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 8cd34bf644b3..77df9cb00688 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -145,9 +145,11 @@ bool __init sclp_has_linemode(void)
 
         if (sccb->header.response_code != 0x20)
                 return 0;
-        if (sccb->sclp_send_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK))
-                return 1;
-        return 0;
+        if (!(sccb->sclp_send_mask & (EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK)))
+                return 0;
+        if (!(sccb->sclp_receive_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK)))
+                return 0;
+        return 1;
 }
 
 bool __init sclp_has_vt220(void)
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index a0f47c83fd62..3f4ca4e09a4c 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -810,7 +810,7 @@ static void tty3270_resize_work(struct work_struct *work)
         struct winsize ws;
 
         screen = tty3270_alloc_screen(tp->n_rows, tp->n_cols);
-        if (!screen)
+        if (IS_ERR(screen))
                 return;
         /* Switch to new output size */
         spin_lock_bh(&tp->view.lock);
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 9b3a24e8d3a0..cf31d3321dab 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -313,7 +313,7 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
         int ret;
 
         dev_num = iminor(inode);
-        if (dev_num > MAXMINOR)
+        if (dev_num >= MAXMINOR)
                 return -ENODEV;
         logptr = &sys_ser[dev_num];
 
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 794820a123d0..ffb1fcf0bf5b 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -151,7 +151,7 @@ static int __init init_cpu_info(enum arch_id arch)
 
         /* get info for boot cpu from lowcore, stored in the HSA */
 
-        sa = kmalloc(sizeof(*sa), GFP_KERNEL);
+        sa = dump_save_area_create(0);
         if (!sa)
                 return -ENOMEM;
         if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) {
@@ -159,7 +159,6 @@ static int __init init_cpu_info(enum arch_id arch)
                 kfree(sa);
                 return -EIO;
         }
-        zfcpdump_save_areas[0] = sa;
         return 0;
 }
 
@@ -246,24 +245,25 @@ static int copy_lc(void __user *buf, void *sa, int sa_off, int len)
 static int zcore_add_lc(char __user *buf, unsigned long start, size_t count)
 {
         unsigned long end;
-        int i = 0;
+        int i;
 
         if (count == 0)
                 return 0;
 
         end = start + count;
-        while (zfcpdump_save_areas[i]) {
+        for (i = 0; i < dump_save_areas.count; i++) {
                 unsigned long cp_start, cp_end; /* copy range */
                 unsigned long sa_start, sa_end; /* save area range */
                 unsigned long prefix;
                 unsigned long sa_off, len, buf_off;
+                struct save_area *save_area = dump_save_areas.areas[i];
 
-                prefix = zfcpdump_save_areas[i]->pref_reg;
+                prefix = save_area->pref_reg;
                 sa_start = prefix + sys_info.sa_base;
                 sa_end = prefix + sys_info.sa_base + sys_info.sa_size;
 
                 if ((end < sa_start) || (start > sa_end))
-                        goto next;
+                        continue;
                 cp_start = max(start, sa_start);
                 cp_end = min(end, sa_end);
 
@@ -272,10 +272,8 @@ static int zcore_add_lc(char __user *buf, unsigned long start, size_t count)
                 len = cp_end - cp_start;
 
                 TRACE("copy_lc for: %lx\n", start);
-                if (copy_lc(buf + buf_off, zfcpdump_save_areas[i], sa_off, len))
+                if (copy_lc(buf + buf_off, save_area, sa_off, len))
                         return -EFAULT;
-next:
-                i++;
         }
         return 0;
 }
@@ -637,8 +635,8 @@ static void __init zcore_header_init(int arch, struct zcore_header *hdr,
         hdr->num_pages = mem_size / PAGE_SIZE;
         hdr->tod = get_tod_clock();
         get_cpu_id(&hdr->cpu_id);
-        for (i = 0; zfcpdump_save_areas[i]; i++) {
-                prefix = zfcpdump_save_areas[i]->pref_reg;
+        for (i = 0; i < dump_save_areas.count; i++) {
+                prefix = dump_save_areas.areas[i]->pref_reg;
                 hdr->real_cpu_cnt++;
                 if (!prefix)
                         continue;
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index d028fd800c9c..f055df0b167f 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -194,15 +194,14 @@ EXPORT_SYMBOL(airq_iv_release);
  */
 unsigned long airq_iv_alloc_bit(struct airq_iv *iv)
 {
-        const unsigned long be_to_le = BITS_PER_LONG - 1;
         unsigned long bit;
 
         if (!iv->avail)
                 return -1UL;
         spin_lock(&iv->lock);
-        bit = find_first_bit_left(iv->avail, iv->bits);
+        bit = find_first_bit_inv(iv->avail, iv->bits);
         if (bit < iv->bits) {
-                clear_bit(bit ^ be_to_le, iv->avail);
+                clear_bit_inv(bit, iv->avail);
                 if (bit >= iv->end)
                         iv->end = bit + 1;
         } else
@@ -220,19 +219,17 @@ EXPORT_SYMBOL(airq_iv_alloc_bit);
  */
 void airq_iv_free_bit(struct airq_iv *iv, unsigned long bit)
 {
-        const unsigned long be_to_le = BITS_PER_LONG - 1;
-
         if (!iv->avail)
                 return;
         spin_lock(&iv->lock);
         /* Clear (possibly left over) interrupt bit */
-        clear_bit(bit ^ be_to_le, iv->vector);
+        clear_bit_inv(bit, iv->vector);
         /* Make the bit position available again */
-        set_bit(bit ^ be_to_le, iv->avail);
+        set_bit_inv(bit, iv->avail);
         if (bit == iv->end - 1) {
                 /* Find new end of bit-field */
                 while (--iv->end > 0)
-                        if (!test_bit((iv->end - 1) ^ be_to_le, iv->avail))
+                        if (!test_bit_inv(iv->end - 1, iv->avail))
                                 break;
         }
         spin_unlock(&iv->lock);
@@ -251,15 +248,13 @@ EXPORT_SYMBOL(airq_iv_free_bit);
 unsigned long airq_iv_scan(struct airq_iv *iv, unsigned long start,
                            unsigned long end)
 {
-        const unsigned long be_to_le = BITS_PER_LONG - 1;
         unsigned long bit;
 
         /* Find non-zero bit starting from 'ivs->next'. */
-        bit = find_next_bit_left(iv->vector, end, start);
+        bit = find_next_bit_inv(iv->vector, end, start);
         if (bit >= end)
                 return -1UL;
-        /* Clear interrupt bit (find left uses big-endian bit numbers) */
-        clear_bit(bit ^ be_to_le, iv->vector);
+        clear_bit_inv(bit, iv->vector);
         return bit;
 }
 EXPORT_SYMBOL(airq_iv_scan);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index d7da67a31c77..88e35d85d205 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -878,9 +878,9 @@ static void css_reset(void)
                         atomic_inc(&chpid_reset_count);
         }
         /* Wait for machine check for all channel paths. */
-        timeout = get_tod_clock() + (RCHP_TIMEOUT << 12);
+        timeout = get_tod_clock_fast() + (RCHP_TIMEOUT << 12);
         while (atomic_read(&chpid_reset_count) != 0) {
-                if (get_tod_clock() > timeout)
+                if (get_tod_clock_fast() > timeout)
                         break;
                 cpu_relax();
         }
diff --git a/drivers/s390/cio/eadm_sch.c b/drivers/s390/cio/eadm_sch.c
index d9eddcba7e88..aca7bfc113aa 100644
--- a/drivers/s390/cio/eadm_sch.c
+++ b/drivers/s390/cio/eadm_sch.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/kernel_stat.h>
+#include <linux/completion.h>
 #include <linux/workqueue.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
@@ -42,7 +43,7 @@ static debug_info_t *eadm_debug;
 
 static void EADM_LOG_HEX(int level, void *data, int length)
 {
-        if (level > eadm_debug->level)
+        if (!debug_level_enabled(eadm_debug, level))
                 return;
         while (length > 0) {
                 debug_event(eadm_debug, level, data, length);
@@ -159,6 +160,9 @@ static void eadm_subchannel_irq(struct subchannel *sch)
         }
         scm_irq_handler((struct aob *)(unsigned long)scsw->aob, error);
         private->state = EADM_IDLE;
+
+        if (private->completion)
+                complete(private->completion);
 }
 
 static struct subchannel *eadm_get_idle_sch(void)
@@ -255,13 +259,32 @@ out:
 
 static void eadm_quiesce(struct subchannel *sch)
 {
+        struct eadm_private *private = get_eadm_private(sch);
+        DECLARE_COMPLETION_ONSTACK(completion);
         int ret;
 
+        spin_lock_irq(sch->lock);
+        if (private->state != EADM_BUSY)
+                goto disable;
+
+        if (eadm_subchannel_clear(sch))
+                goto disable;
+
+        private->completion = &completion;
+        spin_unlock_irq(sch->lock);
+
+        wait_for_completion_io(&completion);
+
+        spin_lock_irq(sch->lock);
+        private->completion = NULL;
+
+disable:
+        eadm_subchannel_set_timeout(sch, 0);
         do {
-                spin_lock_irq(sch->lock);
                 ret = cio_disable_subchannel(sch);
-                spin_unlock_irq(sch->lock);
         } while (ret == -EBUSY);
+
+        spin_unlock_irq(sch->lock);
 }
 
 static int eadm_subchannel_remove(struct subchannel *sch)
diff --git a/drivers/s390/cio/eadm_sch.h b/drivers/s390/cio/eadm_sch.h
index 2779be093982..9664e4653f98 100644
--- a/drivers/s390/cio/eadm_sch.h
+++ b/drivers/s390/cio/eadm_sch.h
@@ -1,6 +1,7 @@
 #ifndef EADM_SCH_H
 #define EADM_SCH_H
 
+#include <linux/completion.h>
 #include <linux/device.h>
 #include <linux/timer.h>
 #include <linux/list.h>
@@ -9,9 +10,10 @@
 struct eadm_private {
         union orb orb;
         enum {EADM_IDLE, EADM_BUSY, EADM_NOT_OPER} state;
+        struct completion *completion;
+        struct subchannel *sch;
         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))
diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h
index 647b422bb22a..dfac9bfefea3 100644
--- a/drivers/s390/cio/qdio_debug.h
+++ b/drivers/s390/cio/qdio_debug.h
@@ -16,12 +16,6 @@
 extern debug_info_t *qdio_dbf_setup;
 extern debug_info_t *qdio_dbf_error;
 
-/* sort out low debug levels early to avoid wasted sprints */
-static inline int qdio_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        */
@@ -65,7 +59,7 @@ static inline void DBF_ERROR_HEX(void *addr, int len)
 #define DBF_DEV_EVENT(level, device, text...) \
         do { \
                 char debug_buffer[QDIO_DBF_LEN]; \
-                if (qdio_dbf_passes(device->debug_area, level)) { \
+                if (debug_level_enabled(device->debug_area, level)) { \
                         snprintf(debug_buffer, QDIO_DBF_LEN, text); \
                         debug_text_event(device->debug_area, level, debug_buffer); \
                 } \
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 8ed52aa49122..3e602e8affa7 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -338,10 +338,10 @@ again:
                 retries++;
 
                 if (!start_time) {
-                        start_time = get_tod_clock();
+                        start_time = get_tod_clock_fast();
                         goto again;
                 }
-                if ((get_tod_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE)
+                if (get_tod_clock_fast() - start_time < QDIO_BUSY_BIT_PATIENCE)
                         goto again;
         }
         if (retries) {
@@ -504,7 +504,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_tod_clock();
+        q->timestamp = get_tod_clock_fast();
 
         /*
          * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
@@ -528,7 +528,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
         case SLSB_P_INPUT_PRIMED:
                 inbound_primed(q, count);
                 q->first_to_check = add_buf(q->first_to_check, count);
-                if (atomic_sub(count, &q->nr_buf_used) == 0)
+                if (atomic_sub_return(count, &q->nr_buf_used) == 0)
                         qperf_inc(q, inbound_queue_full);
                 if (q->irq_ptr->perf_stat_enabled)
                         account_sbals(q, count);
@@ -595,7 +595,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q)
          * At this point we know, that inbound first_to_check
          * has (probably) not moved (see qdio_inbound_processing).
          */
-        if (get_tod_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
+        if (get_tod_clock_fast() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x",
                               q->first_to_check);
                 return 1;
@@ -728,7 +728,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_tod_clock();
+        q->timestamp = get_tod_clock_fast();
 
         if (need_siga_sync(q))
                 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
diff --git a/drivers/s390/crypto/zcrypt_debug.h b/drivers/s390/crypto/zcrypt_debug.h
index 841ea72e4a4e..28d9349de1ad 100644
--- a/drivers/s390/crypto/zcrypt_debug.h
+++ b/drivers/s390/crypto/zcrypt_debug.h
@@ -11,12 +11,6 @@
 /* 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        */
@@ -25,7 +19,7 @@ static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level)
 
 #define ZCRYPT_DBF_COMMON(level, text...) \
         do { \
-                if (zcrypt_dbf_passes(zcrypt_dbf_common, level)) { \
+                if (debug_level_enabled(zcrypt_dbf_common, level)) { \
                         char debug_buffer[ZCRYPT_DBF_LEN]; \
                         snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \
                         debug_text_event(zcrypt_dbf_common, level, \
@@ -35,7 +29,7 @@ static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level)
 
 #define ZCRYPT_DBF_DEVICES(level, text...) \
         do { \
-                if (zcrypt_dbf_passes(zcrypt_dbf_devices, level)) { \
+                if (debug_level_enabled(zcrypt_dbf_devices, level)) { \
                         char debug_buffer[ZCRYPT_DBF_LEN]; \
                         snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \
                         debug_text_event(zcrypt_dbf_devices, level, \
@@ -45,7 +39,7 @@ static inline int zcrypt_dbf_passes(debug_info_t *dbf_grp, int level)
 
 #define ZCRYPT_DBF_DEV(level, device, text...) \
         do { \
-                if (zcrypt_dbf_passes(device->dbf_area, level)) { \
+                if (debug_level_enabled(device->dbf_area, level)) { \
                         char debug_buffer[ZCRYPT_DBF_LEN]; \
                         snprintf(debug_buffer, ZCRYPT_DBF_LEN, text); \
                         debug_text_event(device->dbf_area, level, \
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 1bc5904df19f..3339b9b607b3 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -114,15 +114,9 @@ do { \
         debug_event(claw_dbf_##name,level,(void*)(addr),len); \
 } while (0)
 
-/* Allow to sort out low debug levels early to avoid wasted sprints */
-static inline int claw_dbf_passes(debug_info_t *dbf_grp, int level)
-{
-        return (level <= dbf_grp->level);
-}
-
 #define CLAW_DBF_TEXT_(level,name,text...) \
         do { \
-                if (claw_dbf_passes(claw_dbf_##name, level)) { \
+                if (debug_level_enabled(claw_dbf_##name, level)) { \
                         sprintf(debug_buffer, text); \
                         debug_text_event(claw_dbf_##name, level, \
                                                 debug_buffer); \
diff --git a/drivers/s390/net/ctcm_dbug.c b/drivers/s390/net/ctcm_dbug.c
index 6514e1cb3f1c..8363f1c966ef 100644
--- a/drivers/s390/net/ctcm_dbug.c
+++ b/drivers/s390/net/ctcm_dbug.c
@@ -66,7 +66,7 @@ void ctcm_dbf_longtext(enum ctcm_dbf_names dbf_nix, int level, char *fmt, ...)
         char dbf_txt_buf[64];
         va_list args;
 
-        if (level > (ctcm_dbf[dbf_nix].id)->level)
+        if (!debug_level_enabled(ctcm_dbf[dbf_nix].id, level))
                 return;
         va_start(args, fmt);
         vsnprintf(dbf_txt_buf, sizeof(dbf_txt_buf), fmt, args);
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 8c03392ac833..150fcb4cebc3 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -16,15 +16,9 @@ do { \
         debug_event(lcs_dbf_##name,level,(void*)(addr),len); \
 } while (0)
 
-/* Allow to sort out low debug levels early to avoid wasted sprints */
-static inline int lcs_dbf_passes(debug_info_t *dbf_grp, int level)
-{
-        return (level <= dbf_grp->level);
-}
-
 #define LCS_DBF_TEXT_(level,name,text...) \
         do { \
-                if (lcs_dbf_passes(lcs_dbf_##name, level)) { \
+                if (debug_level_enabled(lcs_dbf_##name, level)) { \
                         sprintf(debug_buffer, text); \
                         debug_text_event(lcs_dbf_##name, level, debug_buffer); \
                 } \
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 279ad504ec3c..9b333fcf1a4c 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -105,15 +105,9 @@ MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver");
 
 DECLARE_PER_CPU(char[256], iucv_dbf_txt_buf);
 
-/* Allow to sort out low debug levels early to avoid wasted sprints */
-static inline int iucv_dbf_passes(debug_info_t *dbf_grp, int level)
-{
-        return (level <= dbf_grp->level);
-}
-
 #define IUCV_DBF_TEXT_(name, level, text...) \
         do { \
-                if (iucv_dbf_passes(iucv_dbf_##name, level)) { \
+                if (debug_level_enabled(iucv_dbf_##name, level)) { \
                         char* __buf = get_cpu_var(iucv_dbf_txt_buf); \
                         sprintf(__buf, text); \
                         debug_text_event(iucv_dbf_##name, level, __buf); \
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 0a328d0d11be..eb4e1f809feb 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4451,7 +4451,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)
         struct qeth_cmd_buffer *iob;
         struct qeth_ipa_cmd *cmd;
         struct qeth_snmp_ureq *ureq;
-        int req_len;
+        unsigned int req_len;
         struct qeth_arp_query_info qinfo = {0, };
         int rc = 0;
 
@@ -4467,6 +4467,10 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)
         /* skip 4 bytes (data_len struct member) to get req_len */
         if (copy_from_user(&req_len, udata + sizeof(int), sizeof(int)))
                 return -EFAULT;
+        if (req_len > (QETH_BUFSIZE - IPA_PDU_HEADER_SIZE -
+                       sizeof(struct qeth_ipacmd_hdr) -
+                       sizeof(struct qeth_ipacmd_setadpparms_hdr)))
+                return -EINVAL;
         ureq = memdup_user(udata, req_len + sizeof(struct qeth_snmp_ureq_hdr));
         if (IS_ERR(ureq)) {
                 QETH_CARD_TEXT(card, 2, "snmpnome");
@@ -5096,7 +5100,7 @@ void qeth_dbf_longtext(debug_info_t *id, int level, char *fmt, ...)
         char dbf_txt_buf[32];
         va_list args;
 
-        if (level > id->level)
+        if (!debug_level_enabled(id, level))
                 return;
         va_start(args, fmt);
         vsnprintf(dbf_txt_buf, sizeof(dbf_txt_buf), fmt, args);
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h
index 3ac7a4b30dd9..0be3d48681ae 100644
--- a/drivers/s390/scsi/zfcp_dbf.h
+++ b/drivers/s390/scsi/zfcp_dbf.h
@@ -278,7 +278,7 @@ struct zfcp_dbf {
 static inline
 void zfcp_dbf_hba_fsf_resp(char *tag, int level, struct zfcp_fsf_req *req)
 {
-        if (level <= req->adapter->dbf->hba->level)
+        if (debug_level_enabled(req->adapter->dbf->hba, level))
                 zfcp_dbf_hba_fsf_res(tag, req);
 }
 
@@ -317,7 +317,7 @@ void _zfcp_dbf_scsi(char *tag, int level, struct scsi_cmnd *scmd,
         struct zfcp_adapter *adapter = (struct zfcp_adapter *)
                                         scmd->device->host->hostdata[0];
 
-        if (level <= adapter->dbf->scsi->level)
+        if (debug_level_enabled(adapter->dbf->scsi, level))
                 zfcp_dbf_scsi(tag, scmd, req);
 }