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

Commit e1ccbbc9 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

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: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Acked-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Acked-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
parent 4e27d475

drivers/firmware/efi/efi.c

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

};

drivers/xen/efi.c

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static const struct efi efi_xen __initconst = { 
	.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,

include/linux/efi.h

+5 −1
Original line number Diff line number Diff line
@@ -547,6 +547,9 @@ void efi_native_runtime_setup(void); 
#define SMBIOS_TABLE_GUID    \

    EFI_GUID(  0xeb9d2d31, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d )



#define SMBIOS3_TABLE_GUID    \

    EFI_GUID(  0xf2fd1544, 0x9794, 0x4a2c, 0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94 )



#define SAL_SYSTEM_TABLE_GUID    \

    EFI_GUID(  0xeb9d2d32, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d )
@@ -810,7 +813,8 @@ extern struct efi { 
	unsigned long mps;		/* MPS table */

	unsigned long acpi;		/* ACPI table  (IA64 ext 0.71) */

	unsigned long acpi20;		/* ACPI table  (ACPI 2.0) */

	unsigned long smbios;		/* SM BIOS table */

	unsigned long smbios;		/* SMBIOS table (32 bit entry point) */

	unsigned long smbios3;		/* SMBIOS table (64 bit entry point) */

	unsigned long sal_systab;	/* SAL system table */

	unsigned long boot_info;	/* boot info table */

	unsigned long hcdp;		/* HCDP table */