From nobody Tue Jan 24 22:12:23 2023 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 4P1h6H65Smz3bfZG; Tue, 24 Jan 2023 22:12:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h6H54jMz3CpZ; Tue, 24 Jan 2023 22:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598343; 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=o0LE6zM6vC5fsBeytOlGBLgNPFhl75SONPXseUtx/pE=; b=ghyEx3taKCzKvlJwylnlr1/AZEK7WYVhHANYsdacIdpWvBqpgfjXTjsCvXq0HdCem6ClgT Lpsmcb5hPvVHJDX6DEaRkwI0HZdCOtv2n4AAFDxYRnRZureCJ+cITRq1B/ZJbo5S7j4HK3 k9R6LFUrQTzMlPbdz9zR4pRMzhSQpX1u1lN0sD7UNftzgyb1UMygNYiSK1JDsJU8p+5TYI ksH20yQr72XD9hPe8FD0sDM5YSNYQZE2ATnZ8wu3Iewts5KSIHVbx7fvlSmLHyVLFhNgWG oXXdcBg2T3aw2TB+xk+GpFVlYdyqiavJHRlmBBxEvpRl2bQpYxq/enDsFwDa0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598343; 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=o0LE6zM6vC5fsBeytOlGBLgNPFhl75SONPXseUtx/pE=; b=pS8H4SMcUw7lkgmbxtkWRn8RvBnpwJRiT3BrrnkhKi6NUS8EE5yQgMXGmYxavcjofBkAHC 2A2g44Xm9L1wR7sJ7xMW/ecd3/+S8cneEttfwcAZnUCz4yK6WcZO5ZdO6ZcrDPrykWXOvw RWpvprfg3sXvoZdAwxxRmlkiaGRxOwnkrX8Fp/OC13tXXmo/Y+ZUmrx2Ne/ffFpL12hioT ZwRVr45H56mqkVu/DUQEuG5mwzjUPp/OIxn4FrPB1GAeUnw90Fte7/PjzAcNB1UhFUN76w acOysPYLUh4KPSGDQkWwF4/tSXhqK6amKCre2ZgW9qXMuo4CmiqPzr7JueJEtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598343; a=rsa-sha256; cv=none; b=cdChaUNV1dAWcWHAuFhlgeZXVAg34+we4zv9prHkRPlHP3WEPH4kLqBM1gye6xeBMcqMNc Kto1uMm83goSPzDUhWo3pXTwOLo5I9OfLLIAf3wKVkPmwaEgCcMiKH5E+zM0ZHCVeeEejG EXo6cvpKxPsGXckV4eVHYWL1iASSrILoDmQPwr2sq2ej/rv6wEpmBcyG7iIuyoXMzSS4KD nXCIvPTl6YEAJhnmOJM5MrELv3cVrIOxvXzGxKJT66MdVixMZUNevDjgjtcLRjnnJHxWp1 wGZtcQ/5RtOPN0Po4KzIH9HVYgSCEg98EH43TC1JJO8/jF0wAIaEHk2Vfo2REg== 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 4P1h6H478fzQVJ; Tue, 24 Jan 2023 22:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMCNNQ086958; Tue, 24 Jan 2023 22:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCNBZ086957; Tue, 24 Jan 2023 22:12:23 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:23 GMT Message-Id: <202301242212.30OMCNBZ086957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 09932da03ec4 - stable/13 - stand: Parse BIOS revision from SMBIOS 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 09932da03ec45fc4da2247a73b802ee4083ab8c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=09932da03ec45fc4da2247a73b802ee4083ab8c8 commit 09932da03ec45fc4da2247a73b802ee4083ab8c8 Author: Kornel Dulęba AuthorDate: 2022-09-02 11:08:32 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:33 +0000 stand: Parse BIOS revision from SMBIOS Add a smbios.bios.revision kenv, which contains the system BIOS revision as defined in SMBIOS specification, section 3.3.1. Since the revision is stored in two separate byte fields, the smbios_setenv helper can't be used. Read and construct the kenv manually instead. Approved by: mw(mentor) Sponsored by: Stormshield Obtained from: Semihalf Differential Revision: https://reviews.freebsd.org/D36413 (cherry picked from commit 66c73af7ea59382ce5ca7cfb2eedb0491790276c) --- stand/libsa/smbios.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 5582a2f3ce90..61bd82f9d6f0 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -298,6 +298,8 @@ smbios_parse_table(const caddr_t addr) { caddr_t cp; int proc, size, osize, type; + uint8_t bios_minor, bios_major; + char buf[16]; type = SMBIOS_GET8(addr, 0); /* 3.1.2 Structure Header Format */ switch(type) { @@ -305,6 +307,13 @@ smbios_parse_table(const caddr_t addr) smbios_setenv("smbios.bios.vendor", addr, 0x04); smbios_setenv("smbios.bios.version", addr, 0x05); smbios_setenv("smbios.bios.reldate", addr, 0x08); + bios_major = SMBIOS_GET8(addr, 0x14); + bios_minor = SMBIOS_GET8(addr, 0x15); + if (bios_minor != 0xFF && bios_major != 0xFF) { + snprintf(buf, sizeof(buf), "%u.%u", + bios_major, bios_minor); + setenv("smbios.bios.revision", buf, 1); + } break; case 1: /* 3.3.2 System Information (Type 1) */