diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2016-01-07 13:37:22 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-01-11 13:03:00 +0100 |
| commit | c2ab7282f0fcd11eea4d0ba45d1c65d89428c314 (patch) | |
| tree | 83642948d0f2f154725b19a0eb7b61429b174822 | |
| parent | bcb7825a77f41c7dd91da6f7ac10b928156a322e (diff) | |
| download | op-kernel-dev-c2ab7282f0fcd11eea4d0ba45d1c65d89428c314.zip op-kernel-dev-c2ab7282f0fcd11eea4d0ba45d1c65d89428c314.tar.gz | |
s390/sclp: fix possible control register corruption
sclp_sync_wait() disables all external interrupt classes except for
the service signal subclass.
The static mask used for that however is wrong. It clears a couple of
bits which shouldn't be cleared and on the other hand potentially does
not clear bits which should be cleared.
Fix this by using the same generic mask like we do it in our delay
implementation.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/char/sclp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index f58bf4c..2728982 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c @@ -579,9 +579,8 @@ sclp_sync_wait(void) old_tick = local_tick_disable(); trace_hardirqs_on(); __ctl_store(cr0, 0, 0); - cr0_sync = cr0; - cr0_sync &= 0xffff00a0; - cr0_sync |= 0x00000200; + cr0_sync = cr0 & ~CR0_IRQ_SUBCLASS_MASK; + cr0_sync |= 1UL << (63 - 54); __ctl_load(cr0_sync, 0, 0); __arch_local_irq_stosm(0x01); /* Loop until driver state indicates finished request */ |
