From nobody Thu May 25 04:34:01 2023 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 4QRZvF63RMz4Cd0b; Thu, 25 May 2023 04:34:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QRZvF5cBZz48l3; Thu, 25 May 2023 04:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684989241; 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=Qua91DN7n8a6nxtqvFA8fvlWgOUU2wpHlBf/97sFNhg=; b=e5n9WJcpysCWID3j5F3QIkcB3Hutxf7cW88JsJ5bMxav9JYJ2oww8i1EMhGldBbe+OzUGx KBTbJebpO2p3srp75i67s2H6D11nXMqrdWnbZrQkHIXr3HiPX7madwpH+8jS7beWNGykyS EYN1Qnm6XpZviLwKA4ohMO0SRMGyPwgcMzd8C1du7eTxPHK9S0L2yWOiF4TYqvOmtYHa1v 7uy7nOQAGOzCCRi0l7W5aNCI5AvAWEpC+PqqinAjoLerygHhiS0IKAMcvhmMezaEvabV8Q hjizHCOLEWPXOMDpdEoPlHvNAfOOpM13qvPcgS01oEsitqrZUrXpwqVB/Pmtcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684989241; 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=Qua91DN7n8a6nxtqvFA8fvlWgOUU2wpHlBf/97sFNhg=; b=SRxJY/RYLOFqrgWwaB3OwdRrybT5qWZhWPXHqlC8kyt9li2YKV2BQRboVA1B9VI8IDInxD BSnzmS8hBX4I5/++8DSJCFWn25wmRYQ59ngwXbkDabU5jMoVNzbH6BZnOwrInbFHOmWnKc Iu+USYY8S/qUPy5+pYk6NivcEADJJIP7KKp+H5oavYjTc3zJJ2S8KzVFM/QB3qx1cPW7nD vkmFq8kb176DYNYxl2MKTYsaxcRFLCMqTrZxixip2Hxdajf3HduvDtuI6ebIi2kbn9ceY3 DQV/51oen7gxYvoEXatrln8cLbTGwUxwfZlwy1DWeVTtSxYajsuwyb+tvkMoxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684989241; a=rsa-sha256; cv=none; b=k+Q/9Fo/sBGq52/aceUe7J9jhHg9xuJbfgMOBRae4gRWpTI2YjRIveuZjn0hp+0a/5B9H0 JTwWQFvLmZHln8cskCj5qmIOluwvbTQhwSV/7OC0ykjEKRi2vKXKf6SYnUISk27Sfb1T0t pDjPfW1lXxgPeNMPe1TB+/FQhJSNSD23lDOFPqkxQu3BCIPMLGryLrlnQFTR+f6+t0FvRY 88TgmK5ubr1hvut6NS55VRceFY+AjlZJaT9Ldyu6sE7ZVklB0OwtHXMZvAhAWa3Ic52jXM WHmOkhI194sQZvl7fQYC5hP6tpI5vZDpbNUOsaJtRWcWI3XaAwLsvItYBQp6OA== 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 4QRZvF4htsz19Ln; Thu, 25 May 2023 04:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34P4Y1gi089260; Thu, 25 May 2023 04:34:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P4Y1bB089259; Thu, 25 May 2023 04:34:01 GMT (envelope-from git) Date: Thu, 25 May 2023 04:34:01 GMT Message-Id: <202305250434.34P4Y1bB089259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2efbc8e2840f - main - stand/efi/smbios: Move detection of smbios earlier. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2efbc8e2840f6c0b8255a46527f2cdb32ace1bd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2efbc8e2840f6c0b8255a46527f2cdb32ace1bd1 commit 2efbc8e2840f6c0b8255a46527f2cdb32ace1bd1 Author: Warner Losh AuthorDate: 2023-05-24 22:34:21 +0000 Commit: Warner Losh CommitDate: 2023-05-25 04:33:53 +0000 stand/efi/smbios: Move detection of smbios earlier. It would be nice to make decisions early in boot, about maybe consoles, based on smbios variables. Set them just after we setup the archsw so we can use them everywhere. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D40219 --- stand/efi/loader/main.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index e5f9b40ae55f..8419331f7a19 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -930,6 +930,22 @@ main(int argc, CHAR16 *argv[]) archsw.arch_readin = efi_readin; archsw.arch_zfs_probe = efi_zfs_probe; +#if !defined(__arm__) + for (k = 0; k < ST->NumberOfTableEntries; k++) { + guid = &ST->ConfigurationTable[k].VendorGuid; + if (!memcmp(guid, &smbios, sizeof(EFI_GUID)) || + !memcmp(guid, &smbios3, sizeof(EFI_GUID))) { + char buf[40]; + + snprintf(buf, sizeof(buf), "%p", + ST->ConfigurationTable[k].VendorTable); + setenv("hint.smbios.0.mem", buf, 1); + smbios_detect(ST->ConfigurationTable[k].VendorTable); + break; + } + } +#endif + /* Get our loaded image protocol interface structure. */ (void) OpenProtocolByHandle(IH, &imgid, (void **)&boot_img); @@ -1181,22 +1197,6 @@ main(int argc, CHAR16 *argv[]) autoload_font(false); /* Set up the font list for console. */ efi_init_environment(); -#if !defined(__arm__) - for (k = 0; k < ST->NumberOfTableEntries; k++) { - guid = &ST->ConfigurationTable[k].VendorGuid; - if (!memcmp(guid, &smbios, sizeof(EFI_GUID)) || - !memcmp(guid, &smbios3, sizeof(EFI_GUID))) { - char buf[40]; - - snprintf(buf, sizeof(buf), "%p", - ST->ConfigurationTable[k].VendorTable); - setenv("hint.smbios.0.mem", buf, 1); - smbios_detect(ST->ConfigurationTable[k].VendorTable); - break; - } - } -#endif - interact(); /* doesn't return */ return (EFI_SUCCESS); /* keep compiler happy */