nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

powerpc: Machine check interrupt is a non-maskable interrupt

Browse source 
Use nmi_enter similarly to system reset interrupts. This uses NMI
printk NMI buffers and turns off various debugging facilities that
helps avoid tripping on ourselves or other CPUs.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin 2017-07-19 16:59:12 +10:00 committed by Michael Ellerman
parent 6fcd6baa90
commit b96672dd84
1 changed files with 6 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
arch/powerpc/kernel/traps.c
View file

@ -644,8 +644,10 @@ int machine_check_generic(struct pt_regs *regs)
void machine_check_exception(struct pt_regs *regs) void machine_check_exception(struct pt_regs *regs)
{ {
enum ctx_state prev_state = exception_enter();
int recover = 0; int recover = 0;
bool nested = in_nmi();
if (!nested)
nmi_enter();
/* 64s accounts the mce in machine_check_early when in HVMODE */ /* 64s accounts the mce in machine_check_early when in HVMODE */
if (!IS_ENABLED(CONFIG_PPC_BOOK3S_64) || !cpu_has_feature(CPU_FTR_HVMODE)) if (!IS_ENABLED(CONFIG_PPC_BOOK3S_64) || !cpu_has_feature(CPU_FTR_HVMODE))
@ -677,10 +679,11 @@ void machine_check_exception(struct pt_regs *regs)
/* Must die if the interrupt is not recoverable */ /* Must die if the interrupt is not recoverable */
if (!(regs->msr & MSR_RI)) if (!(regs->msr & MSR_RI))
panic("Unrecoverable Machine check"); nmi_panic(regs, "Unrecoverable Machine check");
bail: bail:
exception_exit(prev_state); if (!nested)
nmi_exit();
} }
void SMIException(struct pt_regs *regs) void SMIException(struct pt_regs *regs)