efi: Refactor efi_memmap_init_early() into arch-neutral code

Every EFI architecture apart from ia64 needs to setup the EFI memory
map at efi.memmap, and the code for doing that is essentially the same
across all implementations. Therefore, it makes sense to factor this
out into the common code under drivers/firmware/efi/.

The only slight variation is the data structure out of which we pull
the initial memory map information, such as physical address, memory
descriptor size and version, etc. We can address this by passing a
generic data structure (struct efi_memory_map_data) as the argument to
efi_memmap_init_early() which contains the minimum info required for
initialising the memory map.

In the process, this patch also fixes a few undesirable implementation
differences:

 - ARM and arm64 were failing to clear the EFI_MEMMAP bit when
   unmapping the early EFI memory map. EFI_MEMMAP indicates whether
   the EFI memory map is mapped (not the regions contained within) and
   can be traversed.  It's more correct to set the bit as soon as we
   memremap() the passed in EFI memmap.

 - Rename efi_unmmap_memmap() to efi_memmap_unmap() to adhere to the
   regular naming scheme.

This patch also uses a read-write mapping for the memory map instead
of the read-only mapping currently used on ARM and arm64. x86 needs
the ability to update the memory map in-place when assigning virtual
addresses to regions (efi_map_region()) and tagging regions when
reserving boot services (efi_reserve_boot_services()).

There's no way for the generic fake_mem code to know which mapping to
use without introducing some arch-specific constant/hook, so just use
read-write since read-only is of dubious value for the EFI memory map.

Tested-by: Dave Young <dyoung@redhat.com> [kexec/kdump]
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> [arm]
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Peter Jones <pjones@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>

diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index d0bb76d81402c192f7b67cab74eb72285ec8bc1d..4630e2bfa8fb0f73d8b3633448e401bb850bda88 100644 (file)
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -117,7 +117,6 @@ extern int __init efi_memblock_x86_reserve_range(void);
 extern pgd_t * __init efi_call_phys_prolog(void);
 extern void __init efi_call_phys_epilog(pgd_t *save_pgd);
 extern void __init efi_print_memmap(void);
-extern void __init efi_unmap_memmap(void);
 extern void __init efi_memory_uc(u64 addr, unsigned long size);
 extern void __init efi_map_region(efi_memory_desc_t *md);
 extern void __init efi_map_region_fixed(efi_memory_desc_t *md);

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 625ec729b4e85b25caa7b65dac9b9ab600f0aeeb..5ccde8b6cdd1cd8755b98818afd5bd41245b75cf 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -172,7 +172,9 @@ static void __init do_add_efi_memmap(void)
 int __init efi_memblock_x86_reserve_range(void)
 {
        struct efi_info *e = &boot_params.efi_info;
+       struct efi_memory_map_data data;
        phys_addr_t pmap;
+       int rv;
 
        if (efi_enabled(EFI_PARAVIRT))
                return 0;
@@ -187,11 +189,17 @@ int __init efi_memblock_x86_reserve_range(void)
 #else
        pmap = (e->efi_memmap | ((__u64)e->efi_memmap_hi << 32));
 #endif
-       efi.memmap.phys_map     = pmap;
-       efi.memmap.nr_map       = e->efi_memmap_size /
-                                 e->efi_memdesc_size;
-       efi.memmap.desc_size    = e->efi_memdesc_size;
-       efi.memmap.desc_version = e->efi_memdesc_version;
+       data.phys_map           = pmap;
+       data.size               = e->efi_memmap_size;
+       data.desc_size          = e->efi_memdesc_size;
+       data.desc_version       = e->efi_memdesc_version;
+
+       rv = efi_memmap_init_early(&data);
+       if (rv)
+               return rv;
+
+       if (add_efi_memmap)
+               do_add_efi_memmap();
 
        WARN(efi.memmap.desc_version != 1,
             "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
@@ -218,19 +226,6 @@ void __init efi_print_memmap(void)
        }
 }
 
-void __init efi_unmap_memmap(void)
-{
-       unsigned long size;
-
-       clear_bit(EFI_MEMMAP, &efi.flags);
-
-       size = efi.memmap.nr_map * efi.memmap.desc_size;
-       if (efi.memmap.map) {
-               early_memunmap(efi.memmap.map, size);
-               efi.memmap.map = NULL;
-       }
-}
-
 static int __init efi_systab_init(void *phys)
 {
        if (efi_enabled(EFI_64BIT)) {
@@ -414,33 +409,6 @@ static int __init efi_runtime_init(void)
        return 0;
 }
 
-static int __init efi_memmap_init(void)
-{
-       unsigned long addr, size;
-
-       if (efi_enabled(EFI_PARAVIRT))
-               return 0;
-
-       /* Map the EFI memory map */
-       size = efi.memmap.nr_map * efi.memmap.desc_size;
-       addr = (unsigned long)efi.memmap.phys_map;
-
-       efi.memmap.map = early_memremap(addr, size);
-       if (efi.memmap.map == NULL) {
-               pr_err("Could not map the memory map!\n");
-               return -ENOMEM;
-       }
-
-       efi.memmap.map_end = efi.memmap.map + size;
-
-       if (add_efi_memmap)
-               do_add_efi_memmap();
-
-       set_bit(EFI_MEMMAP, &efi.flags);
-
-       return 0;
-}
-
 void __init efi_init(void)
 {
        efi_char16_t *c16;
@@ -498,11 +466,11 @@ void __init efi_init(void)
        if (!efi_runtime_supported())
                pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
        else {
-               if (efi_runtime_disabled() || efi_runtime_init())
+               if (efi_runtime_disabled() || efi_runtime_init()) {
+                       efi_memmap_unmap();
                        return;
+               }
        }
-       if (efi_memmap_init())
-               return;
 
        if (efi_enabled(EFI_DBG))
                efi_print_memmap();
@@ -839,7 +807,7 @@ static void __init kexec_enter_virtual_mode(void)
         * non-native EFI
         */
        if (!efi_is_native()) {
-               efi_unmap_memmap();
+               efi_memmap_unmap();
                clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);
                return;
        }

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 89d1146f5a6f76424a0045266862eee566c2b930..47b99108ff8ed5e200940d9ce7388ac9c1b52a1d 100644 (file)
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -287,7 +287,7 @@ void __init efi_free_boot_services(void)
                free_bootmem_late(start, size);
        }
 
-       efi_unmap_memmap();
+       efi_memmap_unmap();
 }
 
 /*
@@ -365,7 +365,7 @@ void __init efi_apply_memmap_quirks(void)
         */
        if (!efi_runtime_supported()) {
                pr_info("Setup done, disabling due to 32/64-bit mismatch\n");
-               efi_unmap_memmap();
+               efi_memmap_unmap();
        }
 
        /* UV2+ BIOS has a fix for this issue.  UV1 still needs the quirk. */

diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index c49d50e68aeebb0dbe368f8e8f526b8c18bdebb0..5a2df3fefcccf34e58882130c4eea77638e11bd3 100644 (file)
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -211,12 +211,11 @@ static __init void reserve_regions(void)
                        memblock_mark_nomap(paddr, size);
 
        }
-
-       set_bit(EFI_MEMMAP, &efi.flags);
 }
 
 void __init efi_init(void)
 {
+       struct efi_memory_map_data data;
        struct efi_fdt_params params;
 
        /* Grab UEFI information placed in FDT by stub */
@@ -225,9 +224,12 @@ void __init efi_init(void)
 
        efi_system_table = params.system_table;
 
-       efi.memmap.phys_map = params.mmap;
-       efi.memmap.map = early_memremap_ro(params.mmap, params.mmap_size);
-       if (efi.memmap.map == NULL) {
+       data.desc_version = params.desc_ver;
+       data.desc_size = params.desc_size;
+       data.size = params.mmap_size;
+       data.phys_map = params.mmap;
+
+       if (efi_memmap_init_early(&data) < 0) {
                /*
                * If we are booting via UEFI, the UEFI memory map is the only
                * description of memory we have, so there is little point in
@@ -235,9 +237,6 @@ void __init efi_init(void)
                */
                panic("Unable to map EFI memory map.\n");
        }
-       efi.memmap.map_end = efi.memmap.map + params.mmap_size;
-       efi.memmap.desc_size = params.desc_size;
-       efi.memmap.desc_version = params.desc_ver;
 
        WARN(efi.memmap.desc_version != 1,
             "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
@@ -248,7 +247,7 @@ void __init efi_init(void)
 
        reserve_regions();
        efi_memattr_init();
-       early_memunmap(efi.memmap.map, params.mmap_size);
+       efi_memmap_unmap();
 
        memblock_reserve(params.mmap & PAGE_MASK,
                         PAGE_ALIGN(params.mmap_size +

diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index c394b81fe45214dcf2b1e086ec2efe000aaf6c42..eedb30351a68f4b791e189b20cba51a6bcc79f02 100644 (file)
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -114,7 +114,7 @@ static int __init arm_enable_runtime_services(void)
 
        pr_info("Remapping and enabling EFI services.\n");
 
-       mapsize = efi.memmap.map_end - efi.memmap.map;
+       mapsize = efi.memmap.desc_size * efi.memmap.nr_map;
 
        efi.memmap.map = memremap(efi.memmap.phys_map, mapsize, MEMREMAP_WB);
        if (!efi.memmap.map) {

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 5a2631af7410782dc8f7ba993ab0b1139bf71abb..c1879999abe76ae1f803cf768a30954464c806a9 100644 (file)
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -544,6 +544,52 @@ int __init efi_config_init(efi_config_table_type_t *arch_tables)
        return ret;
 }
 
+/**
+ * efi_memmap_init_early - Map the EFI memory map data structure
+ * @data: EFI memory map data
+ *
+ * Use early_memremap() to map the passed in EFI memory map and assign
+ * it to efi.memmap.
+ */
+int __init efi_memmap_init_early(struct efi_memory_map_data *data)
+{
+       struct efi_memory_map map;
+
+       if (efi_enabled(EFI_PARAVIRT))
+               return 0;
+
+       map.phys_map = data->phys_map;
+
+       map.map = early_memremap(data->phys_map, data->size);
+       if (!map.map) {
+               pr_err("Could not map the memory map!\n");
+               return -ENOMEM;
+       }
+
+       map.nr_map = data->size / data->desc_size;
+       map.map_end = map.map + data->size;
+
+       map.desc_version = data->desc_version;
+       map.desc_size = data->desc_size;
+
+       set_bit(EFI_MEMMAP, &efi.flags);
+
+       efi.memmap = map;
+
+       return 0;
+}
+
+void __init efi_memmap_unmap(void)
+{
+       unsigned long size;
+
+       size = efi.memmap.desc_size * efi.memmap.nr_map;
+
+       early_memunmap(efi.memmap.map, size);
+       efi.memmap.map = NULL;
+       clear_bit(EFI_MEMMAP, &efi.flags);
+}
+
 #ifdef CONFIG_EFI_VARS_MODULE
 static int __init efi_load_efivars(void)
 {

diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c
index c437388a7b8521f9392b5dde96e14ab24429b9c2..939eec47139f3a188c451215237f81f73ed4e6af 100644 (file)
--- a/drivers/firmware/efi/fake_mem.c
+++ b/drivers/firmware/efi/fake_mem.c
@@ -57,6 +57,7 @@ static int __init cmp_fake_mem(const void *x1, const void *x2)
 void __init efi_fake_memmap(void)
 {
        u64 start, end, m_start, m_end, m_attr;
+       struct efi_memory_map_data data;
        int new_nr_map = efi.memmap.nr_map;
        efi_memory_desc_t *md;
        phys_addr_t new_memmap_phy;
@@ -180,12 +181,14 @@ void __init efi_fake_memmap(void)
        }
 
        /* swap into new EFI memmap */
-       efi_unmap_memmap();
-       efi.memmap.map = new_memmap;
-       efi.memmap.phys_map = new_memmap_phy;
-       efi.memmap.nr_map = new_nr_map;
-       efi.memmap.map_end = efi.memmap.map + efi.memmap.nr_map * efi.memmap.desc_size;
-       set_bit(EFI_MEMMAP, &efi.flags);
+       early_memunmap(new_memmap, efi.memmap.desc_size * new_nr_map);
+       efi_memmap_unmap();
+
+       data.phys_map = new_memmap_phy;
+       data.size = efi.memmap.desc_size * new_nr_map;
+       data.desc_version = efi.memmap.desc_version;
+       data.desc_size = efi.memmap.desc_size;
+       efi_memmap_init_early(&data);
 
        /* print new EFI memmap */
        efi_print_memmap();

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 7f5a5822538539848450f7d55c94ceee50d6c0bc..d862d499858045439991d3650446e39e4e577ac2 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -669,6 +669,18 @@ typedef struct {
        unsigned long tables;
 } efi_system_table_t;
 
+/*
+ * Architecture independent structure for describing a memory map for the
+ * benefit of efi_memmap_init_early(), saving us the need to pass four
+ * parameters.
+ */
+struct efi_memory_map_data {
+       phys_addr_t phys_map;
+       unsigned long size;
+       unsigned long desc_version;
+       unsigned long desc_size;
+};
+
 struct efi_memory_map {
        phys_addr_t phys_map;
        void *map;
@@ -900,6 +912,10 @@ static inline efi_status_t efi_query_variable_store(u32 attributes,
 }
 #endif
 extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
+
+extern int __init efi_memmap_init_early(struct efi_memory_map_data *data);
+extern void __init efi_memmap_unmap(void);
+
 extern int efi_config_init(efi_config_table_type_t *arch_tables);
 #ifdef CONFIG_EFI_ESRT
 extern void __init efi_esrt_init(void);