diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 10:44:03 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 05:07:14 +0300 |
| commit | b51c079ed4dcc321010110a3514f09d5fcd01a01 (patch) | |
| tree | 929d63e7e8a62df2f482a66e5e69b659641162b9 /arch | |
| parent | 69a793444c7a159e66ee3a0a407a2dad7ef5d116 (diff) | |
| download | linux-b51c079ed4dcc321010110a3514f09d5fcd01a01.tar.xz | |
powerpc/64s: Consolidate Altivec 0x1700 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 40da203d4a07..389032a8e744 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1251,8 +1251,14 @@ EXC_REAL_NONE(0x1600, 0x1700) EXC_REAL(altivec_assist, 0x1700, 0x1800) - +EXC_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700) TRAMP_KVM(PACA_EXGEN, 0x1700) +#ifdef CONFIG_ALTIVEC +EXC_COMMON(altivec_assist_common, 0x1700, altivec_assist_exception) +#else +EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) +#endif + #ifdef CONFIG_CBE_RAS EXC_REAL_HV(cbe_thermal, 0x1800, 0x1900) @@ -1388,12 +1394,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -#ifdef CONFIG_ALTIVEC -EXC_COMMON(altivec_assist_common, 0x1700, altivec_assist_exception) -#else -EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) -#endif - /* * Relocation-on interrupts: A subset of the interrupts can be delivered * with IR=1/DR=1, if AIL==2 and MSR.HV won't be changed by delivering @@ -1410,8 +1410,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700) - EXC_VIRT_NONE(0x5800, 0x5900) EXC_COMMON_BEGIN(ppc64_runlatch_on_trampoline) |