From nobody Tue Apr 8 13:41:04 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 4ZX6fn3Mv4z5sPnL; Tue, 08 Apr 2025 13:41:05 +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 4ZX6fm6VxYz3D7W; Tue, 08 Apr 2025 13:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119664; 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=U2D+o1Uu6Jek95XhrDyQpWrivNKrjyDm+xysPIgX9tU=; b=KpnYudFRV/HAtojjTRjFM7XEPi6uQDG4uXCCIE5Gq2AdCXZVukLP45fYdlOl7tYdQJJ+4j YJ5h4IRKwwSx4owGlIvdF6wE1XdzUYYYhxNjhy99XSjlL5mubwyOQjWNIl7DY0P97U2sOB M+VGqcXdo9tQ+T5eMMU8wWFBtSouL4i7lV6JPJahQnIO+YJaqZzpyVKnNlBZqF3x0kKeFo qaBki+B0rDlsNFZyMq7p2sQZh4nbq7g3m7U8lsBZqWwCd+CDWuqm3fSQQ1dXQvheI6esjQ +2Q3i8hv9GMxr1LCMpobzX4Iel4oh7lwF4xottERtgKc9ogCpqPf1KyJT2T4rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119664; a=rsa-sha256; cv=none; b=iuqhW7ZCR+FmHnU7iYFIsMnxPnDLFsRV6zsMfn3/UYiLKDSB8Zk0WSoyY6f+BF3GZ+LeOD Lb2xLXxab5dmqd+zbrw0Wz6GPSDT5xhd2kZJG0sTDMq+4wXsUPGtRSgDwamkIkcnhfq4Cn g2V4MmliCd5tdPUWYSEOutNkRn/uC5N0zqCOzrACUgDHcNi1FzDrQddl0PmdeCSLy6emtK YjkkCDx794lPH+gA+FFr4zbHGhn0HLRpzuRmNl4ACHWunPCGVwImtL6M/wYCnUkRSs/khj 4YQCFtEUKeDs/cbOkk7nQq0s7c9Y2cMypFi0BSlgyxKuSlj8VO8k0R7ufAbhhA== 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=1744119664; 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=U2D+o1Uu6Jek95XhrDyQpWrivNKrjyDm+xysPIgX9tU=; b=KGpdvAMvPK6QKEYhdWLPtdtnrUaQ7LiKsPjPjnGXEpRPG9rPK+eXOkbU0fcUvdSStm8Iyv hJSvMSZvxpaGxWBdGxmwATBgruISqicPb6yWWyk0giMXUO6VB6+a3bzLq5PDzoEVGA8sm4 0RdQi1epuXprB2HPFC9Jpj7R24Q5v7Fg9BS0J944rzjgL2IlN7G0rwcEZ+U0/uirGOS37v iyf+BQMq/iIfWqhrKWEl/7ghO4IkJnl199iQrNeq8xv8sJOIxrQS/ZVAqyVXBAjTrDpH2U vB6sJBQBcD887vXpuVJ5jU1cOuIbD+WiOqNeMr3OH1oMeqYOlzwEiIzOHEOdYw== 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 4ZX6fm4TDGzZxP; Tue, 08 Apr 2025 13:41:04 +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 538Df4tc032497; Tue, 8 Apr 2025 13:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Df417032493; Tue, 8 Apr 2025 13:41:04 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:04 GMT Message-Id: <202504081341.538Df417032493@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: 19a5b6aaab92 - stable/14 - libsa: smbios: probe: BCD revision parsing is v2-only code; Expand comments 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: 19a5b6aaab92e4fe7617c0f7ed21849cdaa9ae67 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=19a5b6aaab92e4fe7617c0f7ed21849cdaa9ae67 commit 19a5b6aaab92e4fe7617c0f7ed21849cdaa9ae67 Author: Olivier Certner AuthorDate: 2025-03-03 14:30:16 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:27 +0000 libsa: smbios: probe: BCD revision parsing is v2-only code; Expand comments The code parsing the BCD revision is only meaningful on v2, so move it away into the appropriate 'if' branch to ease reading (and to avoid a useless test). Expand comments. In particular, make it clear that setting 'smbios.count' to '-1' removes the limit of the number of structures to parse. No functional change. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49284 (cherry picked from commit d1f351fcb22f46805ff0a0cecf6ce787f84d31d5) --- stand/libsa/smbios.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index c864dc9cdc5b..e726dfeb7af3 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -567,9 +567,12 @@ smbios_probe(const caddr_t addr) smbios.length = SMBIOS_GET32(saddr, 0x0c); /* Structure Table Address */ paddr = SMBIOS_GET64(saddr, 0x10); - /* not present in V3 */ + /* Not present in V3, set it to the maximum value (no limit). */ smbios.count = -1; - /* not present in V3 */ + /* + * No BCD revision in V3, we'll determine the version thanks to + * the major and minor fields below. + */ smbios.ver = 0; maj_off = 0x07; min_off = 0x08; @@ -580,22 +583,26 @@ smbios_probe(const caddr_t addr) smbios.length = SMBIOS_GET16(saddr, 0x16); /* Structure Table Address */ paddr = SMBIOS_GET32(saddr, 0x18); - /* No of SMBIOS Structures */ + /* No. of SMBIOS Structures */ smbios.count = SMBIOS_GET16(saddr, 0x1c); /* SMBIOS BCD Revision */ smbios.ver = SMBIOS_GET8(saddr, 0x1e); + if (smbios.ver != 0) { + smbios.major = smbios.ver >> 4; + smbios.minor = smbios.ver & 0x0f; + if (smbios.major > 9 || smbios.minor > 9) + smbios.ver = 0; + } maj_off = 0x06; min_off = 0x07; } - if (smbios.ver != 0) { - smbios.major = smbios.ver >> 4; - smbios.minor = smbios.ver & 0x0f; - if (smbios.major > 9 || smbios.minor > 9) - smbios.ver = 0; - } if (smbios.ver == 0) { + /* + * v3 table, or v2 with BCD revision being 0 or bad. Use the + * major and minor version fields. + */ smbios.major = SMBIOS_GET8(saddr, maj_off); smbios.minor = SMBIOS_GET8(saddr, min_off); }