arm64/efi: add missing call to early_ioremap_reset() (0e63ea48) · Commits · 戴 / test

The early ioremap support introduced by patch ("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 ("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: ("arm64: add EFI runtime services") Cc: <stable@vger.kernel.org> Signed-off-by:

Leif Lindholm <leif.lindholm@linaro.org> Signed-off-by:

Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by:

Will Deacon <will.deacon@arm.com>

arch/arm64/kernel/efi.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -326,6 +326,7 @@ void __init efi_idmap_init(void)

	/* boot time idmap_pg_dir is incomplete, so fill in missing parts */		/* boot time idmap_pg_dir is incomplete, so fill in missing parts */
	efi_setup_idmap();		efi_setup_idmap();
			early_memunmap(memmap.map, memmap.map_end - memmap.map);
	}		}

	static int __init remap_region(efi_memory_desc_t md, void *new)		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 - memmap.map;		mapsize = memmap.map_end - memmap.map;
	early_memunmap(memmap.map, mapsize);

	if (efi_runtime_disabled()) {		if (efi_runtime_disabled()) {
	pr_info("EFI runtime services will be disabled.\n");		pr_info("EFI runtime services will be disabled.\n");

arch/arm64/kernel/setup.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -402,6 +402,7 @@ void __init setup_arch(char **cmdline_p)
	request_standard_resources();		request_standard_resources();

	efi_idmap_init();		efi_idmap_init();
			early_ioremap_reset();

	unflatten_device_tree();		unflatten_device_tree();

Admin message