diff options
| author | Nicholas Piggin | 2016-09-21 09:43:40 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-10-04 04:07:02 +0200 |
| commit | 39c0da57a97456bb56b675545395fc99c97f3f64 (patch) | |
| tree | 1ffeacf6d1197f3dba1052a7565a981ae8b65839 /arch/powerpc/kernel/exceptions-64s.S | |
| parent | powerpc/64s: Consolidate FP Unavailable 0x800 interrupt (diff) | |
| download | kernel-qcow2-linux-39c0da57a97456bb56b675545395fc99c97f3f64.tar.gz kernel-qcow2-linux-39c0da57a97456bb56b675545395fc99c97f3f64.tar.xz kernel-qcow2-linux-39c0da57a97456bb56b675545395fc99c97f3f64.zip | |
powerpc/64s: Consolidate Decrementer 0x900 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index ac727633cbb1..01d5af00f2e2 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -837,6 +837,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM) EXC_REAL_MASKABLE(decrementer, 0x900, 0x980) +EXC_VIRT_MASKABLE(decrementer, 0x4900, 0x4980, 0x900) +TRAMP_KVM(PACA_EXGEN, 0x900) +EXC_COMMON_ASYNC(decrementer_common, 0x900, timer_interrupt) + EXC_REAL_HV(hdecrementer, 0x980, 0xa00) @@ -969,7 +973,6 @@ EXC_REAL_NONE(0x1800, 0x1900) /*** Out of line interrupts support ***/ /* moved from 0x200 */ -TRAMP_KVM(PACA_EXGEN, 0x900) TRAMP_KVM_HV(PACA_EXGEN, 0x980) #ifdef CONFIG_PPC_DENORMALISATION @@ -1190,7 +1193,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -EXC_COMMON_ASYNC(decrementer_common, 0x900, timer_interrupt) EXC_COMMON(hdecrementer_common, 0x980, hdec_interrupt) #ifdef CONFIG_PPC_DOORBELL @@ -1234,7 +1236,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT_MASKABLE(decrementer, 0x4900, 0x4980, 0x900) EXC_VIRT_HV(hdecrementer, 0x4980, 0x4a00, 0x980) EXC_VIRT_MASKABLE(doorbell_super, 0x4a00, 0x4b00, 0xa00) EXC_VIRT(trap_0b, 0x4b00, 0x4c00, 0xb00) |