s390/cio: add channel ID sysfs attribute

Add new attributes "chid" and "chid_external" to the channel-path
sysfs directory. These attributes contain information related to
the channel-ID of the channel-path.

Reviewed-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 39 insertions, 1 deletions

diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 21fabc6d5a9c..6c440d4349d4 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -352,12 +352,48 @@ static ssize_t chp_shared_show(struct device *dev,
 
 static DEVICE_ATTR(shared, 0444, chp_shared_show, NULL);
 
+static ssize_t chp_chid_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        struct channel_path *chp = to_channelpath(dev);
+        ssize_t rc;
+
+        mutex_lock(&chp->lock);
+        if (chp->desc_fmt1.flags & 0x10)
+                rc = sprintf(buf, "%04x\n", chp->desc_fmt1.chid);
+        else
+                rc = 0;
+        mutex_unlock(&chp->lock);
+
+        return rc;
+}
+static DEVICE_ATTR(chid, 0444, chp_chid_show, NULL);
+
+static ssize_t chp_chid_external_show(struct device *dev,
+                                      struct device_attribute *attr, char *buf)
+{
+        struct channel_path *chp = to_channelpath(dev);
+        ssize_t rc;
+
+        mutex_lock(&chp->lock);
+        if (chp->desc_fmt1.flags & 0x10)
+                rc = sprintf(buf, "%x\n", chp->desc_fmt1.flags & 0x8 ? 1 : 0);
+        else
+                rc = 0;
+        mutex_unlock(&chp->lock);
+
+        return rc;
+}
+static DEVICE_ATTR(chid_external, 0444, chp_chid_external_show, NULL);
+
 static struct attribute *chp_attrs[] = {
         &dev_attr_status.attr,
         &dev_attr_configure.attr,
         &dev_attr_type.attr,
         &dev_attr_cmg.attr,
         &dev_attr_shared.attr,
+        &dev_attr_chid.attr,
+        &dev_attr_chid_external.attr,
         NULL,
 };
 static struct attribute_group chp_attr_group = {
diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index 349d5fc47196..e7ef2a683b8f 100644
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -43,7 +43,9 @@ struct channel_path_desc_fmt1 {
         u8 chpid;
         u32:24;
         u8 chpp;
-        u32 unused[3];
+        u32 unused[2];
+        u16 chid;
+        u32:16;
         u16 mdc;
         u16:13;
         u8 r:1;