Commit 8a03e81c authored by Michal Suchanek's avatar Michal Suchanek Committed by Michael Ellerman

powerpc/64s: consolidate MCE counter increment.

The code in machine_check_exception excludes 64s hvmode when
incrementing the MCE counter only to call opal_machine_check to
increment it specifically for this case.

Remove the exclusion and special case.

Fixes: a43c1590 ("powerpc/pseries: Flush SLB contents on SLB MCE
		errors.")
Signed-off-by: default avatarMichal Suchanek <msuchanek@suse.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 51303113
...@@ -741,8 +741,6 @@ void machine_check_exception(struct pt_regs *regs) ...@@ -741,8 +741,6 @@ void machine_check_exception(struct pt_regs *regs)
if (!nested) if (!nested)
nmi_enter(); nmi_enter();
/* 64s accounts the mce in machine_check_early when in HVMODE */
if (!IS_ENABLED(CONFIG_PPC_BOOK3S_64) || !cpu_has_feature(CPU_FTR_HVMODE))
__this_cpu_inc(irq_stat.mce_exceptions); __this_cpu_inc(irq_stat.mce_exceptions);
add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE); add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);
......
...@@ -578,8 +578,6 @@ int opal_machine_check(struct pt_regs *regs) ...@@ -578,8 +578,6 @@ int opal_machine_check(struct pt_regs *regs)
{ {
struct machine_check_event evt; struct machine_check_event evt;
__this_cpu_inc(irq_stat.mce_exceptions);
if (!get_mce_event(&evt, MCE_EVENT_RELEASE)) if (!get_mce_event(&evt, MCE_EVENT_RELEASE))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment