diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2020-04-29 16:56:52 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-04 15:21:28 +1000 |
| commit | 53459dc9709db2141d784702abbd43e8fcac8e6d (patch) | |
| tree | 49d463f58d0c61235ba3ebaf7784ddb2b7b107b3 /arch/powerpc | |
| parent | c0d7dcf89e5151b2259d1c2c1b922da3b881d02e (diff) | |
| download | linux-stable-53459dc9709db2141d784702abbd43e8fcac8e6d.tar.gz linux-stable-53459dc9709db2141d784702abbd43e8fcac8e6d.tar.bz2 linux-stable-53459dc9709db2141d784702abbd43e8fcac8e6d.zip | |
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: 890274c2dc4c ("powerpc/64s: Implement KUAP for Radix MMU")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200429065654.1677541-5-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 728ccb0f560c..b0ad930cbae5 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -971,6 +971,7 @@ EXC_COMMON_BEGIN(system_reset_common) ld r10,SOFTE(r1) stb r10,PACAIRQSOFTMASK(r13) + kuap_restore_amr r10 EXCEPTION_RESTORE_REGS RFI_TO_USER_OR_KERNEL |