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=-8.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 0188CC43613 for ; Thu, 20 Jun 2019 06:23:41 +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 7B389208CB for ; Thu, 20 Jun 2019 06:23:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fFrtkQ1o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B389208CB 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 lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45TsG12FZjzDqGx for ; Thu, 20 Jun 2019 16:23:37 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::441; helo=mail-pf1-x441.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.b="fFrtkQ1o"; dkim-atps=neutral Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (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 45TqmB6qNMzDqv8 for ; Thu, 20 Jun 2019 15:16:10 +1000 (AEST) Received: by mail-pf1-x441.google.com with SMTP id p184so964618pfp.7 for ; Wed, 19 Jun 2019 22:16:10 -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=XK0z2sodRjLiq0Py7J6ZCsmhyaz31IBp/GjjI92KHiQ=; b=fFrtkQ1o/8YFQF05jHRttSmlbRNnkAgY//ZK9aT+4oIA7o5e0P3MQZL2RpWARMOxKx M8MyWAwvtOikQMCjxtYI0D1aQrGb0eNi95mziKwKFesGfC8nJomXBBT+8Fk4X2+TEYw9 EqVRk6/D3ixHjoNKFv7bCLVMAOPAr1wNe0w62N5TuHxuMH7Y5IDLfVf/o7cqsSX/BXPT 3wxwTkm34uK75DzpFgle4ZdTBP5cQKtRdPFD0uZ8x3bB0XSPeyr0qgi/m8Nvihjjjkit 1ei6TtqW8msv0OXneUgq/0isuPy4JFry+Nsa7kUkFg4TjNR/aM9AKqq8tX054xCqTw7S MsWQ== 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=XK0z2sodRjLiq0Py7J6ZCsmhyaz31IBp/GjjI92KHiQ=; b=AlDtiyPRuKdbLR/1uzM3FNpxvm5g2yjfGG9p8ckF7az6pDpabLPxS0sRbrCeOrFV3q BU33Qjb9DhxhyD6kMJH5Dbv37V9PMbk/mbOD1tB9GJQ7LRrGks26IyiG+Bado58IhfZ4 7y9uoN7pQV6viwq9spyfmcOLr77C6zH4CV++wVH7OFDTvyY6IfSLKTwOV+/ICCKXR76P RLAfOeHMXE34WCkDyx8cCYjrsfqqYrt0ayVtBC4q9bi3ioJa44O+UHEqXv/Htyqi4F3U jdj4WUXCpbLRc/xUJHzFAQ0/ALZle0ueA35x7++8QtoPBrGBChUOTN1Gy04VgqCDfrCj CzsQ== X-Gm-Message-State: APjAAAWnzFS2CzkDzD0SVRE/1jVKxi+B51ia43gInpKMqPpieGzNO171 xheDPvFY/6k+xFMaRA8aH0NsTD6N X-Google-Smtp-Source: APXvYqx1NejjlGkne8QLvmOph+DXO0U1lhMYa4PZBbtbTaEaGJ2QbHQU51IP5uhhvC8avhTHTyKKWg== X-Received: by 2002:a63:f957:: with SMTP id q23mr11402510pgk.326.1561007767995; Wed, 19 Jun 2019 22:16:07 -0700 (PDT) Received: from bobo.local0.net (193-116-72-140.tpgi.com.au. [193.116.72.140]) by smtp.gmail.com with ESMTPSA id h12sm8235847pje.12.2019.06.19.22.16.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 22:16:07 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 32/52] powerpc/64s/exception: windup use r9 consistently to restore SPRs Date: Thu, 20 Jun 2019 15:14:39 +1000 Message-Id: <20190620051459.29573-33-npiggin@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190620051459.29573-1-npiggin@gmail.com> References: <20190620051459.29573-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" Trivial code change, r3->r9. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 539bb1b83d90..804438669454 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -914,8 +914,8 @@ EXC_COMMON_BEGIN(system_reset_common) /* Move original SRR0 and SRR1 into the respective regs */ ld r9,_MSR(r1) mtspr SPRN_SRR1,r9 - ld r3,_NIP(r1) - mtspr SPRN_SRR0,r3 + ld r9,_NIP(r1) + mtspr SPRN_SRR0,r9 ld r9,_CTR(r1) mtctr r9 ld r9,_XER(r1) @@ -1075,8 +1075,8 @@ EXC_COMMON_BEGIN(machine_check_common) /* Move original SRR0 and SRR1 into the respective regs */ \ ld r9,_MSR(r1); \ mtspr SPRN_SRR1,r9; \ - ld r3,_NIP(r1); \ - mtspr SPRN_SRR0,r3; \ + ld r9,_NIP(r1); \ + mtspr SPRN_SRR0,r9; \ ld r9,_CTR(r1); \ mtctr r9; \ ld r9,_XER(r1); \ @@ -1781,8 +1781,8 @@ TRAMP_REAL_BEGIN(hmi_exception_early) /* Move original HSRR0 and HSRR1 into the respective regs */ ld r9,_MSR(r1) mtspr SPRN_HSRR1,r9 - ld r3,_NIP(r1) - mtspr SPRN_HSRR0,r3 + ld r9,_NIP(r1) + mtspr SPRN_HSRR0,r9 ld r9,_CTR(r1) mtctr r9 ld r9,_XER(r1) -- 2.20.1