Commit fa2760ec authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s/exception: machine check remove machine_check_pSeries_0 branch 



This label has only one caller, so unwind the branch and move it
inline. The location of the comment is adjusted to match similar
one in system reset.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190802105709.27696-7-npiggin@gmail.com
parent b5c27f7c

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

+10 −13
Original line number Diff line number Diff line
@@ -1014,20 +1014,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE) 
	b	1b

	b	.	/* prevent speculative execution */



TRAMP_REAL_BEGIN(machine_check_pSeries)

	.globl machine_check_fwnmi

machine_check_fwnmi:

#ifdef CONFIG_PPC_PSERIES

TRAMP_REAL_BEGIN(machine_check_fwnmi)

	EXCEPTION_PROLOG_0 PACA_EXMC

	b	machine_check_common_early



machine_check_pSeries_0:

	EXCEPTION_PROLOG_1 EXC_STD, PACA_EXMC, 1, 0x200, 1, 1, 0

	/*

	 * MSR_RI is not enabled, because PACA_EXMC is being used, so a

	 * nested machine check corrupts it. machine_check_common enables

	 * MSR_RI.

	 */

	EXCEPTION_PROLOG_2_REAL machine_check_common, EXC_STD, 0

#endif



TRAMP_KVM_SKIP(PACA_EXMC, 0x200)
@@ -1197,7 +1188,13 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE) 
	/* Deliver the machine check to host kernel in V mode. */

	MACHINE_CHECK_HANDLER_WINDUP

	EXCEPTION_PROLOG_0 PACA_EXMC

	b	machine_check_pSeries_0

	EXCEPTION_PROLOG_1 EXC_STD, PACA_EXMC, 1, 0x200, 1, 1, 0

	EXCEPTION_PROLOG_2_REAL machine_check_common, EXC_STD, 0

	/*

	 * MSR_RI is not enabled, because PACA_EXMC is being used, so a

	 * nested machine check corrupts it. machine_check_common enables

	 * MSR_RI.

	 */



EXC_COMMON_BEGIN(unrecover_mce)

	/* Invoke machine_check_exception to print MCE event and panic. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE