Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1499558ybv; Fri, 14 Feb 2020 00:40:29 -0800 (PST) X-Google-Smtp-Source: APXvYqxCRPt/ugTiDNUpEZmA7vRDPIx3WiJPnqjxK9HjSnClSQ417yOTwRSlyAwSWk5p2kSNT+G3 X-Received: by 2002:a9d:6ac2:: with SMTP id m2mr1381903otq.191.1581669629057; Fri, 14 Feb 2020 00:40:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581669629; cv=none; d=google.com; s=arc-20160816; b=hWfeT7VA0oWZnaIhBcDEYCQwmtPV7Sih5fQAOyOCStEX7cd3B0sRZMUvhKvESWFFOg 7/+Z1dmh9jEm25JrG2jBusHqXWrBcjJ7ihpYoq+rqh1XVtVGsv1F1BOgJgE04t0yoJyK wDDp6Pu6v2XkH355hCiepS8NHV3hqt2OJYFilzAyRUAxsQLKjggmyv+mvrzDbx7WzWwo eDOvFPO8OvX41X/OAUNCWrf/+iW7Y49/Vfhpdsx8RvylDaik2+ankZArhckGPzDi5ZtD cjvVl2TuEjQfo88/CvPqIhSjk65gIX7VWSSSF6rFz9RwjOuGaUT/kaR8lE3eCD4h09CQ o4jg== 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:message-id :dkim-signature; bh=6gQazCc4WD16N17R9Ucj88w7ApMUGuUdxrC5CbZ6kUo=; b=XPXIwTufb+mKk1lw5GLpMUBiPkbkDdTsz9xBnSoX2HsxpcXcXQZSSCa+nl+O9afyfx tCc/atMLDsPG9tB8MqGT/Z+vdWNGe6M+Ozcq5cDLasXx9p/QlqRfEIBoBnTO0ivu6Cvs uaOt/28rSKgnRgjGP4MXwC20p0Z57vC3O2kOW48E+rirFN2WOVEVHXO0DQGlvn4SjkQ0 Y738a10JY/jSpeVwd9uB+fb/3asnMLUSCZA8wK8IqjoeT3GtjSt8VJny3fjtsme8UYOk O7B71Om3SdDyVNxI3VP2f1ArDjlTg3JGj18TosnoZJ+1z4V9gcpwnfr/wHJnMSHBNfuG pFXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=jaqqs9jF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a8si2445322otp.258.2020.02.14.00.40.15; Fri, 14 Feb 2020 00:40:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=jaqqs9jF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728422AbgBNIjw (ORCPT + 99 others); Fri, 14 Feb 2020 03:39:52 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:47779 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726179AbgBNIjw (ORCPT ); Fri, 14 Feb 2020 03:39:52 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 48Jmys4ssFz9txhq; Fri, 14 Feb 2020 09:39:49 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=jaqqs9jF; 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 50U80ObWLknG; Fri, 14 Feb 2020 09:39:49 +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 48Jmys3n50z9txhn; Fri, 14 Feb 2020 09:39:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1581669589; bh=6gQazCc4WD16N17R9Ucj88w7ApMUGuUdxrC5CbZ6kUo=; h=From:Subject:To:Cc:Date:From; b=jaqqs9jFSGENAD7NHdG9Xqc4Alx7dezcbLukx1hq0a2cdwzs1UKZqfIXBohObK5sE qkpMRBWZ/o3bWdsPEyg/lcu5J8gCJJBVGkPxF5CjZJR2ycwaWshXiraNeWvbAGloIC 1iQ2NVm5vPb5706Mxep/Xw0YYo7ny8x7CNRbrQNY= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7D97C8B87B; Fri, 14 Feb 2020 09:39:50 +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 wS7cpYO9s94s; Fri, 14 Feb 2020 09:39:50 +0100 (CET) Received: from pc16570vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.102]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4D74B8B874; Fri, 14 Feb 2020 09:39:50 +0100 (CET) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 466D565320; Fri, 14 Feb 2020 08:39:50 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH RESEND with Fixes: tag] powerpc/chrp: Fix enter_rtas() with CONFIG_VMAP_STACK To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 14 Feb 2020 08:39:50 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With CONFIG_VMAP_STACK, data MMU has to be enabled to read data on the stack. Fixes: cd08f109e262 ("powerpc/32s: Enable CONFIG_VMAP_STACK") Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/entry_32.S | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 0713daa651d9..bc056d906b51 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -1354,12 +1354,17 @@ _GLOBAL(enter_rtas) mtspr SPRN_SRR0,r8 mtspr SPRN_SRR1,r9 RFI -1: tophys(r9,r1) +1: tophys_novmstack r9, r1 +#ifdef CONFIG_VMAP_STACK + li r0, MSR_KERNEL & ~MSR_IR /* can take DTLB miss */ + mtmsr r0 + isync +#endif lwz r8,INT_FRAME_SIZE+4(r9) /* get return address */ lwz r9,8(r9) /* original msr value */ addi r1,r1,INT_FRAME_SIZE li r0,0 - tophys(r7, r2) + tophys_novmstack r7, r2 stw r0, THREAD + RTAS_SP(r7) mtspr SPRN_SRR0,r8 mtspr SPRN_SRR1,r9 -- 2.25.0