efi: Fix handling of multiple efi_fake_mem= entries

[linux.git] / drivers / firmware / efi / fake_mem.c

diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c
index a8d20568d532b653e7d6ad876e4efcfa59371eb9..6e0f34a38171d921c1a42931e53d44cdf515a293 100644 (file)
--- a/drivers/firmware/efi/fake_mem.c
+++ b/drivers/firmware/efi/fake_mem.c
@@ -34,25 +34,16 @@ static int __init cmp_fake_mem(const void *x1, const void *x2)
        return 0;
 }
 
-void __init efi_fake_memmap(void)
+static void __init efi_fake_range(struct efi_mem_range *efi_range)
 {
        struct efi_memory_map_data data = { 0 };
        int new_nr_map = efi.memmap.nr_map;
        efi_memory_desc_t *md;
        void *new_memmap;
-       int i;
-
-       if (!efi_enabled(EFI_MEMMAP) || !nr_fake_mem)
-               return;
 
        /* count up the number of EFI memory descriptor */
-       for (i = 0; i < nr_fake_mem; i++) {
-               for_each_efi_memory_desc(md) {
-                       struct range *r = &efi_fake_mems[i].range;
-
-                       new_nr_map += efi_memmap_split_count(md, r);
-               }
-       }
+       for_each_efi_memory_desc(md)
+               new_nr_map += efi_memmap_split_count(md, &efi_range->range);
 
        /* allocate memory for new EFI memmap */
        if (efi_memmap_alloc(new_nr_map, &data) != 0)
@@ -61,17 +52,27 @@ void __init efi_fake_memmap(void)
        /* create new EFI memmap */
        new_memmap = early_memremap(data.phys_map, data.size);
        if (!new_memmap) {
-               memblock_free(data.phys_map, data.size);
+               __efi_memmap_free(data.phys_map, data.size, data.flags);
                return;
        }
 
-       for (i = 0; i < nr_fake_mem; i++)
-               efi_memmap_insert(&efi.memmap, new_memmap, &efi_fake_mems[i]);
+       efi_memmap_insert(&efi.memmap, new_memmap, efi_range);
 
        /* swap into new EFI memmap */
        early_memunmap(new_memmap, data.size);
 
        efi_memmap_install(&data);
+}
+
+void __init efi_fake_memmap(void)
+{
+       int i;
+
+       if (!efi_enabled(EFI_MEMMAP) || !nr_fake_mem)
+               return;
+
+       for (i = 0; i < nr_fake_mem; i++)
+               efi_fake_range(&efi_fake_mems[i]);
 
        /* print new EFI memmap */
        efi_print_memmap();