On Thu, 03 Oct, at 12:24:40PM, Leif Lindholm wrote: > +/* > + * If you need to (temporarily) support buggy firmware. > + */ > +#define KEEP_BOOT_SERVICES_REGIONS Have you seen firmware that requires this? I'm just curious more than anything else. > +/* > + * Returns 1 if 'facility' is enabled, 0 otherwise. > + */ > +int efi_enabled(int facility) > +{ > + return test_bit(facility, &arm_efi_facility) != 0; > +} > +EXPORT_SYMBOL(efi_enabled); This should move to drivers/firmware/efi/efi.c. Let me write a patch that moves the x86 stuff out of arch/x86 and means you can get rid of this hunk. > +/* > + * Called explicitly from init/mm.c > + */ That's init/main.c. > +void __init efi_enter_virtual_mode(void) > +{ > + efi_status_t status; > + > + if (!efi_enabled(EFI_BOOT)) { > + pr_info("EFI services will not be available.\n"); > + return; This is dead code as PATCH 3 does, diff --git a/init/main.c b/init/main.c index af310af..ec6d76e 100644 --- a/init/main.c +++ b/init/main.c @@ -875,6 +875,10 @@ static noinline void __init kernel_init_freeable(void) smp_prepare_cpus(setup_max_cpus); do_pre_smp_initcalls(); + + if (IS_ENABLED(CONFIG_ARM) && efi_enabled(EFI_BOOT)) + efi_enter_virtual_mode(); + -- 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 majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html