efi/runtime-map: Use efi.memmap directly instead of a copy

Now that efi.memmap is available all of the time there's no need to
allocate and build a separate copy of the EFI memory map.

Furthermore, efi.memmap contains boot services regions but only those
regions that have been reserved via efi_mem_reserve(). Using
efi.memmap allows us to pass boot services across kexec reboot so that
the ESRT and BGRT drivers will now work.

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>

1 files changed, 13 insertions, 22 deletions

diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
index 5c55227a34c8..8e64b77aeac9 100644
--- a/drivers/firmware/efi/runtime-map.c
+++ b/drivers/firmware/efi/runtime-map.c
@@ -14,10 +14,6 @@
 
 #include <asm/setup.h>
 
-static void *efi_runtime_map;
-static int nr_efi_runtime_map;
-static u32 efi_memdesc_size;
-
 struct efi_runtime_map_entry {
         efi_memory_desc_t md;
         struct kobject kobj;   /* kobject for each entry */
@@ -106,7 +102,8 @@ static struct kobj_type __refdata map_ktype = {
 static struct kset *map_kset;
 
 static struct efi_runtime_map_entry *
-add_sysfs_runtime_map_entry(struct kobject *kobj, int nr)
+add_sysfs_runtime_map_entry(struct kobject *kobj, int nr,
+                            efi_memory_desc_t *md)
 {
         int ret;
         struct efi_runtime_map_entry *entry;
@@ -124,8 +121,7 @@ add_sysfs_runtime_map_entry(struct kobject *kobj, int nr)
                 return ERR_PTR(-ENOMEM);
         }
 
-        memcpy(&entry->md, efi_runtime_map + nr * efi_memdesc_size,
-               sizeof(efi_memory_desc_t));
+        memcpy(&entry->md, md, sizeof(efi_memory_desc_t));
 
         kobject_init(&entry->kobj, &map_ktype);
         entry->kobj.kset = map_kset;
@@ -142,12 +138,12 @@ add_sysfs_runtime_map_entry(struct kobject *kobj, int nr)
 
 int efi_get_runtime_map_size(void)
 {
-        return nr_efi_runtime_map * efi_memdesc_size;
+        return efi.memmap.nr_map * efi.memmap.desc_size;
 }
 
 int efi_get_runtime_map_desc_size(void)
 {
-        return efi_memdesc_size;
+        return efi.memmap.desc_size;
 }
 
 int efi_runtime_map_copy(void *buf, size_t bufsz)
@@ -157,38 +153,33 @@ int efi_runtime_map_copy(void *buf, size_t bufsz)
         if (sz > bufsz)
                 sz = bufsz;
 
-        memcpy(buf, efi_runtime_map, sz);
+        memcpy(buf, efi.memmap.map, sz);
         return 0;
 }
 
-void efi_runtime_map_setup(void *map, int nr_entries, u32 desc_size)
-{
-        efi_runtime_map = map;
-        nr_efi_runtime_map = nr_entries;
-        efi_memdesc_size = desc_size;
-}
-
 int __init efi_runtime_map_init(struct kobject *efi_kobj)
 {
         int i, j, ret = 0;
         struct efi_runtime_map_entry *entry;
+        efi_memory_desc_t *md;
 
-        if (!efi_runtime_map)
+        if (!efi_enabled(EFI_MEMMAP))
                 return 0;
 
-        map_entries = kzalloc(nr_efi_runtime_map * sizeof(entry), GFP_KERNEL);
+        map_entries = kzalloc(efi.memmap.nr_map * sizeof(entry), GFP_KERNEL);
         if (!map_entries) {
                 ret = -ENOMEM;
                 goto out;
         }
 
-        for (i = 0; i < nr_efi_runtime_map; i++) {
-                entry = add_sysfs_runtime_map_entry(efi_kobj, i);
+        i = 0;
+        for_each_efi_memory_desc(md) {
+                entry = add_sysfs_runtime_map_entry(efi_kobj, i, md);
                 if (IS_ERR(entry)) {
                         ret = PTR_ERR(entry);
                         goto out_add_entry;
                 }
-                *(map_entries + i) = entry;
+                *(map_entries + i++) = entry;
         }
 
         return 0;