From nobody Tue Mar 11 14:04:44 2025 X-Original-To: dev-commits-src-main@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 4ZBwW12dM7z5qc1b; Tue, 11 Mar 2025 14:04:45 +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 4ZBwW04299z3r2J; Tue, 11 Mar 2025 14:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701884; 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=y0Ekkr1qTIIAgjz+yYwHLtHHknvWXmZo7YUa5aluyJ4=; b=ZSJtg6BpI8wpqwijeEZWGn7qmNsaBdBlkr6dWucW13KoZJDPnPoZ/rdxTEUUbCO3G5qr4Z XAmRbBVvqhYXyJ5EB3RtkZ0L9Ei852DUIADGd8DUbPVFgiCraPmcmEVv3SUsgDFDZEJ2Z3 fVJ7EQ9WYnrMspL6iIbS9KxhMirm+ssTmVRSyiAX8M5QnpqnGrCtdoTE83AypxvPP6/BIC k1x1I8C+xJ2bGerCdvJqgbThY+DnX0Wxg6JrPAyy2uMoUbvqucOgTSyOSY9QiXY1q/OkZt ZCistozZ/hBoRW20rzf6ZcyIqnhym3hQJjVgGiV84cNWyfLWpM9heRXlhNEo8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701884; a=rsa-sha256; cv=none; b=BJJSiYCYW2JaastYAyMGC1UYf5Z0le28EXCk+jNsM2QOm7aGa0V/mop/yyZbyzp8mTHU1w uXZ+TlPRrzYf6kMMhZRHfJ9uWxO6hLxJhymCKpaavl4qYPfrSp1wnxj3znCsJKdCiIqPTP lIJ61unQDYgDXhzPpPxgk8AoMWJQ76dwTmC5aGlY/qVuGNpPJ/G1hqvMacbkFsZBzRSGWI yUo2h5UC/VHmsRk4O3Zr0FiJh4jWQnJg7PhjgH7o27Ypjr734A55LrLxoralF+MFTfUVoV Sl7/kyn1DyclyU4GnzvRQV5NTxoF4TanYFhz+5+wpp9Qd95J/MAQ+dW5sEbIvA== 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=1741701884; 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=y0Ekkr1qTIIAgjz+yYwHLtHHknvWXmZo7YUa5aluyJ4=; b=Wvkan7MZTQXqkhh6qbeupsKENiFopK4PcTcKTT4hkTmm2jYLJ/QZA8r9TFOOGQoG0Rb5pA KcVBHIcoqqmkIA/reJ/vKV0a45f0jcHvR3IG+TKkhu4lJPA9Qu3iqGkm6ciNbnAYkOOtYc 8DZYA7eaq9L4wCzPt7tJaBRbsYzoeKpcrdnRC/k5Ada0pWPoA1dRVJdijzjsjAJ3/bAcKt sN6Kerl7y4kDg47NK7Wlz7e0NpdPRYFB96R1U0MDNGpJOrrt4AHpvUmU6rO1Q0wyII28Ef KX7QMbi/EJJSw56ljmGjjGY+0oKxzsYk/rlnrWqh5YNgjF4zSMxK3vfpNDmiUQ== 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 4ZBwW03dsZzD5q; Tue, 11 Mar 2025 14:04:44 +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 52BE4i9Z028838; Tue, 11 Mar 2025 14:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4iGj028835; Tue, 11 Mar 2025 14:04:44 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:44 GMT Message-Id: <202503111404.52BE4iGj028835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 3f744fb8b2c5 - main - libsa: smbios: Favor the v3 (64-bit) entry point on non-EFI boot List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3f744fb8b2c5528c2170be113e0e4947eee3cffc Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3f744fb8b2c5528c2170be113e0e4947eee3cffc commit 3f744fb8b2c5528c2170be113e0e4947eee3cffc Author: Olivier Certner AuthorDate: 2025-03-03 14:38:10 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:09 +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 --- 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*