Skip to content

Commit

Permalink
arm64/efi: mark UEFI reserved regions as MEMBLOCK_NOMAP
Browse files Browse the repository at this point in the history
Change the EFI memory reservation logic to use memblock_mark_nomap()
rather than memblock_reserve() to mark UEFI reserved regions as
occupied. In addition to reserving them against allocations done by
memblock, this will also prevent them from being covered by the linear
mapping.

Reviewed-by: Matt Fleming <[email protected]>
Signed-off-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
  • Loading branch information
Ard Biesheuvel authored and wildea01 committed Dec 9, 2015
1 parent 68709f4 commit 4dffbfc
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/arm64/kernel/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static __init void reserve_regions(void)
early_init_dt_add_memory_arch(paddr, size);

if (is_reserve_region(md)) {
memblock_reserve(paddr, size);
memblock_mark_nomap(paddr, size);
if (efi_enabled(EFI_DBG))
pr_cont("*");
}
Expand All @@ -209,8 +209,6 @@ void __init efi_init(void)

efi_system_table = params.system_table;

memblock_reserve(params.mmap & PAGE_MASK,
PAGE_ALIGN(params.mmap_size + (params.mmap & ~PAGE_MASK)));
memmap.phys_map = params.mmap;
memmap.map = early_memremap(params.mmap, params.mmap_size);
if (memmap.map == NULL) {
Expand All @@ -230,6 +228,9 @@ void __init efi_init(void)

reserve_regions();
early_memunmap(memmap.map, params.mmap_size);
memblock_mark_nomap(params.mmap & PAGE_MASK,
PAGE_ALIGN(params.mmap_size +
(params.mmap & ~PAGE_MASK)));
}

static bool __init efi_virtmap_init(void)
Expand Down

0 comments on commit 4dffbfc

Please sign in to comment.