mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-07 11:28:32 +00:00
Code Issues Releases Wiki Activity

powerpc/64s: consolidate MCE counter increment.

Browse source 
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: a43c159042 ("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>
This commit is contained in:
Michal Suchanek 2018-09-26 14:24:30 +02:00 committed by Michael Ellerman
parent 51303113e3
commit 8a03e81cb1
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -741,9 +741,7 @@ 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 */ __this_cpu_inc(irq_stat.mce_exceptions);
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); add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);

2
arch/powerpc/platforms/powernv/opal.c
View file

@ -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;