powerpc/traps: fix recoverability of machine check handling on book3s/32

commit 0bbea75c476b77fa7d7811d6be911cc7583e640f upstream.

Looks like book3s/32 doesn't set RI on machine check, so
checking RI before calling die() will always be fatal
allthought this is not an issue in most cases.

Fixes: b96672dd840f ("powerpc: Machine check interrupt is a non-maskable interrupt")
Fixes: daf00ae71dad ("powerpc/traps: restore recoverability of machine_check interrupts")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: stable@vger.kernel.org
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index a5f2b7593976dae2195ffaacf5eebdb67bc2b7d6..0322d56894612899e10c6e35b1a6657b2f1aebdb 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -694,15 +694,15 @@ void machine_check_exception(struct pt_regs *regs)
        if (check_io_access(regs))
                goto bail;
 
-       /* Must die if the interrupt is not recoverable */
-       if (!(regs->msr & MSR_RI))
-               nmi_panic(regs, "Unrecoverable Machine check");
-
        if (!nested)
                nmi_exit();
 
        die("Machine check", regs, SIGBUS);
 
+       /* Must die if the interrupt is not recoverable */
+       if (!(regs->msr & MSR_RI))
+               nmi_panic(regs, "Unrecoverable Machine check");
+
        return;
 
 bail: