From 031b4026a8e3a3340e6b99ba7e167c2d6bb4e498 Mon Sep 17 00:00:00 2001 From: Nicholas Piggin Date: Wed, 21 Sep 2016 17:43:48 +1000 Subject: [PATCH] powerpc/64s: Consolidate Hypervisor Emulation Assistance 0xe40 interrupt Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/exceptions-64s.S | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 5b2afa5ef919..128b21b42f8b 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -937,6 +937,12 @@ EXC_COMMON(h_instr_storage_common, 0xe20, unknown_exception) __EXC_REAL_OOL_HV(emulation_assist, 0xe40, 0xe60) +__TRAMP_REAL_REAL_OOL_HV(emulation_assist, 0xe40) +__EXC_VIRT_OOL_HV(emulation_assist, 0x4e40, 0x4e60) +__TRAMP_REAL_VIRT_OOL_HV(emulation_assist, 0xe40) +TRAMP_KVM_HV(PACA_EXGEN, 0xe40) +EXC_COMMON(emulation_assist_common, 0xe40, emulation_assist_interrupt) + __EXC_REAL_OOL_HV_DIRECT(hmi_exception, 0xe60, 0xe80, hmi_exception_early) @@ -1082,9 +1088,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) #endif /* moved from 0xe00 */ -__TRAMP_REAL_REAL_OOL_HV(emulation_assist, 0xe40) -TRAMP_KVM_HV(PACA_EXGEN, 0xe40) - __TRAMP_REAL_REAL_OOL_MASKABLE_HV(hmi_exception, 0xe60) TRAMP_KVM_HV(PACA_EXGEN, 0xe60) @@ -1230,7 +1233,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -EXC_COMMON(emulation_assist_common, 0xe40, emulation_assist_interrupt) EXC_COMMON_ASYNC(hmi_exception_common, 0xe60, handle_hmi_exception) #ifdef CONFIG_PPC_DOORBELL EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, doorbell_exception) @@ -1263,8 +1265,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -__EXC_VIRT_OOL_HV(emulation_assist, 0x4e40, 0x4e60) - EXC_VIRT_BEGIN(unused, 0x4e60, 0x4e80) b . /* Can't happen, see v2.07 Book III-S section 6.5 */ EXC_VIRT_END(unused, 0x4e60, 0x4e80) @@ -1374,7 +1374,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX) b ret_from_except /* Equivalents to the above handlers for relocation-on interrupt vectors */ -__TRAMP_REAL_VIRT_OOL_HV(emulation_assist, 0xe40) __TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_doorbell, 0xe80) __TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0) __TRAMP_REAL_VIRT_OOL(performance_monitor, 0xf00) -- 2.20.1