openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Fix workaround for spurious MCE on POWER9 

In the recent commit d8bd9f3f09 ("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: d8bd9f3f09 ("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>
This commit is contained in:
Michael Neuling 2017-09-28 22:37:35 -05:00 committed by Michael Ellerman
parent d8bd9f3f09
commit bca73f595a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/mce_power.c
View File

@ -626,7 +626,7 @@ long __machine_check_early_realmode_p9(struct pt_regs *regs)
{ {
/* /*
* On POWER9 DD2.1 and below, it's possible to get a machine check * On POWER9 DD2.1 and below, it's possible to get a machine check
* caused by a paste instruction where only DSISR bit 30 is set. This * caused by a paste instruction where only DSISR bit 25 is set. This
* will result in the MCE handler seeing an unknown event and the kernel * will result in the MCE handler seeing an unknown event and the kernel
* crashing. An MCE that occurs like this is spurious, so we don't need * crashing. An MCE that occurs like this is spurious, so we don't need
* to do anything in terms of servicing it. If there is something that * 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)
* correct DSISR so that it can be serviced properly. So detect this * correct DSISR so that it can be serviced properly. So detect this
* case and mark it as handled. * case and mark it as handled.
*/ */
if (SRR1_MC_LOADSTORE(regs->msr) && regs->dsisr == 0x40000000) if (SRR1_MC_LOADSTORE(regs->msr) && regs->dsisr == 0x02000000)
return 1; return 1;
return mce_handle_error(regs, mce_p9_derror_table, mce_p9_ierror_table); return mce_handle_error(regs, mce_p9_derror_table, mce_p9_ierror_table);