7 files changed, 42 insertions, 24 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 432444af7ee4..a1d3ddba99cc 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -24,6 +24,7 @@
 #include <linux/mutex.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
+#include <linux/vmalloc.h>
 
 #include <asm/ccwdev.h>
 #include <asm/ebcdic.h>
@@ -888,11 +889,11 @@ char *dasd_get_user_string(const char __user *user_buf, size_t user_len)
 {
         char *buffer;
 
-        buffer = kmalloc(user_len + 1, GFP_KERNEL);
+        buffer = vmalloc(user_len + 1);
         if (buffer == NULL)
                 return ERR_PTR(-ENOMEM);
         if (copy_from_user(buffer, user_buf, user_len) != 0) {
-                kfree(buffer);
+                vfree(buffer);
                 return ERR_PTR(-EFAULT);
         }
         /* got the string, now strip linefeed. */
@@ -930,7 +931,7 @@ static ssize_t dasd_stats_write(struct file *file,
                 dasd_profile_off(prof);
         } else
                 rc = -EINVAL;
-        kfree(buffer);
+        vfree(buffer);
         return rc;
 }
 
@@ -1042,7 +1043,7 @@ static ssize_t dasd_stats_global_write(struct file *file,
                 dasd_global_profile_level = DASD_PROFILE_OFF;
         } else
                 rc = -EINVAL;
-        kfree(buffer);
+        vfree(buffer);
         return rc;
 }
 
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 30fb979d684d..6e835c9fdfcb 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1461,6 +1461,15 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                                 "Read device characteristic failed, rc=%d", rc);
                 goto out_err3;
         }
+
+        if ((device->features & DASD_FEATURE_USERAW) &&
+            !(private->rdc_data.facilities.RT_in_LR)) {
+                dev_err(&device->cdev->dev, "The storage server does not "
+                        "support raw-track access\n");
+                rc = -EINVAL;
+                goto out_err3;
+        }
+
         /* find the valid cylinder size */
         if (private->rdc_data.no_cyl == LV_COMPAT_CYL &&
             private->rdc_data.long_no_cyl)
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 6c3c5364d082..e12989fff4ff 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -312,14 +312,14 @@ static ssize_t dasd_stats_proc_write(struct file *file,
                 pr_info("The statistics have been reset\n");
         } else
                 goto out_parse_error;
-        kfree(buffer);
+        vfree(buffer);
         return user_len;
 out_parse_error:
         rc = -EINVAL;
         pr_warning("%s is not a supported value for /proc/dasd/statistics\n",
                 str);
 out_error:
-        kfree(buffer);
+        vfree(buffer);
         return rc;
 #else
         pr_warning("/proc/dasd/statistics: is not activated in this kernel\n");
diff --git a/drivers/s390/char/sclp_async.c b/drivers/s390/char/sclp_async.c
index 7ad30e72f868..5f9f929e891c 100644
--- a/drivers/s390/char/sclp_async.c
+++ b/drivers/s390/char/sclp_async.c
@@ -82,12 +82,9 @@ static int proc_handler_callhome(struct ctl_table *ctl, int write,
                         return -EFAULT;
         } else {
                 len = *count;
-                rc = copy_from_user(buf, buffer, sizeof(buf));
-                if (rc != 0)
-                        return -EFAULT;
-                buf[sizeof(buf) - 1] = '\0';
-                if (strict_strtoul(buf, 0, &val) != 0)
-                        return -EINVAL;
+                rc = kstrtoul_from_user(buffer, len, 0, &val);
+                if (rc)
+                        return rc;
                 if (val != 0 && val != 1)
                         return -EINVAL;
                 callhome_enabled = val;
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 7bc643f3f5ab..e5c966462c5a 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -14,6 +14,8 @@
 #include "chsc.h"
 
 #define QDIO_BUSY_BIT_PATIENCE          (100 << 12)     /* 100 microseconds */
+#define QDIO_BUSY_BIT_RETRY_DELAY       10              /* 10 milliseconds */
+#define QDIO_BUSY_BIT_RETRIES           1000            /* = 10s retry time */
 #define QDIO_INPUT_THRESHOLD            (500 << 12)     /* 500 microseconds */
 
 /*
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index f8b03a636e49..0e615cb912d0 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -188,19 +188,13 @@ static ssize_t qperf_seq_write(struct file *file, const char __user *ubuf,
         struct qdio_irq *irq_ptr = seq->private;
         struct qdio_q *q;
         unsigned long val;
-        char buf[8];
         int ret, i;
 
         if (!irq_ptr)
                 return 0;
-        if (count >= sizeof(buf))
-                return -EINVAL;
-        if (copy_from_user(&buf, ubuf, count))
-                return -EFAULT;
-        buf[count] = 0;
-
-        ret = strict_strtoul(buf, 10, &val);
-        if (ret < 0)
+
+        ret = kstrtoul_from_user(ubuf, count, 10, &val);
+        if (ret)
                 return ret;
 
         switch (val) {
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index e58169c32474..288c9140290e 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -313,7 +313,7 @@ static int qdio_siga_output(struct qdio_q *q, unsigned int *busy_bit)
         unsigned long schid = *((u32 *) &q->irq_ptr->schid);
         unsigned int fc = QDIO_SIGA_WRITE;
         u64 start_time = 0;
-        int cc;
+        int retries = 0, cc;
 
         if (is_qebsm(q)) {
                 schid = q->irq_ptr->sch_token;
@@ -325,6 +325,7 @@ again:
         /* hipersocket busy condition */
         if (unlikely(*busy_bit)) {
                 WARN_ON(queue_type(q) != QDIO_IQDIO_QFMT || cc != 2);
+                retries++;
 
                 if (!start_time) {
                         start_time = get_clock();
@@ -333,6 +334,11 @@ again:
                 if ((get_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE)
                         goto again;
         }
+        if (retries) {
+                DBF_DEV_EVENT(DBF_WARN, q->irq_ptr,
+                              "%4x cc2 BB1:%1d", SCH_NO(q), q->nr);
+                DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "count:%u", retries);
+        }
         return cc;
 }
 
@@ -728,13 +734,14 @@ static inline int qdio_outbound_q_moved(struct qdio_q *q)
 
 static int qdio_kick_outbound_q(struct qdio_q *q)
 {
+        int retries = 0, cc;
         unsigned int busy_bit;
-        int cc;
 
         if (!need_siga_out(q))
                 return 0;
 
         DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w:%1d", q->nr);
+retry:
         qperf_inc(q, siga_write);
 
         cc = qdio_siga_output(q, &busy_bit);
@@ -743,7 +750,11 @@ static int qdio_kick_outbound_q(struct qdio_q *q)
                 break;
         case 2:
                 if (busy_bit) {
-                        DBF_ERROR("%4x cc2 REP:%1d", SCH_NO(q), q->nr);
+                        while (++retries < QDIO_BUSY_BIT_RETRIES) {
+                                mdelay(QDIO_BUSY_BIT_RETRY_DELAY);
+                                goto retry;
+                        }
+                        DBF_ERROR("%4x cc2 BBC:%1d", SCH_NO(q), q->nr);
                         cc |= QDIO_ERROR_SIGA_BUSY;
                 } else
                         DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w cc2:%1d", q->nr);
@@ -753,6 +764,10 @@ static int qdio_kick_outbound_q(struct qdio_q *q)
                 DBF_ERROR("%4x SIGA-W:%1d", SCH_NO(q), cc);
                 break;
         }
+        if (retries) {
+                DBF_ERROR("%4x cc2 BB2:%1d", SCH_NO(q), q->nr);
+                DBF_ERROR("count:%u", retries);
+        }
         return cc;
 }