Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp670261ybz; Sat, 25 Apr 2020 01:45:50 -0700 (PDT) X-Google-Smtp-Source: APiQypLvl49RkvcByARGgAEDvk/LzbKeqzoNnUdjcirPzV5Rp1n+pmoloKG3LAsMqQnbuCq0QugF X-Received: by 2002:a50:da4a:: with SMTP id a10mr10968002edk.158.1587804349894; Sat, 25 Apr 2020 01:45:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587804349; cv=none; d=google.com; s=arc-20160816; b=ZDiymKhKl0HsvORKLTDXkAJ0h3nNyM0FEsgnf5VDTnpVDGZaH7ODyd2xdcWaTgyLec kCVpfi1nhDR+J2SvpeLS4CZHJ0w7WejS/Lz8l91QO9mYdx8SurihY+qiz/ZeoCSYrG3y uI8vTz4ZrJ+ADAWNu10idwC8v0pr13uXyRW4J0NcpGimVVlk8CVAayLxZnv/e+mSSgRF XO3zXz8TvM/N+obmoIMksX3ntDJPJrjmI3pcO2QOPzezcOn8o4nhXZ3e4TWYPPIKWKeZ K0HZ4vcaZ5VikiR/xCD2QKnE/qt/8tPpo1NtQA9qUGFR9diQ7T5k84BB3Q1VW/gQ4PKp so2A== 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=XzEnAs580LgBVw8wiK2hSI0eGod1WJP2rzXMEsGy3RQ55aE4QbhmpdMkcS7RrrIZGn QxPNVLY1da2ALaxELa90Dw3dOCMDaUfk3+w3JQwuUy4D8G+KaskJCbKdd65g9hEB7+UI 7IifQvLre6fKE14Rz291EkwfS90Ameshlc1zIcGaCg9EfaTpi17c2M0Gq3N3OwR82GVF xQyvzrr2Zg+fgR4cfulW6nyrKooOTjfPqbOUUliJWlld7hWggp5Te9oSea9spxSf01dj i82NV2UPaNC4KVzg4eU8xkPo8EFJVVzG/3tPptYo6eQ+sClTYdREnPGeb/S3AFYmfRnT difg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=j7qvNahf; spf=pass (google.com: 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 dn4si4398028edb.239.2020.04.25.01.45.26; Sat, 25 Apr 2020 01:45:49 -0700 (PDT) Received-SPF: pass (google.com: 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=j7qvNahf; spf=pass (google.com: 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 S1726363AbgDYInw (ORCPT + 99 others); Sat, 25 Apr 2020 04:43:52 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:46274 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726306AbgDYIno (ORCPT ); Sat, 25 Apr 2020 04:43:44 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 498PhY1Hr4z9txnG; Sat, 25 Apr 2020 10:43:41 +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=j7qvNahf; 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 3KMBZsyLJrCp; Sat, 25 Apr 2020 10:43:41 +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 498PhY0CZhz9txnh; Sat, 25 Apr 2020 10:43:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1587804221; bh=RsyxMy7Y5Bx9LrA8rcOoGxnVO3hSnKKPR8y4ZmX75Pg=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=j7qvNahfIqIgLH7COI0Fj3i3PE3SAYWdP9t5yXvpbRkG/6DRhcqxttY06aOgFup/R 3OVruNnt+8p+/JDQFMwbD8xAVS3f67uhtN+6ioSABZ20tjKHGvWD8iuIUtIyVov+Mx 3nLuwLmfplxq0iHDpzwsdFyuQDF1A30u4b8WVZ18= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 333EF8B769; Sat, 25 Apr 2020 10:43:42 +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 ZA9TPR1o3M0g; Sat, 25 Apr 2020 10:43:42 +0200 (CEST) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id DFBBD8B773; Sat, 25 Apr 2020 10:43:41 +0200 (CEST) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C2D4665877; Sat, 25 Apr 2020 08:43:41 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v4 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: Sat, 25 Apr 2020 08:43:41 +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