UEFI: Don't pass boot services regions to SetVirtualAddressMap()

We need to map boot services regions during startup in order to avoid
firmware bugs, but we shouldn't be passing those regions to
SetVirtualAddressMap(). Ensure that we're only passing regions that are
marked as being mapped at runtime.

Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 55856b2310d37d76240a2af47140f2deb97e8482..339e11f9b3a9e6a6e25b308652202cf9cfd7a38e 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -1026,6 +1026,13 @@ void __init efi_enter_virtual_mode(void)
                        va = efi_ioremap(md->phys_addr, size,
                                         md->type, md->attribute);
 
+               if (!(md->attribute & EFI_MEMORY_RUNTIME)) {
+                       if (!va)
+                               pr_err("ioremap of 0x%llX failed!\n",
+                                      (unsigned long long)md->phys_addr);
+                       continue;
+               }
+
                md->virt_addr = (u64) (unsigned long) va;
 
                if (!va) {