Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 EFI changes from Ingo Molnar:
 "Two fixes that should in principle increase robustness of our
  interaction with the EFI firmware, and a cleanup"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: retry ExitBootServices() on failure
  efi: Convert runtime services function ptrs
  UEFI: Don't pass boot services regions to SetVirtualAddressMap()

4 files changed, 52 insertions, 31 deletions

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index c205035a6b96..d606463aa6d6 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -992,18 +992,20 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
         efi_memory_desc_t *mem_map;
         efi_status_t status;
         __u32 desc_version;
+        bool called_exit = false;
         u8 nr_entries;
         int i;
 
         size = sizeof(*mem_map) * 32;
 
 again:
-        size += sizeof(*mem_map);
+        size += sizeof(*mem_map) * 2;
         _size = size;
         status = low_alloc(size, 1, (unsigned long *)&mem_map);
         if (status != EFI_SUCCESS)
                 return status;
 
+get_map:
         status = efi_call_phys5(sys_table->boottime->get_memory_map, &size,
                                 mem_map, &key, &desc_size, &desc_version);
         if (status == EFI_BUFFER_TOO_SMALL) {
@@ -1029,8 +1031,20 @@ again:
         /* Might as well exit boot services now */
         status = efi_call_phys2(sys_table->boottime->exit_boot_services,
                                 handle, key);
-        if (status != EFI_SUCCESS)
-                goto free_mem_map;
+        if (status != EFI_SUCCESS) {
+                /*
+                 * ExitBootServices() will fail if any of the event
+                 * handlers change the memory map. In which case, we
+                 * must be prepared to retry, but only once so that
+                 * we're guaranteed to exit on repeated failures instead
+                 * of spinning forever.
+                 */
+                if (called_exit)
+                        goto free_mem_map;
+
+                called_exit = true;
+                goto get_map;
+        }
 
         /* Historic? */
         boot_params->alt_mem_k = 32 * 1024;
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 60c89f30c727..0062a0125041 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -52,40 +52,40 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3,
                      u64 arg4, u64 arg5, u64 arg6);
 
 #define efi_call_phys0(f)                       \
-        efi_call0((void *)(f))
+        efi_call0((f))
 #define efi_call_phys1(f, a1)                   \
-        efi_call1((void *)(f), (u64)(a1))
+        efi_call1((f), (u64)(a1))
 #define efi_call_phys2(f, a1, a2)                       \
-        efi_call2((void *)(f), (u64)(a1), (u64)(a2))
+        efi_call2((f), (u64)(a1), (u64)(a2))
 #define efi_call_phys3(f, a1, a2, a3)                           \
-        efi_call3((void *)(f), (u64)(a1), (u64)(a2), (u64)(a3))
+        efi_call3((f), (u64)(a1), (u64)(a2), (u64)(a3))
 #define efi_call_phys4(f, a1, a2, a3, a4)                               \
-        efi_call4((void *)(f), (u64)(a1), (u64)(a2), (u64)(a3),         \
+        efi_call4((f), (u64)(a1), (u64)(a2), (u64)(a3),         \
                   (u64)(a4))
 #define efi_call_phys5(f, a1, a2, a3, a4, a5)                           \
-        efi_call5((void *)(f), (u64)(a1), (u64)(a2), (u64)(a3),         \
+        efi_call5((f), (u64)(a1), (u64)(a2), (u64)(a3),         \
                   (u64)(a4), (u64)(a5))
 #define efi_call_phys6(f, a1, a2, a3, a4, a5, a6)                       \
-        efi_call6((void *)(f), (u64)(a1), (u64)(a2), (u64)(a3),         \
+        efi_call6((f), (u64)(a1), (u64)(a2), (u64)(a3),         \
                   (u64)(a4), (u64)(a5), (u64)(a6))
 
 #define efi_call_virt0(f)                               \
-        efi_call0((void *)(efi.systab->runtime->f))
+        efi_call0((efi.systab->runtime->f))
 #define efi_call_virt1(f, a1)                                   \
-        efi_call1((void *)(efi.systab->runtime->f), (u64)(a1))
+        efi_call1((efi.systab->runtime->f), (u64)(a1))
 #define efi_call_virt2(f, a1, a2)                                       \
-        efi_call2((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2))
+        efi_call2((efi.systab->runtime->f), (u64)(a1), (u64)(a2))
 #define efi_call_virt3(f, a1, a2, a3)                                   \
-        efi_call3((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+        efi_call3((efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                   (u64)(a3))
 #define efi_call_virt4(f, a1, a2, a3, a4)                               \
-        efi_call4((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+        efi_call4((efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                   (u64)(a3), (u64)(a4))
 #define efi_call_virt5(f, a1, a2, a3, a4, a5)                           \
-        efi_call5((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+        efi_call5((efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                   (u64)(a3), (u64)(a4), (u64)(a5))
 #define efi_call_virt6(f, a1, a2, a3, a4, a5, a6)                       \
-        efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+        efi_call6((efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                   (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))
 
 extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index d2fbcedcf6ea..b410b71bdcf7 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -929,6 +929,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) {
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 2bc0ad78d058..21ae6b3c0359 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -287,20 +287,20 @@ typedef struct {
 
 typedef struct {
         efi_table_hdr_t hdr;
-        unsigned long get_time;
-        unsigned long set_time;
-        unsigned long get_wakeup_time;
-        unsigned long set_wakeup_time;
-        unsigned long set_virtual_address_map;
-        unsigned long convert_pointer;
-        unsigned long get_variable;
-        unsigned long get_next_variable;
-        unsigned long set_variable;
-        unsigned long get_next_high_mono_count;
-        unsigned long reset_system;
-        unsigned long update_capsule;
-        unsigned long query_capsule_caps;
-        unsigned long query_variable_info;
+        void *get_time;
+        void *set_time;
+        void *get_wakeup_time;
+        void *set_wakeup_time;
+        void *set_virtual_address_map;
+        void *convert_pointer;
+        void *get_variable;
+        void *get_next_variable;
+        void *set_variable;
+        void *get_next_high_mono_count;
+        void *reset_system;
+        void *update_capsule;
+        void *query_capsule_caps;
+        void *query_variable_info;
 } efi_runtime_services_t;
 
 typedef efi_status_t efi_get_time_t (efi_time_t *tm, efi_time_cap_t *tc);