Skip to content

Commit

Permalink
ARM: implement create_mapping_late() for EFI use
Browse files Browse the repository at this point in the history
This implements create_mapping_late(), which we will use to populate
the UEFI Runtime Services page tables.

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
  • Loading branch information
Ard Biesheuvel committed Dec 13, 2015
1 parent b430e55 commit c793620
Showing 2 changed files with 22 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/include/asm/mach/map.h
Original file line number Diff line number Diff line change
@@ -42,6 +42,8 @@ enum {
extern void iotable_init(struct map_desc *, int);
extern void vm_reserve_area_early(unsigned long addr, unsigned long size,
void *caller);
extern void create_mapping_late(struct mm_struct *mm, struct map_desc *md,
bool ng);

#ifdef CONFIG_DEBUG_LL
extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);
20 changes: 20 additions & 0 deletions arch/arm/mm/mmu.c
Original file line number Diff line number Diff line change
@@ -724,6 +724,14 @@ static void __init *early_alloc(unsigned long sz)
return early_alloc_aligned(sz, sz);
}

static void *__init late_alloc(unsigned long sz)
{
void *ptr = (void *)__get_free_pages(PGALLOC_GFP, get_order(sz));

BUG_ON(!ptr);
return ptr;
}

static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,
unsigned long prot,
void *(*alloc)(unsigned long sz))
@@ -960,6 +968,18 @@ static void __init create_mapping(struct map_desc *md)
__create_mapping(&init_mm, md, early_alloc, false);
}

void __init create_mapping_late(struct mm_struct *mm, struct map_desc *md,
bool ng)
{
#ifdef CONFIG_ARM_LPAE
pud_t *pud = pud_alloc(mm, pgd_offset(mm, md->virtual), md->virtual);
if (WARN_ON(!pud))
return;
pmd_alloc(mm, pud, 0);
#endif
__create_mapping(mm, md, late_alloc, ng);
}

/*
* Create the architecture specific mappings
*/

0 comments on commit c793620

Please sign in to comment.