Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp4755514pxu; Mon, 21 Dec 2020 23:12:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZCozlEiyh6MC+dvZ26mdC7mzi5Jr7DZpx7/vJ0VXeRNLBMDEHFm5cKBYqaPtOZtkS+wFS X-Received: by 2002:aa7:df0f:: with SMTP id c15mr19401724edy.354.1608621171940; Mon, 21 Dec 2020 23:12:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608621171; cv=none; d=google.com; s=arc-20160816; b=08Cz6AmO5CVhoFYdHOdiLs6NSMGwmXmtA7Yx8zL+xDjH2RYg8SAktb2gmrUZYU3Wat GtTcUC/T7405ZFBJY7yh3cU12yU9u3uUSNY+MvmqMUrdlH7bpajyXOWa5g6FK5yZX7+9 tbQ8pbYvfxos4YtUu+SOcvYqocads8XvlK9u/yy301IAREmJm/JyLSn6kIo70huU2BJE gD8M7YZ1VM29j8/zXFptN+g1Xl6HTVwzZ4M8cNFZIFaDcb6UhKrFGVO6QNYZ1YsiB5gP k7LxMIUQDYX931gw1XI++LvjltEzLxy/9UAmOXjL5vbetGa0PUV9f+G/ZWbqbdmRG7oH 93+Q== 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:message-id; bh=xDhA2O06LFWuWLsnCFP87FFDv1VzgxG6cutcnPKM4UQ=; b=lcena5eDaKocGrzR09reZ2MHOGNZcNGGIQoRM6CdK9F6VewXi5qmlG4EycAcrqrf3D H+L+4wwAqYvBAn2dxg+Ebp1yCU5lhPjimNcI1EAp1rtSkjXYLVQ5F3yv8r81Dp7RrLSD M6FWyjTsABTet4Z/hshtlUZbu9a7oASylpwGSEwVtAM0WUV24qHsqZFSS3lL/phBeX/J h4+moohkFlRIMr1yO6JKgE6qsz0aP3hYSqEdI6Qjr8+ZEWhTTLzS/j6czvlAsG9UBYnm HYdMRdLNEpbrZQ0CCUytI975J2R2AypNQUplrW1XpbkZ9hzjPNEe9Nqzn/yndhPwivqe vFHA== 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 s21si11846885edc.368.2020.12.21.23.12.29; Mon, 21 Dec 2020 23:12:51 -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 S1726068AbgLVHMC (ORCPT + 99 others); Tue, 22 Dec 2020 02:12:02 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:56006 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726025AbgLVHMB (ORCPT ); Tue, 22 Dec 2020 02:12:01 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4D0SDk6DQcz9tx3y; Tue, 22 Dec 2020 08:11:18 +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 WKpCFi-AX3-2; Tue, 22 Dec 2020 08:11:18 +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 4D0SDk4CqMz9tx3x; Tue, 22 Dec 2020 08:11:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 614998B7DC; Tue, 22 Dec 2020 08:11:19 +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 Fq3QTDTMuInt; Tue, 22 Dec 2020 08:11:19 +0100 (CET) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 049928B75E; Tue, 22 Dec 2020 08:11:19 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id C22E366969; Tue, 22 Dec 2020 07:11:18 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/32s: Fix RTAS machine check with VMAP stack To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 22 Dec 2020 07:11:18 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When we have VMAP stack, exception prolog 1 sets r1, not r11. Fixes: da7bb43ab9da ("powerpc/32: Fix vmap stack - Properly set r1 before activating MMU") Fixes: d2e006036082 ("powerpc/32: Use SPRN_SPRG_SCRATCH2 in exception prologs") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_book3s_32.S | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index 349bf3f0c3af..fbc48a500846 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -260,9 +260,16 @@ __secondary_hold_acknowledge: MachineCheck: EXCEPTION_PROLOG_0 #ifdef CONFIG_PPC_CHRP +#ifdef CONFIG_VMAP_STACK + mtspr SPRN_SPRG_SCRATCH2,r1 + mfspr r1, SPRN_SPRG_THREAD + lwz r1, RTAS_SP(r1) + cmpwi cr1, r1, 0 +#else mfspr r11, SPRN_SPRG_THREAD lwz r11, RTAS_SP(r11) cmpwi cr1, r11, 0 +#endif bne cr1, 7f #endif /* CONFIG_PPC_CHRP */ EXCEPTION_PROLOG_1 for_rtas=1 -- 2.25.0