Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2496986pxb; Tue, 9 Mar 2021 04:11:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzxoPp7SqD+eunYHl3O9PPj+kYAxbcw28H5bWNir9oaSh4ORUL/XIfw+mw4E6tYA6zBTkOb X-Received: by 2002:aa7:da48:: with SMTP id w8mr3598303eds.81.1615291872132; Tue, 09 Mar 2021 04:11:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615291872; cv=none; d=google.com; s=arc-20160816; b=CPRaEpQ6Bhp/hAzEZfibB1ee8GTsSTTmILFPYQ6gHrFDprBgRObIbzLHJwkDjmZwL0 3UG+kP6FaFROC3dGBOjqn7rVFIH1lDw2ssRvM+MrimF8e+VDi7kzPN3B3Kf99L3iV7Qc qAkAFgBooO9zm2YEm03FcziElEBgUgRgdGVHeCjGjveS6C4GYvlQx1dTF6jrZoRQmgqY kJ2gdPPSMbaToXVjxzjq3qU/sRymQp5RUU5modq5wAELduKOvMKULf2DLEWhA2NGrhGN E/wgAT+2a7lb5vdZM9OovNSKKLbYbmWjSUN8f6PpL9e6nbfEHhw1/Upd6qpShLtbLrud fS5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=pwGurRJQGFjHtPtJK3sCuLCZ3jRtyMFYWVIDMXWVl1w=; b=qFdMS1Yge95/B9CDr1Ga53D1l/QyD0cnYU/K5iU+IoFVOo/GgDW80SgjnppenTHBGr /pyZb4VwJ/9qNKcYKB4CwiP4SS6BrvmSJgL/4CMbEvV3ip63KqZiLw3v36aIqy3vuoJt 6tGVWKSgwT5B8jkmTZ6dgzaz6bjoWoXVkmoIE3ZU1CND7tpnRZfQE9GI/6rR6mEn1XU+ 75ckTjCSrMhBEUi0f8hkJwQLayl3s2CVqBr3B8Qe4iNEuogYUL1ZpedIl4RM7Q5lBV55 iqQRfkUD4p409/buFhz50LZYTBfkeQacMJJmZe93G0lVwh987UvaOCD0ZO2Q2JhGvUTL EeZA== 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 y10si9326501ede.335.2021.03.09.04.10.47; Tue, 09 Mar 2021 04:11:12 -0800 (PST) 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 S231226AbhCIMJt (ORCPT + 99 others); Tue, 9 Mar 2021 07:09:49 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:44437 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230215AbhCIMJe (ORCPT ); Tue, 9 Mar 2021 07:09:34 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DvvCH1S0Pz9tyjJ; Tue, 9 Mar 2021 13:09:31 +0100 (CET) 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 ZOjZE2jFrW8u; Tue, 9 Mar 2021 13:09:31 +0100 (CET) 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 4DvvCH0hq4z9tyjG; Tue, 9 Mar 2021 13:09:31 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 756208B803; Tue, 9 Mar 2021 13:09:32 +0100 (CET) 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 N-ieO1DIy90F; Tue, 9 Mar 2021 13:09:32 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EF4748B800; Tue, 9 Mar 2021 13:09:31 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id D1E8267555; Tue, 9 Mar 2021 12:09:31 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 06/43] powerpc/40x: Reorder a few instructions in critical exception prolog To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 9 Mar 2021 12:09:31 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to ease preparation for CONFIG_VMAP_STACK, reorder a few instruction, especially save r1 into stack frame earlier. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_40x.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S index 067ae1302c1c..5b337bf49bcb 100644 --- a/arch/powerpc/kernel/head_40x.S +++ b/arch/powerpc/kernel/head_40x.S @@ -119,6 +119,9 @@ _ENTRY(saved_ksp_limit) lwz r11,TASK_STACK-THREAD(r11) /* this thread's kernel stack */ 1: addi r11,r11,THREAD_SIZE-INT_FRAME_SIZE /* Alloc an excpt frm */ tophys(r11,r11) + stw r1,GPR1(r11) + stw r1,0(r11) + tovirt(r1,r11) stw r10,_CCR(r11) /* save various registers */ stw r12,GPR12(r11) stw r9,GPR9(r11) @@ -129,14 +132,11 @@ _ENTRY(saved_ksp_limit) stw r10,GPR10(r11) stw r12,GPR11(r11) mfspr r12,SPRN_DEAR /* save DEAR and ESR in the frame */ - stw r12,_DEAR(r11) /* since they may have had stuff */ mfspr r9,SPRN_ESR /* in them at the point where the */ + stw r12,_DEAR(r11) /* since they may have had stuff */ stw r9,_ESR(r11) /* exception was taken */ mfspr r12,SPRN_SRR2 - stw r1,GPR1(r11) mfspr r9,SPRN_SRR3 - stw r1,0(r11) - tovirt(r1,r11) rlwinm r9,r9,0,14,12 /* clear MSR_WE (necessary?) */ stw r0,GPR0(r11) lis r10, STACK_FRAME_REGS_MARKER@ha /* exception frame marker */ -- 2.25.0