Commit 95f0ddf0 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Linus Torvalds
Browse files

mm/ioremap: rename ioremap_*_range to vmap_*_range 

This will be used as a generic kernel virtual mapping function, so re-name
it in preparation.

Link: https://lkml.kernel.org/r/20210317062402.533919-6-npiggin@gmail.com


Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ding Tianhong <dingtianhong@huawei.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Uladzislau Rezki (Sony) <urezki@gmail.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a264884

mm/ioremap.c

+33 −31
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ static inline int ioremap_pud_enabled(void) { return 0; } 
static inline int ioremap_pmd_enabled(void) { return 0; }

#endif	/* CONFIG_HAVE_ARCH_HUGE_VMAP */



static int ioremap_pte_range(pmd_t *pmd, unsigned long addr,

		unsigned long end, phys_addr_t phys_addr, pgprot_t prot,

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;
@@ -81,9 +81,8 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, 
	return 0;

}



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 long end,

			phys_addr_t phys_addr, pgprot_t prot)

{

	if (!ioremap_pmd_enabled())

		return 0;
@@ -103,8 +102,8 @@ static int ioremap_try_huge_pmd(pmd_t *pmd, unsigned long addr, 
	return pmd_set_huge(pmd, phys_addr, prot);

}



static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,

		unsigned long end, phys_addr_t phys_addr, pgprot_t prot,

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;
@@ -116,20 +115,19 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, 
	do {

		next = pmd_addr_end(addr, end);



		if (ioremap_try_huge_pmd(pmd, addr, next, phys_addr, prot)) {

		if (vmap_try_huge_pmd(pmd, addr, next, phys_addr, prot)) {

			*mask |= PGTBL_PMD_MODIFIED;

			continue;

		}



		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 += (next - addr), addr = next, addr != end);

	return 0;

}



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 long end,

			phys_addr_t phys_addr, pgprot_t prot)

{

	if (!ioremap_pud_enabled())

		return 0;
@@ -149,8 +147,8 @@ static int ioremap_try_huge_pud(pud_t *pud, unsigned long addr, 
	return pud_set_huge(pud, phys_addr, prot);

}



static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr,

		unsigned long end, phys_addr_t phys_addr, pgprot_t prot,

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;
@@ -162,20 +160,19 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, 
	do {

		next = pud_addr_end(addr, end);



		if (ioremap_try_huge_pud(pud, addr, next, phys_addr, prot)) {

		if (vmap_try_huge_pud(pud, addr, next, phys_addr, prot)) {

			*mask |= PGTBL_PUD_MODIFIED;

			continue;

		}



		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 += (next - addr), addr = next, addr != end);

	return 0;

}



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 long end,

			phys_addr_t phys_addr, pgprot_t prot)

{

	if (!ioremap_p4d_enabled())

		return 0;
@@ -195,8 +192,8 @@ static int ioremap_try_huge_p4d(p4d_t *p4d, unsigned long addr, 
	return p4d_set_huge(p4d, phys_addr, prot);

}



static inline int ioremap_p4d_range(pgd_t *pgd, unsigned long addr,

		unsigned long end, phys_addr_t phys_addr, pgprot_t prot,

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;
@@ -208,19 +205,19 @@ static inline int ioremap_p4d_range(pgd_t *pgd, unsigned long addr, 
	do {

		next = p4d_addr_end(addr, end);



		if (ioremap_try_huge_p4d(p4d, addr, next, phys_addr, prot)) {

		if (vmap_try_huge_p4d(p4d, addr, next, phys_addr, prot)) {

			*mask |= PGTBL_P4D_MODIFIED;

			continue;

		}



		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 += (next - addr), addr = next, addr != end);

	return 0;

}



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 = pgd_offset_k(addr);

	do {

		next = pgd_addr_end(addr, end);

		err = ioremap_p4d_range(pgd, addr, next, phys_addr, prot,

					&mask);

		err = vmap_p4d_range(pgd, addr, next, phys_addr, prot, &mask);

		if (err)

			break;

	} while (pgd++, phys_addr += (next - addr), addr = next, addr != end);
@@ -249,6 +245,12 @@ int ioremap_page_range(unsigned long addr, 
	return err;

}



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)

{