[PATCH 16/41] powerpc/64s: consolidate Directed Privileged Doorbell 0xa00 interrupt
From: Nicholas Piggin <npiggin@gmail.com>
Date: 2016-09-21 07:45:11
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index c18f48e..4c4bdda 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S@@ -846,8 +846,14 @@ COMMON_HANDLER(hdecrementer_common, 0x980, hdec_interrupt) VECTOR_HANDLER_REAL_MASKABLE(doorbell_super, 0xa00, 0xb00) - +VECTOR_HANDLER_VIRT_MASKABLE(doorbell_super, 0x4a00, 0x4b00, 0xa00) TRAMP_KVM(PACA_EXGEN, 0xa00) +#ifdef CONFIG_PPC_DOORBELL +COMMON_HANDLER_ASYNC(doorbell_super_common, 0xa00, doorbell_exception) +#else +COMMON_HANDLER_ASYNC(doorbell_super_common, 0xa00, unknown_exception) +#endif + VECTOR_HANDLER_REAL(trap_0b, 0xb00, 0xc00)
@@ -1198,11 +1204,6 @@ TRAMP_HANDLER_END(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -#ifdef CONFIG_PPC_DOORBELL -COMMON_HANDLER_ASYNC(doorbell_super_common, 0xa00, doorbell_exception) -#else -COMMON_HANDLER_ASYNC(doorbell_super_common, 0xa00, unknown_exception) -#endif COMMON_HANDLER(trap_0b_common, 0xb00, unknown_exception) COMMON_HANDLER(single_step_common, 0xd00, single_step_exception) COMMON_HANDLER(trap_0e_common, 0xe00, unknown_exception)
@@ -1242,7 +1243,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) -VECTOR_HANDLER_VIRT_MASKABLE(doorbell_super, 0x4a00, 0x4b00, 0xa00) VECTOR_HANDLER_VIRT(trap_0b, 0x4b00, 0x4c00, 0xb00) VECTOR_HANDLER_VIRT_BEGIN(system_call, 0x4c00, 0x4d00)
--
2.9.3