[PATCH] EFI: keep physical table addresses in efi structure

Almost all users of the table addresses from the EFI system table want
physical addresses.  So rather than doing the pa->va->pa conversion, just keep
physical addresses in struct efi.

This fixes a DMI bug: the efi structure contained the physical SMBIOS address
on x86 but the virtual address on ia64, so dmi_scan_machine() used ioremap()
on a virtual address on ia64.

This is essentially the same as an earlier patch by Matt Tolentino:
	http://marc.theaimsgroup.com/?l=linux-kernel&m=112130292316281&w=2
except that this changes all table addresses, not just ACPI addresses.

Matt's original patch was backed out because it caused MCAs on HP sx1000
systems.  That problem is resolved by the ioremap() attribute checking added
for ia64.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Cc: "Tolentino, Matthew E" <matthew.e.tolentino@intel.com>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: Andi Kleen <ak@muc.de>
Acked-by: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 21 insertions, 12 deletions

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index f1a21945963d..033066176b3e 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -668,10 +668,10 @@ unsigned long __init acpi_find_rsdp(void)
         unsigned long rsdp_phys = 0;
 
         if (efi_enabled) {
-                if (efi.acpi20)
-                        return __pa(efi.acpi20);
-                else if (efi.acpi)
-                        return __pa(efi.acpi);
+                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                        return efi.acpi20;
+                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+                        return efi.acpi;
         }
         /*
          * Scan memory looking for the RSDP signature. First search EBDA (low
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index c032f9e06bb6..170d4c9f9bc3 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -217,14 +217,14 @@ void __init dmi_scan_machine(void)
         int rc;
 
         if (efi_enabled) {
-                if (!efi.smbios)
+                if (efi.smbios == EFI_INVALID_TABLE_ADDR)
                         goto out;
 
                /* This is called as a core_initcall() because it isn't
                 * needed during early boot.  This also means we can
                 * iounmap the space when we're done with it.
                 */
-                p = dmi_ioremap((unsigned long)efi.smbios, 32);
+                p = dmi_ioremap(efi.smbios, 32);
                 if (p == NULL)
                         goto out;
 
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index 7ec6cfa01fb3..c224c2aebbab 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -381,29 +381,38 @@ void __init efi_init(void)
         if (config_tables == NULL)
                 printk(KERN_ERR PFX "Could not map EFI Configuration Table!\n");
 
+        efi.mps        = EFI_INVALID_TABLE_ADDR;
+        efi.acpi       = EFI_INVALID_TABLE_ADDR;
+        efi.acpi20     = EFI_INVALID_TABLE_ADDR;
+        efi.smbios     = EFI_INVALID_TABLE_ADDR;
+        efi.sal_systab = EFI_INVALID_TABLE_ADDR;
+        efi.boot_info  = EFI_INVALID_TABLE_ADDR;
+        efi.hcdp       = EFI_INVALID_TABLE_ADDR;
+        efi.uga        = EFI_INVALID_TABLE_ADDR;
+
         for (i = 0; i < num_config_tables; i++) {
                 if (efi_guidcmp(config_tables[i].guid, MPS_TABLE_GUID) == 0) {
-                        efi.mps = (void *)config_tables[i].table;
+                        efi.mps = config_tables[i].table;
                         printk(KERN_INFO " MPS=0x%lx ", config_tables[i].table);
                 } else
                     if (efi_guidcmp(config_tables[i].guid, ACPI_20_TABLE_GUID) == 0) {
-                        efi.acpi20 = __va(config_tables[i].table);
+                        efi.acpi20 = config_tables[i].table;
                         printk(KERN_INFO " ACPI 2.0=0x%lx ", config_tables[i].table);
                 } else
                     if (efi_guidcmp(config_tables[i].guid, ACPI_TABLE_GUID) == 0) {
-                        efi.acpi = __va(config_tables[i].table);
+                        efi.acpi = config_tables[i].table;
                         printk(KERN_INFO " ACPI=0x%lx ", config_tables[i].table);
                 } else
                     if (efi_guidcmp(config_tables[i].guid, SMBIOS_TABLE_GUID) == 0) {
-                        efi.smbios = (void *) config_tables[i].table;
+                        efi.smbios = config_tables[i].table;
                         printk(KERN_INFO " SMBIOS=0x%lx ", config_tables[i].table);
                 } else
                     if (efi_guidcmp(config_tables[i].guid, HCDP_TABLE_GUID) == 0) {
-                        efi.hcdp = (void *)config_tables[i].table;
+                        efi.hcdp = config_tables[i].table;
                         printk(KERN_INFO " HCDP=0x%lx ", config_tables[i].table);
                 } else
                     if (efi_guidcmp(config_tables[i].guid, UGA_IO_PROTOCOL_GUID) == 0) {
-                        efi.uga = (void *)config_tables[i].table;
+                        efi.uga = config_tables[i].table;
                         printk(KERN_INFO " UGA=0x%lx ", config_tables[i].table);
                 }
         }