Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 patches from Martin Schwidefsky:
 "A new binary interface to be able to query and modify the LPAR
  scheduler weight and cap settings.  Some improvements for the hvc
  terminal over iucv and a couple of bux fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/hypfs: add interface for diagnose 0x304
  s390: wire up sys_sched_setattr/sys_sched_getattr
  s390/uapi: fix struct statfs64 definition
  s390/uaccess: remove dead extern declarations, make functions static
  s390/uaccess: test if current->mm is set before walking page tables
  s390/zfcpdump: make zfcpdump depend on 64BIT
  s390/32bit: fix cmpxchg64
  s390/xpram: don't modify module parameters
  s390/zcrypt: remove zcrypt kmsg documentation again
  s390/hvc_iucv: Automatically assign free HVC terminal devices
  s390/hvc_iucv: Display connection details through device attributes
  s390/hvc_iucv: fix sparse warning
  s390/vmur: Link parent CCW device during UR device creation

4 files changed, 105 insertions, 12 deletions

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 464dd29d06c0..58141f0651f2 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -257,6 +257,7 @@ static int __init xpram_setup_sizes(unsigned long pages)
         unsigned long mem_needed;
         unsigned long mem_auto;
         unsigned long long size;
+        char *sizes_end;
         int mem_auto_no;
         int i;
 
@@ -275,8 +276,8 @@ static int __init xpram_setup_sizes(unsigned long pages)
         mem_auto_no = 0;
         for (i = 0; i < xpram_devs; i++) {
                 if (sizes[i]) {
-                        size = simple_strtoull(sizes[i], &sizes[i], 0);
-                        switch (sizes[i][0]) {
+                        size = simple_strtoull(sizes[i], &sizes_end, 0);
+                        switch (*sizes_end) {
                         case 'g':
                         case 'G':
                                 size <<= 20;
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index cb3c4e05a385..49af8eeb90ea 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -700,3 +700,8 @@ out:
         free_page((unsigned long) sccb);
         return rc;
 }
+
+bool sclp_has_sprp(void)
+{
+        return !!(sclp_fac84 & 0x2);
+}
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 64c467998a90..0efb27f6f199 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -922,8 +922,8 @@ static int ur_set_online(struct ccw_device *cdev)
                 goto fail_free_cdev;
         }
 
-        urd->device = device_create(vmur_class, NULL, urd->char_device->dev,
-                                    NULL, "%s", node_id);
+        urd->device = device_create(vmur_class, &cdev->dev,
+                                    urd->char_device->dev, NULL, "%s", node_id);
         if (IS_ERR(urd->device)) {
                 rc = PTR_ERR(urd->device);
                 TRACE("ur_set_online: device_create rc=%d\n", rc);
diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
index db19a38c8c69..ea74460f3638 100644
--- a/drivers/tty/hvc/hvc_iucv.c
+++ b/drivers/tty/hvc/hvc_iucv.c
@@ -77,6 +77,7 @@ struct hvc_iucv_private {
         struct list_head        tty_outqueue;   /* outgoing IUCV messages */
         struct list_head        tty_inqueue;    /* incoming IUCV messages */
         struct device           *dev;           /* device structure */
+        u8                      info_path[16];  /* IUCV path info (dev attr) */
 };
 
 struct iucv_tty_buffer {
@@ -126,7 +127,7 @@ static struct iucv_handler hvc_iucv_handler = {
  * This function returns the struct hvc_iucv_private instance that corresponds
  * to the HVC virtual terminal number specified as parameter @num.
  */
-struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num)
+static struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num)
 {
         if ((num < HVC_IUCV_MAGIC) || (num - HVC_IUCV_MAGIC > hvc_iucv_devices))
                 return NULL;
@@ -772,18 +773,37 @@ static int hvc_iucv_filter_connreq(u8 ipvmid[8])
 static  int hvc_iucv_path_pending(struct iucv_path *path,
                                   u8 ipvmid[8], u8 ipuser[16])
 {
-        struct hvc_iucv_private *priv;
+        struct hvc_iucv_private *priv, *tmp;
+        u8 wildcard[9] = "lnxhvc  ";
+        int i, rc, find_unused;
         u8 nuser_data[16];
         u8 vm_user_id[9];
-        int i, rc;
 
+        ASCEBC(wildcard, sizeof(wildcard));
+        find_unused = !memcmp(wildcard, ipuser, 8);
+
+        /* First, check if the pending path request is managed by this
+         * IUCV handler:
+         * - find a disconnected device if ipuser contains the wildcard
+         * - find the device that matches the terminal ID in ipuser
+         */
         priv = NULL;
-        for (i = 0; i < hvc_iucv_devices; i++)
-                if (hvc_iucv_table[i] &&
-                    (0 == memcmp(hvc_iucv_table[i]->srv_name, ipuser, 8))) {
-                        priv = hvc_iucv_table[i];
+        for (i = 0; i < hvc_iucv_devices; i++) {
+                tmp = hvc_iucv_table[i];
+                if (!tmp)
+                        continue;
+
+                if (find_unused) {
+                        spin_lock(&tmp->lock);
+                        if (tmp->iucv_state == IUCV_DISCONN)
+                                priv = tmp;
+                        spin_unlock(&tmp->lock);
+
+                } else if (!memcmp(tmp->srv_name, ipuser, 8))
+                                priv = tmp;
+                if (priv)
                         break;
-                }
+        }
         if (!priv)
                 return -ENODEV;
 
@@ -826,6 +846,10 @@ static	int hvc_iucv_path_pending(struct iucv_path *path,
         priv->path = path;
         priv->iucv_state = IUCV_CONNECTED;
 
+        /* store path information */
+        memcpy(priv->info_path, ipvmid, 8);
+        memcpy(priv->info_path + 8, ipuser + 8, 8);
+
         /* flush buffered output data... */
         schedule_delayed_work(&priv->sndbuf_work, 5);
 
@@ -960,6 +984,49 @@ static int hvc_iucv_pm_restore_thaw(struct device *dev)
         return 0;
 }
 
+static ssize_t hvc_iucv_dev_termid_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct hvc_iucv_private *priv = dev_get_drvdata(dev);
+        size_t len;
+
+        len = sizeof(priv->srv_name);
+        memcpy(buf, priv->srv_name, len);
+        EBCASC(buf, len);
+        buf[len++] = '\n';
+        return len;
+}
+
+static ssize_t hvc_iucv_dev_state_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct hvc_iucv_private *priv = dev_get_drvdata(dev);
+        return sprintf(buf, "%u:%u\n", priv->iucv_state, priv->tty_state);
+}
+
+static ssize_t hvc_iucv_dev_peer_show(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        struct hvc_iucv_private *priv = dev_get_drvdata(dev);
+        char vmid[9], ipuser[9];
+
+        memset(vmid, 0, sizeof(vmid));
+        memset(ipuser, 0, sizeof(ipuser));
+
+        spin_lock_bh(&priv->lock);
+        if (priv->iucv_state == IUCV_CONNECTED) {
+                memcpy(vmid, priv->info_path, 8);
+                memcpy(ipuser, priv->info_path + 8, 8);
+        }
+        spin_unlock_bh(&priv->lock);
+        EBCASC(ipuser, 8);
+
+        return sprintf(buf, "%s:%s\n", vmid, ipuser);
+}
+
 
 /* HVC operations */
 static const struct hv_ops hvc_iucv_ops = {
@@ -985,6 +1052,25 @@ static struct device_driver hvc_iucv_driver = {
         .pm   = &hvc_iucv_pm_ops,
 };
 
+/* IUCV HVC device attributes */
+static DEVICE_ATTR(termid, 0640, hvc_iucv_dev_termid_show, NULL);
+static DEVICE_ATTR(state, 0640, hvc_iucv_dev_state_show, NULL);
+static DEVICE_ATTR(peer, 0640, hvc_iucv_dev_peer_show, NULL);
+static struct attribute *hvc_iucv_dev_attrs[] = {
+        &dev_attr_termid.attr,
+        &dev_attr_state.attr,
+        &dev_attr_peer.attr,
+        NULL,
+};
+static struct attribute_group hvc_iucv_dev_attr_group = {
+        .attrs = hvc_iucv_dev_attrs,
+};
+static const struct attribute_group *hvc_iucv_dev_attr_groups[] = {
+        &hvc_iucv_dev_attr_group,
+        NULL,
+};
+
+
 /**
  * hvc_iucv_alloc() - Allocates a new struct hvc_iucv_private instance
  * @id:                 hvc_iucv_table index
@@ -1046,6 +1132,7 @@ static int __init hvc_iucv_alloc(int id, unsigned int is_console)
         priv->dev->bus = &iucv_bus;
         priv->dev->parent = iucv_root;
         priv->dev->driver = &hvc_iucv_driver;
+        priv->dev->groups = hvc_iucv_dev_attr_groups;
         priv->dev->release = (void (*)(struct device *)) kfree;
         rc = device_register(priv->dev);
         if (rc) {