efi: Defer freeing boot services memory until after ACPI init

[deliverable/linux.git] / arch / x86 / platform / efi / efi.c

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index f55a4ce6dc494d7375dcd564d40424a0b416ce7f..b3dbbdbd2a42b4b4a2658dd7b850b1fdb7acafbc 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -419,10 +419,21 @@ void __init efi_reserve_boot_services(void)
        }
 }
 
-static void __init efi_free_boot_services(void)
+static void __init efi_unmap_memmap(void)
+{
+       if (memmap.map) {
+               early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);
+               memmap.map = NULL;
+       }
+}
+
+void __init efi_free_boot_services(void)
 {
        void *p;
 
+       if (!efi_native)
+               return;
+
        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                efi_memory_desc_t *md = p;
                unsigned long long start = md->phys_addr;
@@ -438,6 +449,8 @@ static void __init efi_free_boot_services(void)
 
                free_bootmem_late(start, size);
        }
+
+       efi_unmap_memmap();
 }
 
 static int __init efi_systab_init(void *phys)
@@ -787,8 +800,10 @@ void __init efi_enter_virtual_mode(void)
         * non-native EFI
         */
 
-       if (!efi_native)
-               goto out;
+       if (!efi_native) {
+               efi_unmap_memmap();
+               return;
+       }
 
        /* Merge contiguous regions of the same type and attribute */
        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
@@ -877,13 +892,6 @@ void __init efi_enter_virtual_mode(void)
                panic("EFI call to SetVirtualAddressMap() failed!");
        }
 
-       /*
-        * Thankfully, it does seem that no runtime services other than
-        * SetVirtualAddressMap() will touch boot services code, so we can
-        * get rid of it all at this point
-        */
-       efi_free_boot_services();
-
        /*
         * Now that EFI is in virtual mode, update the function
         * pointers in the runtime service table to the new virtual addresses.
@@ -907,9 +915,6 @@ void __init efi_enter_virtual_mode(void)
        if (__supported_pte_mask & _PAGE_NX)
                runtime_code_page_mkexec();
 
-out:
-       early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);
-       memmap.map = NULL;
        kfree(new_memmap);
 }