Skip to content

Commit 11cb0a2

Browse files
npigginmpe
authored andcommitted
powerpc: improve handling of unrecoverable system reset
If an unrecoverable system reset hits in process context, the system does not have to panic. Similar to machine check, call nmi_exit() before die(). Signed-off-by: Nicholas Piggin <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent c538938 commit 11cb0a2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/powerpc/kernel/traps.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,11 @@ void system_reset_exception(struct pt_regs *regs)
503503
die("Unrecoverable nested System Reset", regs, SIGABRT);
504504
#endif
505505
/* Must die if the interrupt is not recoverable */
506-
if (!(regs->msr & MSR_RI))
506+
if (!(regs->msr & MSR_RI)) {
507+
/* For the reason explained in die_mce, nmi_exit before die */
508+
nmi_exit();
507509
die("Unrecoverable System Reset", regs, SIGABRT);
510+
}
508511

509512
if (saved_hsrrs) {
510513
mtspr(SPRN_HSRR0, hsrr0);

0 commit comments

Comments
 (0)