powerpc/64s: consolidate MCE counter increment. (8a03e81c) · Commits · 戴 / test

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: ("powerpc/pseries: Flush SLB contents on SLB MCE errors.") Signed-off-by:

Michal Suchanek <msuchanek@suse.de> Signed-off-by:

Michael Ellerman <mpe@ellerman.id.au>

arch/powerpc/kernel/traps.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -741,8 +741,6 @@ void machine_check_exception(struct pt_regs *regs)
		if (!nested)
		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);

		add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);

arch/powerpc/platforms/powernv/opal.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -578,8 +578,6 @@ int opal_machine_check(struct pt_regs *regs)
		{
		struct machine_check_event evt;

		__this_cpu_inc(irq_stat.mce_exceptions);

		if (!get_mce_event(&evt, MCE_EVENT_RELEASE))
		return 0;

Admin message