From nobody Tue Mar 11 14:04:41 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 4ZBwVx4rP2z5qbQK; Tue, 11 Mar 2025 14:04:41 +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 4ZBwVx3ML1z3qZX; Tue, 11 Mar 2025 14:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701881; 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=KVgS1YlYh1oaipH5PADMGU6w6rdmis1YQOru0dRjlVk=; b=AMRCDH8RqBMfpQdTmWRDVkcmTdPpJIqoNGmiopDoh0DXkMmM8HRIh/rhkDW7WE7DJlQyDR 83ni1Tdd7E0dNYAo7lKcgkHo2eWaCTJ8qiKCZkNVZEvHXDASTPIG2XLEotl95tmE8e6phS hG7UXykVxF+lA7eprfmIjkMO9Kr7dda/FrW7ywxvXiVe+fjEdm2TXAviMzue/3/i+omA8h 3G0glPxg1/AUCrCKCHhEGLgC69Ofb4RowKCW07vCpx08xITWHQ8vUyrBEbby574G4iR0Pf Xa4hoGSSRCM6vLFIGMKPo26rmClD5UidZ6MmF+VZaut1O0VMr/MCUnHD8umolw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701881; a=rsa-sha256; cv=none; b=OTlDOmAXn6Kl477lMp2e1UHJFE7VXET9m609DkZ9Y7rtiIpQlMUd50vHD9AhjdolWAYY1C GeSj+5HSOudA2lG8MG48Jp+4wQM851brjUBKwi7Q3TciGfQhcxHhdvo95NyKymSk+Frhkd bmGVrU/6ELms866ELRxoVl5FIUB2HdTBOk3VLux/S6ZxMW7LvrCzAiDJ1YYQaBCGBSBU27 FREoxivQEMvrhu3ky/E+rrIqU1c5OU86KG66yYd/aFAZcE8D/5iuSk1PQCt6wZdoQRo/Gm DCNFo1DTuUcJCyJ0RugUjO+d51Bj2JkUerSlsTAvLJJIsiS2dgxQ4NG+tFBvLQ== 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=1741701881; 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=KVgS1YlYh1oaipH5PADMGU6w6rdmis1YQOru0dRjlVk=; b=Cz/KeiiSd1FNON6n1hNc3pz3FE9wBsKYOjHOrgFDK93/joJyXNxZvDHeCCkfuOrAZSQpqF R+V71/Onm807Dt9qqtwW1A9UXZzqHZRN/kVNZATNO6lx+tOvbm5bGUfZpbUNT/iqz40ZNd 0WKF741SrYbHVLimopFkzoIA05KcieZ4A6kGGoaGl+nCZOv8gWQb+KNIG5T1TeKDpMXv7K /2d5SrssBrs/nWsVL6/2PXDYI5bAcZnC5IqfKNd9R09lqLPTt9G4o150RryvQTWG3tJ+os crphrX+4qjBMpi/YWYa9PBVBOHqN4Jbiesh9tAQdvaAq0Q69KAaYYVn5EsJ1Lg== 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 4ZBwVx0lGDzDHm; Tue, 11 Mar 2025 14:04:41 +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 52BE4fXx028730; Tue, 11 Mar 2025 14:04:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4fDn028727; Tue, 11 Mar 2025 14:04:41 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:41 GMT Message-Id: <202503111404.52BE4fDn028727@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: d1f351fcb22f - main - libsa: smbios: probe: BCD revision parsing is v2-only code; Expand comments 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/main X-Git-Reftype: branch X-Git-Commit: d1f351fcb22f46805ff0a0cecf6ce787f84d31d5 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f351fcb22f46805ff0a0cecf6ce787f84d31d5 commit d1f351fcb22f46805ff0a0cecf6ce787f84d31d5 Author: Olivier Certner AuthorDate: 2025-03-03 14:30:16 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:08 +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 --- 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); }