Commit 0e63ea48 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64/efi: add missing call to early_ioremap_reset()

The early ioremap support introduced by patch bf4b558e
("arm64: add early_ioremap support") failed to add a call to
early_ioremap_reset() at an appropriate time. Without this call,
invocations of early_ioremap etc. that are done too late will go
unnoticed and may cause corruption.

This is exactly what happened when the first user of this feature
was added in patch f84d0275 ("arm64: add EFI runtime services").
The early mapping of the EFI memory map is unmapped during an early
initcall, at which time the early ioremap support is long gone.

Fix by adding the missing call to early_ioremap_reset() to
setup_arch(), and move the offending early_memunmap() to right after
the point where the early mapping of the EFI memory map is last used.

Fixes: f84d0275

 ("arm64: add EFI runtime services")
Cc: <>
Signed-off-by: default avatarLeif Lindholm <>
Signed-off-by: default avatarArd Biesheuvel <>
Signed-off-by: default avatarWill Deacon <>
parent 59c68329
......@@ -326,6 +326,7 @@ void __init efi_idmap_init(void)
/* boot time idmap_pg_dir is incomplete, so fill in missing parts */
early_memunmap(, memmap.map_end -;
static int __init remap_region(efi_memory_desc_t *md, void **new)
......@@ -380,7 +381,6 @@ static int __init arm64_enter_virtual_mode(void)
mapsize = memmap.map_end -;
early_memunmap(, mapsize);
if (efi_runtime_disabled()) {
pr_info("EFI runtime services will be disabled.\n");
......@@ -402,6 +402,7 @@ void __init setup_arch(char **cmdline_p)
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