[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, 29 insertions, 0 deletions

diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index 66c882e52f3..62b0e2ad507 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -38,6 +38,35 @@ static inline int stsch(struct subchannel_id schid,
         return ccode;
 }
 
+static inline int stsch_err(struct subchannel_id schid,
+                                volatile struct schib *addr)
+{
+        int ccode;
+
+        __asm__ __volatile__(
+                "    lhi  %0,%3\n"
+                "    lr   1,%1\n"
+                "    stsch 0(%2)\n"
+                "0:  ipm  %0\n"
+                "    srl  %0,28\n"
+                "1:\n"
+#ifdef CONFIG_ARCH_S390X
+                ".section __ex_table,\"a\"\n"
+                "   .align 8\n"
+                "   .quad 0b,1b\n"
+                ".previous"
+#else
+                ".section __ex_table,\"a\"\n"
+                "   .align 4\n"
+                "   .long 0b,1b\n"
+                ".previous"
+#endif
+                : "=&d" (ccode)
+                : "d" (schid), "a" (addr), "K" (-EIO), "m" (*addr)
+                : "cc", "1" );
+        return ccode;
+}
+
 static inline int msch(struct subchannel_id schid,
                            volatile struct schib *addr)
 {