From nobody Fri Mar 7 16:44:36 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 4Z8XFK1kYNz5pZLS; Fri, 07 Mar 2025 16:44:37 +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 4Z8XFJ6HKSz43tX; Fri, 07 Mar 2025 16:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741365876; 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=epuJ59BxJoo5jmi3ARhHTE/0CFxalFTH7qTfvQvUJbQ=; b=ke6VlGlVOdq8Aws7U7+SHq11Tsw3KjF/IoNTZVAdRn56KIo4SblB3RHzIU4VedxdDq+CFu IaZYzOlEfV61MAA1HeSBYT3Mp7upqdTnqUA/4QQ7piAuLGq5TvhyRItieVNI+FtMwdytpT PWx9Ug57prsF1Ufuo2bA1rZ+do5fBhfNNyR9f7g9zHLPKRz7lIBQDVinTHWBGLrtaMM3j2 jYm6RbkpUYGYVGtVrMnLsHoCZ8PHl/tEBcNUMJvFLxk5FrHfKKHDVaVcGcYfAAJ2u9Nieh /SO3MZV7s3JEFne4p+tAYePx2xrFvdIgTvqCQDq2pU3w8CLGIS++huLrB7ttgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741365876; a=rsa-sha256; cv=none; b=fAfF299qdI1lDAKPt94b2Vv0twEthuZgMkhKI+QWw3Hv+kGxOT885xjtzgjJqWUENvbW37 Riu00hBE7FfZzjYYlyX92Mo73F5KKFZByDw69Xkmlfdklo9XnepuOor5OgImzIwiMtLhXj nx9A9WTMWYjoHrAHQN8rKmysbKzBQuLrMuMhigXwVEv5JqrpfhQjOcEYO5rbjfbF+1v54p wtbgSE9VcLtMJfMpJJBMpnD7yEKgOe8yKwPQpfuQieXJ0Kj3hq0T7FNx9wlHZqPdwVC2M2 wfrVfOrH6ohBNu4eZE1SzacynaYy5Wi/GvZpVVPvsHw54xqPdwGREUSJ5axf8A== 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=1741365876; 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=epuJ59BxJoo5jmi3ARhHTE/0CFxalFTH7qTfvQvUJbQ=; b=jUD/Gb1WLCc+V8Sfw8ivvCrYzmfJVPLExQ4oVl/96DOEl7M6STJu5iSjH7YSjpevIO5bDV whHzgu3PfL24jj/uNOOpJbsR2IEMAilFsbd9eAalzbVVK0DAjtaysnSFA2gmwlqJ7vB2YE mL5sqKhMuCD+WnNcqmrrtUChZQkMKHIw0qnn5Cue1cU8TJyH1emHfLJMDnKfh6Bcqq97H+ NLomOGswUwdP3AK5neuuUzLrPM/PrAA9aZWD4uUdVu8MUP60FVXEwe8YPk2N72phmDNtUj sqqg7uE/hGWZE7+SMmG9CsIQCbypc3qL7kUF76X2BIUUKSGzhJHjRBUiZdDr+A== 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 4Z8XFJ5rwzzlWl; Fri, 07 Mar 2025 16:44:36 +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 527GiaWM051957; Fri, 7 Mar 2025 16:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527GiatQ051954; Fri, 7 Mar 2025 16:44:36 GMT (envelope-from git) Date: Fri, 7 Mar 2025 16:44:36 GMT Message-Id: <202503071644.527GiatQ051954@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: bc7f6508363c - main - smbios: Search for v3 (64-bit) entry point first on BIOS boot 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: bc7f6508363c5cf4544044e00bbaf71de8f0168d Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bc7f6508363c5cf4544044e00bbaf71de8f0168d commit bc7f6508363c5cf4544044e00bbaf71de8f0168d Author: Olivier Certner AuthorDate: 2025-02-28 16:54:42 +0000 Commit: Olivier Certner CommitDate: 2025-03-07 16:42:45 +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 --- 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 bbfe80a6a8a6..f4a6453fd043 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -102,9 +102,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) {