powerpc/64s/exception: fix sreset KVM test code (8f528359) · Commits · 戴 / test

The sreset handler KVM test theoretically should not depend on P7. In practice KVM now only supports P7 and up so no real bug fix, but this change is made now so the quirk is not propagated through cleanup patches. Signed-off-by:

Nicholas Piggin <npiggin@gmail.com> Signed-off-by:

Michael Ellerman <mpe@ellerman.id.au>

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -126,10 +126,10 @@ EXC_VIRT_NONE(0x4000, 0x100)
		bltlr cr1 ; /* no state loss, return to idle caller */ \
		BRANCH_TO_C000(r10, system_reset_idle_common) ; \
		1: \
		KVMTEST_PR(n) ; \
		END_FTR_SECTION_IFSET(CPU_FTR_HVMODE \| CPU_FTR_ARCH_206)
		END_FTR_SECTION_IFSET(CPU_FTR_HVMODE \| CPU_FTR_ARCH_206) ; \
		KVMTEST_PR(n)
		#else
		#define IDLETEST NOTEST
		#define IDLETEST KVMTEST_PR
		#endif

		EXC_REAL_BEGIN(system_reset, 0x100, 0x100)

Admin message