Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp4109946ybl; Tue, 20 Aug 2019 07:10:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqwqLwUtIQN+pBrlVoKS9bTatuOmxEUzcaZR37l+eg4YscwD/frHpayvJXcLV0IIbJKZ4G0l X-Received: by 2002:a63:3fc9:: with SMTP id m192mr25370994pga.429.1566310209827; Tue, 20 Aug 2019 07:10:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566310209; cv=none; d=google.com; s=arc-20160816; b=Uo7sFz+/sgZw3c1LxPbpUQgFUBLnFjfoM8Xp1bpYo1FpqrcUMYMaByz3TqV2fbg0HE WD8z2KNK6jdP5wclASjGYYFNdFwmYtAPedZQwohNmOtLuKrc8G4yyYulQPGBiWyCUawP bhVvv/6kV4sasJuqSKX3ckxRrFtwQW6pK1BxGnqBWfkBDWroBjpsWrmLXK5BFbLgWcKV WNnZAC/P4cr1vPPm8A/Qmk04z61JMyCHfm141rps1u+5jcEPW3/PDM+LPeFQD6oFTDiY adJXIT1dS/qytevNOjkjnC3oUPcCHylptzBS3ishh17qJ2RdFZ/ruCLd3xpcnUl+wNQI aI9w== 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:dkim-signature; bh=qz+pPdC1G+mo30Fx/0cNs3zoD0kntRfmzksofk6rzz0=; b=JiTOb7Yo7xSwTkf6Y+Lgrs6zRIe/OpQ7nNt6Dl81NWVoJdB8fl2dThaBz0YsLBMD/c 4f7MiIK03z5G5gKFqa4F7yYc72y5RALwufGPwPagKsGlbqT7awttcPKb1yHq88k2/5sY gcONVxPi8YCufcVEOkWXMd5CR+BTCLrSMIb07QK8UlS0WPG8vo4vo51hL+P3kIY9P1O4 wri47KE57RZurOkBMTvMmsHWtUR5dA5zYl0w82SPxKIqsz4VHEvzk6QtDCu+3bcss6Od zy7JdGgJGpKzZbguIc3aU4fdE24MAqsY1Zd9Hp50eno/iNECwoT1zlEREY8QyltyZseO POxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=UzwYaPa2; 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 x203si12248761pgx.545.2019.08.20.07.09.54; Tue, 20 Aug 2019 07:10:09 -0700 (PDT) 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=UzwYaPa2; 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 S1730322AbfHTOHU (ORCPT + 99 others); Tue, 20 Aug 2019 10:07:20 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:59915 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730239AbfHTOHR (ORCPT ); Tue, 20 Aug 2019 10:07:17 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 46CXfq4dC4z9v0Gl; Tue, 20 Aug 2019 16:07:15 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=UzwYaPa2; 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 HcTDbkpANpoL; Tue, 20 Aug 2019 16:07:15 +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 46CXfq3WcCz9v0GZ; Tue, 20 Aug 2019 16:07:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1566310035; bh=qz+pPdC1G+mo30Fx/0cNs3zoD0kntRfmzksofk6rzz0=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=UzwYaPa2OMNBCTf/CXy3zZnyIDo8wplTvsWXtYZAsI9NApPYmRQk6KSfnsG0cejOd XSF6BH0daR9kSLqMqaPq97dMu6CIMdq+cpN4Lgo8nRfU+csMxN7ZfBlsvQEBd4tqMj Q2xQy08Ov4+fxbFJ6bSc4MtJItr0xUttCgN9MOm4= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D491C8B7D0; Tue, 20 Aug 2019 16:07:15 +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 3u25EvomztU7; Tue, 20 Aug 2019 16:07:15 +0200 (CEST) Received: from pc16032vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 93BFC8B7C9; Tue, 20 Aug 2019 16:07:15 +0200 (CEST) Received: by pc16032vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 722A66B734; Tue, 20 Aug 2019 14:07:15 +0000 (UTC) Message-Id: <0b3eb0e0f1490a99fd6c983e166fb8946233f151.1566309262.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 07/12] powerpc/mm: move ioremap_prot() into ioremap.c To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com, hch@lst.de Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 20 Aug 2019 14:07:15 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Both ioremap_prot() are idenfical, move them into ioremap.c Signed-off-by: Christophe Leroy --- arch/powerpc/mm/ioremap.c | 19 +++++++++++++++++++ arch/powerpc/mm/pgtable_32.c | 17 ----------------- arch/powerpc/mm/pgtable_64.c | 24 ------------------------ 3 files changed, 19 insertions(+), 41 deletions(-) diff --git a/arch/powerpc/mm/ioremap.c b/arch/powerpc/mm/ioremap.c index 7f1d462e7745..3d388aaa3ee6 100644 --- a/arch/powerpc/mm/ioremap.c +++ b/arch/powerpc/mm/ioremap.c @@ -34,3 +34,22 @@ void __iomem *ioremap_coherent(phys_addr_t addr, unsigned long size) return iowa_ioremap(addr, size, prot, caller); return __ioremap_caller(addr, size, prot, caller); } + +void __iomem *ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) +{ + pte_t pte = __pte(flags); + void *caller = __builtin_return_address(0); + + /* writeable implies dirty for kernel addresses */ + if (pte_write(pte)) + pte = pte_mkdirty(pte); + + /* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ + pte = pte_exprotect(pte); + pte = pte_mkprivileged(pte); + + if (iowa_is_active()) + return iowa_ioremap(addr, size, pte_pgprot(pte), caller); + return __ioremap_caller(addr, size, pte_pgprot(pte), caller); +} +EXPORT_SYMBOL(ioremap_prot); diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 3a4972007ec0..b0f2d45da232 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c @@ -48,23 +48,6 @@ ioremap_wt(phys_addr_t addr, unsigned long size) EXPORT_SYMBOL(ioremap_wt); void __iomem * -ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) -{ - pte_t pte = __pte(flags); - - /* writeable implies dirty for kernel addresses */ - if (pte_write(pte)) - pte = pte_mkdirty(pte); - - /* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ - pte = pte_exprotect(pte); - pte = pte_mkprivileged(pte); - - return __ioremap_caller(addr, size, pte_pgprot(pte), __builtin_return_address(0)); -} -EXPORT_SYMBOL(ioremap_prot); - -void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *caller) { unsigned long v, i; diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 358233ea8d85..2b9078e1bc43 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c @@ -203,29 +203,6 @@ void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, return ret; } -void __iomem * ioremap_prot(phys_addr_t addr, unsigned long size, - unsigned long flags) -{ - pte_t pte = __pte(flags); - void *caller = __builtin_return_address(0); - - /* writeable implies dirty for kernel addresses */ - if (pte_write(pte)) - pte = pte_mkdirty(pte); - - /* we don't want to let _PAGE_EXEC leak out */ - pte = pte_exprotect(pte); - /* - * Force kernel mapping. - */ - pte = pte_mkprivileged(pte); - - if (iowa_is_active()) - return iowa_ioremap(addr, size, pte_pgprot(pte), caller); - return __ioremap_caller(addr, size, pte_pgprot(pte), caller); -} - - /* * Unmap an IO region and remove it from imalloc'd list. * Access to IO memory should be serialized by driver. @@ -247,7 +224,6 @@ void iounmap(volatile void __iomem *token) vunmap(addr); } -EXPORT_SYMBOL(ioremap_prot); EXPORT_SYMBOL(__ioremap_at); EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(__iounmap_at); -- 2.13.3