Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp4477700ybb; Tue, 14 Apr 2020 08:05:19 -0700 (PDT) X-Google-Smtp-Source: APiQypIhT2KcMPRxa1+suHrdm58/iLpjEdNoObuVuUTTE1ao4imuOQcr19MouKNDidzQ3GHAyhp3 X-Received: by 2002:a05:6402:b49:: with SMTP id bx9mr12565393edb.24.1586876719018; Tue, 14 Apr 2020 08:05:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586876719; cv=none; d=google.com; s=arc-20160816; b=0b1CB3s1W1AekExdfUlJxCLMwh3l3pjEPkQfO+/WWPA1X7jnR93/cz+X9W7DRbo+Vm YhWxgHIINvv2g3ddRMU4clT9z1ep+TSTGDaBqQ8D0EYJ0bGAgmf1/xLspYelxF98Ko1A qn/oTdbe6grRvO+6TuXhCjlLaJe8mIfjUvgK4dydPFvlHAgvSXKlOB1LxQmrnP7fK5Rp r2dRdbwB1qrIpxzz+YVROlb4eXJ1wnFvIU27AdfX5dmFWYoqF8QbfGxKczf5ETlEIsis fh4Axd5LGLw1Dc2ni6ZqcL725ErZEYilyg17C8LMIgJOMH93hv/QbfjMArHqzWMu+rrJ VI7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=RsyxMy7Y5Bx9LrA8rcOoGxnVO3hSnKKPR8y4ZmX75Pg=; b=xUQ6YAOwNQb+tlhlygkRiC0+i3nLBsOJF+JAXT/a3gqd7OB6XaDdG1oFUaAnb430sK FSgOuPlPSsIKviOw/EDmLOVefmOcr967NYcdo7ytVYKnF09RJS7tej+iwpjKAuuV2g+O EEAg7/NIyQ4Bk2liInoFysfzqEDPmydjEeueh2/W2tAq3nT5TKp0iz59fjFMDmYOEcLK qtpT49tzSo37ml5u18qgdPOnaRjv4omfy7LkTUMGzcY23QoepvquAaOf1rtw4EQPNlAR 6n24ZOEG0qwOg3QR5mAhyXnx+FWTdWGQEnD+ywtMnvPwJU0C/uHjX8ENZgyP1bv5d/gw WlVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=jZxn3ODM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u19si6632026eja.75.2020.04.14.08.04.48; Tue, 14 Apr 2020 08:05:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=jZxn3ODM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436488AbgDNIUN (ORCPT + 99 others); Tue, 14 Apr 2020 04:20:13 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:26205 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407073AbgDNITc (ORCPT ); Tue, 14 Apr 2020 04:19:32 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 491dgj2vRdz9tydc; Tue, 14 Apr 2020 10:19:29 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=jZxn3ODM; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id K1nEimlO-mtz; Tue, 14 Apr 2020 10:19:29 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 491dgj1vNGz9tydZ; Tue, 14 Apr 2020 10:19:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1586852369; bh=RsyxMy7Y5Bx9LrA8rcOoGxnVO3hSnKKPR8y4ZmX75Pg=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=jZxn3ODMiqKMwokxZePb8whd4KMBgWkMXyPD466oQkWR634Y2xIL8wuE22W4AnZ6m a09qAvAOhIs+HNIQj3+Pz5wbT6VgJg29uW7EBS3DldAp0OwGtv7aDO1OLfWwd/lJbE aD71oy61jJmKtVJX2wcP8UjBxPfuWhMXI8no7LGg= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 53FF78B797; Tue, 14 Apr 2020 10:19:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 4G1S6cfpD57T; Tue, 14 Apr 2020 10:19:30 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 18D5B8B796; Tue, 14 Apr 2020 10:19:30 +0200 (CEST) Received: by localhost.localdomain (Postfix, from userid 0) id E0D6F6578A; Tue, 14 Apr 2020 08:19:29 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 13/13] powerpc/40x: Don't save CR in SPRN_SPRG_SCRATCH6 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , michal.simek@xilinx.com, arnd@arndb.de Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 14 Apr 2020 08:19:29 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have r12 available, use it to keep CR around and don't save it in SPRN_SPRG_SCRATCH6. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_40x.S | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S index 804cbd0899ac..f9b880235aee 100644 --- a/arch/powerpc/kernel/head_40x.S +++ b/arch/powerpc/kernel/head_40x.S @@ -253,9 +253,8 @@ _ENTRY(saved_ksp_limit) mtspr SPRN_SPRG_SCRATCH1, r11 mtspr SPRN_SPRG_SCRATCH3, r12 mtspr SPRN_SPRG_SCRATCH4, r9 - mfcr r11 + mfcr r12 mfspr r9, SPRN_PID - mtspr SPRN_SPRG_SCRATCH6, r11 mtspr SPRN_SPRG_SCRATCH5, r9 mfspr r10, SPRN_DEAR /* Get faulting address */ @@ -322,9 +321,8 @@ _ENTRY(saved_ksp_limit) * and call the heavyweights to help us out. */ mfspr r9, SPRN_SPRG_SCRATCH5 - mfspr r11, SPRN_SPRG_SCRATCH6 mtspr SPRN_PID, r9 - mtcr r11 + mtcr r12 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3 mfspr r11, SPRN_SPRG_SCRATCH1 @@ -340,9 +338,8 @@ _ENTRY(saved_ksp_limit) mtspr SPRN_SPRG_SCRATCH1, r11 mtspr SPRN_SPRG_SCRATCH3, r12 mtspr SPRN_SPRG_SCRATCH4, r9 - mfcr r11 + mfcr r12 mfspr r9, SPRN_PID - mtspr SPRN_SPRG_SCRATCH6, r11 mtspr SPRN_SPRG_SCRATCH5, r9 mfspr r10, SPRN_SRR0 /* Get faulting address */ @@ -409,9 +406,8 @@ _ENTRY(saved_ksp_limit) * and call the heavyweights to help us out. */ mfspr r9, SPRN_SPRG_SCRATCH5 - mfspr r11, SPRN_SPRG_SCRATCH6 mtspr SPRN_PID, r9 - mtcr r11 + mtcr r12 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3 mfspr r11, SPRN_SPRG_SCRATCH1 @@ -555,9 +551,8 @@ finish_tlb_load: /* Done...restore registers and get out of here. */ mfspr r9, SPRN_SPRG_SCRATCH5 - mfspr r11, SPRN_SPRG_SCRATCH6 mtspr SPRN_PID, r9 - mtcr r11 + mtcr r12 mfspr r9, SPRN_SPRG_SCRATCH4 mfspr r12, SPRN_SPRG_SCRATCH3 mfspr r11, SPRN_SPRG_SCRATCH1 -- 2.25.0