[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, 30 insertions, 27 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index ac5bbaedac1b..fc8a3bce6cbb 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -156,12 +156,10 @@ acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
 {
         if (efi_enabled) {
                 addr->pointer_type = ACPI_PHYSICAL_POINTER;
-                if (efi.acpi20)
-                        addr->pointer.physical =
-                            (acpi_physical_address) virt_to_phys(efi.acpi20);
-                else if (efi.acpi)
-                        addr->pointer.physical =
-                            (acpi_physical_address) virt_to_phys(efi.acpi);
+                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                        addr->pointer.physical = efi.acpi20;
+                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+                        addr->pointer.physical = efi.acpi;
                 else {
                         printk(KERN_ERR PREFIX
                                "System description tables not found\n");
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 343379f23a53..9b7e4d52ffd4 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -568,20 +568,20 @@ systab_read(struct subsystem *entry, char *buf)
         if (!entry || !buf)
                 return -EINVAL;
 
-        if (efi.mps)
-                str += sprintf(str, "MPS=0x%lx\n", __pa(efi.mps));
-        if (efi.acpi20)
-                str += sprintf(str, "ACPI20=0x%lx\n", __pa(efi.acpi20));
-        if (efi.acpi)
-                str += sprintf(str, "ACPI=0x%lx\n", __pa(efi.acpi));
-        if (efi.smbios)
-                str += sprintf(str, "SMBIOS=0x%lx\n", __pa(efi.smbios));
-        if (efi.hcdp)
-                str += sprintf(str, "HCDP=0x%lx\n", __pa(efi.hcdp));
-        if (efi.boot_info)
-                str += sprintf(str, "BOOTINFO=0x%lx\n", __pa(efi.boot_info));
-        if (efi.uga)
-                str += sprintf(str, "UGA=0x%lx\n", __pa(efi.uga));
+        if (efi.mps != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "MPS=0x%lx\n", efi.mps);
+        if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "ACPI20=0x%lx\n", efi.acpi20);
+        if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "ACPI=0x%lx\n", efi.acpi);
+        if (efi.smbios != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);
+        if (efi.hcdp != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "HCDP=0x%lx\n", efi.hcdp);
+        if (efi.boot_info != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "BOOTINFO=0x%lx\n", efi.boot_info);
+        if (efi.uga != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "UGA=0x%lx\n", efi.uga);
 
         return str - buf;
 }
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index ae1fb45dbb40..c37baf9448bc 100644
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -89,19 +89,20 @@ efi_setup_pcdp_console(char *cmdline)
         struct pcdp_uart *uart;
         struct pcdp_device *dev, *end;
         int i, serial = 0;
+        int rc = -ENODEV;
 
-        pcdp = efi.hcdp;
-        if (!pcdp)
+        if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
                 return -ENODEV;
 
-        printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, __pa(pcdp));
+        pcdp = ioremap(efi.hcdp, 4096);
+        printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp);
 
         if (strstr(cmdline, "console=hcdp")) {
                 if (pcdp->rev < 3)
                         serial = 1;
         } else if (strstr(cmdline, "console=")) {
                 printk(KERN_INFO "Explicit \"console=\"; ignoring PCDP\n");
-                return -ENODEV;
+                goto out;
         }
 
         if (pcdp->rev < 3 && efi_uart_console_only())
@@ -110,7 +111,8 @@ efi_setup_pcdp_console(char *cmdline)
         for (i = 0, uart = pcdp->uart; i < pcdp->num_uarts; i++, uart++) {
                 if (uart->flags & PCDP_UART_PRIMARY_CONSOLE || serial) {
                         if (uart->type == PCDP_CONSOLE_UART) {
-                                return setup_serial_console(uart);
+                                rc = setup_serial_console(uart);
+                                goto out;
                         }
                 }
         }
@@ -121,10 +123,13 @@ efi_setup_pcdp_console(char *cmdline)
              dev = (struct pcdp_device *) ((u8 *) dev + dev->length)) {
                 if (dev->flags & PCDP_PRIMARY_CONSOLE) {
                         if (dev->type == PCDP_CONSOLE_VGA) {
-                                return setup_vga_console(dev);
+                                rc = setup_vga_console(dev);
+                                goto out;
                         }
                 }
         }
 
-        return -ENODEV;
+out:
+        iounmap(pcdp);
+        return rc;
 }