diff options
Diffstat (limited to 'drivers/s390/cio/device_id.c')
| -rw-r--r-- | drivers/s390/cio/device_id.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c index 438db483035d..1398367b5f68 100644 --- a/drivers/s390/cio/device_id.c +++ b/drivers/s390/cio/device_id.c | |||
| @@ -42,18 +42,15 @@ diag210(struct diag210 * addr) | |||
| 42 | spin_lock_irqsave(&diag210_lock, flags); | 42 | spin_lock_irqsave(&diag210_lock, flags); |
| 43 | diag210_tmp = *addr; | 43 | diag210_tmp = *addr; |
| 44 | 44 | ||
| 45 | asm volatile ( | 45 | asm volatile( |
| 46 | " lhi %0,-1\n" | 46 | " lhi %0,-1\n" |
| 47 | " sam31\n" | 47 | " sam31\n" |
| 48 | " diag %1,0,0x210\n" | 48 | " diag %1,0,0x210\n" |
| 49 | "0: ipm %0\n" | 49 | "0: ipm %0\n" |
| 50 | " srl %0,28\n" | 50 | " srl %0,28\n" |
| 51 | "1: sam64\n" | 51 | "1: sam64\n" |
| 52 | ".section __ex_table,\"a\"\n" | 52 | EX_TABLE(0b,1b) |
| 53 | " .align 8\n" | 53 | : "=&d" (ccode) : "a" (__pa(&diag210_tmp)) : "cc", "memory"); |
| 54 | " .quad 0b,1b\n" | ||
| 55 | ".previous" | ||
| 56 | : "=&d" (ccode) : "a" (__pa(&diag210_tmp)) : "cc", "memory" ); | ||
| 57 | 54 | ||
| 58 | *addr = diag210_tmp; | 55 | *addr = diag210_tmp; |
| 59 | spin_unlock_irqrestore(&diag210_lock, flags); | 56 | spin_unlock_irqrestore(&diag210_lock, flags); |
| @@ -66,17 +63,14 @@ diag210(struct diag210 * addr) | |||
| 66 | { | 63 | { |
| 67 | int ccode; | 64 | int ccode; |
| 68 | 65 | ||
| 69 | asm volatile ( | 66 | asm volatile( |
| 70 | " lhi %0,-1\n" | 67 | " lhi %0,-1\n" |
| 71 | " diag %1,0,0x210\n" | 68 | " diag %1,0,0x210\n" |
| 72 | "0: ipm %0\n" | 69 | "0: ipm %0\n" |
| 73 | " srl %0,28\n" | 70 | " srl %0,28\n" |
| 74 | "1:\n" | 71 | "1:\n" |
| 75 | ".section __ex_table,\"a\"\n" | 72 | EX_TABLE(0b,1b) |
| 76 | " .align 4\n" | 73 | : "=&d" (ccode) : "a" (__pa(addr)) : "cc", "memory"); |
| 77 | " .long 0b,1b\n" | ||
| 78 | ".previous" | ||
| 79 | : "=&d" (ccode) : "a" (__pa(addr)) : "cc", "memory" ); | ||
| 80 | 74 | ||
| 81 | return ccode; | 75 | return ccode; |
| 82 | } | 76 | } |