Commit b5c27f7c authored Aug 02, 2019 by Nicholas Piggin Committed by Michael Ellerman Aug 30, 2019

powerpc/64s/exception: machine check pseries should always run the early handler



Now that pseries with fwnmi registered runs the early machine check
handler, there is no good reason to special case the non-fwnmi case
and skip the early handler. Reducing the code and number of paths is
a top priority for asm code, it's better to handle this in C where
possible (and the pseries early handler is a no-op if fwnmi is not
registered).

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190802105709.27696-6-npiggin@gmail.com

parent fe9d482b

arch/powerpc/kernel/exceptions-64s.S

+0 −4

Original line number	Diff line number	Diff line
		@@ -934,11 +934,7 @@ EXC_COMMON_BEGIN(system_reset_common)

		EXC_REAL_BEGIN(machine_check, 0x200, 0x100)
		EXCEPTION_PROLOG_0 PACA_EXMC
		BEGIN_FTR_SECTION
		b machine_check_common_early
		FTR_SECTION_ELSE
		b machine_check_pSeries_0
		ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)
		EXC_REAL_END(machine_check, 0x200, 0x100)
		EXC_VIRT_NONE(0x4200, 0x100)
		TRAMP_REAL_BEGIN(machine_check_common_early)

Admin message