Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1134713c authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: Consolidate Facility Unavailable 0xf60 interrupt 



Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 792cbddd

arch/powerpc/kernel/exceptions-64s.S

+6 −7
Original line number Diff line number Diff line
@@ -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