Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1495077ybv; Fri, 14 Feb 2020 00:34:59 -0800 (PST) X-Google-Smtp-Source: APXvYqzaM/xa3YHE33dFk5pwNnd7Rkw7ZpkPSXD0PDnGCFQltCqPI33XhdCIqLeLf3rhoyeKc7RX X-Received: by 2002:a05:6830:22c3:: with SMTP id q3mr1337116otc.335.1581669299043; Fri, 14 Feb 2020 00:34:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581669299; cv=none; d=google.com; s=arc-20160816; b=st1A2W+qZL9ST8SFDttI/h2IQVJ+Fc40MNqPSN8/+LQxkYhiP7FVXvw+2ABzLzrTH/ rH/OgBTmlaCe9wbAlqfInQBHZeCXmXOtKeRzIT60BOfcg+0/qCDBh0v1Uqb7WSxzuDds lqcc9EUPUtURcBOa/PjZXbOc0YQ9R/UyP/entvXXmXFqFWf89qfnpBX3s+uTDT/FB3l1 jc030rIkRAxRjWH+au6dwvp4FmqTXSB5GblMEQX+IHZo11OqURndDUN5JoLneXCRQaiI UqtgT14PloEN2jUkeVN053bLIIAMp3Ezev5E93nd91Pv1LKcVwl9sIq8apN2yUiQ9J1D pFXQ== 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=rfu9QfcHTR7SY43rhOXPY1brk16w1ODvFQIZbggd35g=; b=agOg017XEmxlFL8GFvj1Adm04sF/H3v+Lc75Fi588dG8UDVHXQ8bUEg7r0PO4scp5g If5mkyIRluMlBpzHUECl21nERCgHlSyGnQdcjL/1PphraCh4+76yNQAd0riqjsrsbhAQ O7oXI/ibfyiL0xyFOw+Dh4OINSJwndbOmqk96l1G1K70YjL5/RS93n4DFASbG4WMpDaT fHHl8zkZRXK7pEmZE34qWb3o/x9VxqC1A8i4NyB/4sgDkSTLRhf1OWEraK59jdYS9wVH VS9p6oModu+fzPNXWMSMNQDS/xHzyESQfL+KzCIk3Z18QzBWDdwVx4YIZkq78JRUCQgm 5pdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Ae6H25Sk; 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 n203si2248869oia.112.2020.02.14.00.34.46; Fri, 14 Feb 2020 00:34:59 -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=Ae6H25Sk; 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 S1729020AbgBNIdT (ORCPT + 99 others); Fri, 14 Feb 2020 03:33:19 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:7650 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728239AbgBNIdS (ORCPT ); Fri, 14 Feb 2020 03:33:18 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 48JmqJ5B7vz9txhn; Fri, 14 Feb 2020 09:33:16 +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=Ae6H25Sk; 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 dVdXZgnzcuRk; Fri, 14 Feb 2020 09:33:16 +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 48JmqJ41PGz9txhm; Fri, 14 Feb 2020 09:33:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1581669196; bh=rfu9QfcHTR7SY43rhOXPY1brk16w1ODvFQIZbggd35g=; h=From:Subject:To:Cc:Date:From; b=Ae6H25SkRuCmgIV1MWiGxiyUpkFpaPxsD/hc4nExSBHb1pGT88UfkkrCFq4V1lqVO 5wSuioE+fZpTb3aAJd3e9RCF6xgJwt6ELmR2ivPb6bf2Bs6NPw/U7CjddE7sQ4iRnQ JRdojKrggmIjcWqjpIVbgharhtupCjxqUmJnC2X4= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 87AC88B87B; Fri, 14 Feb 2020 09:33:17 +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 ZanIXXYaCly0; Fri, 14 Feb 2020 09:33:17 +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 5D94B8B874; Fri, 14 Feb 2020 09:33:17 +0100 (CET) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 01C8565320; Fri, 14 Feb 2020 08:33:16 +0000 (UTC) Message-Id: <159ecb0ab021c07fd2f383d4a083a43d16d67b92.1581669187.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH] 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:33:16 +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. 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