[PATCH] s390: introduce struct subchannel_id

This patch introduces a struct subchannel_id containing the subchannel number
(formerly referred to as "irq") and switches code formerly relying on the
subchannel number over to it.

While we're touching inline assemblies anyway, make sure they have correct
memory constraints.

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, 31 insertions, 24 deletions

diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index 45480a2bc4c0..66c882e52f32 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -1,12 +1,13 @@
 #ifndef S390_CIO_IOASM_H
 #define S390_CIO_IOASM_H
 
+#include "schid.h"
+
 /*
  * TPI info structure
  */
 struct tpi_info {
-        __u32 reserved1  : 16;   /* reserved 0x00000001 */
-        __u32 irq        : 16;   /* aka. subchannel number */
+        struct subchannel_id schid;
         __u32 intparm;           /* interruption parameter */
         __u32 adapter_IO : 1;
         __u32 reserved2  : 1;
@@ -21,7 +22,8 @@ struct tpi_info {
  * Some S390 specific IO instructions as inline
  */
 
-static inline int stsch(int irq, volatile struct schib *addr)
+static inline int stsch(struct subchannel_id schid,
+                            volatile struct schib *addr)
 {
         int ccode;
 
@@ -31,12 +33,13 @@ static inline int stsch(int irq, volatile struct schib *addr)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000), "a" (addr)
+                : "d" (schid), "a" (addr), "m" (*addr)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int msch(int irq, volatile struct schib *addr)
+static inline int msch(struct subchannel_id schid,
+                           volatile struct schib *addr)
 {
         int ccode;
 
@@ -46,12 +49,13 @@ static inline int msch(int irq, volatile struct schib *addr)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000L), "a" (addr)
+                : "d" (schid), "a" (addr), "m" (*addr)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int msch_err(int irq, volatile struct schib *addr)
+static inline int msch_err(struct subchannel_id schid,
+                               volatile struct schib *addr)
 {
         int ccode;
 
@@ -74,12 +78,13 @@ static inline int msch_err(int irq, volatile struct schib *addr)
                 ".previous"
 #endif
                 : "=&d" (ccode)
-                : "d" (irq | 0x10000L), "a" (addr), "K" (-EIO)
+                : "d" (schid), "a" (addr), "K" (-EIO), "m" (*addr)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int tsch(int irq, volatile struct irb *addr)
+static inline int tsch(struct subchannel_id schid,
+                           volatile struct irb *addr)
 {
         int ccode;
 
@@ -89,7 +94,7 @@ static inline int tsch(int irq, volatile struct irb *addr)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000L), "a" (addr)
+                : "d" (schid), "a" (addr), "m" (*addr)
                 : "cc", "1" );
         return ccode;
 }
@@ -103,12 +108,13 @@ static inline int tpi( volatile struct tpi_info *addr)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "a" (addr)
+                : "a" (addr), "m" (*addr)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int ssch(int irq, volatile struct orb *addr)
+static inline int ssch(struct subchannel_id schid,
+                           volatile struct orb *addr)
 {
         int ccode;
 
@@ -118,12 +124,12 @@ static inline int ssch(int irq, volatile struct orb *addr)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000L), "a" (addr)
+                : "d" (schid), "a" (addr), "m" (*addr)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int rsch(int irq)
+static inline int rsch(struct subchannel_id schid)
 {
         int ccode;
 
@@ -133,12 +139,12 @@ static inline int rsch(int irq)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000L)
+                : "d" (schid)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int csch(int irq)
+static inline int csch(struct subchannel_id schid)
 {
         int ccode;
 
@@ -148,12 +154,12 @@ static inline int csch(int irq)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000L)
+                : "d" (schid)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int hsch(int irq)
+static inline int hsch(struct subchannel_id schid)
 {
         int ccode;
 
@@ -163,12 +169,12 @@ static inline int hsch(int irq)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000L)
+                : "d" (schid)
                 : "cc", "1" );
         return ccode;
 }
 
-static inline int xsch(int irq)
+static inline int xsch(struct subchannel_id schid)
 {
         int ccode;
 
@@ -178,21 +184,22 @@ static inline int xsch(int irq)
                 "   ipm   %0\n"
                 "   srl   %0,28"
                 : "=d" (ccode)
-                : "d" (irq | 0x10000L)
+                : "d" (schid)
                 : "cc", "1" );
         return ccode;
 }
 
 static inline int chsc(void *chsc_area)
 {
+        typedef struct { char _[4096]; } addr_type;
         int cc;
 
         __asm__ __volatile__ (
-                ".insn  rre,0xb25f0000,%1,0     \n\t"
+                ".insn  rre,0xb25f0000,%2,0     \n\t"
                 "ipm    %0      \n\t"
                 "srl    %0,28   \n\t"
-                : "=d" (cc)
-                : "d" (chsc_area)
+                : "=d" (cc), "=m" (*(addr_type *) chsc_area)
+                : "d" (chsc_area), "m" (*(addr_type *) chsc_area)
                 : "cc" );
 
         return cc;