git: 9408d0ba3d11 - stable/14 - stand: bandaide for acpi

From: Warner Losh <>
Date: Tue, 16 Apr 2024 02:34:40 UTC
The branch stable/14 has been updated by imp:


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
@@ -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.
+	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.
 	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.
+	The WITHOUT_LLD_IS_LD option has been removed.  When LLD is enabled
+	it is always installed as /usr/bin/ld.
 	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
+function core.isX86()
+	return loader.machine_arch == "i386" or loader.machine_arch == "amd64"
 function core.getACPI()
 	if not core.hasACPI() then
-		return false
+		-- x86 requires ACPI pretty much
+		return false or core.isX86()
 	-- Otherwise, respect disabled if it's set