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

Commit 461a52a4 authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman
Browse files

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: b96672dd ("powerpc: Machine check interrupt is a non-maskable interrupt")
Fixes: daf00ae71dad ("powerpc/traps: restore recoverability of machine_check interrupts")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent baed68a9

arch/powerpc/kernel/traps.c

+4 −4
Original line number Diff line number Diff line
@@ -767,15 +767,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: