[PATCH] s390: multiple subchannel sets support

Add support for multiple subchannel sets.  Works with arbitrary devices in
subchannel set 1 and is transparent to device drivers.  Although currently
only two subchannel sets are available, this will work with the architectured
maximum number of subchannel sets as well.

Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index 929f8fb505f..db09c209098 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -36,9 +36,10 @@ ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb)
                 
         CIO_MSG_EVENT(0, "Channel-Check or Interface-Control-Check "
                       "received"
-                      " ... device %04X on subchannel %04X, dev_stat "
+                      " ... device %04x on subchannel 0.%x.%04x, dev_stat "
                       ": %02X sch_stat : %02X\n",
-                      cdev->private->devno, cdev->private->sch_no,
+                      cdev->private->devno, cdev->private->ssid,
+                      cdev->private->sch_no,
                       irb->scsw.dstat, irb->scsw.cstat);
 
         if (irb->scsw.cc != 3) {
@@ -61,8 +62,9 @@ ccw_device_path_notoper(struct ccw_device *cdev)
         sch = to_subchannel(cdev->dev.parent);
         stsch (sch->schid, &sch->schib);
 
-        CIO_MSG_EVENT(0, "%s(%04x) - path(s) %02x are "
-                      "not operational \n", __FUNCTION__, sch->schid.sch_no,
+        CIO_MSG_EVENT(0, "%s(0.%x.%04x) - path(s) %02x are "
+                      "not operational \n", __FUNCTION__,
+                      sch->schid.ssid, sch->schid.sch_no,
                       sch->schib.pmcw.pnom);
 
         sch->lpm &= ~sch->schib.pmcw.pnom;