From nobody Tue Apr 8 13:41:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZX6fy35L0z5sQTZ; Tue, 08 Apr 2025 13:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX6fx5FZ4z3Dbr; Tue, 08 Apr 2025 13:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/L+BVINAaXrljnzazBJiOigXdB/J2vja3vUo1u8c24=; b=KZqLdSAqZ18jsL6fnQvja6J+tfaYw1aJW+Knj2qHPxIe63iKhUBI5NeG8COPOzWMbWDKEU crYHHrPvOP0J+HK82tgBSLTeAEMzvMg75lio8EhG2qhK0hroRuIt1vxfiJZRcId7Mjik/Y 1Bjpf4bFKjywa9LbOnaYlFp9v4pDzJsZ5ohEM8j7be1VXncjyqkK8e6Qnf1WTIwDmTeXsi YJQzPIvzlCBrvWVQjh8sf2/D/XFCeKqeEHNEAF4bXdqEJu4TwptYRopGo3bbk1YjHkKMHc /9fAFFBpMbV5t56RXnHj8AYAG7IUCHSIH/66gXqG6AHXLYBaknO0JwbhJ6/wkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119673; a=rsa-sha256; cv=none; b=rRTJvKVba5ASwceG2OQBd7HzRKXDwUzxv7gAPd9nzmOE5ZwiRvVdCQJdYAPuND55ItsxwR Y3iGSBJrhINid9+ZkixKClbGAfcYRP3Kkj5Ih0jLwjDcHHZkL0e3V+cFgkoLbhDfC2iObY Vq1T73ch7b7VS8bAb0DEh+BieSBEDco/7BwcAFnU+FOHB6SwuVn9mwff/rXMoMiuTstX8u +ub6PQaRjTiEohuylzt85GoyF/H05BsnQlxxqrs9qsY5euB37KRlPORq8gh10FkW2L59fp vqJ/foz7/RU1Sz5XoiDnao40dNuywTMdzX5R1En8j5eQlxr8xoFj3kVUrGV6eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/L+BVINAaXrljnzazBJiOigXdB/J2vja3vUo1u8c24=; b=pCF98LDR+4H5wWkcGt+hpR2O7MK93hzU9o0TgfplVS7NQdZTgl9GqRvrvRsqiKOTzgFvVB JxzNFmL3vkGx910SisQyL4/TQ4XyI8TbGYH7gf2I9H83B9OAo+JwHIgEZOBdHae0qYkWQq 9qKLaG3kKR8fEDE+Vh3WhwPy0ys8x7s/00AyQr/bWnUv5+5fAmAfFF0TmDFbeNHKp4pLVI Gyy11FVMXLaQy1VwdAkMlhDuLJ0z4ccV+9lZaIIBdAdSXMqVKgq2+izuhWvc8h7RTsqQZe rZ0Va9uuxyv5wYC4BPSDRl1U5QXJlsZV8AgmlPtt5J2qyRPz8aUj0bDRDaffqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZX6fx43kyzZxV; Tue, 08 Apr 2025 13:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 538DfDTU034575; Tue, 8 Apr 2025 13:41:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DfDXK034572; Tue, 8 Apr 2025 13:41:13 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:13 GMT Message-Id: <202504081341.538DfDXK034572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 807d51be8040 - stable/14 - loader.efi: smbios: Favor the v3 (64-bit) entry point List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 807d51be8040bbb2e96692b37d7084f16442ca94 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=807d51be8040bbb2e96692b37d7084f16442ca94 commit 807d51be8040bbb2e96692b37d7084f16442ca94 Author: Olivier Certner AuthorDate: 2025-03-05 10:46:50 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:29 +0000 loader.efi: smbios: Favor the v3 (64-bit) entry point Be consistent with what we are now doing with non-EFI boot (but with the difference that EFI runs in 64-bit mode on 64-bit platforms, so there is no restriction that the v3 entry point should be below 4GB). While here, move out the EFI smbios detection code in a separate sub-routine. Reviewed by: imp, markj MFC after: 2 weeks Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49292 (cherry picked from commit 96f77576e9ea83b3a5d1a02a24da7d54c06a58a8) --- stand/efi/loader/main.c | 51 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 819acbcd1fe5..ccde939581fc 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -946,12 +946,45 @@ acpi_detect(void) } } +static void +efi_smbios_detect(void) +{ + VOID *smbios_v2_ptr = NULL; + UINTN k; + + for (k = 0; k < ST->NumberOfTableEntries; k++) { + EFI_GUID *guid; + VOID *const VT = ST->ConfigurationTable[k].VendorTable; + char buf[40]; + bool is_smbios_v2, is_smbios_v3; + + guid = &ST->ConfigurationTable[k].VendorGuid; + is_smbios_v2 = memcmp(guid, &smbios, sizeof(*guid)) == 0; + is_smbios_v3 = memcmp(guid, &smbios3, sizeof(*guid)) == 0; + + if (!is_smbios_v2 && !is_smbios_v3) + continue; + + snprintf(buf, sizeof(buf), "%p", VT); + setenv("hint.smbios.0.mem", buf, 1); + if (is_smbios_v2) + /* + * We will parse a v2 table only if we don't find a v3 + * table. In the meantime, store the address. + */ + smbios_v2_ptr = VT; + else if (smbios_detect(VT) != NULL) + /* v3 parsing succeeded, we are done. */ + return; + } + if (smbios_v2_ptr != NULL) + (void)smbios_detect(smbios_v2_ptr); +} + EFI_STATUS main(int argc, CHAR16 *argv[]) { - EFI_GUID *guid; int howto, i, uhowto; - UINTN k; bool has_kbd, is_last; char *s; EFI_DEVICE_PATH *imgpath; @@ -974,19 +1007,7 @@ main(int argc, CHAR16 *argv[]) archsw.arch_zfs_probe = efi_zfs_probe; #if !defined(__arm__) - for (k = 0; k < ST->NumberOfTableEntries; k++) { - guid = &ST->ConfigurationTable[k].VendorGuid; - if (!memcmp(guid, &smbios, sizeof(EFI_GUID)) || - !memcmp(guid, &smbios3, sizeof(EFI_GUID))) { - char buf[40]; - - snprintf(buf, sizeof(buf), "%p", - ST->ConfigurationTable[k].VendorTable); - setenv("hint.smbios.0.mem", buf, 1); - smbios_detect(ST->ConfigurationTable[k].VendorTable); - break; - } - } + efi_smbios_detect(); #endif /* Get our loaded image protocol interface structure. */