From nobody Tue Apr 8 13:41:14 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 4ZX6g01SC6z5sQTb; Tue, 08 Apr 2025 13:41:16 +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 4ZX6fy56DDz3Dqx; Tue, 08 Apr 2025 13:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119674; 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=M6s6UAD5WiEqon5N9zQS9CbNgg6wVCQCukD4tYcG/BQ=; b=Xwt9yC3mCSublxx5mC60q76wudRGzpez6RF6fNM1aGm7YIg3yZbiVvEOVlj/y3RYPMod23 HQgiUtV6ymCmgNko9UAccZSyBQxD1uwBOHO6iFfNrc86qPDa2vKjjIh6jQhr/CgNaWcfH0 QlnuAZDZaCn2F8c/BB8yuPluoffOUtImG5dzfwZPAuHz8I0xdg6qWuB0f/Nv34sutlC56q r58UX6WFd2RNZCmF2Tyn9jT2IyKK8cBSAgKL+KZc4HSbZciXK62MNlX8JElh4IxoC6xmG/ mfl9eMPz15cTjo+hLWzOM2dzpKft70VNGowZWoIdxE45sLsUL+E3nYKFjOaAXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119674; a=rsa-sha256; cv=none; b=Fs7qC7yNtlMP7SBTtM08CL1IWwr0xWO9oTJmxVNHK0JrI7b59rij7DS7HKGk0EXzABq9wG 2Bzscj4LXZNFimMh5DH24EdkONT5Q1NIUeX12OJZ2Qm0pXOROwTo1FwBVsETPIxV8ruoHK J1MSbsC3aO1Pf81DETjs9vhnsGkR4Ex7Z0aHDmz9Lj67GE3JE6jjNRqS1OUo/dobp88fvX 9xpr05XrFaCJGVLvzNjLRaSWd0NKG3AJ6g76T8fB4Jx/aKxWF/aT47TRZKitUjtVZ91+tr FPtI/bfJ24t0gvUcmc9APhnP6ZMYq6ZfpX+ABioPQWOKdoIRtNSNEASj6abHJg== 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=1744119674; 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=M6s6UAD5WiEqon5N9zQS9CbNgg6wVCQCukD4tYcG/BQ=; b=x+WB/fd7LxClmCjl2nzjxhP0K5V2ldEfxKA1VXuFq7Jesu8qbKWPE1KILLXDsreMsJXBdb rynVSwohtOPVVDweNiRB9s+F0mcpqIhjnANEDO5PTzDpCfWv7PNA4pov+yn9SEU4UIx8UV xD7fCx/y9dn5aFcp1cHiKJiad4ypREjIXiWCZoS+rGpZUO8qanukwqrihdY9ZckSPphRNZ FJ282Cfzpmshkd3chM7WMoV1YZ/hQb5WXQcgt3jiYccPv2qquNJRT0WRypKz33P/msP5Bb EseRjRaLeeY+SbGYtc/O1jJahJfw1ye2t8MWCMFpbRrF/x2oTRQ6RibG+Lfbog== 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 4ZX6fy4fZzzb81; Tue, 08 Apr 2025 13:41:14 +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 538DfEUn034607; Tue, 8 Apr 2025 13:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DfEb0034604; Tue, 8 Apr 2025 13:41:14 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:14 GMT Message-Id: <202504081341.538DfEb0034604@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: 0c5d22eacf23 - stable/14 - loader.kboot: smbios: Add a comment about v3 entry point being favored 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c5d22eacf236bfbce1cfb680507b932f9342b00 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0c5d22eacf236bfbce1cfb680507b932f9342b00 commit 0c5d22eacf236bfbce1cfb680507b932f9342b00 Author: Olivier Certner AuthorDate: 2025-03-05 10:47:53 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:29 +0000 loader.kboot: smbios: Add a comment about v3 entry point being favored Note that the behavior here is consistent with BIOS and EFI boot. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49293 (cherry picked from commit 0f492f79084f2f88c9d5ade92f900e26cc47a7d0) --- stand/kboot/kboot/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index e57446baa47d..f6dfe481e883 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -259,6 +259,10 @@ kboot_find_smbios(void) ep = buffer + strlen(buffer); walker = buffer; while (walker <= ep) { + /* + * Linux outputs the v3 table first if present, so we will + * choose it in priority. + */ if (strncmp("SMBIOS3=", walker, 8) == 0) return((vm_offset_t)strtoull(walker + 8, NULL, 0)); if (strncmp("SMBIOS=", walker, 7) == 0)