From patchwork Wed Aug 10 10:48:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 657662 X-Patchwork-Delegate: benh@kernel.crashing.org 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 3s8Sbj2LJlz9t0m for ; Wed, 10 Aug 2016 20:50:25 +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=w/DpiVqV; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3s8Sbj107NzDr2b for ; Wed, 10 Aug 2016 20:50:25 +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=w/DpiVqV; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3s8SZC6g1YzDqZj for ; Wed, 10 Aug 2016 20:49:07 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=w/DpiVqV; dkim-atps=neutral Received: by ozlabs.org (Postfix) id 3s8SZC6BJrz9t1Q; Wed, 10 Aug 2016 20:49:07 +1000 (AEST) Delivered-To: linuxppc-dev@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 ozlabs.org (Postfix) with ESMTPS id 3s8SZC2lpkz9t0m for ; Wed, 10 Aug 2016 20:49:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=w/DpiVqV; dkim-atps=neutral Received: by mail-pa0-x242.google.com with SMTP id vy10so2659804pac.0 for ; Wed, 10 Aug 2016 03:49:07 -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=ePXTPlqwCvywS3oe6kZcPt8e2uHLklcqKKpZEHVyebU=; b=w/DpiVqVlofyzRLNIQIY8ExziGbK6MbnKF8723xWX+jsk9Eu+sNaAr140Nt++vtWYu 3wjbiD9F3tYoqvDcHE0dlwDm+LJEVPuHmto+r1KKI07/sLUtug4ge7zZ4hXwTzm+1Z8b KzWEHVXt+im8GE11wC7rVUGyhOl0JNLWWUatNvGIOx3io9GGNSo9WAYwwZIvwF2T/7zt KNTV7EZRDeIEiLyn0P6hDeHAMmUs+VPbzN6RShErCCFXM+bEDnfuBspgk4nH74KtENMm E/RFiqBOl4wAea8tkZXZn7hE2Endjw80IP97Q+il+MVkB4L2VfDPXjRAv+XIa9UmNeHU y8ag== 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=ePXTPlqwCvywS3oe6kZcPt8e2uHLklcqKKpZEHVyebU=; b=MdeyGWJa4vOm4mmV9H82/H4Yoi9whIFJS00ZVDDqG8VOILdppZUd7Jmhjd7KTkZNca ehYOmhtCeiKEjDIoUydDsFO87QabJiL7bPBkK0wbnkcT1azveYPKJOkZeWLp3pNc+YLo 0HBpltc6/ABxCAxADzdN9AocPS3twn30QMQuez3mWvWYrEiBgdIVWUy7Lm9lG93wcF34 OdfThx/jrKa+wke830KF/0v1IvoKY/ShxHzdqXfDrxeXk7gulcSe7LuyzDnUuLm2gbHu YGywkghnoKK92z+rRp0Uap0w7RV54hwzQRRWgee7cd0zbJlNdynjYiJaMHW1Iwi2SB0a TXpQ== X-Gm-Message-State: AEkoousaLDuUy8TUSed4PkQoA8Oh8pvaKmUO8tm3t2S0qwC+lnF+HgMtJrc5C3nJYrlcRw== X-Received: by 10.66.220.194 with SMTP id py2mr5739375pac.77.1470826145139; Wed, 10 Aug 2016 03:49:05 -0700 (PDT) Received: from roar.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id os8sm47808783pab.6.2016.08.10.03.49.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 03:49:04 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@ozlabs.org Subject: [PATCH 1/2] powerpc/pseries: PACA save area fix for general exception vs MCE Date: Wed, 10 Aug 2016 20:48:42 +1000 Message-Id: <1470826123-14699-2-git-send-email-npiggin@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1470826005-14520-1-git-send-email-npiggin@gmail.com> References: <1470826005-14520-1-git-send-email-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stewart Smith , Mahesh Salgaonkar , Nicholas Piggin , "Shreyas B . Prabhu" Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" MCE must not use PACA_EXGEN. When a general exception enables MSR_RI, that means SPRN_SRR[01] and SPRN_SPRG are no longer used. However the PACA save area is still in use. Acked-by: Mahesh Salgaonkar --- arch/powerpc/kernel/exceptions-64s.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 694def6..4174c4e 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -984,14 +984,14 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_RADIX) machine_check_common: mfspr r10,SPRN_DAR - std r10,PACA_EXGEN+EX_DAR(r13) + std r10,PACA_EXMC+EX_DAR(r13) mfspr r10,SPRN_DSISR - stw r10,PACA_EXGEN+EX_DSISR(r13) + stw r10,PACA_EXMC+EX_DSISR(r13) EXCEPTION_PROLOG_COMMON(0x200, PACA_EXMC) FINISH_NAP RECONCILE_IRQ_STATE(r10, r11) - ld r3,PACA_EXGEN+EX_DAR(r13) - lwz r4,PACA_EXGEN+EX_DSISR(r13) + ld r3,PACA_EXMC+EX_DAR(r13) + lwz r4,PACA_EXMC+EX_DSISR(r13) std r3,_DAR(r1) std r4,_DSISR(r1) bl save_nvgprs