s390: cleanup and add sanity checks to control register macros

- turn some macros into functions
- merge two almost identical versions for 32/64 bit
- add BUILD_BUG_ON() check to make sure the passed in array is large enough

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 51 insertions, 61 deletions

diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h
index debfda33d1f8..9b69c0befdca 100644
--- a/arch/s390/include/asm/ctl_reg.h
+++ b/arch/s390/include/asm/ctl_reg.h
@@ -8,69 +8,59 @@
 #define __ASM_CTL_REG_H
 
 #ifdef CONFIG_64BIT
-
-#define __ctl_load(array, low, high) ({                         \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       lctlg   %1,%2,%0\n"                     \
-                : : "Q" (*(addrtype *)(&array)),                \
-                    "i" (low), "i" (high));                     \
-        })
-
-#define __ctl_store(array, low, high) ({                        \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       stctg   %1,%2,%0\n"                     \
-                : "=Q" (*(addrtype *)(&array))                  \
-                : "i" (low), "i" (high));                       \
-        })
-
-#else /* CONFIG_64BIT */
-
-#define __ctl_load(array, low, high) ({                         \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       lctl    %1,%2,%0\n"                     \
-                : : "Q" (*(addrtype *)(&array)),                \
-                    "i" (low), "i" (high));                     \
-})
-
-#define __ctl_store(array, low, high) ({                        \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       stctl   %1,%2,%0\n"                     \
-                : "=Q" (*(addrtype *)(&array))                  \
-                : "i" (low), "i" (high));                       \
-        })
-
-#endif /* CONFIG_64BIT */
-
-#define __ctl_set_bit(cr, bit) ({       \
-        unsigned long __dummy;          \
-        __ctl_store(__dummy, cr, cr);   \
-        __dummy |= 1UL << (bit);        \
-        __ctl_load(__dummy, cr, cr);    \
-})
-
-#define __ctl_clear_bit(cr, bit) ({     \
-        unsigned long __dummy;          \
-        __ctl_store(__dummy, cr, cr);   \
-        __dummy &= ~(1UL << (bit));     \
-        __ctl_load(__dummy, cr, cr);    \
-})
+# define __CTL_LOAD     "lctlg"
+# define __CTL_STORE    "stctg"
+#else
+# define __CTL_LOAD     "lctl"
+# define __CTL_STORE    "stctl"
+#endif
+
+#define __ctl_load(array, low, high) {                                  \
+        typedef struct { char _[sizeof(array)]; } addrtype;             \
+                                                                        \
+        BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\
+        asm volatile(                                                   \
+                __CTL_LOAD " %1,%2,%0\n"                                \
+                : : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high));\
+}
+
+#define __ctl_store(array, low, high) {                                 \
+        typedef struct { char _[sizeof(array)]; } addrtype;             \
+                                                                        \
+        BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\
+        asm volatile(                                                   \
+                __CTL_STORE " %1,%2,%0\n"                               \
+                : "=Q" (*(addrtype *)(&array))                          \
+                : "i" (low), "i" (high));                               \
+}
+
+static inline void __ctl_set_bit(unsigned int cr, unsigned int bit)
+{
+        unsigned long reg;
+
+        __ctl_store(reg, cr, cr);
+        reg |= 1UL << bit;
+        __ctl_load(reg, cr, cr);
+}
+
+static inline void __ctl_clear_bit(unsigned int cr, unsigned int bit)
+{
+        unsigned long reg;
+
+        __ctl_store(reg, cr, cr);
+        reg &= ~(1UL << bit);
+        __ctl_load(reg, cr, cr);
+}
+
+void smp_ctl_set_bit(int cr, int bit);
+void smp_ctl_clear_bit(int cr, int bit);
 
 #ifdef CONFIG_SMP
-
-extern void smp_ctl_set_bit(int cr, int bit);
-extern void smp_ctl_clear_bit(int cr, int bit);
-#define ctl_set_bit(cr, bit) smp_ctl_set_bit(cr, bit)
-#define ctl_clear_bit(cr, bit) smp_ctl_clear_bit(cr, bit)
-
+# define ctl_set_bit(cr, bit) smp_ctl_set_bit(cr, bit)
+# define ctl_clear_bit(cr, bit) smp_ctl_clear_bit(cr, bit)
 #else
-
-#define ctl_set_bit(cr, bit) __ctl_set_bit(cr, bit)
-#define ctl_clear_bit(cr, bit) __ctl_clear_bit(cr, bit)
-
-#endif /* CONFIG_SMP */
+# define ctl_set_bit(cr, bit) __ctl_set_bit(cr, bit)
+# define ctl_clear_bit(cr, bit) __ctl_clear_bit(cr, bit)
+#endif
 
 #endif /* __ASM_CTL_REG_H */