Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2c99e3c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

[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: default avatarBjorn 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: default avatar"Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 27d8e3d1

arch/i386/kernel/acpi/boot.c

+4 −4
Original line number Diff line number Diff line
@@ -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

arch/i386/kernel/dmi_scan.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/i386/kernel/efi.c

+15 −6
Original line number Diff line number Diff line
@@ -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);

		}

	}

arch/ia64/kernel/acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -651,9 +651,9 @@ unsigned long __init acpi_find_rsdp(void) 
{

	unsigned long rsdp_phys = 0;



	if (efi.acpi20)

		rsdp_phys = __pa(efi.acpi20);

	else if (efi.acpi)

	if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)

		rsdp_phys = efi.acpi20;

	else if (efi.acpi != EFI_INVALID_TABLE_ADDR)

		printk(KERN_WARNING PREFIX

		       "v1.0/r0.71 tables no longer supported\n");

	return rsdp_phys;

arch/ia64/kernel/efi.c

+15 −6
Original line number Diff line number Diff line
@@ -458,24 +458,33 @@ efi_init (void) 
	printk(KERN_INFO "EFI v%u.%.02u by %s:",

	       efi.systab->hdr.revision >> 16, efi.systab->hdr.revision & 0xffff, vendor);



	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 < (int) efi.systab->nr_tables; i++) {

		if (efi_guidcmp(config_tables[i].guid, MPS_TABLE_GUID) == 0) {

			efi.mps = __va(config_tables[i].table);

			efi.mps = config_tables[i].table;

			printk(" 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(" 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(" ACPI=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, SMBIOS_TABLE_GUID) == 0) {

			efi.smbios = __va(config_tables[i].table);

			efi.smbios = config_tables[i].table;

			printk(" SMBIOS=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, SAL_SYSTEM_TABLE_GUID) == 0) {

			efi.sal_systab = __va(config_tables[i].table);

			efi.sal_systab = config_tables[i].table;

			printk(" SALsystab=0x%lx", config_tables[i].table);

		} else if (efi_guidcmp(config_tables[i].guid, HCDP_TABLE_GUID) == 0) {

			efi.hcdp = __va(config_tables[i].table);

			efi.hcdp = config_tables[i].table;

			printk(" HCDP=0x%lx", config_tables[i].table);

		}

	}