Skip to content

Commit 53459dc

Browse files
npigginmpe
authored andcommitted
powerpc/64s/kuap: Restore AMR in system reset exception
The system reset interrupt handler locks AMR and exits with EXCEPTION_RESTORE_REGS without restoring AMR. Similarly to the soft-NMI handler, it needs to restore. Fixes: 890274c ("powerpc/64s: Implement KUAP for Radix MMU") Signed-off-by: Nicholas Piggin <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent c0d7dcf commit 53459dc

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/powerpc/kernel/exceptions-64s.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,7 @@ EXC_COMMON_BEGIN(system_reset_common)
971971
ld r10,SOFTE(r1)
972972
stb r10,PACAIRQSOFTMASK(r13)
973973

974+
kuap_restore_amr r10
974975
EXCEPTION_RESTORE_REGS
975976
RFI_TO_USER_OR_KERNEL
976977

0 commit comments

Comments
 (0)