From nobody Tue Apr 08 13:40:48 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 4ZX6fT3Bkwz5sQ53; Tue, 08 Apr 2025 13:40:49 +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 4ZX6fT0DSZz3D2y; Tue, 08 Apr 2025 13:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119649; 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=U8PweAO2ogHnj+KdytXmu08eqraeRBi3LbkZ3BUu7iE=; b=Ut0YJOJRDSn8N6Hn7SMMAn5bYWo1zcTQZAiK/7i2/51y0nin1InUvsoCR4/gKHDn/0P4aU uVVrUVZVst/fuLv1y60Ji162lXzj9yfaGXuGuSHYP44CegGsz0C92VEzCkXbJ1Td3TIxcj 5XF33oOZtmcbwXi60Ypf6Nm2tvKW0a5x8jBJt3lDkxe2HulL+YA8rtknVL/qgb5Q5ZOUqG NvrTzQVF1bEsQ1UMzhByfUqSGUIvgu/Un3nIFIb09zoW1m1Fe6cqWQM30IJkpnVv3BgDRm 7CcwtkboNsFbFPXNWQNaJW5MHPqQVHcmkhMoJKti6m2nRsMf9Vrvljui5yofgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119649; a=rsa-sha256; cv=none; b=XjcZh1iXK4S0jC9e+2v4K69AelEOv1YY7EA6Dfb2mbWbHQ8WquhOnOEOdO2NmYeap2MJFj B/YPmrO5GEd9y9qtRFbkcJm8Pi6Py6pVaIedq1gXLBLyWXh2B0zihmAcJaeWPCiMB4KT3e rFnUZi8f2Fdidjzi7n9ibhOAMAkFSXL9KD6CxpDxORDCs9CH3EySZgDCwM3ADiuCR/3q5/ hyj14UyscJ3fWpvD6DdYnrFa7TgNcsVYl0tahBj2yg4v1PUc/6xe5iz/ldXWKO7JiDp/pD s8W3RvO1RQiy1YsRApVP3tvpYlG+frSxkpiPuODV2uBVCnSLQXiZQt++AduK/A== 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=1744119649; 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=U8PweAO2ogHnj+KdytXmu08eqraeRBi3LbkZ3BUu7iE=; b=Eq6FVgnNWPDpwOylXG5+7xGzU5mNHCgvN+Lc87XJIxem9lizg6tG4HnUN5VI8ptIEQTpPU rBHQNtxgQw4r4ZSxEGTZz09FCvSzbrINM6Au7tW6e4+XUAWxs9c3Vt1n+9DmCuu3nh083+ qAdfrJk98FL0aKUJDYOI9PqvG+e78cJC2u0pn42gmV4XukEp99qFe1KeVg6ejNtfYKeBtn cKGGkK/P+6ETv1/zQxWlEy9xneKXOPp/W1xPGXOKMREeF/6khTCp7IIUyDFNnJw2t6iwi4 knj9uObk3n7DA2Lex/fqJUEjQkpvqg/kcTa8kbkvxCNcs3uBR4R7PZY+SlzqPQ== 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 4ZX6fS6nJBzb7w; Tue, 08 Apr 2025 13:40:48 +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 538DemY6031991; Tue, 8 Apr 2025 13:40:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DemQS031987; Tue, 8 Apr 2025 13:40:48 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:40:48 GMT Message-Id: <202504081340.538DemQS031987@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: 145ef4af15f0 - stable/14 - smbios: Search for v3 (64-bit) entry point first on BIOS boot 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: 145ef4af15f09aa06d4ae53ea1abd2a281d63f82 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=145ef4af15f09aa06d4ae53ea1abd2a281d63f82 commit 145ef4af15f09aa06d4ae53ea1abd2a281d63f82 Author: Olivier Certner AuthorDate: 2025-02-28 16:54:42 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:23 +0000 smbios: Search for v3 (64-bit) entry point first on BIOS boot When booted from BIOS (i.e., not EFI), also search for a 64-bit version of the SMBIOS Entry Point. This allows us to detect and report the proper SMBIOS version with BIOSes that only provide the v3 table, as happens on Hetzner virtual machines. For machines that provide both, leverage the v3 table in priority consistently with the EFI case. PR: 284460 Reviewed by: markj, imp (both older version) MFC after: 2 weeks Relnotes: yes Event: February src bug-busting session Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49179 (cherry picked from commit bc7f6508363c5cf4544044e00bbaf71de8f0168d) --- sys/dev/smbios/smbios.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c index 9fd37becb43a..7886376523e1 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -103,9 +103,15 @@ smbios_identify (driver_t *driver, device_t parent) #endif #if defined(__amd64__) || defined(__i386__) - if (addr == 0) - addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN, + if (addr == 0) { + addr = bios_sigsearch(SMBIOS_START, SMBIOS3_SIG, SMBIOS3_LEN, SMBIOS_STEP, SMBIOS_OFF); + if (addr != 0) + map_size = sizeof(*eps3); + else + addr = bios_sigsearch(SMBIOS_START, + SMBIOS_SIG, SMBIOS_LEN, SMBIOS_STEP, SMBIOS_OFF); + } #endif if (addr != 0) {