On Mon, 22 Dec, at 07:08:35PM, Ard Biesheuvel wrote: > On systems that boot via UEFI, all memory nodes are deleted from the > device tree, and instead, the size and location of system RAM is derived > from the UEFI memory map. This is handled by reserve_regions, which not only > reserves parts of memory that UEFI declares as reserved, but also installs > the memblocks that cover the remaining usable memory. > > Currently, reserve_regions() is only called if uefi_init() succeeds. > However, it does not actually depend on anything that uefi_init() does, > and not calling reserve_regions() results in a broken boot, so it is > better to just call it unconditionally. > > Signed-off-by: Ard Biesheuvel <[email protected]> > --- > arch/arm64/kernel/efi.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c > index d7d2e818c856..d2f483a7cffe 100644 > --- a/arch/arm64/kernel/efi.c > +++ b/arch/arm64/kernel/efi.c > @@ -208,8 +208,7 @@ void __init efi_init(void) > memmap.desc_size = params.desc_size; > memmap.desc_version = params.desc_ver; > > - if (uefi_init() < 0) > - return; > + WARN_ON(uefi_init() < 0); > > reserve_regions(); > } > @@ -218,15 +217,13 @@ static int __init arm64_enter_virtual_mode(void) > { > u64 mapsize; > > - if (!efi_enabled(EFI_BOOT)) { > - pr_info("EFI services will not be available.\n"); > - return -1; > - } > + if (!efi_enabled(EFI_MEMMAP)) > + return 0; > > mapsize = memmap.map_end - memmap.map; > early_memunmap(memmap.map, mapsize); > > - if (efi_runtime_disabled()) { > + if (!efi_enabled(EFI_BOOT) || efi_runtime_disabled()) { > pr_info("EFI runtime services will be disabled.\n"); > return -1; > }
Am I correct in thinking that it's possible to have EFI_MEMMAP set but not EFI_BOOT? That's not how things work on x86. EFI_BOOT means "I am an EFI-enabled platform and I was booted using EFI." In other words, EFI_MEMMAP should imply EFI_BOOT (how did you get the memmap if you weren't booted using EFI?) It looks like you should be setting EFI_BOOT (and EFI_64BIT) in efi_init() if efi_get_fdt_params() succeeds. -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
