From patchwork Wed Sep 21 07:43:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 672682 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfCsq19Zhz9ryQ for ; Wed, 21 Sep 2016 18:46:55 +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=PSKQM7Z4; 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 3sfCsp72GtzDvSX for ; Wed, 21 Sep 2016 18:46:54 +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=PSKQM7Z4; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x242.google.com (mail-pa0-x242.google.com [IPv6:2607:f8b0:400e:c03::242]) (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 3sfBWK47KTzDsh1 for ; Wed, 21 Sep 2016 17:45:49 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PSKQM7Z4; dkim-atps=neutral Received: by mail-pa0-x242.google.com with SMTP id my20so1946043pab.3 for ; Wed, 21 Sep 2016 00:45:49 -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=vbWU5Coims+5xK3hRItLrV3WHkUc40VlL8h7YeZmCKE=; b=PSKQM7Z4GF5nrm8iBsvqIlYbYB7VVjUEFjluiaLcOII+A6OiCN1QMsH0ZgAFNT5JPn hhbfiV4wcf9McdKquS4TKRVFXCK087zK/RznAu3wGsTByUlXBwT3b1SBN74O2vPdVRUQ GA0qYaJ6FauxQlT1f0sOreP2AxRN56yLSnXw7Z2bbaheAFahfp7UTu1MKYZG8rTQZExd ke5FQq55wWMdWWse5BrUBxryl76nA/awgeXuXSgaH/KBjYOw/eHTcu/xw1h31E68dZO1 pPUnTPxwoeTZZpgfYIzChJm8DaXVHUg0wwhHgdMwi69J5CBAJb/oFxL4ObdEvxR1qlLT qmOA== 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=vbWU5Coims+5xK3hRItLrV3WHkUc40VlL8h7YeZmCKE=; b=LY6/7vdyF7/tPLFSHStvSEOS49FYh2iu6zn2F1vgNC+NYYI2ppJ8TAncYeqzbCumbP eEd1WKxyTWgTV4xwMb/Qj/OnfmlyiyNnQFLlov6eI49xVKMpOlpdf1NjtBOqCvdpXTVU yoetuVsfHjrnrmL1gbosWMbg6ehHaAr/mxEiVC6tL32/OqP480F6xbTlzMDkQd928FAL MZn1IR91h62DlES3rj10AXiOqBqYB8UeNDqVv20DxapV2AKmmk302KOHnpjs4tlnBJG5 Gbyz5wZaCxp+76i3p2KjGXQ5sLZ/zReTdkX0QRUK8SRWI1gNa4Li+wObCGOHctlwEl74 ImnA== X-Gm-Message-State: AE9vXwMw8VTgRZGkx51Wp8dWZhpq55OpCZhyDRYTzk4HheNU+LgqvrLNk9okioEuiZM+8w== X-Received: by 10.67.7.34 with SMTP id cz2mr47811270pad.173.1474443948052; Wed, 21 Sep 2016 00:45:48 -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.45.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2016 00:45:47 -0700 (PDT) From: Nicholas Piggin To: Michael Ellerman Subject: [PATCH 33/41] powerpc/64s: consolidate CBE System Error 0x1200 interrupt Date: Wed, 21 Sep 2016 17:43:59 +1000 Message-Id: <20160921074407.4885-34-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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index fe5cd85..64255bc 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1132,13 +1132,14 @@ VECTOR_HANDLER_VIRT_NONE(0x4fa0, 0x5200) #ifdef CONFIG_CBE_RAS VECTOR_HANDLER_REAL_HV(cbe_system_error, 0x1200, 0x1300) - +VECTOR_HANDLER_VIRT_NONE(0x5200, 0x5300) TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1200) - +COMMON_HANDLER(cbe_system_error_common, 0x1200, cbe_system_error_exception) #else /* CONFIG_CBE_RAS */ VECTOR_HANDLER_REAL_NONE(0x1200, 0x1300) #endif + VECTOR_HANDLER_REAL(instruction_breakpoint, 0x1300, 0x1400) TRAMP_KVM_SKIP(PACA_EXGEN, 0x1300) @@ -1400,7 +1401,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -VECTOR_HANDLER_VIRT_NONE(0x5200, 0x5300) VECTOR_HANDLER_VIRT(instruction_breakpoint, 0x5300, 0x5400, 0x1300) @@ -1437,7 +1437,6 @@ __end_interrupts: UNUSE_FIXED_SECTION(virt_trampolines) #ifdef CONFIG_CBE_RAS -COMMON_HANDLER(cbe_system_error_common, 0x1200, cbe_system_error_exception) COMMON_HANDLER(cbe_maintenance_common, 0x1600, cbe_maintenance_exception) COMMON_HANDLER(cbe_thermal_common, 0x1800, cbe_thermal_exception) #endif /* CONFIG_CBE_RAS */