From nobody Tue Apr 16 02:34:40 2024 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 4VJSmc5yWfz5Hb1H; Tue, 16 Apr 2024 02:34:40 +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 4VJSmc4TgYz4HTY; Tue, 16 Apr 2024 02:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713234880; 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=UlgZb+SifwEK3wusaYg0Xut2GvbwAVkt+6TVKfNYA+w=; b=cer3aM39xwz6ScuoUZJ0dWLNjL+2F1fMAyJQ/RNclBcXXHcO1exgweZSCJcngO3xdDosXE i9D80MDTMgqfnuPFTVCpFIfxQ58cMLA227qHLL0hZEtdEHFGxYKfGux9vt8fSitdkkvr6y GGtmEfqREq3OCCxX2/nqA4Hb+TvKs88B4o4uqjLaqDFI4Cy0p2rixReUK9vEwKOARcEgFf 0NVNGn3A+0vusKM2ncxLeW84vLXRPtI0ZEtzS6abQ2I+Gbx8s7shkRa2xhcRCCvRlIGF5c UNDEqs6IKvCgMOSVK3oqXSPKEKtNsdoYbPptjPCKz/JNphQe/RM/IjX2wfMejQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713234880; a=rsa-sha256; cv=none; b=xF9CjtN8ieOFjgMB1Xv4RpvSUwvdBdUDhft9nsmPQEwdyjJyfNrP7topu3MzSZvFylTLeY kX5uuIQd/6GMmAOiCD3Am+02o25umg0j5WVTiHPBBxSo+QOIDZa9l5aDDi++Doq5ATf2+t 2RuqbU/jMa5iD22hI3Z4rxXZfFpznPVdu3WelRtB89tmyHkehORd4Yn79vEkIW6duYTXbY c1kMOoq21roaOYeg/SLopBMbyxslGh46vV+irtuBJHOkNO5dfKlrSW+BsKU3pXTwMCjQjW s5SoPjHVZWQd2PBWMgjvKQZg8OmJnedgSJioll8dqDSxhIUf+ms4nDtjBShagA== 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=1713234880; 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=UlgZb+SifwEK3wusaYg0Xut2GvbwAVkt+6TVKfNYA+w=; b=NlqIX6r+LvIW84z3cKUByjLmp9RMGc4qVdyCsjpRNMbdJxOIUe7TgiF+6Jv0Rs3PDLjNf/ BKFQgy2YEpe8IBcem8PeMcrhAeO7C4DhEf+0JehTXpWmp75UYp79wcVLAmz9sLEC8waEws 1Oghq+0V9hjqF+G/qUWc03UFsBZVtz31uRnnxlC+Zlr9Er1PaX6zFeH4fGLlZXTWRVU/xa huj6jy3KpMF8q282gbh3MB+y7P1CDqiRNvI5ZkY42xT2yxxscEnYgQ4I9SkrLj6sXojId7 FpThdLLTRPJyuaaatLllnXiPQeX/LQMznEyMa2Sq0absBIRJfRJPngF98kGkjA== 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 4VJSmc3q9VzPlv; Tue, 16 Apr 2024 02:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43G2YeSh037439; Tue, 16 Apr 2024 02:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G2YeBa037436; Tue, 16 Apr 2024 02:34:40 GMT (envelope-from git) Date: Tue, 16 Apr 2024 02:34:40 GMT Message-Id: <202404160234.43G2YeBa037436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9408d0ba3d11 - stable/14 - stand: bandaide for acpi 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9408d0ba3d11ae59420706e0733cbcf0b022db85 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9408d0ba3d11ae59420706e0733cbcf0b022db85 commit 9408d0ba3d11ae59420706e0733cbcf0b022db85 Author: Warner Losh AuthorDate: 2023-11-21 03:30:16 +0000 Commit: Warner Losh CommitDate: 2024-04-16 02:32:04 +0000 stand: bandaide for acpi Old binaries do not set acpi.rsdp early enough. So when we boot with an older loader.efi from an ESP that's not been updated, we assume there's no ACPI on this system. This is unwise. Put a band-aide on this until we can implement a proper 'feature' variable that the binary reports so we can do conditionals for things like this in the future. This is at best a rapid-response stop-gap. Glanced at by: kevans Sponsored by: Netflix (cherry picked from commit 0abe05aeac29d99786401b9078e97dcead35f7f3) --- UPDATING | 11 +++++++++++ stand/lua/core.lua | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index ee9fb7a3103b..d211814b0248 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,13 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240415: + MFC e0f3dc82727f: If you have an arm64 system that uses ACPI, you will + need to update your loader.efi in the ESP when you update past this + point. Detection of ACPI was moved earlier in the binary so the scripts + could use it, but old binaries don't have this, so we default to 'no + ACPI' in this case. + 20240218: MFC of 713db49d06de changed 'struct ieee80211vap' internals in net80211. Given we do not have enough spares and the struct is allocated by @@ -25,6 +32,10 @@ and/or ports. non-compliant MTAs; please see the first 8.18.1 release note in contrib/sendmail/RELEASE_NOTES for mitigations. +20231113: + The WITHOUT_LLD_IS_LD option has been removed. When LLD is enabled + it is always installed as /usr/bin/ld. + 20240119: Commit d34f4baaf138 changed the internal interface between the nfscommon and nfscl modules. As such, both need to be diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 3bbdca3de01e..e7ffdc091c0c 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -136,9 +136,14 @@ function core.hasACPI() return loader.getenv("acpi.rsdp") ~= nil end +function core.isX86() + return loader.machine_arch == "i386" or loader.machine_arch == "amd64" +end + function core.getACPI() if not core.hasACPI() then - return false + -- x86 requires ACPI pretty much + return false or core.isX86() end -- Otherwise, respect disabled if it's set