diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2019-11-06 17:43:05 -0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-07 15:44:04 +0100 |
| commit | 6950e31b35fdf4588cbbdec1813091bb02cf8871 (patch) | |
| tree | e7ffd8d61e6140c3862926032c1ef3a343fd5d05 /drivers/firmware/efi/esrt.c | |
| parent | efi: Enumerate EFI_MEMORY_SP (diff) | |
| download | linux-dev-6950e31b35fdf4588cbbdec1813091bb02cf8871.tar.xz linux-dev-6950e31b35fdf4588cbbdec1813091bb02cf8871.zip | |
x86/efi: Push EFI_MEMMAP check into leaf routines
In preparation for adding another EFI_MEMMAP dependent call that needs
to occur before e820__memblock_setup() fixup the existing efi calls to
check for EFI_MEMMAP internally. This ends up being cleaner than the
alternative of checking EFI_MEMMAP multiple times in setup_arch().
Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/firmware/efi/esrt.c')
| -rw-r--r-- | drivers/firmware/efi/esrt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index d6dd5f503fa2..2762e0662bf4 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -246,6 +246,9 @@ void __init efi_esrt_init(void) int rc; phys_addr_t end; + if (!efi_enabled(EFI_MEMMAP)) + return; + pr_debug("esrt-init: loading.\n"); if (!esrt_table_exists()) return; |