From nobody Tue Mar 11 14:04:51 2025 X-Original-To: dev-commits-src-main@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 4ZBwW80pyBz5qbyW; Tue, 11 Mar 2025 14:04:52 +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 4ZBwW72M4Mz3r3T; Tue, 11 Mar 2025 14:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701891; 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=D+3Exoo0Jh6r9E2hIpJkc0GeVGiBZr22HYblp+cHB8U=; b=DSZ+HZYKRXpo1SLDxEdGZB9aw7BWxLqFIeLnCeHvivDkEd2LSlBXJ1yr4iq0GvgwqP1h9D DHEfWAqIsuSsnYxWjd97+kUmCcmpX+Q2sTxbzstltVXWZpHNg3TmVHJMZ7WuG+wQczxnIH x+rREkfo51ehVt72gdCnb1UzvbO4QQl6ejtwcMD3davWgNXY0+lfJO1uFJEfdh1oN/lGKB uCGDUjGQgurrSLmhY2/x1vbAaJ+HD604qcX9zmRxwcH+EpJJ3eIrNlFjZa/ohsgb+ieuFV ypCOhOkTW0FDVbzZfFGYe64bN9hJ+dY53yZDs02DDuGcBedonB9u0E5IYjbN5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701891; a=rsa-sha256; cv=none; b=cYoOos5m4fugl+M/iL+wEZOwxr2MLYMkCDFtv8iE4p5TA6abEWS3annCKuxLkXrs2Jg3Zl FNDMM6IAbeD7dYozRhsr/mQ2xSp0wfEnguyhczTwlRVk5TWKz85K7BDnCF0mlrKs+SMiTF z1K6Vs1/fUls5nTXWqZQdx04R/4oBH4NXPmsUgVEmufe5pR4FHUwobvgcX2s8CstVlVsY1 ExUKXYwqjHQpRG+p6XPpHlguUPJyaxgMjlbrMzTjjMFq0067ZgVe4Qs4kVMHlTAFjcPtRP m+xJ08JYvAWCWcBquB9NUyrCdfYadNj0NPJahVVmS1RUCgyqvPT/SQqlji20oQ== 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=1741701891; 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=D+3Exoo0Jh6r9E2hIpJkc0GeVGiBZr22HYblp+cHB8U=; b=hHcJs4GP+aNYMcirJb4ry6s4i3S+zV/LDrZVdw4x+9pja6Fb4pJcePMAJrjxJOQQsGP2I2 /YAmstMBaTwW7UiRQgWkeOGgqiIm9NutJppVKw12a6CTRqnnTl7D/dsN03zSnDN2TA8wpY Xplw39sATpEbB0lzPHiInPSl2EV3zzXQlthCeRDT0ejh7BH8AydM/Q0q9lmAFSNIdg/ali pttJ/uE6GdZiqOWYTk9wBJMvBWcJE9lMDavybioP9bQr51y+JjUZrFGve1w+OnuRtsXYBS H+kQsg8Zt+8fRqBiVhNpTIH8DVu3kjUPa671/IWZo4IVT13lip1m1kTKLX/O5g== 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 4ZBwW71tlvzDHn; Tue, 11 Mar 2025 14:04:51 +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 52BE4peB029052; Tue, 11 Mar 2025 14:04:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4pXp029047; Tue, 11 Mar 2025 14:04:51 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:51 GMT Message-Id: <202503111404.52BE4pXp029047@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: 0f492f79084f - main - loader.kboot: smbios: Add a comment about v3 entry point being favored List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 0f492f79084f2f88c9d5ade92f900e26cc47a7d0 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0f492f79084f2f88c9d5ade92f900e26cc47a7d0 commit 0f492f79084f2f88c9d5ade92f900e26cc47a7d0 Author: Olivier Certner AuthorDate: 2025-03-05 10:47:53 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:11 +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 --- 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 a9ea2d9354c9..65f7b77f1ace 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -261,6 +261,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)