Commit 7fe5d2b1 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Catalin Marinas
Browse files

arm64/efi: handle potential failure to remap memory map

When remapping the UEFI memory map using ioremap_cache(), we
have to deal with potential failure. Note that, even if the
common case is for ioremap_cache() to return the existing linear
mapping of the memory map, we cannot rely on that to be always the
case, e.g., in the presence of a mem= kernel parameter.

At the same time, remove a stale comment and move the memmap code

Signed-off-by: default avatarArd Biesheuvel <>
Acked-by: Mark Rutland's avatarMark Rutland <>
Acked-by: default avatarMark Salter <>
Signed-off-by: Catalin Marinas's avatarCatalin Marinas <>
parent d67703a8
......@@ -229,19 +229,21 @@ static int __init arm64_enable_runtime_services(void)
return -1;
mapsize = memmap.map_end -;
if (efi_runtime_disabled()) {
pr_info("EFI runtime services will be disabled.\n");
return -1;
pr_info("Remapping and enabling EFI services.\n");
/* replace early memmap mapping with permanent mapping */
mapsize = memmap.map_end -; = (__force void *)ioremap_cache((phys_addr_t)memmap.phys_map,
if (! {
pr_err("Failed to remap EFI memory map\n");
return -1;
memmap.map_end = + mapsize;
efi.memmap = &memmap;
efi.systab = (__force void *)ioremap_cache(efi_system_table,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment