diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 17:43:51 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 13:07:08 +1100 |
| commit | 74408776752ae5af0f7ebdd7fc4c35aa51c88e48 (patch) | |
| tree | 401a9f684f41ba8ba6ef452055276e090875b059 /arch/powerpc/kernel | |
| parent | 9bcb81bf6882cebb686fc4c99e9c824908e1909d (diff) | |
powerpc/64s: Consolidate Hypervisor Virtualization 0xea0 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 3e347c72a941..54e352d6b50c 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1015,6 +1015,12 @@ EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, unknown_exception) __EXC_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0xec0) +__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0) +__EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0) +__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0) +TRAMP_KVM_HV(PACA_EXGEN, 0xea0) +EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ) + EXC_REAL_NONE(0xec0, 0xf00) @@ -1153,10 +1159,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) b . #endif - /* moved from 0xe00 */ -__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0) -TRAMP_KVM_HV(PACA_EXGEN, 0xea0) - /* moved from 0xf00 */ __TRAMP_REAL_REAL_OOL(performance_monitor, 0xf00) TRAMP_KVM(PACA_EXGEN, 0xf00) @@ -1293,7 +1295,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ) EXC_COMMON_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception) EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception) EXC_COMMON_HV(denorm_common, 0x1500, unknown_exception) @@ -1319,8 +1320,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -__EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0) - EXC_VIRT_NONE(0x4ec0, 0x4f00) __EXC_VIRT_OOL(performance_monitor, 0x4f00, 0x4f20) @@ -1422,7 +1421,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_MASKABLE_HV(h_virt_irq, 0xea0) __TRAMP_REAL_VIRT_OOL(performance_monitor, 0xf00) __TRAMP_REAL_VIRT_OOL(altivec_unavailable, 0xf20) __TRAMP_REAL_VIRT_OOL(vsx_unavailable, 0xf40) |