Commit 20d12cf9 authored Jul 23, 2018 by AKASHI Takahiro Committed by Will Deacon Jul 23, 2018

efi/arm: map UEFI memory map even w/o runtime services enabled

Under the current implementation, UEFI memory map will be mapped and made
available in virtual mappings only if runtime services are enabled.
But in a later patch, we want to use UEFI memory map in acpi_os_ioremap()
to create mappings of ACPI tables using memory attributes described in
UEFI memory map.
See the following commit:
    arm64: acpi: fix alignment fault in accessing ACPI tables

So, as a first step, arm_enter_runtime_services() is modified, alongside
Ard's patch[1], so that UEFI memory map will not be freed even if
efi=noruntime.

[1] https://marc.info/?l=linux-efi&m=152930773507524&w=2



Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 3ea86495

drivers/firmware/efi/arm-runtime.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -117,6 +117,13 @@ static int __init arm_enable_runtime_services(void)

		efi_memmap_unmap();

		mapsize = efi.memmap.desc_size * efi.memmap.nr_map;

		if (efi_memmap_init_late(efi.memmap.phys_map, mapsize)) {
		pr_err("Failed to remap EFI memory map\n");
		return 0;
		}

		if (efi_runtime_disabled()) {
		pr_info("EFI runtime services will be disabled.\n");
		return 0;
		@@ -129,13 +136,6 @@ static int __init arm_enable_runtime_services(void)

		pr_info("Remapping and enabling EFI services.\n");

		mapsize = efi.memmap.desc_size * efi.memmap.nr_map;

		if (efi_memmap_init_late(efi.memmap.phys_map, mapsize)) {
		pr_err("Failed to remap EFI memory map\n");
		return -ENOMEM;
		}

		if (!efi_virtmap_init()) {
		pr_err("UEFI virtual mapping missing or invalid -- runtime services will not be available\n");
		return -ENOMEM;