Commit c2ab7282 authored Jan 07, 2016 by Heiko Carstens Committed by Martin Schwidefsky Jan 11, 2016

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>

parent bcb7825a

drivers/s390/char/sclp.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message