17 files changed, 271 insertions, 307 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index ac6d4d3218b3..8ba3f135da22 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -925,6 +925,8 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
         struct dasd_ccw_req *cqr;
         struct dasd_device *device;
 
+        if (!intparm)
+                return;
         cqr = (struct dasd_ccw_req *) intparm;
         if (cqr->status != DASD_CQR_IN_IO) {
                 MESSAGE(KERN_DEBUG,
@@ -976,17 +978,16 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         if (IS_ERR(irb)) {
                 switch (PTR_ERR(irb)) {
                 case -EIO:
-                        dasd_handle_killed_request(cdev, intparm);
                         break;
                 case -ETIMEDOUT:
                         printk(KERN_WARNING"%s(%s): request timed out\n",
                                __func__, cdev->dev.bus_id);
-                        //FIXME - dasd uses own timeout interface...
                         break;
                 default:
                         printk(KERN_WARNING"%s(%s): unknown error %ld\n",
                                __func__, cdev->dev.bus_id, PTR_ERR(irb));
                 }
+                dasd_handle_killed_request(cdev, intparm);
                 return;
         }
 
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index f4fb40257348..d774e79476fe 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -86,10 +86,10 @@ static DEFINE_SPINLOCK(dasd_devmap_lock);
 static struct list_head dasd_hashlists[256];
 int dasd_max_devindex;
 
-static struct dasd_devmap *dasd_add_busid(char *, int);
+static struct dasd_devmap *dasd_add_busid(const char *, int);
 
 static inline int
-dasd_hash_busid(char *bus_id)
+dasd_hash_busid(const char *bus_id)
 {
         int hash, i;
 
@@ -394,7 +394,7 @@ dasd_parse(void)
  * devices.
  */
 static struct dasd_devmap *
-dasd_add_busid(char *bus_id, int features)
+dasd_add_busid(const char *bus_id, int features)
 {
         struct dasd_devmap *devmap, *new, *tmp;
         int hash;
@@ -430,7 +430,7 @@ dasd_add_busid(char *bus_id, int features)
  * Find devmap for device with given bus_id.
  */
 static struct dasd_devmap *
-dasd_find_busid(char *bus_id)
+dasd_find_busid(const char *bus_id)
 {
         struct dasd_devmap *devmap, *tmp;
         int hash;
@@ -452,7 +452,7 @@ dasd_find_busid(char *bus_id)
  * Check if busid has been added to the list of dasd ranges.
  */
 int
-dasd_busid_known(char *bus_id)
+dasd_busid_known(const char *bus_id)
 {
         return IS_ERR(dasd_find_busid(bus_id)) ? -ENOENT : 0;
 }
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 6c624bf44617..fb2f931cf844 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -598,7 +598,7 @@ struct dasd_device *dasd_device_from_cdev_locked(struct ccw_device *);
 struct dasd_device *dasd_device_from_devindex(int);
 
 int dasd_parse(void);
-int dasd_busid_known(char *);
+int dasd_busid_known(const char *);
 
 /* externals in dasd_gendisk.c */
 int  dasd_gendisk_init(void);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 7ad8cf157641..76e44eb7c47f 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -76,32 +76,9 @@ const char *tape_op_verbose[TO_SIZE] =
         [TO_KEKL_QUERY] = "KLQ",[TO_RDC] = "RDC",
 };
 
-static int
-busid_to_int(char *bus_id)
+static int devid_to_int(struct ccw_dev_id *dev_id)
 {
-        int     dec;
-        int     d;
-        char *  s;
-
-        for(s = bus_id, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = d;
-        for(s++, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = (dec << 8) + d;
-
-        for(s++; *s != '\0'; s++) {
-                if (*s >= '0' && *s <= '9') {
-                        d = *s - '0';
-                } else if (*s >= 'a' && *s <= 'f') {
-                        d = *s - 'a' + 10;
-                } else {
-                        d = *s - 'A' + 10;
-                }
-                dec = (dec << 4) + d;
-        }
-
-        return dec;
+        return dev_id->devno + (dev_id->ssid << 16);
 }
 
 /*
@@ -551,6 +528,7 @@ tape_generic_probe(struct ccw_device *cdev)
 {
         struct tape_device *device;
         int ret;
+        struct ccw_dev_id dev_id;
 
         device = tape_alloc_device();
         if (IS_ERR(device))
@@ -565,7 +543,8 @@ tape_generic_probe(struct ccw_device *cdev)
         cdev->dev.driver_data = device;
         cdev->handler = __tape_do_irq;
         device->cdev = cdev;
-        device->cdev_id = busid_to_int(cdev->dev.bus_id);
+        ccw_device_get_id(cdev, &dev_id);
+        device->cdev_id = devid_to_int(&dev_id);
         PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
         return ret;
 }
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index c1f2adefad41..5043150019ac 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -965,8 +965,7 @@ tty3270_write_room(struct tty_struct *tty)
  * Insert character into the screen at the current position with the
  * current color and highlight. This function does NOT do cursor movement.
  */
-static int
-tty3270_put_character(struct tty3270 *tp, char ch)
+static void tty3270_put_character(struct tty3270 *tp, char ch)
 {
         struct tty3270_line *line;
         struct tty3270_cell *cell;
@@ -986,7 +985,6 @@ tty3270_put_character(struct tty3270 *tp, char ch)
         cell->character = tp->view.ascebc[(unsigned int) ch];
         cell->highlight = tp->highlight;
         cell->f_color = tp->f_color;
-        return 1;
 }
 
 /*
@@ -1612,16 +1610,15 @@ tty3270_write(struct tty_struct * tty,
 /*
  * Put single characters to the ttys character buffer
  */
-static void
-tty3270_put_char(struct tty_struct *tty, unsigned char ch)
+static int tty3270_put_char(struct tty_struct *tty, unsigned char ch)
 {
         struct tty3270 *tp;
 
         tp = tty->driver_data;
-        if (!tp)
-                return;
-        if (tp->char_count < TTY3270_CHAR_BUF_SIZE)
-                tp->char_buf[tp->char_count++] = ch;
+        if (!tp || tp->char_count >= TTY3270_CHAR_BUF_SIZE)
+                return 0;
+        tp->char_buf[tp->char_count++] = ch;
+        return 1;
 }
 
 /*
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index d364e0bfae12..e8487347e4d4 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -858,7 +858,7 @@ static int __init vmlogrdr_init(void)
         for (i=0; i < MAXMINOR; ++i ) {
                 sys_ser[i].buffer = (char *) get_zeroed_page(GFP_KERNEL);
                 if (!sys_ser[i].buffer) {
-                        rc = ENOMEM;
+                        rc = -ENOMEM;
                         break;
                 }
                 sys_ser[i].current_position = sys_ser[i].buffer;
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 40ef948fcb3a..a4a5f2efea48 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -43,164 +43,169 @@ typedef enum {add, free} range_action;
  * Function: blacklist_range
  * (Un-)blacklist the devices from-to
  */
-static void
-blacklist_range (range_action action, unsigned int from, unsigned int to,
-                 unsigned int ssid)
+static int blacklist_range(range_action action, unsigned int from_ssid,
+                           unsigned int to_ssid, unsigned int from,
+                           unsigned int to, int msgtrigger)
 {
-        if (!to)
-                to = from;
-
-        if (from > to || to > __MAX_SUBCHANNEL || ssid > __MAX_SSID) {
-                printk (KERN_WARNING "cio: Invalid blacklist range "
-                        "0.%x.%04x to 0.%x.%04x, skipping\n",
-                        ssid, from, ssid, to);
-                return;
+        if ((from_ssid > to_ssid) || ((from_ssid == to_ssid) && (from > to))) {
+                if (msgtrigger)
+                        printk(KERN_WARNING "cio: Invalid cio_ignore range "
+                               "0.%x.%04x-0.%x.%04x\n", from_ssid, from,
+                               to_ssid, to);
+                return 1;
         }
-        for (; from <= to; from++) {
+
+        while ((from_ssid < to_ssid) || ((from_ssid == to_ssid) &&
+               (from <= to))) {
                 if (action == add)
-                        set_bit (from, bl_dev[ssid]);
+                        set_bit(from, bl_dev[from_ssid]);
                 else
-                        clear_bit (from, bl_dev[ssid]);
+                        clear_bit(from, bl_dev[from_ssid]);
+                from++;
+                if (from > __MAX_SUBCHANNEL) {
+                        from_ssid++;
+                        from = 0;
+                }
         }
+
+        return 0;
 }
 
-/*
- * Function: blacklist_busid
- * Get devno/busid from given string.
- * Shamelessly grabbed from dasd_devmap.c.
- */
-static int
-blacklist_busid(char **str, int *id0, int *ssid, int *devno)
+static int pure_hex(char **cp, unsigned int *val, int min_digit,
+                    int max_digit, int max_val)
 {
-        int val, old_style;
-        char *sav;
+        int diff;
+        unsigned int value;
 
-        sav = *str;
+        diff = 0;
+        *val = 0;
 
-        /* check for leading '0x' */
-        old_style = 0;
-        if ((*str)[0] == '0' && (*str)[1] == 'x') {
-                *str += 2;
-                old_style = 1;
-        }
-        if (!isxdigit((*str)[0]))       /* We require at least one hex digit */
-                goto confused;
-        val = simple_strtoul(*str, str, 16);
-        if (old_style || (*str)[0] != '.') {
-                *id0 = *ssid = 0;
-                if (val < 0 || val > 0xffff)
-                        goto confused;
-                *devno = val;
-                if ((*str)[0] != ',' && (*str)[0] != '-' &&
-                    (*str)[0] != '\n' && (*str)[0] != '\0')
-                        goto confused;
-                return 0;
+        while (isxdigit(**cp) && (diff <= max_digit)) {
+
+                if (isdigit(**cp))
+                        value = **cp - '0';
+                else
+                        value = tolower(**cp) - 'a' + 10;
+                *val = *val * 16 + value;
+                (*cp)++;
+                diff++;
         }
-        /* New style x.y.z busid */
-        if (val < 0 || val > 0xff)
-                goto confused;
-        *id0 = val;
-        (*str)++;
-        if (!isxdigit((*str)[0]))       /* We require at least one hex digit */
-                goto confused;
-        val = simple_strtoul(*str, str, 16);
-        if (val < 0 || val > 0xff || (*str)++[0] != '.')
-                goto confused;
-        *ssid = val;
-        if (!isxdigit((*str)[0]))       /* We require at least one hex digit */
-                goto confused;
-        val = simple_strtoul(*str, str, 16);
-        if (val < 0 || val > 0xffff)
-                goto confused;
-        *devno = val;
-        if ((*str)[0] != ',' && (*str)[0] != '-' &&
-            (*str)[0] != '\n' && (*str)[0] != '\0')
-                goto confused;
+
+        if ((diff < min_digit) || (diff > max_digit) || (*val > max_val))
+                return 1;
+
         return 0;
-confused:
-        strsep(str, ",\n");
-        printk(KERN_WARNING "cio: Invalid cio_ignore parameter '%s'\n", sav);
-        return 1;
 }
 
-static int
-blacklist_parse_parameters (char *str, range_action action)
+static int parse_busid(char *str, int *cssid, int *ssid, int *devno,
+                       int msgtrigger)
 {
-        int from, to, from_id0, to_id0, from_ssid, to_ssid;
-
-        while (*str != 0 && *str != '\n') {
-                range_action ra = action;
-                while(*str == ',')
-                        str++;
-                if (*str == '!') {
-                        ra = !action;
-                        ++str;
+        char *str_work;
+        int val, rc, ret;
+
+        rc = 1;
+
+        if (*str == '\0')
+                goto out;
+
+        /* old style */
+        str_work = str;
+        val = simple_strtoul(str, &str_work, 16);
+
+        if (*str_work == '\0') {
+                if (val <= __MAX_SUBCHANNEL) {
+                        *devno = val;
+                        *ssid = 0;
+                        *cssid = 0;
+                        rc = 0;
                 }
+                goto out;
+        }
 
-                /*
-                 * Since we have to parse the proc commands and the
-                 * kernel arguments we have to check four cases
-                 */
-                if (strncmp(str,"all,",4) == 0 || strcmp(str,"all") == 0 ||
-                    strncmp(str,"all\n",4) == 0 || strncmp(str,"all ",4) == 0) {
-                        int j;
-
-                        str += 3;
-                        for (j=0; j <= __MAX_SSID; j++)
-                                blacklist_range(ra, 0, __MAX_SUBCHANNEL, j);
-                } else {
-                        int rc;
+        /* new style */
+        str_work = str;
+        ret = pure_hex(&str_work, cssid, 1, 2, __MAX_CSSID);
+        if (ret || (str_work[0] != '.'))
+                goto out;
+        str_work++;
+        ret = pure_hex(&str_work, ssid, 1, 1, __MAX_SSID);
+        if (ret || (str_work[0] != '.'))
+                goto out;
+        str_work++;
+        ret = pure_hex(&str_work, devno, 4, 4, __MAX_SUBCHANNEL);
+        if (ret || (str_work[0] != '\0'))
+                goto out;
+
+        rc = 0;
+out:
+        if (rc && msgtrigger)
+                printk(KERN_WARNING "cio: Invalid cio_ignore device '%s'\n",
+                       str);
+
+        return rc;
+}
 
-                        rc = blacklist_busid(&str, &from_id0,
-                                             &from_ssid, &from);
-                        if (rc)
-                                continue;
-                        to = from;
-                        to_id0 = from_id0;
-                        to_ssid = from_ssid;
-                        if (*str == '-') {
-                                str++;
-                                rc = blacklist_busid(&str, &to_id0,
-                                                     &to_ssid, &to);
-                                if (rc)
-                                        continue;
-                        }
-                        if (*str == '-') {
-                                printk(KERN_WARNING "cio: invalid cio_ignore "
-                                        "parameter '%s'\n",
-                                        strsep(&str, ",\n"));
-                                continue;
-                        }
-                        if ((from_id0 != to_id0) ||
-                            (from_ssid != to_ssid)) {
-                                printk(KERN_WARNING "cio: invalid cio_ignore "
-                                       "range %x.%x.%04x-%x.%x.%04x\n",
-                                       from_id0, from_ssid, from,
-                                       to_id0, to_ssid, to);
-                                continue;
+static int blacklist_parse_parameters(char *str, range_action action,
+                                      int msgtrigger)
+{
+        int from_cssid, to_cssid, from_ssid, to_ssid, from, to;
+        int rc, totalrc;
+        char *parm;
+        range_action ra;
+
+        totalrc = 0;
+
+        while ((parm = strsep(&str, ","))) {
+                rc = 0;
+                ra = action;
+                if (*parm == '!') {
+                        if (ra == add)
+                                ra = free;
+                        else
+                                ra = add;
+                        parm++;
+                }
+                if (strcmp(parm, "all") == 0) {
+                        from_cssid = 0;
+                        from_ssid = 0;
+                        from = 0;
+                        to_cssid = __MAX_CSSID;
+                        to_ssid = __MAX_SSID;
+                        to = __MAX_SUBCHANNEL;
+                } else {
+                        rc = parse_busid(strsep(&parm, "-"), &from_cssid,
+                                         &from_ssid, &from, msgtrigger);
+                        if (!rc) {
+                                if (parm != NULL)
+                                        rc = parse_busid(parm, &to_cssid,
+                                                         &to_ssid, &to,
+                                                         msgtrigger);
+                                else {
+                                        to_cssid = from_cssid;
+                                        to_ssid = from_ssid;
+                                        to = from;
+                                }
                         }
-                        blacklist_range (ra, from, to, to_ssid);
                 }
+                if (!rc) {
+                        rc = blacklist_range(ra, from_ssid, to_ssid, from, to,
+                                             msgtrigger);
+                        if (rc)
+                                totalrc = 1;
+                } else
+                        totalrc = 1;
         }
-        return 1;
+
+        return totalrc;
 }
 
-/* Parsing the commandline for blacklist parameters, e.g. to blacklist
- * bus ids 0.0.1234, 0.0.1235 and 0.0.1236, you could use any of:
- * - cio_ignore=1234-1236
- * - cio_ignore=0x1234-0x1235,1236
- * - cio_ignore=0x1234,1235-1236
- * - cio_ignore=1236 cio_ignore=1234-0x1236
- * - cio_ignore=1234 cio_ignore=1236 cio_ignore=0x1235
- * - cio_ignore=0.0.1234-0.0.1236
- * - cio_ignore=0.0.1234,0x1235,1236
- * - ...
- */
 static int __init
 blacklist_setup (char *str)
 {
         CIO_MSG_EVENT(6, "Reading blacklist parameters\n");
-        return blacklist_parse_parameters (str, add);
+        if (blacklist_parse_parameters(str, add, 1))
+                return 0;
+        return 1;
 }
 
 __setup ("cio_ignore=", blacklist_setup);
@@ -224,27 +229,23 @@ is_blacklisted (int ssid, int devno)
  * Function: blacklist_parse_proc_parameters
  * parse the stuff which is piped to /proc/cio_ignore
  */
-static void
-blacklist_parse_proc_parameters (char *buf)
+static int blacklist_parse_proc_parameters(char *buf)
 {
-        if (strncmp (buf, "free ", 5) == 0) {
-                blacklist_parse_parameters (buf + 5, free);
-        } else if (strncmp (buf, "add ", 4) == 0) {
-                /* 
-                 * We don't need to check for known devices since
-                 * css_probe_device will handle this correctly. 
-                 */
-                blacklist_parse_parameters (buf + 4, add);
-        } else {
-                printk (KERN_WARNING "cio: cio_ignore: Parse error; \n"
-                        KERN_WARNING "try using 'free all|<devno-range>,"
-                                     "<devno-range>,...'\n"
-                        KERN_WARNING "or 'add <devno-range>,"
-                                     "<devno-range>,...'\n");
-                return;
-        }
+        int rc;
+        char *parm;
+
+        parm = strsep(&buf, " ");
+
+        if (strcmp("free", parm) == 0)
+                rc = blacklist_parse_parameters(buf, free, 0);
+        else if (strcmp("add", parm) == 0)
+                rc = blacklist_parse_parameters(buf, add, 0);
+        else
+                return 1;
 
         css_schedule_reprobe();
+
+        return rc;
 }
 
 /* Iterator struct for all devices. */
@@ -328,6 +329,8 @@ cio_ignore_write(struct file *file, const char __user *user_buf,
                  size_t user_len, loff_t *offset)
 {
         char *buf;
+        size_t i;
+        ssize_t rc, ret;
 
         if (*offset)
                 return -EINVAL;
@@ -336,16 +339,27 @@ cio_ignore_write(struct file *file, const char __user *user_buf,
         buf = vmalloc (user_len + 1); /* maybe better use the stack? */
         if (buf == NULL)
                 return -ENOMEM;
+        memset(buf, 0, user_len + 1);
+
         if (strncpy_from_user (buf, user_buf, user_len) < 0) {
-                vfree (buf);
-                return -EFAULT;
+                rc = -EFAULT;
+                goto out_free;
         }
-        buf[user_len] = '\0';
 
-        blacklist_parse_proc_parameters (buf);
+        i = user_len - 1;
+        while ((i >= 0) && (isspace(buf[i]) || (buf[i] == 0))) {
+                buf[i] = '\0';
+                i--;
+        }
+        ret = blacklist_parse_proc_parameters(buf);
+        if (ret)
+                rc = -EINVAL;
+        else
+                rc = user_len;
 
+out_free:
         vfree (buf);
-        return user_len;
+        return rc;
 }
 
 static const struct seq_operations cio_ignore_proc_seq_ops = {
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 08a578161306..82c6a2d45128 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -39,23 +39,6 @@ debug_info_t *cio_debug_msg_id;
 debug_info_t *cio_debug_trace_id;
 debug_info_t *cio_debug_crw_id;
 
-int cio_show_msg;
-
-static int __init
-cio_setup (char *parm)
-{
-        if (!strcmp (parm, "yes"))
-                cio_show_msg = 1;
-        else if (!strcmp (parm, "no"))
-                cio_show_msg = 0;
-        else
-                printk(KERN_ERR "cio: cio_setup: "
-                       "invalid cio_msg parameter '%s'", parm);
-        return 1;
-}
-
-__setup ("cio_msg=", cio_setup);
-
 /*
  * Function: cio_debug_init
  * Initializes three debug logs for common I/O:
@@ -166,7 +149,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)
 
         stsch (sch->schid, &sch->schib);
 
-        CIO_MSG_EVENT(0, "cio_start: 'not oper' status for "
+        CIO_MSG_EVENT(2, "cio_start: 'not oper' status for "
                       "subchannel 0.%x.%04x!\n", sch->schid.ssid,
                       sch->schid.sch_no);
         sprintf(dbf_text, "no%s", sch->dev.bus_id);
@@ -567,10 +550,9 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
          * ... just being curious we check for non I/O subchannels
          */
         if (sch->st != 0) {
-                CIO_DEBUG(KERN_INFO, 0,
-                          "Subchannel 0.%x.%04x reports "
-                          "non-I/O subchannel type %04X\n",
-                          sch->schid.ssid, sch->schid.sch_no, sch->st);
+                CIO_MSG_EVENT(4, "Subchannel 0.%x.%04x reports "
+                              "non-I/O subchannel type %04X\n",
+                              sch->schid.ssid, sch->schid.sch_no, sch->st);
                 /* We stop here for non-io subchannels. */
                 err = sch->st;
                 goto out;
@@ -588,7 +570,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
                  * This device must not be known to Linux. So we simply
                  * say that there is no device and return ENODEV.
                  */
-                CIO_MSG_EVENT(4, "Blacklisted device detected "
+                CIO_MSG_EVENT(6, "Blacklisted device detected "
                               "at devno %04X, subchannel set %x\n",
                               sch->schib.pmcw.dev, sch->schid.ssid);
                 err = -ENODEV;
@@ -601,12 +583,11 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
         sch->lpm = sch->schib.pmcw.pam & sch->opm;
         sch->isc = 3;
 
-        CIO_DEBUG(KERN_INFO, 0,
-                  "Detected device %04x on subchannel 0.%x.%04X"
-                  " - PIM = %02X, PAM = %02X, POM = %02X\n",
-                  sch->schib.pmcw.dev, sch->schid.ssid,
-                  sch->schid.sch_no, sch->schib.pmcw.pim,
-                  sch->schib.pmcw.pam, sch->schib.pmcw.pom);
+        CIO_MSG_EVENT(6, "Detected device %04x on subchannel 0.%x.%04X "
+                      "- PIM = %02X, PAM = %02X, POM = %02X\n",
+                      sch->schib.pmcw.dev, sch->schid.ssid,
+                      sch->schid.sch_no, sch->schib.pmcw.pim,
+                      sch->schib.pmcw.pam, sch->schib.pmcw.pom);
 
         /*
          * We now have to initially ...
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 3c75412904dc..6e933aebe013 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -118,6 +118,4 @@ extern void *cio_get_console_priv(void);
 #define cio_get_console_priv() NULL
 #endif
 
-extern int cio_show_msg;
-
 #endif
diff --git a/drivers/s390/cio/cio_debug.h b/drivers/s390/cio/cio_debug.h
index d7429ef6c666..e64e8278c42e 100644
--- a/drivers/s390/cio/cio_debug.h
+++ b/drivers/s390/cio/cio_debug.h
@@ -31,10 +31,4 @@ static inline void CIO_HEX_EVENT(int level, void *data, int length)
         }
 }
 
-#define CIO_DEBUG(printk_level, event_level, msg...) do {       \
-                if (cio_show_msg)                               \
-                        printk(printk_level "cio: " msg);       \
-                CIO_MSG_EVENT(event_level, msg);                \
-        } while (0)
-
 #endif
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 595e327d2f76..a76956512b2d 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -570,7 +570,7 @@ static void reprobe_all(struct work_struct *unused)
 {
         int ret;
 
-        CIO_MSG_EVENT(2, "reprobe start\n");
+        CIO_MSG_EVENT(4, "reprobe start\n");
 
         need_reprobe = 0;
         /* Make sure initial subchannel scan is done. */
@@ -578,7 +578,7 @@ static void reprobe_all(struct work_struct *unused)
                    atomic_read(&ccw_device_init_count) == 0);
         ret = for_each_subchannel_staged(NULL, reprobe_subchannel, NULL);
 
-        CIO_MSG_EVENT(2, "reprobe done (rc=%d, need_reprobe=%d)\n", ret,
+        CIO_MSG_EVENT(4, "reprobe done (rc=%d, need_reprobe=%d)\n", ret,
                       need_reprobe);
 }
 
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index abfd601d237a..e22813db74a2 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -341,7 +341,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
                 rc = device_schedule_callback(&cdev->dev,
                                               ccw_device_remove_orphan_cb);
                 if (rc)
-                        CIO_MSG_EVENT(2, "Couldn't unregister orphan "
+                        CIO_MSG_EVENT(0, "Couldn't unregister orphan "
                                       "0.%x.%04x\n",
                                       cdev->private->dev_id.ssid,
                                       cdev->private->dev_id.devno);
@@ -351,7 +351,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
         rc = device_schedule_callback(cdev->dev.parent,
                                       ccw_device_remove_sch_cb);
         if (rc)
-                CIO_MSG_EVENT(2, "Couldn't unregister disconnected device "
+                CIO_MSG_EVENT(0, "Couldn't unregister disconnected device "
                               "0.%x.%04x\n",
                               cdev->private->dev_id.ssid,
                               cdev->private->dev_id.devno);
@@ -397,7 +397,7 @@ int ccw_device_set_offline(struct ccw_device *cdev)
         if (ret == 0)
                 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
         else {
-                CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
+                CIO_MSG_EVENT(0, "ccw_device_offline returned %d, "
                               "device 0.%x.%04x\n",
                               ret, cdev->private->dev_id.ssid,
                               cdev->private->dev_id.devno);
@@ -433,7 +433,7 @@ int ccw_device_set_online(struct ccw_device *cdev)
         if (ret == 0)
                 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
         else {
-                CIO_MSG_EVENT(2, "ccw_device_online returned %d, "
+                CIO_MSG_EVENT(0, "ccw_device_online returned %d, "
                               "device 0.%x.%04x\n",
                               ret, cdev->private->dev_id.ssid,
                               cdev->private->dev_id.devno);
@@ -451,7 +451,7 @@ int ccw_device_set_online(struct ccw_device *cdev)
         if (ret == 0)
                 wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
         else
-                CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
+                CIO_MSG_EVENT(0, "ccw_device_offline returned %d, "
                               "device 0.%x.%04x\n",
                               ret, cdev->private->dev_id.ssid,
                               cdev->private->dev_id.devno);
@@ -803,7 +803,7 @@ static void sch_attach_disconnected_device(struct subchannel *sch,
         other_sch = to_subchannel(get_device(cdev->dev.parent));
         ret = device_move(&cdev->dev, &sch->dev);
         if (ret) {
-                CIO_MSG_EVENT(2, "Moving disconnected device 0.%x.%04x failed "
+                CIO_MSG_EVENT(0, "Moving disconnected device 0.%x.%04x failed "
                               "(ret=%d)!\n", cdev->private->dev_id.ssid,
                               cdev->private->dev_id.devno, ret);
                 put_device(&other_sch->dev);
@@ -933,7 +933,7 @@ io_subchannel_register(struct work_struct *work)
                         ret = device_reprobe(&cdev->dev);
                         if (ret)
                                 /* We can't do much here. */
-                                CIO_MSG_EVENT(2, "device_reprobe() returned"
+                                CIO_MSG_EVENT(0, "device_reprobe() returned"
                                               " %d for 0.%x.%04x\n", ret,
                                               cdev->private->dev_id.ssid,
                                               cdev->private->dev_id.devno);
@@ -1086,7 +1086,7 @@ static void ccw_device_move_to_sch(struct work_struct *work)
         rc = device_move(&cdev->dev, &sch->dev);
         mutex_unlock(&sch->reg_mutex);
         if (rc) {
-                CIO_MSG_EVENT(2, "Moving device 0.%x.%04x to subchannel "
+                CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to subchannel "
                               "0.%x.%04x failed (ret=%d)!\n",
                               cdev->private->dev_id.ssid,
                               cdev->private->dev_id.devno, sch->schid.ssid,
@@ -1446,8 +1446,7 @@ ccw_device_remove (struct device *dev)
                         wait_event(cdev->private->wait_q,
                                    dev_fsm_final_state(cdev));
                 else
-                        //FIXME: we can't fail!
-                        CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
+                        CIO_MSG_EVENT(0, "ccw_device_offline returned %d, "
                                       "device 0.%x.%04x\n",
                                       ret, cdev->private->dev_id.ssid,
                                       cdev->private->dev_id.devno);
@@ -1524,7 +1523,7 @@ static int recovery_check(struct device *dev, void *data)
         spin_lock_irq(cdev->ccwlock);
         switch (cdev->private->state) {
         case DEV_STATE_DISCONNECTED:
-                CIO_MSG_EVENT(3, "recovery: trigger 0.%x.%04x\n",
+                CIO_MSG_EVENT(4, "recovery: trigger 0.%x.%04x\n",
                               cdev->private->dev_id.ssid,
                               cdev->private->dev_id.devno);
                 dev_fsm_event(cdev, DEV_EVENT_VERIFY);
@@ -1554,7 +1553,7 @@ static void recovery_work_func(struct work_struct *unused)
                 }
                 spin_unlock_irq(&recovery_lock);
         } else
-                CIO_MSG_EVENT(2, "recovery: end\n");
+                CIO_MSG_EVENT(4, "recovery: end\n");
 }
 
 static DECLARE_WORK(recovery_work, recovery_work_func);
@@ -1572,7 +1571,7 @@ void ccw_device_schedule_recovery(void)
 {
         unsigned long flags;
 
-        CIO_MSG_EVENT(2, "recovery: schedule\n");
+        CIO_MSG_EVENT(4, "recovery: schedule\n");
         spin_lock_irqsave(&recovery_lock, flags);
         if (!timer_pending(&recovery_timer) || (recovery_phase != 0)) {
                 recovery_phase = 0;
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 99403b0a97a7..e268d5a77c12 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -322,10 +322,10 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
         same_dev = 0; /* Keep the compiler quiet... */
         switch (state) {
         case DEV_STATE_NOT_OPER:
-                CIO_DEBUG(KERN_WARNING, 2,
-                          "SenseID : unknown device %04x on subchannel "
-                          "0.%x.%04x\n", cdev->private->dev_id.devno,
-                          sch->schid.ssid, sch->schid.sch_no);
+                CIO_MSG_EVENT(2, "SenseID : unknown device %04x on "
+                              "subchannel 0.%x.%04x\n",
+                              cdev->private->dev_id.devno,
+                              sch->schid.ssid, sch->schid.sch_no);
                 break;
         case DEV_STATE_OFFLINE:
                 if (cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID) {
@@ -348,20 +348,19 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                         return;
                 }
                 /* Issue device info message. */
-                CIO_DEBUG(KERN_INFO, 2,
-                          "SenseID : device 0.%x.%04x reports: "
-                          "CU  Type/Mod = %04X/%02X, Dev Type/Mod = "
-                          "%04X/%02X\n",
-                          cdev->private->dev_id.ssid,
-                          cdev->private->dev_id.devno,
-                          cdev->id.cu_type, cdev->id.cu_model,
-                          cdev->id.dev_type, cdev->id.dev_model);
+                CIO_MSG_EVENT(4, "SenseID : device 0.%x.%04x reports: "
+                              "CU  Type/Mod = %04X/%02X, Dev Type/Mod = "
+                              "%04X/%02X\n",
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno,
+                              cdev->id.cu_type, cdev->id.cu_model,
+                              cdev->id.dev_type, cdev->id.dev_model);
                 break;
         case DEV_STATE_BOXED:
-                CIO_DEBUG(KERN_WARNING, 2,
-                          "SenseID : boxed device %04x on subchannel "
-                          "0.%x.%04x\n", cdev->private->dev_id.devno,
-                          sch->schid.ssid, sch->schid.sch_no);
+                CIO_MSG_EVENT(0, "SenseID : boxed device %04x on "
+                              " subchannel 0.%x.%04x\n",
+                              cdev->private->dev_id.devno,
+                              sch->schid.ssid, sch->schid.sch_no);
                 break;
         }
         cdev->private->state = state;
@@ -443,9 +442,8 @@ ccw_device_done(struct ccw_device *cdev, int state)
 
 
         if (state == DEV_STATE_BOXED)
-                CIO_DEBUG(KERN_WARNING, 2,
-                          "Boxed device %04x on subchannel %04x\n",
-                          cdev->private->dev_id.devno, sch->schid.sch_no);
+                CIO_MSG_EVENT(0, "Boxed device %04x on subchannel %04x\n",
+                              cdev->private->dev_id.devno, sch->schid.sch_no);
 
         if (cdev->private->flags.donotify) {
                 cdev->private->flags.donotify = 0;
@@ -900,7 +898,7 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
                         /* Basic sense hasn't started. Try again. */
                         ccw_device_do_sense(cdev, irb);
                 else {
-                        CIO_MSG_EVENT(2, "Huh? 0.%x.%04x: unsolicited "
+                        CIO_MSG_EVENT(0, "0.%x.%04x: unsolicited "
                                       "interrupt during w4sense...\n",
                                       cdev->private->dev_id.ssid,
                                       cdev->private->dev_id.devno);
@@ -1169,8 +1167,10 @@ ccw_device_nop(struct ccw_device *cdev, enum dev_event dev_event)
 static void
 ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event)
 {
-        CIO_MSG_EVENT(0, "dev_jumptable[%i][%i] == NULL\n",
-                      cdev->private->state, dev_event);
+        CIO_MSG_EVENT(0, "Internal state [%i][%i] not handled for device "
+                      "0.%x.%04x\n", cdev->private->state, dev_event,
+                      cdev->private->dev_id.ssid,
+                      cdev->private->dev_id.devno);
         BUG();
 }
 
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index dc4d87f77f6c..cba7020517ed 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -214,7 +214,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                  *     sense id information. So, for intervention required,
                  *     we use the "whack it until it talks" strategy...
                  */
-                CIO_MSG_EVENT(2, "SenseID : device %04x on Subchannel "
+                CIO_MSG_EVENT(0, "SenseID : device %04x on Subchannel "
                               "0.%x.%04x reports cmd reject\n",
                               cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no);
@@ -239,7 +239,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
 
                 lpm = to_io_private(sch)->orb.lpm;
                 if ((lpm & sch->schib.pmcw.pim & sch->schib.pmcw.pam) != 0)
-                        CIO_MSG_EVENT(2, "SenseID : path %02X for device %04x "
+                        CIO_MSG_EVENT(4, "SenseID : path %02X for device %04x "
                                       "on subchannel 0.%x.%04x is "
                                       "'not operational'\n", lpm,
                                       cdev->private->dev_id.devno,
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index c52449a1f9fc..5cf7be008e98 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -79,7 +79,7 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)
                         /* ret is 0, -EBUSY, -EACCES or -ENODEV */
                         if (ret != -EACCES)
                                 return ret;
-                        CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel "
+                        CIO_MSG_EVENT(3, "SNID - Device %04x on Subchannel "
                                       "0.%x.%04x, lpm %02X, became 'not "
                                       "operational'\n",
                                       cdev->private->dev_id.devno,
@@ -159,7 +159,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
                 u8 lpm;
 
                 lpm = to_io_private(sch)->orb.lpm;
-                CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel 0.%x.%04x,"
+                CIO_MSG_EVENT(3, "SNID - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
                               cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no, lpm);
@@ -243,16 +243,10 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
         /* Setup sense path group id channel program. */
         cdev->private->pgid[0].inf.fc = func;
         ccw = cdev->private->iccws;
-        if (!cdev->private->flags.pgid_single) {
-                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
-                ccw->cmd_code = CCW_CMD_SUSPEND_RECONN;
-                ccw->cda = 0;
-                ccw->count = 0;
-                ccw->flags = CCW_FLAG_SLI | CCW_FLAG_CC;
-                ccw++;
-        } else
+        if (cdev->private->flags.pgid_single)
                 cdev->private->pgid[0].inf.fc |= SPID_FUNC_SINGLE_PATH;
-
+        else
+                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
         ccw->cmd_code = CCW_CMD_SET_PGID;
         ccw->cda = (__u32) __pa (&cdev->private->pgid[0]);
         ccw->count = sizeof (struct pgid);
@@ -275,7 +269,7 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
                         return ret;
         }
         /* PGID command failed on this path. */
-        CIO_MSG_EVENT(2, "SPID - Device %04x on Subchannel "
+        CIO_MSG_EVENT(3, "SPID - Device %04x on Subchannel "
                       "0.%x.%04x, lpm %02X, became 'not operational'\n",
                       cdev->private->dev_id.devno, sch->schid.ssid,
                       sch->schid.sch_no, cdev->private->imask);
@@ -317,7 +311,7 @@ static int __ccw_device_do_nop(struct ccw_device *cdev)
                         return ret;
         }
         /* nop command failed on this path. */
-        CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel "
+        CIO_MSG_EVENT(3, "NOP - Device %04x on Subchannel "
                       "0.%x.%04x, lpm %02X, became 'not operational'\n",
                       cdev->private->dev_id.devno, sch->schid.ssid,
                       sch->schid.sch_no, cdev->private->imask);
@@ -362,7 +356,7 @@ __ccw_device_check_pgid(struct ccw_device *cdev)
                 return -EAGAIN;
         }
         if (irb->scsw.cc == 3) {
-                CIO_MSG_EVENT(2, "SPID - Device %04x on Subchannel 0.%x.%04x,"
+                CIO_MSG_EVENT(3, "SPID - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
                               cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no, cdev->private->imask);
@@ -391,7 +385,7 @@ static int __ccw_device_check_nop(struct ccw_device *cdev)
                 return -ETIME;
         }
         if (irb->scsw.cc == 3) {
-                CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel 0.%x.%04x,"
+                CIO_MSG_EVENT(3, "NOP - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
                               cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no, cdev->private->imask);
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 47a7e6200b26..9f55ce6f3c78 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -78,27 +78,32 @@ static unsigned desc_size(const struct kvm_device_desc *desc)
                 + desc->config_len;
 }
 
-/*
- * This tests (and acknowleges) a feature bit.
- */
-static bool kvm_feature(struct virtio_device *vdev, unsigned fbit)
+/* This gets the device's feature bits. */
+static u32 kvm_get_features(struct virtio_device *vdev)
 {
+        unsigned int i;
+        u32 features = 0;
         struct kvm_device_desc *desc = to_kvmdev(vdev)->desc;
-        u8 *features;
+        u8 *in_features = kvm_vq_features(desc);
 
-        if (fbit / 8 > desc->feature_len)
-                return false;
+        for (i = 0; i < min(desc->feature_len * 8, 32); i++)
+                if (in_features[i / 8] & (1 << (i % 8)))
+                        features |= (1 << i);
+        return features;
+}
 
-        features = kvm_vq_features(desc);
-        if (!(features[fbit / 8] & (1 << (fbit % 8))))
-                return false;
+static void kvm_set_features(struct virtio_device *vdev, u32 features)
+{
+        unsigned int i;
+        struct kvm_device_desc *desc = to_kvmdev(vdev)->desc;
+        /* Second half of bitmap is features we accept. */
+        u8 *out_features = kvm_vq_features(desc) + desc->feature_len;
 
-        /*
-         * We set the matching bit in the other half of the bitmap to tell the
-         * Host we want to use this feature.
-         */
-        features[desc->feature_len + fbit / 8] |= (1 << (fbit % 8));
-        return true;
+        memset(out_features, 0, desc->feature_len);
+        for (i = 0; i < min(desc->feature_len * 8, 32); i++) {
+                if (features & (1 << i))
+                        out_features[i / 8] |= (1 << (i % 8));
+        }
 }
 
 /*
@@ -221,7 +226,8 @@ static void kvm_del_vq(struct virtqueue *vq)
  * The config ops structure as defined by virtio config
  */
 static struct virtio_config_ops kvm_vq_configspace_ops = {
-        .feature = kvm_feature,
+        .get_features = kvm_get_features,
+        .set_features = kvm_set_features,
         .get = kvm_get,
         .set = kvm_set,
         .get_status = kvm_get_status,
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 4d4b54277c43..5080f343ad74 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -48,10 +48,11 @@ s390_collect_crw_info(void *param)
         int ccode;
         struct semaphore *sem;
         unsigned int chain;
+        int ignore;
 
         sem = (struct semaphore *)param;
 repeat:
-        down_interruptible(sem);
+        ignore = down_interruptible(sem);
         chain = 0;
         while (1) {
                 if (unlikely(chain > 1)) {