Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1833c9f6 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/smp: reenable smt after resume 



After a suspend/resume cycle we missed to enable smt again, which leads
to all sorts of bugs, since the kernel assumes smt is enabled, while the
hardware thinks it is not.

Reported-and-tested-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reported-by: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e143fa93

arch/s390/kernel/swsusp_asm64.S

+11 −0
Original line number Diff line number Diff line
@@ -177,6 +177,17 @@ restart_entry: 
	lhi	%r1,1

	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE

	sam64

#ifdef CONFIG_SMP

	larl	%r1,smp_cpu_mt_shift

	icm	%r1,15,0(%r1)

	jz	smt_done

	llgfr	%r1,%r1

smt_loop:

	sigp	%r1,%r0,SIGP_SET_MULTI_THREADING

	brc	8,smt_done			/* accepted */

	brc	2,smt_loop			/* busy, try again */

smt_done:

#endif

	larl	%r1,.Lnew_pgm_check_psw

	lpswe	0(%r1)

pgm_check_entry: