From patchwork Wed Sep 21 07:43:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 672645 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfBww6y2Hz9s4x for ; Wed, 21 Sep 2016 18:04:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=f52k816m; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sfBww5qy6zDsqP for ; Wed, 21 Sep 2016 18:04:32 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=f52k816m; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x244.google.com (mail-pa0-x244.google.com [IPv6:2607:f8b0:400e:c03::244]) (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 3sfBVK3l7gzDshH for ; Wed, 21 Sep 2016 17:44:57 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=f52k816m; dkim-atps=neutral Received: by mail-pa0-x244.google.com with SMTP id s3so575629pay.1 for ; Wed, 21 Sep 2016 00:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xbt/Muyz/doJ0SajPLbSYKj9xFnNUMfAOXH/ulLndbE=; b=f52k816mvvF89osNHSA6OlTYcegISA8Ux3lTH5jufo6cCJSoAlHPYNYLnPT3ZMd7Kj bmNTLCiqyL4YQx9Ba9zHm67E3K1FyZhgzCL2T4iZjqEk3HYQ7j9274QStWJza1qzaDvU nWNXB4o7RHIpNGM4hf5AV1SmRmJZ4zYWT0JvxDgkEKX828uH/fjFyrK2ayxP9+p2GE9O lcTmEQ9UlwgrBSe3+dMy1oOAq8aeeejoNw/Gm3594P2Flu+oAVo8VoE8SNLUmVUnI1g3 FUJGzC8fMhg6/ubTBvqNTKX79iHEniWknNtPY72hH7m3w9TP2kWUUdeLRijuD5wp38VM +uOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xbt/Muyz/doJ0SajPLbSYKj9xFnNUMfAOXH/ulLndbE=; b=AQ0/vwjVbNtdsH/kmJ+NDoElHM6OYs3F3o0foiR/5kTddbTO1PyVbRd0CfPW0+W9s1 ytZNBczwOuRvfd/eJ26jusQq3JBrNhqWYBTiQZ8Bp7y4BXF0S+juIo9Ywzm6m/hlqrXL nYEFF3MMh61TLF+U10C7m94KusYdHmAVyWwGxDuYLMrG6WlOarmJL7gi3j8T0wSvtCBo sS5JxVT/SzzLXEUdrq5F15PHYJJpU7+Sf8HTmQW8ScwR2LD8LGpJDCc0FbiB08xIqe0Z eqzxRON0sXf7oaEBJLXX2xB36esFk6X2EXS5Qs3CdAoID3rjx9yghnvrYcFgv9YjEQ1R idiw== X-Gm-Message-State: AE9vXwODQ4clx3BQaXHS4vFDIef8iRBywqvb8JPer0I2byLp3HKCGDat4z0oQFHNRC5rXA== X-Received: by 10.66.54.132 with SMTP id j4mr63026309pap.110.1474443895919; Wed, 21 Sep 2016 00:44:55 -0700 (PDT) Received: from roar.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id xv9sm44135600pab.36.2016.09.21.00.44.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2016 00:44:55 -0700 (PDT) From: Nicholas Piggin To: Michael Ellerman Subject: [PATCH 10/41] powerpc/64s: consolidate External 0x500 interrupt Date: Wed, 21 Sep 2016 17:43:36 +1000 Message-Id: <20160921074407.4885-11-npiggin@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160921074407.4885-1-npiggin@gmail.com> References: <20160921074407.4885-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 0320b60..fc5ad5c 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -752,6 +752,19 @@ do_kvm_0x500: ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206) VECTOR_HANDLER_REAL_END(hardware_interrupt, 0x500, 0x600) +VECTOR_HANDLER_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x4600) + .globl hardware_interrupt_relon_hv; +hardware_interrupt_relon_hv: + BEGIN_FTR_SECTION + _MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common, EXC_HV, SOFTEN_TEST_HV) + FTR_SECTION_ELSE + _MASKABLE_RELON_EXCEPTION_PSERIES(0x500, FIXED_SECTION_REL_ADDR(text, hardware_interrupt_common), EXC_STD, SOFTEN_TEST_PR) + ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE) +VECTOR_HANDLER_VIRT_END(hardware_interrupt, 0x4500, 0x4600) + +COMMON_HANDLER_ASYNC(hardware_interrupt_common, 0x500, do_IRQ) + + VECTOR_HANDLER_REAL(alignment, 0x600, 0x700) TRAMP_KVM(PACA_EXGEN, 0x600) @@ -1122,7 +1135,6 @@ TRAMP_HANDLER_END(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -COMMON_HANDLER_ASYNC(hardware_interrupt_common, 0x500, do_IRQ) COMMON_HANDLER_ASYNC(decrementer_common, 0x900, timer_interrupt) COMMON_HANDLER(hdecrementer_common, 0x980, hdec_interrupt) @@ -1170,16 +1182,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) -VECTOR_HANDLER_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x4600) - .globl hardware_interrupt_relon_hv; -hardware_interrupt_relon_hv: - BEGIN_FTR_SECTION - _MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common, EXC_HV, SOFTEN_TEST_HV) - FTR_SECTION_ELSE - _MASKABLE_RELON_EXCEPTION_PSERIES(0x500, FIXED_SECTION_REL_ADDR(text, hardware_interrupt_common), EXC_STD, SOFTEN_TEST_PR) - ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE) -VECTOR_HANDLER_VIRT_END(hardware_interrupt, 0x4500, 0x4600) - VECTOR_HANDLER_VIRT(alignment, 0x4600, 0x4700, 0x600) VECTOR_HANDLER_VIRT(program_check, 0x4700, 0x4800, 0x700) VECTOR_HANDLER_VIRT(fp_unavailable, 0x4800, 0x4900, 0x800)