From patchwork Wed Sep 21 07:43:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 672637 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 3sfBhM1SM5z9s9Y for ; Wed, 21 Sep 2016 17:53:39 +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=GDuWi1lu; 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 3sfBhM04SnzDsmW for ; Wed, 21 Sep 2016 17:53:39 +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=GDuWi1lu; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x241.google.com (mail-pa0-x241.google.com [IPv6:2607:f8b0:400e:c03::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 3sfBV36fxhzDshH for ; Wed, 21 Sep 2016 17:44:43 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=GDuWi1lu; dkim-atps=neutral Received: by mail-pa0-x241.google.com with SMTP id s3so575389pay.1 for ; Wed, 21 Sep 2016 00:44:43 -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=nnupDqwgNbwC2j5sGyuvFg31u2SNhWCLJDMyAE/FT8o=; b=GDuWi1luBuGP+XeIwEKOixq3vfDJmb7D0iuup5TzeaQhNPBqH16ovGHua5khRQR8nw boxAhjDvX6EZb2br48kVF6OtBldtTJErwMT9xR5KXxhBX0jc0b/gOFco+/y4FvjgD01k /ZsvXRNTZG7+5MuD00zSB2AV3B9kd3G7yLl9A0CMxP2OvO+BWTB+gLUwqJu/kY+2OsIE PMqqrHLhvH9ONrHJfFb7u5ZVEws7vQoTH1vfJ90jxAYW0iUP5eJkJ+PnuamF4ui13bgk bmxzzYmJ0rlJAgjoiBmeSv9AKvW0VLv53c4LTZYSW7ha0M7bft2iRv3vAdTgDcMjXNz2 AzyQ== 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=nnupDqwgNbwC2j5sGyuvFg31u2SNhWCLJDMyAE/FT8o=; b=BTLzUrbQ83/WgdTJDd/Fkeb5DarDjlg3VhNhiyxFyv1MrlqY2q11ZXptuS8Z9xXKfe vIaQW5z63nsYGjcCHNfgTjaTkLtxAWcL8GHuyERYblGHBtnWuulf08MPh1bEnjM2dR9E 0VBA6z0RrpIktKYyCxSMq1LL9WrSOvqXUSrEMcNsSjmIdXgjHR59DcPWdR+9JEnWlikA hZW1APeykig56m7F57whbro2N9RRkZmp7NiFC51V1q8KLBbnZViPWk4NwHzXYPXLLBPQ XCzKpHwUUy9EJM+lek0TDthFKPTEwD44UzaGPhpPv1lGOgoi44YVmJI6mcleKkgkMboj XoOw== X-Gm-Message-State: AE9vXwMs2jI24WgZYeIRG6+IYDKDsrLmkvvjTobtAvBgusOFenIDSvU3pncfgHSkUS1KJA== X-Received: by 10.66.1.71 with SMTP id 7mr48059255pak.168.1474443882248; Wed, 21 Sep 2016 00:44:42 -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.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2016 00:44:41 -0700 (PDT) From: Nicholas Piggin To: Michael Ellerman Subject: [PATCH 04/41] powerpc/64s: consolidate System Reset 0x100 interrupt Date: Wed, 21 Sep 2016 17:43:30 +1000 Message-Id: <20160921074407.4885-5-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 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 11a7b28..a562285 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -185,6 +185,20 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206) EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD, NOTEST, 0x100) VECTOR_HANDLER_REAL_END(system_reset, 0x100, 0x200) +VECTOR_HANDLER_VIRT_NONE(0x4100, 0x4200) +COMMON_HANDLER(system_reset_common, 0x100, system_reset_exception) + +#ifdef CONFIG_PPC_PSERIES +/* + * Vectors for the FWNMI option. Share common code. + */ +TRAMP_HANDLER_BEGIN(system_reset_fwnmi) + SET_SCRATCH0(r13) /* save r13 */ + EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD, + NOTEST, 0x100) +TRAMP_HANDLER_END(system_reset_fwnmi) +#endif /* CONFIG_PPC_PSERIES */ + VECTOR_HANDLER_REAL_BEGIN(machine_check, 0x200, 0x300) /* This is moved out of line as it can be patched by FW, but @@ -708,18 +722,6 @@ FTR_SECTION_ELSE ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE) blr -#ifdef CONFIG_PPC_PSERIES -/* - * Vectors for the FWNMI option. Share common code. - */ -TRAMP_HANDLER_BEGIN(system_reset_fwnmi) - SET_SCRATCH0(r13) /* save r13 */ - EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD, - NOTEST, 0x100) -TRAMP_HANDLER_END(system_reset_fwnmi) - -#endif /* CONFIG_PPC_PSERIES */ - #ifdef CONFIG_KVM_BOOK3S_64_HANDLER TRAMP_HANDLER_BEGIN(kvmppc_skip_interrupt) /* @@ -757,7 +759,6 @@ TRAMP_HANDLER_END(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -COMMON_HANDLER(system_reset_common, 0x100, system_reset_exception) COMMON_HANDLER_ASYNC(hardware_interrupt_common, 0x500, do_IRQ) COMMON_HANDLER_ASYNC(decrementer_common, 0x900, timer_interrupt) COMMON_HANDLER(hdecrementer_common, 0x980, hdec_interrupt) @@ -802,7 +803,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) * only has extra guff for STAB-based processors -- which never * come here. */ -VECTOR_HANDLER_VIRT_NONE(0x4100, 0x4200) VECTOR_HANDLER_VIRT_NONE(0x4200, 0x4300) VECTOR_HANDLER_VIRT(data_access, 0x4300, 0x4380, 0x300)