diff mbox series

[Concept,v2,11/20] efi: app: Support reading SMBIOS3 tables

Message ID	20251007170549.541981-12-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Tue, 7 Oct 2025 11:05:25 -0600 Message-ID: <20251007170549.541981-12-sjg@u-boot.org> In-Reply-To: <20251007170549.541981-1-sjg@u-boot.org> References: <20251007170549.541981-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: DCINBZA7N2VFCUZ7OALURFBGEMP3J2VU CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <sjg@chromium.org>, Claude <noreply@anthropic.com> Precedence: list Subject: [Concept] [PATCH v2 11/20] efi: app: Support reading SMBIOS3 tables Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/DCINBZA7N2VFCUZ7OALURFBGEMP3J2VU/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	expo: Complete mouse operation in the EFI app \| [Concept,v2,00/20] expo: Complete mouse operation in the EFI app [Concept,v2,01/20] qfw: Export qfw_locate_file() for external use [Concept,v2,02/20] event: Add EVT_BOOTCMD event for custom boot commands [Concept,v2,03/20] x86: qemu: Add EVT_BOOTCMD handler to get bootcmd from fw_cfg [Concept,v2,04/20] scripts: build-qemu: Add --bootcmd option to pass bootcmd via fw_cfg [Concept,v2,05/20] mouse: Replace mouse_press_state_t enum with bool [Concept,v2,06/20] mouse: Replace press_state with bool pressed [Concept,v2,07/20] mouse: Move click detection into mouse_get_event() [Concept,v2,08/20] expo: Speed up polling the keyboard [Concept,v2,09/20] x86: efi: Avoid setting MTRRs in the app [Concept,v2,10/20] x86: efi: Disable i8042 in the x86 app [Concept,v2,11/20] efi: app: Support reading SMBIOS3 tables [Concept,v2,12/20] efi: app: Detect running under QEMU [Concept,v2,14/20] efi: video: Add some more debugging for the modes [Concept,v2,15/20] efi: mouse: Move simple-pointer code into a function [Concept,v2,16/20] efi: mouse: Move button handling into a function [Concept,v2,17/20] efi: mouse: Split out event handling further [Concept,v2,18/20] efi: Add definitions for the absolute-pointer protocol [Concept,v2,19/20] efi: mouse: Add support for an absolute pointer [Concept,v2,20/20] efi: mouse: Scale the pointer to the display

Commit Message

Simon Glass Oct. 7, 2025, 5:05 p.m. UTC

  From: Simon Glass <sjg@chromium.org>

Check for both GUIDs when looking for the SMBIOS tables. This allows
both table versions to be detected when running from OVMF.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 lib/efi_client/efi_app.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/lib/efi_client/efi_app.c b/lib/efi_client/efi_app.c
index c851173f1ae..00003c27ec5 100644
--- a/lib/efi_client/efi_app.c
+++ b/lib/efi_client/efi_app.c
@@ -164,7 +164,8 @@  static void free_memory(struct efi_priv *priv)
 static void scan_tables(struct efi_system_table *sys_table)
 {
 	efi_guid_t acpi = EFI_ACPI_TABLE_GUID;
-	efi_guid_t smbios = SMBIOS3_TABLE_GUID;
+	efi_guid_t smbios = SMBIOS_TABLE_GUID;
+	efi_guid_t smbios3 = SMBIOS3_TABLE_GUID;
 	uint i;
 
 	for (i = 0; i < sys_table->nr_tables; i++) {
@@ -172,8 +173,9 @@  static void scan_tables(struct efi_system_table *sys_table)
 
 		if (!memcmp(&tab->guid, &acpi, sizeof(efi_guid_t)))
 			gd_set_acpi_start(map_to_sysmem(tab->table));
-		else if (!memcmp(&tab->guid, &smbios, sizeof(efi_guid_t)))
-			gd->arch.smbios_start = map_to_sysmem(tab->table);
+		else if (!memcmp(&tab->guid, &smbios, sizeof(efi_guid_t)) ||
+			 !memcmp(&tab->guid, &smbios3, sizeof(efi_guid_t)))
+			gd_set_smbios_start(map_to_sysmem(tab->table));
 	}
 }