aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2017-09-28 23:37:35 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2017-09-29 00:19:44 -0400
commitbca73f595a566f0262967535bb5b2ea9c4271d9a (patch)
tree9624efb3f49de0d5125350d7530ed5c291e6d0c9
parentd8bd9f3f0925d22726de159531bfe3774b5cacc6 (diff)
powerpc: Fix workaround for spurious MCE on POWER9
In the recent commit d8bd9f3f0925 ("powerpc: Handle MCE on POWER9 with only DSISR bit 30 set") I screwed up the bit number. It should be bit 25 (IBM bit 38). Fixes: d8bd9f3f0925 ("powerpc: Handle MCE on POWER9 with only DSISR bit 30 set") Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/kernel/mce_power.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c
index f523125b9d34..72f153c6f3fa 100644
--- a/arch/powerpc/kernel/mce_power.c
+++ b/arch/powerpc/kernel/mce_power.c
@@ -626,7 +626,7 @@ long __machine_check_early_realmode_p9(struct pt_regs *regs)
626{ 626{
627 /* 627 /*
628 * On POWER9 DD2.1 and below, it's possible to get a machine check 628 * On POWER9 DD2.1 and below, it's possible to get a machine check
629 * caused by a paste instruction where only DSISR bit 30 is set. This 629 * caused by a paste instruction where only DSISR bit 25 is set. This
630 * will result in the MCE handler seeing an unknown event and the kernel 630 * will result in the MCE handler seeing an unknown event and the kernel
631 * crashing. An MCE that occurs like this is spurious, so we don't need 631 * crashing. An MCE that occurs like this is spurious, so we don't need
632 * to do anything in terms of servicing it. If there is something that 632 * to do anything in terms of servicing it. If there is something that
@@ -634,7 +634,7 @@ long __machine_check_early_realmode_p9(struct pt_regs *regs)
634 * correct DSISR so that it can be serviced properly. So detect this 634 * correct DSISR so that it can be serviced properly. So detect this
635 * case and mark it as handled. 635 * case and mark it as handled.
636 */ 636 */
637 if (SRR1_MC_LOADSTORE(regs->msr) && regs->dsisr == 0x40000000) 637 if (SRR1_MC_LOADSTORE(regs->msr) && regs->dsisr == 0x02000000)
638 return 1; 638 return 1;
639 639
640 return mce_handle_error(regs, mce_p9_derror_table, mce_p9_ierror_table); 640 return mce_handle_error(regs, mce_p9_derror_table, mce_p9_ierror_table);