Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / s390 / cio / ioasm.h

diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index c874607..95a9462 100644 (file)
--- 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
  */
 
-extern __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,42 @@ extern __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 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_64BIT
+               ".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;
 }
 
-extern __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 +78,13 @@ extern __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;
 }
 
-extern __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;
 
@@ -62,7 +95,7 @@ extern __inline__ int msch_err(int irq, volatile struct schib *addr)
                "0:  ipm  %0\n"
                "    srl  %0,28\n"
                "1:\n"
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
                ".section __ex_table,\"a\"\n"
                "   .align 8\n"
                "   .quad 0b,1b\n"
@@ -74,12 +107,13 @@ extern __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;
 }
 
-extern __inline__ int tsch(int irq, volatile struct irb *addr)
+static inline int tsch(struct subchannel_id schid,
+                          volatile struct irb *addr)
 {
        int ccode;
 
@@ -89,12 +123,12 @@ extern __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;
 }
 
-extern __inline__ int tpi( volatile struct tpi_info *addr)
+static inline int tpi( volatile struct tpi_info *addr)
 {
        int ccode;
 
@@ -103,12 +137,13 @@ extern __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;
 }
 
-extern __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 +153,12 @@ extern __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;
 }
 
-extern __inline__ int rsch(int irq)
+static inline int rsch(struct subchannel_id schid)
 {
        int ccode;
 
@@ -133,12 +168,12 @@ extern __inline__ int rsch(int irq)
                "   ipm   %0\n"
                "   srl   %0,28"
                : "=d" (ccode)
-               : "d" (irq | 0x10000L)
+               : "d" (schid)
                : "cc", "1" );
        return ccode;
 }
 
-extern __inline__ int csch(int irq)
+static inline int csch(struct subchannel_id schid)
 {
        int ccode;
 
@@ -148,12 +183,12 @@ extern __inline__ int csch(int irq)
                "   ipm   %0\n"
                "   srl   %0,28"
                : "=d" (ccode)
-               : "d" (irq | 0x10000L)
+               : "d" (schid)
                : "cc", "1" );
        return ccode;
 }
 
-extern __inline__ int hsch(int irq)
+static inline int hsch(struct subchannel_id schid)
 {
        int ccode;
 
@@ -163,12 +198,12 @@ extern __inline__ int hsch(int irq)
                "   ipm   %0\n"
                "   srl   %0,28"
                : "=d" (ccode)
-               : "d" (irq | 0x10000L)
+               : "d" (schid)
                : "cc", "1" );
        return ccode;
 }
 
-extern __inline__ int xsch(int irq)
+static inline int xsch(struct subchannel_id schid)
 {
        int ccode;
 
@@ -178,27 +213,28 @@ extern __inline__ int xsch(int irq)
                "   ipm   %0\n"
                "   srl   %0,28"
                : "=d" (ccode)
-               : "d" (irq | 0x10000L)
+               : "d" (schid)
                : "cc", "1" );
        return ccode;
 }
 
-extern __inline__ int chsc(void *chsc_area)
+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;
 }
 
-extern __inline__ int iac( void)
+static inline int iac( void)
 {
        int ccode;
 
@@ -210,7 +246,7 @@ extern __inline__ int iac( void)
        return ccode;
 }
 
-extern __inline__ int rchp(int chpid)
+static inline int rchp(int chpid)
 {
        int ccode;