From nobody Tue Apr 8 13:41:07 2025 X-Original-To: dev-commits-src-all@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 4ZX6fr1Flxz5sQ7T; Tue, 08 Apr 2025 13:41:08 +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 4ZX6fq6t8tz3DXC; Tue, 08 Apr 2025 13:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119668; 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=NFWgIf1BU+9oyPs22qPcxSVScfH/0u4Vox108W75cwo=; b=pIMK05FhHutbd7YvDyHWocbZcsBOefLIcMkNJILeEdtZa6PaqzKmb5dLCXXRL/Gc85Hr5v PFSnfdh0DdjYp8KzZP50YY6f9fM1xK07gCojcoWX0X5UvN8DkYmw2LHGWJ8BE4o+vZ+XIy o8Vju+3rSXEKBNk93wtOYqZ4nDS5Srt4iXiEzOhRmkeXtb1MpZP87lJ6v9nBE50E9P1Niu 02UxyMrgdEKuE3ntOkJhKM55XXqFkSwJFr5D7wgGX763gKA7yFdlHhdWr3F/mR2rMbuZou SsQ6/skIlbrDALoe9m6aWUC7i0BUqqKlNsteRzw0DReKmwNQuLO/A46I/0uR2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119668; a=rsa-sha256; cv=none; b=m3gB/d0edda3DPO6MYTlgktPLIFX1MQOZvvSUOWmZiBJV92w9Ze7u6+UIX5AtQx7KYzuZA EgE+57/6uz5xJipyQoag7GXRnXEcMSvhmg/oC0IegLabWz3mgf2Y8SSJcG3r+0nPbeDKOC oAhSpLbBBAgakeTUlSiKkgcMvAU3ZcPWhQHqEhwiPm3O2yvFXoD76ygb+JdTXlz1t/+HQ3 tD3bMfKqgENumsU81xHv5w/KT2phXrrZU7h3M/u39gN4pEgzmgrvtW6spRALBA8hrUppQ/ +WouxqirRCxyxfxrUkZfzKoZjr5s1P2bjcIk5tO8AzucgQ9sTzCwfM/gdjW+eQ== 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=1744119668; 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=NFWgIf1BU+9oyPs22qPcxSVScfH/0u4Vox108W75cwo=; b=irfdcXIwYVZQ+W7Z9CkWxzvthbowOMYRIGJQorpROlVumcMv2bxm8l+ol3yIc9RBfwXGRL miiZWFxIRY30z30XFdxEUFLEVum9V3eUrCEIPVDYy7kusJgOqIw3Nqph7wO8/1HpdUYEu4 MvZbQf20fXtL6zDWMJcmj/fZlHiXH7ywgd+l4izTHVICnhiMtwkRYhyEXXjHIeK2edUL64 yPCEeYoIWIQ1t5+8tJ8s9XmZYzecTD2Hd64iccU1lqhV9VULVOAuWxAMkYQwuBY07F5AL6 eIsMXRbUqJlTj4nuc5A7p+KkfyOwFJD8qWtP3duV0UUBWujf5Sc1fgXqBH36Rg== 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 4ZX6fq6TWtzZh3; Tue, 08 Apr 2025 13:41:07 +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 538Df7No033415; Tue, 8 Apr 2025 13:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Df7ki033408; Tue, 8 Apr 2025 13:41:07 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:07 GMT Message-Id: <202504081341.538Df7ki033408@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: 93af0db0d529 - stable/14 - libsa: smbios: Favor the v3 (64-bit) entry point on non-EFI boot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 93af0db0d5298bc7d1eb05d57aacfc6495d2c057 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=93af0db0d5298bc7d1eb05d57aacfc6495d2c057 commit 93af0db0d5298bc7d1eb05d57aacfc6495d2c057 Author: Olivier Certner AuthorDate: 2025-03-03 14:38:10 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:27 +0000 libsa: smbios: Favor the v3 (64-bit) entry point on non-EFI boot When both the 32-bit and 64-bit entry points are present, the SMBIOS specification says that the 64-bit entry point always has at least all the structures the 32-bit entry point refers. In other words, the 32-bit entry point is provided for compatibility, so we assume the 64-bit one has more chances to be filled with adequate values. Doing this also increases consistency with the kernel's smbios(4) driver. Reviewed by: imp, markj MFC after: 2 weeks Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49287 (cherry picked from commit 3f744fb8b2c5528c2170be113e0e4947eee3cffc) --- stand/libsa/smbios.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 4deea4f31b11..2477c0ccf2d3 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -180,16 +180,10 @@ static caddr_t smbios_sigsearch(const caddr_t addr, const uint32_t len) { caddr_t cp; + caddr_t v2_p = NULL; /* Search on 16-byte boundaries. */ for (cp = addr; cp < addr + len; cp += SMBIOS_STEP) { - /* v2.1, 32-bit Entry point */ - if (strncmp(cp, SMBIOS_SIG, sizeof(SMBIOS_SIG) - 1) == 0 && - smbios_checksum(cp, SMBIOS_GET8(cp, 0x05)) == 0 && - strncmp(cp + 0x10, SMBIOS_DMI_SIG, 5) == 0 && - smbios_checksum(cp + 0x10, 0x0f) == 0) - return (cp); - #ifdef SMBIOS_64BIT_EP /* v3.0, 64-bit Entry point */ if (strncmp(cp, SMBIOS3_SIG, sizeof(SMBIOS3_SIG) - 1) == 0 && @@ -205,8 +199,24 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) return (cp); } #endif + + /* v2.1, 32-bit Entry point */ + if (strncmp(cp, SMBIOS_SIG, sizeof(SMBIOS_SIG) - 1) == 0 && + smbios_checksum(cp, SMBIOS_GET8(cp, 0x05)) == 0 && + strncmp(cp + 0x10, SMBIOS_DMI_SIG, 5) == 0 && + smbios_checksum(cp + 0x10, 0x0f) == 0) { + /* + * Note that we saw this entry point, but don't return + * it right now on SMBIOS_64BIT_EP as we favor the 64-bit + * one if present. + */ + v2_p = cp; +#ifndef SMBIOS_64BIT_EP + break; +#endif + } } - return (NULL); + return (v2_p); } static const char*