Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp1571690ybk; Thu, 21 May 2020 09:58:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysT1KJLyGKf3B6rImMkZThr9KOQek0qI3SgrKRKBfRU2kPzyi4QQPgN7zGWn3fVNFo8F1N X-Received: by 2002:a17:907:1189:: with SMTP id uz9mr4330391ejb.53.1590080279952; Thu, 21 May 2020 09:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590080279; cv=none; d=google.com; s=arc-20160816; b=atJncB2/OEr57lXw/R9leaZ43hFrm7u2ZHAW6Sb/x+71CWESF7bxZHUv0zrQtsG4RF 2cKoWcS31R/3M2SACrcdAAok/0ZoGb4ChsKVMsYS0P26hVdZLmUlVbibI/p7/y6DeiSD uFPFejcUChe1Q669YbPtn08GJ4/2tmGuxXM8nLfF1+Yui5P/MwnpPWA0gH3zMsEOZA66 gfyprY0n16qx8sqsNcaRUxn33NZc1jxnhI2b7PyXSd1Ddea5oeeQ+byhWiR85/4AqISR poVsLRKu0FQ+s9Dk89Ch//07CmJ9hyIA53CL/+jPa98Edo6LRxXtbRVqhYDqQfNcVNKS UhOg== 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; bh=H1GaN1waJ9rA64ItOjxsEXBbvjRzhckEzjA5OcsuymM=; b=akOTrQv9XSKfogCzfjTzgeVy8hg/skP0Je4TIzo4RJJ61RILuLeBDS2rfVhS7Y6yll v3CKXwOfDJ6CgZXIBetHBDAjy6NHZU9GXa3vd7iUUo2JxkCCLgky2eCQw4YJUneZo2RK 4j8WnDhcTR8onblbDozn+t3HZbqBvKtdEuntwgjPYT7UnvysYzsV5PCK6D5Xj1zKVLYv 8lsML/qstSiRh6H0QFMKTKETeH7q5HVo/8SSjjJG3zyaFHFnM6m+Aufr9HmYH94MFRdy WrcJEiaGEj9/JB6lopmAeIVr7kJjWFFvoZJ06MOhsqN60oMmcq+V021++S6Tv25EWuSE R/Iw== ARC-Authentication-Results: i=1; mx.google.com; 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 b17si2472855ejj.145.2020.05.21.09.57.36; Thu, 21 May 2020 09:57:59 -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; 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 S1730026AbgEUQ4J (ORCPT + 99 others); Thu, 21 May 2020 12:56:09 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:36406 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728677AbgEUQ4I (ORCPT ); Thu, 21 May 2020 12:56:08 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 49SbNf5Y5Kz9v125; Thu, 21 May 2020 18:56:02 +0200 (CEST) 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 AlEOGPn7iSWK; Thu, 21 May 2020 18:56:02 +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 49SbNf4mc9z9v0pY; Thu, 21 May 2020 18:56:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 021E38B7DB; Thu, 21 May 2020 18:56:05 +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 Nsn87wHNhN-S; Thu, 21 May 2020 18:56:04 +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 BEE9F8B778; Thu, 21 May 2020 18:56:04 +0200 (CEST) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 9BD7F65A53; Thu, 21 May 2020 16:56:04 +0000 (UTC) Message-Id: <019f314a98c107c4ca46e46c1cf402e9a44114a7.1590079969.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v5 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: Thu, 21 May 2020 16:56:04 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe Leroy We have r12 available, use it to keep CR around and don't save it in SPRN_SPRG_SCRATCH6. Signed-off-by: Christophe Leroy 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 b584e81f6d19..a22a8209971b 100644 --- a/arch/powerpc/kernel/head_40x.S +++ b/arch/powerpc/kernel/head_40x.S @@ -254,9 +254,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 */ @@ -323,9 +322,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 @@ -341,9 +339,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 */ @@ -410,9 +407,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 @@ -556,9 +552,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