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

powerpc/64s: Consolidate Altivec 0x1700 interrupt 



Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 69a79344

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

+7 −9
Original line number Diff line number Diff line
@@ -1251,8 +1251,14 @@ EXC_REAL_NONE(0x1600, 0x1700) 




EXC_REAL(altivec_assist, 0x1700, 0x1800)



EXC_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700)

TRAMP_KVM(PACA_EXGEN, 0x1700)

#ifdef CONFIG_ALTIVEC

EXC_COMMON(altivec_assist_common, 0x1700, altivec_assist_exception)

#else

EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception)

#endif





#ifdef CONFIG_CBE_RAS

EXC_REAL_HV(cbe_thermal, 0x1800, 0x1900)
@@ -1388,12 +1394,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) 
/*** Common interrupt handlers ***/





#ifdef CONFIG_ALTIVEC

EXC_COMMON(altivec_assist_common, 0x1700, altivec_assist_exception)

#else

EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception)

#endif



	/*

	 * Relocation-on interrupts: A subset of the interrupts can be delivered

	 * with IR=1/DR=1, if AIL==2 and MSR.HV won't be changed by delivering
@@ -1410,8 +1410,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) 
	 * come here.

	 */



EXC_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700)



EXC_VIRT_NONE(0x5800, 0x5900)



EXC_COMMON_BEGIN(ppc64_runlatch_on_trampoline)