From nobody Tue Apr 08 13:41:02 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 4ZX6fl2Z1Gz5sQR8; Tue, 08 Apr 2025 13:41:03 +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 4ZX6fk2Z2gz3D9Q; Tue, 08 Apr 2025 13:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119662; 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=iNnPgM9KBGQmKR3N6WdlyB1bx0t5lNnxomOT5W1Yyg8=; b=qNcgGuKfCpZfLGFdtoJBdVfP1n4S78nfCy8ve04ZE3X0IET33Q3n3V2mRi5nMclSaVGuK5 NcnYWUf2K1dmH0hq55wQKpdh+agD350XAQwpZKQwNEeT7jhdZFYhiHvu4C58jD/eo0rJfS JgK2YkBzStu8a58ZvTs/assU2oy+YWjGso9eF8HlRnmZwWK8zodSWqZH5NyRvabmVQiH5T CbGPEjK/xfmPhlPdOLXIPeaddtbGvtV+BRO0HOjpuTcA3zlJ0VpLMFX1EZ0uHDJvebxrMl p7vJuNOxxXsndYXaQlvfGIR1YJnT8/CfjW9PJO53765Mt/2csGsgcGOqfNqHkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119662; a=rsa-sha256; cv=none; b=QMyuI7bDoqq7hMaH5uC1ZIgQc3lHi1El+xXXGajk08L06YU55PMzouSpNOJ51jZRTgsZFP LOo2TLwqlbzg7e4YRPmiiu5jsFl/+OZ26558IF1CLZ1iN6ber4P0l8LtUInLJ/EF7Yy9HR BjgyVJ3ny6GXW/5csph2iToCXo5wUsyU9CjU6/bhK72wjqMWF4S8NBOFlkxQxU/vDqJsMd SMzCt99DlqV2ac/R6pbORMdARLtOovZ/X7H+BME5ETKdcqLkVd/edWfEfZdtb1v6lSRjqT VMAvVpYL/xOHSNCHeX2kvqZgA22tW1vDKQ91CHvaqu8Jnr+31rdSVzk0ZiQMwQ== 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=1744119662; 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=iNnPgM9KBGQmKR3N6WdlyB1bx0t5lNnxomOT5W1Yyg8=; b=H8T8D7QYH6POFqRYW9WN5F0vWMxEkCLleAXqyCLd5Emmhj78udtb57MN9QqCNcZ32pSJxS gdnhRIXnXWbDL9Sv7h9RPfaE4ivmH6Nkp6ngGAGb5Vx87smr0IEr4YldFi/ZjqHP4SEkNB b4JFwxPLoFg0kPQ5XZQSKYSawfP+3uH5MKlSZkVfTINzfrqwvg94clFMAWLV1kp1dgjHQ9 zDNis7tbIY28gobEoDdZ7i5A+0ZxJIy5XhvtIzMHeZfRPC0EirqVgMeENya+Jq1GOjhlaa CCewJSqC/gcBpitlPmVZBXgCChPqkgaF000WcwMfGo39+pfKLSXo6FdbtJ9a2Q== 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 4ZX6fk28x1zZrZ; Tue, 08 Apr 2025 13:41:02 +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 538Df2h3032427; Tue, 8 Apr 2025 13:41:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Df24h032424; Tue, 8 Apr 2025 13:41:02 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:02 GMT Message-Id: <202504081341.538Df24h032424@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: 4b7fbd67ed82 - stable/14 - libsa: smbios: Make 'is_64bit_ep' a field of '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: 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: 4b7fbd67ed82be2a771c8de8c05e6347bdf8e276 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4b7fbd67ed82be2a771c8de8c05e6347bdf8e276 commit 4b7fbd67ed82be2a771c8de8c05e6347bdf8e276 Author: Olivier Certner AuthorDate: 2025-03-03 16:29:04 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:26 +0000 libsa: smbios: Make 'is_64bit_ep' a field of 'smbios' No functional change. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49282 (cherry picked from commit a39ab17c9abb74019f15b02970d8739c97d4185c) --- stand/libsa/smbios.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index a45bc78b7ad0..a334e39e9eff 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -144,6 +144,9 @@ SMBIOS_GET64(const caddr_t base, int off) struct smbios_attr { int probed; +#ifdef SMBIOS_64BIT_EP + int is_64bit_ep; +#endif caddr_t addr; size_t length; size_t count; @@ -160,9 +163,6 @@ struct smbios_attr { }; static struct smbios_attr smbios; -#ifdef SMBIOS_64BIT_EP -static int is_64bit_ep; -#endif static uint8_t smbios_checksum(const caddr_t addr, const uint8_t len) @@ -193,7 +193,7 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) /* v3.0, 64-bit Entry point */ if (strncmp(cp, SMBIOS3_SIG, sizeof(SMBIOS3_SIG) - 1) == 0 && smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) { - is_64bit_ep = 1; + smbios.is_64bit_ep = 1; return (cp); } #endif @@ -562,7 +562,7 @@ smbios_probe(const caddr_t addr) return; #ifdef SMBIOS_64BIT_EP - if (is_64bit_ep) { + if (smbios.is_64bit_ep) { /* Structure Table Length */ smbios.length = SMBIOS_GET32(saddr, 0x0c); /* Structure Table Address */