From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0533EC433E1 for ; Fri, 21 Aug 2020 15:12:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A47E6207DE for ; Fri, 21 Aug 2020 15:12:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bIpiMwmt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A47E6207DE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 49C0B8D002B; Fri, 21 Aug 2020 11:12:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 425178D0022; Fri, 21 Aug 2020 11:12:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 314088D002B; Fri, 21 Aug 2020 11:12:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0242.hostedemail.com [216.40.44.242]) by kanga.kvack.org (Postfix) with ESMTP id 14BF78D0022 for ; Fri, 21 Aug 2020 11:12:52 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A5358180AD80F for ; Fri, 21 Aug 2020 15:12:51 +0000 (UTC) X-FDA: 77174918142.16.slave15_180e66a2703a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 7357A100E690C for ; Fri, 21 Aug 2020 15:12:51 +0000 (UTC) X-HE-Tag: slave15_180e66a2703a X-Filterd-Recvd-Size: 9332 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Fri, 21 Aug 2020 15:12:50 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id ep8so945026pjb.3 for ; Fri, 21 Aug 2020 08:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Y/hT12bvV3dyctfA7PHWDL72BJBoDG5OIVFWS0o/KA=; b=bIpiMwmt/XIM38Vr6L1TlzZOPMgWYxGOwBAbhA3oYMBCFWPqTUMnGA6po81aipEVWy LCzFlAAclsAz7y8oeClqiLMycBmdgJrtZNCffPgv0t18TWGbtbWL4O/w8TBHO5Uic51y CcVw4H7gUfF2TgiwlgtpnG5NeVps3SCC6n7JJGmLyAxqQ74b8CpYowythc5hnQtKhhGh d65SUZmCu5xQaap6bORtBpaRA3BvXze/2Kxi4MaMPEEhua3o3AgpmGu+2wgTLHvTr6jv yofXOJT1FjbXSBYVmn+aGcHvCNOByG4AaDH9kcJ4M7oOQdrR5dK+pBxT22iS6bFYv6SY poCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Y/hT12bvV3dyctfA7PHWDL72BJBoDG5OIVFWS0o/KA=; b=sxzxeE59TTLAuRoI47+YatY751SP2nDPfnkXu9kHXAe5k8TZoeMDc8GQv96gPSYVpa HqhXaDees0efiuvVfDBuwkBJdQhvGOcD8kFsQB0C/OZhQeMncKGtI5YvDHNmATamE3NU cmvkeoRg8lEKL0yKpQT2PFpyqamDtLvlhvsquLx3eLL86mEC+5Zo8wCbEf63pTLmasxG n5Ou9ITnwaqjvvfvEPf7Q947Iqj3Xdx4Xnz2nm0aVcrjf2+J43xxhCs+KZKR3+/HpoxW UtXv/22jQZv5n1n6EStIpPTYAkSSR3RAAhPdjlmT61kDaj655/4ByTkkE65NuKK2fDow BEAA== X-Gm-Message-State: AOAM531P59AFCMsFpfUefQAkyxqFIqIEp2NwltX3ARy8LKb8mblU/O2g sm3uASxdPSTEGs8Bx3+c6l4BcYDPMBk= X-Google-Smtp-Source: ABdhPJwM5fcpqmto8P3F5fSFr0rvGDBKsbzEu5uwFG787PaO4Qmy+4/1b58cB+92h3UZOd8VH4aIog== X-Received: by 2002:a17:902:8609:: with SMTP id f9mr2765135plo.324.1598022769517; Fri, 21 Aug 2020 08:12:49 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (61-68-212-105.tpgi.com.au. [61.68.212.105]) by smtp.gmail.com with ESMTPSA id s8sm3126985pfc.122.2020.08.21.08.12.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 08:12:48 -0700 (PDT) From: Nicholas Piggin To: linux-mm@kvack.org, Andrew Morton Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Zefan Li , Jonathan Cameron , Christoph Hellwig , Christophe Leroy Subject: [PATCH v6 04/12] mm/ioremap: rename ioremap_*_range to vmap_*_range Date: Sat, 22 Aug 2020 01:12:08 +1000 Message-Id: <20200821151216.1005117-5-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200821151216.1005117-1-npiggin@gmail.com> References: <20200821151216.1005117-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7357A100E690C X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This will be used as a generic kernel virtual mapping function, so re-name it in preparation. Signed-off-by: Nicholas Piggin --- mm/ioremap.c | 64 +++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/mm/ioremap.c b/mm/ioremap.c index 5fa1ab41d152..3f4d36f9745a 100644 --- a/mm/ioremap.c +++ b/mm/ioremap.c @@ -61,9 +61,9 @@ static inline int ioremap_pud_enabled(void) { return 0;= } static inline int ioremap_pmd_enabled(void) { return 0; } #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ =20 -static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot, - pgtbl_mod_mask *mask) +static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long = end, + phys_addr_t phys_addr, pgprot_t prot, + pgtbl_mod_mask *mask) { pte_t *pte; u64 pfn; @@ -81,9 +81,8 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long = addr, return 0; } =20 -static int ioremap_try_huge_pmd(pmd_t *pmd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, - pgprot_t prot) +static int vmap_try_huge_pmd(pmd_t *pmd, unsigned long addr, unsigned lo= ng end, + phys_addr_t phys_addr, pgprot_t prot) { if (!ioremap_pmd_enabled()) return 0; @@ -103,9 +102,9 @@ static int ioremap_try_huge_pmd(pmd_t *pmd, unsigned = long addr, return pmd_set_huge(pmd, phys_addr, prot); } =20 -static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot, - pgtbl_mod_mask *mask) +static int vmap_pmd_range(pud_t *pud, unsigned long addr, unsigned long = end, + phys_addr_t phys_addr, pgprot_t prot, + pgtbl_mod_mask *mask) { pmd_t *pmd; unsigned long next; @@ -116,20 +115,19 @@ static inline int ioremap_pmd_range(pud_t *pud, uns= igned long addr, do { next =3D pmd_addr_end(addr, end); =20 - if (ioremap_try_huge_pmd(pmd, addr, next, phys_addr, prot)) { + if (vmap_try_huge_pmd(pmd, addr, next, phys_addr, prot)) { *mask |=3D PGTBL_PMD_MODIFIED; continue; } =20 - if (ioremap_pte_range(pmd, addr, next, phys_addr, prot, mask)) + if (vmap_pte_range(pmd, addr, next, phys_addr, prot, mask)) return -ENOMEM; } while (pmd++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); return 0; } =20 -static int ioremap_try_huge_pud(pud_t *pud, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, - pgprot_t prot) +static int vmap_try_huge_pud(pud_t *pud, unsigned long addr, unsigned lo= ng end, + phys_addr_t phys_addr, pgprot_t prot) { if (!ioremap_pud_enabled()) return 0; @@ -149,9 +147,9 @@ static int ioremap_try_huge_pud(pud_t *pud, unsigned = long addr, return pud_set_huge(pud, phys_addr, prot); } =20 -static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot, - pgtbl_mod_mask *mask) +static int vmap_pud_range(p4d_t *p4d, unsigned long addr, unsigned long = end, + phys_addr_t phys_addr, pgprot_t prot, + pgtbl_mod_mask *mask) { pud_t *pud; unsigned long next; @@ -162,20 +160,19 @@ static inline int ioremap_pud_range(p4d_t *p4d, uns= igned long addr, do { next =3D pud_addr_end(addr, end); =20 - if (ioremap_try_huge_pud(pud, addr, next, phys_addr, prot)) { + if (vmap_try_huge_pud(pud, addr, next, phys_addr, prot)) { *mask |=3D PGTBL_PUD_MODIFIED; continue; } =20 - if (ioremap_pmd_range(pud, addr, next, phys_addr, prot, mask)) + if (vmap_pmd_range(pud, addr, next, phys_addr, prot, mask)) return -ENOMEM; } while (pud++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); return 0; } =20 -static int ioremap_try_huge_p4d(p4d_t *p4d, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, - pgprot_t prot) +static int vmap_try_huge_p4d(p4d_t *p4d, unsigned long addr, unsigned lo= ng end, + phys_addr_t phys_addr, pgprot_t prot) { if (!ioremap_p4d_enabled()) return 0; @@ -195,9 +192,9 @@ static int ioremap_try_huge_p4d(p4d_t *p4d, unsigned = long addr, return p4d_set_huge(p4d, phys_addr, prot); } =20 -static inline int ioremap_p4d_range(pgd_t *pgd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot, - pgtbl_mod_mask *mask) +static int vmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long = end, + phys_addr_t phys_addr, pgprot_t prot, + pgtbl_mod_mask *mask) { p4d_t *p4d; unsigned long next; @@ -208,19 +205,19 @@ static inline int ioremap_p4d_range(pgd_t *pgd, uns= igned long addr, do { next =3D p4d_addr_end(addr, end); =20 - if (ioremap_try_huge_p4d(p4d, addr, next, phys_addr, prot)) { + if (vmap_try_huge_p4d(p4d, addr, next, phys_addr, prot)) { *mask |=3D PGTBL_P4D_MODIFIED; continue; } =20 - if (ioremap_pud_range(p4d, addr, next, phys_addr, prot, mask)) + if (vmap_pud_range(p4d, addr, next, phys_addr, prot, mask)) return -ENOMEM; } while (p4d++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); return 0; } =20 -int ioremap_page_range(unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) +static int vmap_range(unsigned long addr, unsigned long end, + phys_addr_t phys_addr, pgprot_t prot) { pgd_t *pgd; unsigned long start; @@ -235,8 +232,7 @@ int ioremap_page_range(unsigned long addr, pgd =3D pgd_offset_k(addr); do { next =3D pgd_addr_end(addr, end); - err =3D ioremap_p4d_range(pgd, addr, next, phys_addr, prot, - &mask); + err =3D vmap_p4d_range(pgd, addr, next, phys_addr, prot, &mask); if (err) break; } while (pgd++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); @@ -249,6 +245,12 @@ int ioremap_page_range(unsigned long addr, return err; } =20 +int ioremap_page_range(unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot) +{ + return vmap_range(addr, end, phys_addr, prot); +} + #ifdef CONFIG_GENERIC_IOREMAP void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long = prot) { --=20 2.23.0