From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08656C38A2A for ; Fri, 8 May 2020 04:51:14 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FB0D20720 for ; Fri, 8 May 2020 04:51:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nJNdLZKU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FB0D20720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49JHwH0nQrzDqMW for ; Fri, 8 May 2020 14:51:11 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1041; helo=mail-pj1-x1041.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=nJNdLZKU; dkim-atps=neutral Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49JHY83Y3jzDqx6 for ; Fri, 8 May 2020 14:34:36 +1000 (AEST) Received: by mail-pj1-x1041.google.com with SMTP id e6so3668303pjt.4 for ; Thu, 07 May 2020 21:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GfUgzWLbitF9qaGUNCmu1l6A97VMBe9r/QOhCM2woYA=; b=nJNdLZKUblc1WhaspIbSyAZh7ykqN/NRaNT3KIgIAsxLsRGe/NC4N6GVnFBxC48HuN NWXwJF+KgiHLLaF+FAt5jNnOD/zXlPJbJTDPNhcCprimeG6D/Fg3dxTV1ihFQnuwY95n FPxel4e8QOzUlYo7miT2N57DZcIzqJJ6qTdHobDx0OB2ygjEevkQjVhBCEwQdzrQHrss NiBxJkZmuPJru0ffxofMzg3hb6ooUF4UuZKIcCFEcqMZhrjwfnQluf5pcsSAsqtlGMOK lXA6Al5jiZoUO5gIZKNBK8ZalzljX4rccPHcG20I0iuV7eKhOqM2+cfahVUZXcUUTN2u E4lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GfUgzWLbitF9qaGUNCmu1l6A97VMBe9r/QOhCM2woYA=; b=S4uGszSmwB8qjSakiAFtRHUKciqxTF7rZptr38EGt/5OZgFr789GTy6cYYBJXhrxGL CwULvdRV9V+S3+MFQw2u942Wh8aP29+/2y1jprU0wB8/mVB586UG0dEmrUknEuhhdvom 8CnrBKZHl7FprSW0IXdnjSpbpvNQyKMino9JIaTxk49jdxzDXZReCb9kksbFBF+W3KRX CZUKqAIFz2QCQrpJoRdyQ+m8wUJl/JHPAV298V7hzr1Zfw1Q5+sgKimSMYPySu5CcKhR G9GHf0fs2LcRY8Bjcaep29HNnH26U0qAUqQRzuVSLlK9o8G6dwv0dJTVutzHfpqVPD8O 2V1g== X-Gm-Message-State: AGi0PuYZ6evb9OQZquWhVpLc9dhsk1+3tHPg9UVhWPoz4RRZXiRbRxVv AwOb3zvn8yqmoiXgRuyN2dTp9lvJ X-Google-Smtp-Source: APiQypLw8xZU04Jhk7N8auUDqihWoVPLhPxghoaCTQ3D7JQbNnOq4XHx8jH0I1J0eEPcPUkLaeEAqQ== X-Received: by 2002:a17:902:bd47:: with SMTP id b7mr608233plx.79.1588912473790; Thu, 07 May 2020 21:34:33 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (61-68-214-199.tpgi.com.au. [61.68.214.199]) by smtp.gmail.com with ESMTPSA id i9sm358813pfk.199.2020.05.07.21.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2020 21:34:33 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v4 07/16] powerpc/pseries/ras: fwnmi avoid modifying r3 in error case Date: Fri, 8 May 2020 14:33:59 +1000 Message-Id: <20200508043408.886394-8-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200508043408.886394-1-npiggin@gmail.com> References: <20200508043408.886394-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" If there is some error with the fwnmi save area, r3 has already been modified which doesn't help with debugging. Only update r3 when to restore the saved value. Signed-off-by: Nicholas Piggin --- arch/powerpc/platforms/pseries/ras.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index a5bd0f747bb1..fe14186a8cef 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c @@ -423,18 +423,19 @@ static inline struct rtas_error_log *fwnmi_get_errlog(void) */ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs) { + unsigned long savep_ra; unsigned long *savep; struct rtas_error_log *h; /* Mask top two bits */ - regs->gpr[3] &= ~(0x3UL << 62); + savep_ra = regs->gpr[3] & ~(0x3UL << 62); - if (!VALID_FWNMI_BUFFER(regs->gpr[3])) { + if (!VALID_FWNMI_BUFFER(savep_ra)) { printk(KERN_ERR "FWNMI: corrupt r3 0x%016lx\n", regs->gpr[3]); return NULL; } - savep = __va(regs->gpr[3]); + savep = __va(savep_ra); regs->gpr[3] = be64_to_cpu(savep[0]); /* restore original r3 */ h = (struct rtas_error_log *)&savep[1]; -- 2.23.0