p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

powerpc/64s: Consolidate Directed Hypervisor Doorbell 0xe80 interrupt 

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin 2016-09-21 17:43:50 +10:00 committed by Michael Ellerman
parent 62f9b03b06
commit 9bcb81bf68
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/powerpc/kernel/exceptions-64s.S
View File

@ -1003,6 +1003,16 @@ EXC_COMMON_ASYNC(hmi_exception_common, 0xe60, handle_hmi_exception)
__EXC_REAL_OOL_MASKABLE_HV(h_doorbell, 0xe80, 0xea0) __EXC_REAL_OOL_MASKABLE_HV(h_doorbell, 0xe80, 0xea0)
__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_doorbell, 0xe80)
__EXC_VIRT_OOL_MASKABLE_HV(h_doorbell, 0x4e80, 0x4ea0)
__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_doorbell, 0xe80)
TRAMP_KVM_HV(PACA_EXGEN, 0xe80)
#ifdef CONFIG_PPC_DOORBELL
EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, doorbell_exception)
#else
EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, unknown_exception)
#endif
__EXC_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0xec0) __EXC_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0xec0)
@ -1144,9 +1154,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
#endif #endif
/* moved from 0xe00 */ /* moved from 0xe00 */
__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_doorbell, 0xe80)
TRAMP_KVM_HV(PACA_EXGEN, 0xe80)
__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0) __TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0)
TRAMP_KVM_HV(PACA_EXGEN, 0xea0) TRAMP_KVM_HV(PACA_EXGEN, 0xea0)
@ -1286,11 +1293,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt)
/*** Common interrupt handlers ***/ /*** Common interrupt handlers ***/
#ifdef CONFIG_PPC_DOORBELL
EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, doorbell_exception)
#else
EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, unknown_exception)
#endif
EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ) EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ)
EXC_COMMON_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception) EXC_COMMON_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception)
EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception) EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception)
@ -1317,8 +1319,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception)
* come here. * come here.
*/ */
__EXC_VIRT_OOL_MASKABLE_HV(h_doorbell, 0x4e80, 0x4ea0)
__EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0) __EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0)
EXC_VIRT_NONE(0x4ec0, 0x4f00) EXC_VIRT_NONE(0x4ec0, 0x4f00)
@ -1422,7 +1422,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
b ret_from_except b ret_from_except
/* Equivalents to the above handlers for relocation-on interrupt vectors */ /* Equivalents to the above handlers for relocation-on interrupt vectors */
__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_doorbell, 0xe80)
__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0) __TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0)
__TRAMP_REAL_VIRT_OOL(performance_monitor, 0xf00) __TRAMP_REAL_VIRT_OOL(performance_monitor, 0xf00)
__TRAMP_REAL_VIRT_OOL(altivec_unavailable, 0xf20) __TRAMP_REAL_VIRT_OOL(altivec_unavailable, 0xf20)