[S390] Inline assembly cleanup.

Major cleanup of all s390 inline assemblies. They now have a common
coding style. Quite a few have been shortened, mainly by using register
asm variables. Use of the EX_TABLE macro helps  as well. The atomic ops,
bit ops and locking inlines new use the Q-constraint if a newer gcc
is used.  That results in slightly better code.

Thanks to Christian Borntraeger for proof reading the changes.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 21 insertions, 62 deletions

diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 985d1613baaa..31e335751d6d 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -100,13 +100,12 @@ service_call(sclp_cmdw_t command, void *sccb)
 {
         int cc;
 
-        __asm__ __volatile__(
-                "   .insn rre,0xb2200000,%1,%2\n"  /* servc %1,%2 */
-                "   ipm   %0\n"
-                "   srl   %0,28"
-                : "=&d" (cc)
-                : "d" (command), "a" (__pa(sccb))
-                : "cc", "memory" );
+        asm volatile(
+                "       .insn   rre,0xb2200000,%1,%2\n"  /* servc %1,%2 */
+                "       ipm     %0\n"
+                "       srl     %0,28"
+                : "=&d" (cc) : "d" (command), "a" (__pa(sccb))
+                : "cc", "memory");
         if (cc == 3)
                 return -EIO;
         if (cc == 2)
@@ -360,16 +359,6 @@ sclp_interrupt_handler(struct pt_regs *regs, __u16 code)
         sclp_process_queue();
 }
 
-/* Return current Time-Of-Day clock. */
-static inline u64
-sclp_get_clock(void)
-{
-        u64 result;
-
-        asm volatile ("STCK 0(%1)" : "=m" (result) : "a" (&(result)) : "cc");
-        return result;
-}
-
 /* Convert interval in jiffies to TOD ticks. */
 static inline u64
 sclp_tod_from_jiffies(unsigned long jiffies)
@@ -382,7 +371,6 @@ sclp_tod_from_jiffies(unsigned long jiffies)
 void
 sclp_sync_wait(void)
 {
-        unsigned long psw_mask;
         unsigned long flags;
         unsigned long cr0, cr0_sync;
         u64 timeout;
@@ -392,7 +380,7 @@ sclp_sync_wait(void)
         timeout = 0;
         if (timer_pending(&sclp_request_timer)) {
                 /* Get timeout TOD value */
-                timeout = sclp_get_clock() +
+                timeout = get_clock() +
                           sclp_tod_from_jiffies(sclp_request_timer.expires -
                                                 jiffies);
         }
@@ -406,13 +394,12 @@ sclp_sync_wait(void)
         cr0_sync |= 0x00000200;
         cr0_sync &= 0xFFFFF3AC;
         __ctl_load(cr0_sync, 0, 0);
-        asm volatile ("STOSM 0(%1),0x01"
-                      : "=m" (psw_mask) : "a" (&psw_mask) : "memory");
+        __raw_local_irq_stosm(0x01);
         /* Loop until driver state indicates finished request */
         while (sclp_running_state != sclp_running_state_idle) {
                 /* Check for expired request timer */
                 if (timer_pending(&sclp_request_timer) &&
-                    sclp_get_clock() > timeout &&
+                    get_clock() > timeout &&
                     del_timer(&sclp_request_timer))
                         sclp_request_timer.function(sclp_request_timer.data);
                 barrier();
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 807320a41fa4..4b868f72fe89 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -54,48 +54,20 @@ enum vmwdt_func {
 static int __diag288(enum vmwdt_func func, unsigned int timeout,
                             char *cmd, size_t len)
 {
-        register unsigned long __func asm("2");
-        register unsigned long __timeout asm("3");
-        register unsigned long __cmdp asm("4");
-        register unsigned long __cmdl asm("5");
+        register unsigned long __func asm("2") = func;
+        register unsigned long __timeout asm("3") = timeout;
+        register unsigned long __cmdp asm("4") = virt_to_phys(cmd);
+        register unsigned long __cmdl asm("5") = len;
         int err;
 
-        __func = func;
-        __timeout = timeout;
-        __cmdp = virt_to_phys(cmd);
-        __cmdl = len;
-        err = 0;
-        asm volatile (
-#ifdef CONFIG_64BIT
-                       "diag %2,%4,0x288\n"
-                "1:     \n"
-                ".section .fixup,\"ax\"\n"
-                "2:     lghi %0,%1\n"
-                "       jg 1b\n"
-                ".previous\n"
-                ".section __ex_table,\"a\"\n"
-                "       .align 8\n"
-                "       .quad 1b,2b\n"
-                ".previous\n"
-#else
-                       "diag %2,%4,0x288\n"
-                "1:     \n"
-                ".section .fixup,\"ax\"\n"
-                "2:     lhi %0,%1\n"
-                "       bras 1,3f\n"
-                "       .long 1b\n"
-                "3:     l 1,0(1)\n"
-                "       br 1\n"
-                ".previous\n"
-                ".section __ex_table,\"a\"\n"
-                "       .align 4\n"
-                "       .long 1b,2b\n"
-                ".previous\n"
-#endif
-                : "+&d"(err)
-                : "i"(-EINVAL), "d"(__func), "d"(__timeout),
-                  "d"(__cmdp), "d"(__cmdl)
-                : "1", "cc");
+        err = -EINVAL;
+        asm volatile(
+                "       diag    %1,%3,0x288\n"
+                "0:     la      %0,0\n"
+                "1:\n"
+                EX_TABLE(0b,1b)
+                : "=d" (err) : "d"(__func), "d"(__timeout),
+                  "d"(__cmdp), "d"(__cmdl), "0" (-EINVAL) : "1", "cc");
         return err;
 }