efi: dmi: add support for SMBIOS 3.0 UEFI configuration table

This adds support to the UEFI side for detecting the presence of
a SMBIOS 3.0 64-bit entry point. This allows the actual SMBIOS
structure table to reside at a physical offset over 4 GB, which
cannot be supported by the legacy SMBIOS 32-bit entry point.

Since the firmware can legally provide both entry points, store
the SMBIOS 3.0 entry point in a separate variable, and let the
DMI decoding layer decide which one will be used.

Tested-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 8590099ac148..9035c1b74d58 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -30,6 +30,7 @@ struct efi __read_mostly efi = {
         .acpi       = EFI_INVALID_TABLE_ADDR,
         .acpi20     = EFI_INVALID_TABLE_ADDR,
         .smbios     = EFI_INVALID_TABLE_ADDR,
+        .smbios3    = EFI_INVALID_TABLE_ADDR,
         .sal_systab = EFI_INVALID_TABLE_ADDR,
         .boot_info  = EFI_INVALID_TABLE_ADDR,
         .hcdp       = EFI_INVALID_TABLE_ADDR,
@@ -86,6 +87,8 @@ static ssize_t systab_show(struct kobject *kobj,
                 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.smbios3 != EFI_INVALID_TABLE_ADDR)
+                str += sprintf(str, "SMBIOS3=0x%lx\n", efi.smbios3);
         if (efi.hcdp != EFI_INVALID_TABLE_ADDR)
                 str += sprintf(str, "HCDP=0x%lx\n", efi.hcdp);
         if (efi.boot_info != EFI_INVALID_TABLE_ADDR)
@@ -260,6 +263,7 @@ static __initdata efi_config_table_type_t common_tables[] = {
         {MPS_TABLE_GUID, "MPS", &efi.mps},
         {SAL_SYSTEM_TABLE_GUID, "SALsystab", &efi.sal_systab},
         {SMBIOS_TABLE_GUID, "SMBIOS", &efi.smbios},
+        {SMBIOS3_TABLE_GUID, "SMBIOS 3.0", &efi.smbios3},
         {UGA_IO_PROTOCOL_GUID, "UGA", &efi.uga},
         {NULL_GUID, NULL, NULL},
 };