diff options
author | Vitor Soares <vitor.soares@toradex.com> | 2024-04-12 11:43:44 +0100 |
---|---|---|
committer | Vitor Soares <vitor.soares@toradex.com> | 2024-04-12 11:43:44 +0100 |
commit | 007e957fced38af6d59f7220fff114fcac0771e9 (patch) | |
tree | 97b84eb7bdf31b2d6b5bfd8e78d2d7b0e3c00e22 | |
parent | ca551722e0b5341282a2dd346ddd1897db47cb5b (diff) |
arm: mach-k3: common: EFI loader map memory below ram top
During the boot, the EFI loader maps the memory from ram_top to ram_end
as EFI_BOOT_SERVICES_DATA. When LMB does boot_fdt_add_mem_rsv_regions()
to OPTEE, TFA, R5, and M4F DMA/memory "no-map" for the kernel it produces
the following error message:
ERROR: reserving fdt memory region failed (addr=9cb00000 size=100000 flags=4)
ERROR: reserving fdt memory region failed (addr=9cc00000 size=e00000 flags=4)
ERROR: reserving fdt memory region failed (addr=9da00000 size=100000 flags=4)
ERROR: reserving fdt memory region failed (addr=9db00000 size=c00000 flags=4)
ERROR: reserving fdt memory region failed (addr=9e780000 size=80000 flags=4)
ERROR: reserving fdt memory region failed (addr=9e800000 size=1800000 flags=4)
To avoid this, don't flag with EFI_BOOT_SERVICES_DATA the memory from
ram_top to ram_end by the EFI loader.
Upstream-Status: Backport [3206b77c844c7f2d85e9154982f6ef9d72adaab6]
Related-to: ELB-5326
Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
-rw-r--r-- | arch/arm/mach-k3/common.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index faa7848dc21..1a334bc435f 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -24,6 +24,7 @@ #include <asm/io.h> #include <fs_loader.h> #include <fs.h> +#include <efi_loader.h> #include <env.h> #include <elf.h> #include <soc.h> @@ -633,3 +634,14 @@ int misc_init_r(void) return 0; } + +void efi_add_known_memory(void) +{ + if (IS_ENABLED(CONFIG_EFI_LOADER)) + /* + * Memory over ram_top can be used by various firmware + * Declare to EFI only memory area below ram_top + */ + efi_add_memory_map(gd->ram_base, gd->ram_top - gd->ram_base, + EFI_CONVENTIONAL_MEMORY); +} |