@@ -167,7 +167,7 @@ static __init void reserve_regions(void)
if (uefi_debug) {
char buf[64];
- pr_info(" 0x%012llx-0x%012llx %s",
+ pr_info(" 0x%012llx-0x%012llx %s\n",
paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
efi_md_typeattr_format(buf, sizeof(buf), md));
}
@@ -177,15 +177,6 @@ static __init void reserve_regions(void)
if (is_normal_ram(md))
early_init_dt_add_memory_arch(paddr, size);
-
- if (is_reserve_region(md)) {
- memblock_reserve(paddr, size);
- if (uefi_debug)
- pr_cont("*");
- }
-
- if (uefi_debug)
- pr_cont("\n");
}
/*
@@ -196,7 +187,18 @@ static __init void reserve_regions(void)
for_each_memblock(memory, r)
memblock_add_phys(r->base, r->size);
+ for_each_efi_memory_desc(&memmap, md) {
+ if (is_reserve_region(md)) {
+ paddr = md->phys_addr;
+ npages = md->num_pages;
+ memrange_efi_to_native(&paddr, &npages);
+ memblock_remove(paddr, npages << PAGE_SHIFT);
+ }
+ }
+
set_bit(EFI_MEMMAP, &efi.flags);
+ if (uefi_debug)
+ __memblock_dump_all();
}
void __init efi_init(void)
Now that we have the 'physmem' memblock table to keep track of physical RAM regions, we can start using memblock_remove() to eliminate UEFI reserved regions from the 'memory' memblock table and the kernel direct linear mapping entirely. This makes these regions inaccessible entirely, unless they are remapped explicitly by the UEFI Runtime Services layer, UEFI configuration table drivers or the ACPI layer. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/kernel/efi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)