diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 17:43:56 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 13:07:11 +1100 |
| commit | 1134713c26330ddf554122dae260e4d1546514a7 (patch) | |
| tree | 2f700574c62632d19a36d0d4c6af7f403159587f /arch/powerpc/kernel | |
| parent | 792cbddd628282027f99f5499f2899613e07f8f9 (diff) | |
| download | lwn-1134713c26330ddf554122dae260e4d1546514a7.tar.gz lwn-1134713c26330ddf554122dae260e4d1546514a7.zip | |
powerpc/64s: Consolidate Facility Unavailable 0xf60 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 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index f8015d22657f..2e89d4bfc7e6 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1112,6 +1112,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX) __EXC_REAL_OOL(facility_unavailable, 0xf60, 0xf80) +__TRAMP_REAL_REAL_OOL(facility_unavailable, 0xf60) +__EXC_VIRT_OOL(facility_unavailable, 0x4f60, 0x4f80) +__TRAMP_REAL_VIRT_OOL(facility_unavailable, 0xf60) +TRAMP_KVM(PACA_EXGEN, 0xf60) +EXC_COMMON(facility_unavailable_common, 0xf60, facility_unavailable_exception) + __EXC_REAL_OOL_HV(h_facility_unavailable, 0xf80, 0xfa0) @@ -1241,9 +1247,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) #endif /* moved from 0xf00 */ -__TRAMP_REAL_REAL_OOL(facility_unavailable, 0xf60) -TRAMP_KVM(PACA_EXGEN, 0xf60) - __TRAMP_REAL_REAL_OOL_HV(h_facility_unavailable, 0xf80) TRAMP_KVM_HV(PACA_EXGEN, 0xf80) @@ -1391,8 +1394,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -__EXC_VIRT_OOL(facility_unavailable, 0x4f60, 0x4f80) - __EXC_VIRT_OOL_HV(h_facility_unavailable, 0x4f80, 0x4fa0) EXC_VIRT_NONE(0x4fa0, 0x5200) @@ -1419,7 +1420,6 @@ EXC_COMMON_BEGIN(ppc64_runlatch_on_trampoline) b __ppc64_runlatch_on /* Equivalents to the above handlers for relocation-on interrupt vectors */ -__TRAMP_REAL_VIRT_OOL(facility_unavailable, 0xf60) __TRAMP_REAL_VIRT_OOL_HV(h_facility_unavailable, 0xf80) USE_FIXED_SECTION(virt_trampolines) @@ -1435,7 +1435,6 @@ USE_FIXED_SECTION(virt_trampolines) __end_interrupts: DEFINE_FIXED_SYMBOL(__end_interrupts) -EXC_COMMON(facility_unavailable_common, 0xf60, facility_unavailable_exception) EXC_COMMON(h_facility_unavailable_common, 0xf80, facility_unavailable_exception) #ifdef CONFIG_CBE_RAS |