Revert "x86, efi: Calling __pa() with an ioremap()ed address is invalid"

This hangs my MacBook Air at boot time; I get no console
messages at all. I reverted this on top of -rc5 and my machine
boots again.

This reverts commit e8c7106280a305e1ff2a3a8a4dfce141469fb039.

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Huang Ying <huang.ying.caritas@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/1321621751-3650-1-git-send-email-matt@console
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 28 insertions, 18 deletions

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index c9718a16be15..37718f0f053d 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -323,13 +323,10 @@ static void __init do_add_efi_memmap(void)
                 case EFI_UNUSABLE_MEMORY:
                         e820_type = E820_UNUSABLE;
                         break;
-                case EFI_RUNTIME_SERVICES_DATA:
-                        e820_type = E820_RESERVED_EFI;
-                        break;
                 default:
                         /*
                          * EFI_RESERVED_TYPE EFI_RUNTIME_SERVICES_CODE
-                         * EFI_MEMORY_MAPPED_IO
+                         * EFI_RUNTIME_SERVICES_DATA EFI_MEMORY_MAPPED_IO
                          * EFI_MEMORY_MAPPED_IO_PORT_SPACE EFI_PAL_CODE
                          */
                         e820_type = E820_RESERVED;
@@ -674,21 +671,10 @@ void __init efi_enter_virtual_mode(void)
                 end_pfn = PFN_UP(end);
                 if (end_pfn <= max_low_pfn_mapped
                     || (end_pfn > (1UL << (32 - PAGE_SHIFT))
-                        && end_pfn <= max_pfn_mapped)) {
+                        && end_pfn <= max_pfn_mapped))
                         va = __va(md->phys_addr);
-
-                        if (!(md->attribute & EFI_MEMORY_WB)) {
-                                addr = (u64) (unsigned long)va;
-                                npages = md->num_pages;
-                                memrange_efi_to_native(&addr, &npages);
-                                set_memory_uc(addr, npages);
-                        }
-                } else {
-                        if (!(md->attribute & EFI_MEMORY_WB))
-                                va = ioremap_nocache(md->phys_addr, size);
-                        else
-                                va = ioremap_cache(md->phys_addr, size);
-                }
+                else
+                        va = efi_ioremap(md->phys_addr, size, md->type);
 
                 md->virt_addr = (u64) (unsigned long) va;
 
@@ -698,6 +684,13 @@ void __init efi_enter_virtual_mode(void)
                         continue;
                 }
 
+                if (!(md->attribute & EFI_MEMORY_WB)) {
+                        addr = md->virt_addr;
+                        npages = md->num_pages;
+                        memrange_efi_to_native(&addr, &npages);
+                        set_memory_uc(addr, npages);
+                }
+
                 systab = (u64) (unsigned long) efi_phys.systab;
                 if (md->phys_addr <= systab && systab < end) {
                         systab += md->virt_addr - md->phys_addr;
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 312250c6b2de..ac3aa54e2654 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -80,3 +80,20 @@ void __init efi_call_phys_epilog(void)
         local_irq_restore(efi_flags);
         early_code_mapping_set_exec(0);
 }
+
+void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
+                                 u32 type)
+{
+        unsigned long last_map_pfn;
+
+        if (type == EFI_MEMORY_MAPPED_IO)
+                return ioremap(phys_addr, size);
+
+        last_map_pfn = init_memory_mapping(phys_addr, phys_addr + size);
+        if ((last_map_pfn << PAGE_SHIFT) < phys_addr + size) {
+                unsigned long top = last_map_pfn << PAGE_SHIFT;
+                efi_ioremap(top, size - (top - phys_addr), type);
+        }
+
+        return (void __iomem *)__va(phys_addr);
+}