From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sfBWB6VCJzDsgm for ; Wed, 21 Sep 2016 17:45:42 +1000 (AEST) Received: by mail-pf0-x241.google.com with SMTP id 21so2038809pfy.1 for ; Wed, 21 Sep 2016 00:45:42 -0700 (PDT) From: Nicholas Piggin To: Michael Ellerman Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 30/41] powerpc/64s: consolidate Facility Unavailable 0xf60 interrupt Date: Wed, 21 Sep 2016 17:43:56 +1000 Message-Id: <20160921074407.4885-31-npiggin@gmail.com> In-Reply-To: <20160921074407.4885-1-npiggin@gmail.com> References: <20160921074407.4885-1-npiggin@gmail.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 7df5c63..dfc1ced 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1111,6 +1111,12 @@ COMMON_HANDLER_END(vsx_unavailable_common) __VECTOR_HANDLER_REAL_OOL(facility_unavailable, 0xf60, 0xf80) +__TRAMP_HANDLER_REAL_OOL(facility_unavailable, 0xf60) +__VECTOR_HANDLER_VIRT_OOL(facility_unavailable, 0x4f60, 0x4f80) +__TRAMP_HANDLER_VIRT_OOL(facility_unavailable, 0xf60) +TRAMP_KVM(PACA_EXGEN, 0xf60) +COMMON_HANDLER(facility_unavailable_common, 0xf60, facility_unavailable_exception) + __VECTOR_HANDLER_REAL_OOL_HV(h_facility_unavailable, 0xf80, 0xfa0) @@ -1242,9 +1248,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) TRAMP_HANDLER_END(denorm_assist) /* moved from 0xf00 */ -__TRAMP_HANDLER_REAL_OOL(facility_unavailable, 0xf60) -TRAMP_KVM(PACA_EXGEN, 0xf60) - __TRAMP_HANDLER_REAL_OOL_HV(h_facility_unavailable, 0xf80) TRAMP_KVM_HV(PACA_EXGEN, 0xf80) @@ -1394,18 +1397,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) * come here. */ - - - - - - - - - - -__VECTOR_HANDLER_VIRT_OOL(facility_unavailable, 0x4f60, 0x4f80) - __VECTOR_HANDLER_VIRT_OOL_HV(h_facility_unavailable, 0x4f80, 0x4fa0) VECTOR_HANDLER_VIRT_NONE(0x4fa0, 0x5200) @@ -1433,7 +1424,6 @@ TRAMP_HANDLER_BEGIN(ppc64_runlatch_on_trampoline) TRAMP_HANDLER_END(ppc64_runlatch_on_trampoline) /* Equivalents to the above handlers for relocation-on interrupt vectors */ -__TRAMP_HANDLER_VIRT_OOL(facility_unavailable, 0xf60) __TRAMP_HANDLER_VIRT_OOL_HV(h_facility_unavailable, 0xf80) USE_FIXED_SECTION(virt_trampolines) @@ -1449,7 +1439,6 @@ USE_FIXED_SECTION(virt_trampolines) __end_interrupts: UNUSE_FIXED_SECTION(virt_trampolines) -COMMON_HANDLER(facility_unavailable_common, 0xf60, facility_unavailable_exception) COMMON_HANDLER(h_facility_unavailable_common, 0xf80, facility_unavailable_exception) #ifdef CONFIG_CBE_RAS -- 2.9.3