Commit d7ecbddf authored by Mark Salter's avatar Mark Salter Committed by Matt Fleming
Browse files

arm64: Add function to create identity mappings 



At boot time, before switching to a virtual UEFI memory map, firmware
expects UEFI memory and IO regions to be identity mapped whenever
kernel makes runtime services calls. The existing early boot code
creates an identity map of kernel text/data but this is not sufficient
for UEFI. This patch adds a create_id_mapping() function which reuses
the core code of the existing create_mapping().

Signed-off-by: default avatarMark Salter <msalter@redhat.com>
[ Fixed error message formatting (%pa). ]
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 0302f71c

arch/arm64/include/asm/mmu.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -28,5 +28,7 @@ extern void paging_init(void); 
extern void setup_mm_for_reboot(void);

extern void setup_mm_for_reboot(void);

extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt);

extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt);

extern void init_mem_pgprot(void);

extern void init_mem_pgprot(void);

/* create an identity mapping for memory (or io if map_io is true) */

extern void create_id_mapping(phys_addr_t addr, phys_addr_t size, int map_io);





#endif
 
#endif

arch/arm64/mm/mmu.c

+47 −18
Original line number Original line Diff line number Diff line
@@ -168,7 +168,8 @@ static void __init *early_alloc(unsigned long sz) 
}

}





static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,

static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,

				  unsigned long end, unsigned long pfn)

				  unsigned long end, unsigned long pfn,

				  pgprot_t prot)

{

{

	pte_t *pte;

	pte_t *pte;
@@ -180,16 +181,28 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, 




	pte = pte_offset_kernel(pmd, addr);

	pte = pte_offset_kernel(pmd, addr);

	do {

	do {

		set_pte(pte, pfn_pte(pfn, PAGE_KERNEL_EXEC));

		set_pte(pte, pfn_pte(pfn, prot));

		pfn++;

		pfn++;

	} while (pte++, addr += PAGE_SIZE, addr != end);

	} while (pte++, addr += PAGE_SIZE, addr != end);

}

}





static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,

static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,

				  unsigned long end, phys_addr_t phys)

				  unsigned long end, phys_addr_t phys,

				  int map_io)

{

{

	pmd_t *pmd;

	pmd_t *pmd;

	unsigned long next;

	unsigned long next;

	pmdval_t prot_sect;

	pgprot_t prot_pte;



	if (map_io) {

		prot_sect = PMD_TYPE_SECT | PMD_SECT_AF |

			    PMD_ATTRINDX(MT_DEVICE_nGnRE);

		prot_pte = __pgprot(PROT_DEVICE_nGnRE);

	} else {

		prot_sect = prot_sect_kernel;

		prot_pte = PAGE_KERNEL_EXEC;

	}





	/*

	/*

	 * Check for initial section mappings in the pgd/pud and remove them.

	 * Check for initial section mappings in the pgd/pud and remove them.
@@ -205,7 +218,7 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr, 
		/* try section mapping first */

		/* try section mapping first */

		if (((addr | next | phys) & ~SECTION_MASK) == 0) {

		if (((addr | next | phys) & ~SECTION_MASK) == 0) {

			pmd_t old_pmd =*pmd;

			pmd_t old_pmd =*pmd;

			set_pmd(pmd, __pmd(phys | prot_sect_kernel));

			set_pmd(pmd, __pmd(phys | prot_sect));

			/*

			/*

			 * Check for previous table entries created during

			 * Check for previous table entries created during

			 * boot (__create_page_tables) and flush them.

			 * boot (__create_page_tables) and flush them.
@@ -213,21 +226,23 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr, 
			if (!pmd_none(old_pmd))

			if (!pmd_none(old_pmd))

				flush_tlb_all();

				flush_tlb_all();

		} else {

		} else {

			alloc_init_pte(pmd, addr, next, __phys_to_pfn(phys));

			alloc_init_pte(pmd, addr, next, __phys_to_pfn(phys),

				       prot_pte);

		}

		}

		phys += next - addr;

		phys += next - addr;

	} while (pmd++, addr = next, addr != end);

	} while (pmd++, addr = next, addr != end);

}

}





static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,

static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,

				  unsigned long end, unsigned long phys)

				  unsigned long end, unsigned long phys,

				  int map_io)

{

{

	pud_t *pud = pud_offset(pgd, addr);

	pud_t *pud = pud_offset(pgd, addr);

	unsigned long next;

	unsigned long next;





	do {

	do {

		next = pud_addr_end(addr, end);

		next = pud_addr_end(addr, end);

		alloc_init_pmd(pud, addr, next, phys);

		alloc_init_pmd(pud, addr, next, phys, map_io);

		phys += next - addr;

		phys += next - addr;

	} while (pud++, addr = next, addr != end);

	} while (pud++, addr = next, addr != end);

}

}
@@ -236,30 +251,44 @@ static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr, 
 * Create the page directory entries and any necessary page tables for the

 * Create the page directory entries and any necessary page tables for the

 * mapping specified by 'md'.

 * mapping specified by 'md'.

 */

 */

static void __init create_mapping(phys_addr_t phys, unsigned long virt,

static void __init __create_mapping(pgd_t *pgd, phys_addr_t phys,

				  phys_addr_t size)

				    unsigned long virt, phys_addr_t size,

				    int map_io)

{

{

	unsigned long addr, length, end, next;

	unsigned long addr, length, end, next;

	pgd_t *pgd;



	if (virt < VMALLOC_START) {

		pr_warning("BUG: not creating mapping for 0x%016llx at 0x%016lx - outside kernel range\n",

			   phys, virt);

		return;

	}





	addr = virt & PAGE_MASK;

	addr = virt & PAGE_MASK;

	length = PAGE_ALIGN(size + (virt & ~PAGE_MASK));

	length = PAGE_ALIGN(size + (virt & ~PAGE_MASK));





	pgd = pgd_offset_k(addr);

	end = addr + length;

	end = addr + length;

	do {

	do {

		next = pgd_addr_end(addr, end);

		next = pgd_addr_end(addr, end);

		alloc_init_pud(pgd, addr, next, phys);

		alloc_init_pud(pgd, addr, next, phys, map_io);

		phys += next - addr;

		phys += next - addr;

	} while (pgd++, addr = next, addr != end);

	} while (pgd++, addr = next, addr != end);

}

}





static void __init create_mapping(phys_addr_t phys, unsigned long virt,

				  phys_addr_t size)

{

	if (virt < VMALLOC_START) {

		pr_warn("BUG: not creating mapping for %pa at 0x%016lx - outside kernel range\n",

			&phys, virt);

		return;

	}

	__create_mapping(pgd_offset_k(virt & PAGE_MASK), phys, virt, size, 0);

}



void __init create_id_mapping(phys_addr_t addr, phys_addr_t size, int map_io)

{

	if ((addr >> PGDIR_SHIFT) >= ARRAY_SIZE(idmap_pg_dir)) {

		pr_warn("BUG: not creating id mapping for %pa\n", &addr);

		return;

	}

	__create_mapping(&idmap_pg_dir[pgd_index(addr)],

			 addr, addr, size, map_io);

}



static void __init map_mem(void)

static void __init map_mem(void)

{

{

	struct memblock_region *reg;

	struct memblock_region *reg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE