From nobody Tue Nov 21 03:30:34 2023 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 4SZ8yz1SMBz51fGZ; Tue, 21 Nov 2023 03:30:35 +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 4SZ8yz0kW2z3Q1w; Tue, 21 Nov 2023 03:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700537435; 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=efufbhj4lge8Lo+D9EtEheVCrBR75sIvd6lBo6oEXzs=; b=WD8UOXBuG2CfkK5uecikOjmWeBch5doHHzu0i5mC7PiRX9A57rbteiXut+3Do9weQr4SAE KhNzpjDN/ESdWLWrigtOssE7hH3CW2muFqVUdC81vddGlhV9nYvBg6rISjmXJXbio5tk1a E8wmGr8BBwgG7ZvKvplRpy04zTsWHrNj3g3au1OwLn1Wz8oBCQsEEa/dKQk9unC2xAVkOs fs8ZzYzlBZst8XFC34wyh0LYhx0zj71OQOFeFu/qx4XOzxcpOxLscHEFb3rYMMHoDRbqbv BlMW3o5YGmOt8Sa48qKaQv5dmJxWWhDF4dSBGPId+Z7LLkKtj+fttsrOhSU83g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700537435; 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=efufbhj4lge8Lo+D9EtEheVCrBR75sIvd6lBo6oEXzs=; b=L9mBtQJNKLDZ+eiZ/IlLPvK3vnUS/NGAXxFn9a79b1Lqg9VNUvtmwTa8mQkDnk9fqoEI3w fAqxIAr1jF0MmEmCxXFXwm/18nIrTWsxr/dGHGb1bQsZdwqIQ27yySARRQBvJ6h+aE31QC PtrS7jvygsFjoMOCpvczJf1vu7qZelhsDAAz8WJtwAYIoyn4hKVF3Nm81S/WFbpAbHqQnN CXHpyPRhLqyEUpzkwrvo+K8N7nkfQw9L5+Xp6CGSiWp5TCPyc97d2M1EXHVrjX8Vzg7T6u L9cEU1A90aoVb2tFa66LSzmxgSL1RjAHdZXFB9F77+HyxJrJNXLxeiq6M0uzmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700537435; a=rsa-sha256; cv=none; b=DbS0iB3Y9w5CmHoRTqSbmp2mgYyl6CDphOuBpfw1wG5X/CIVxL+2eQnDemqgcMHezMabcd IhTNttc9Cf7pRNLCNIuj8U5YPHILjFdbKAqdDus73WELSyszG0JfIwam4S+N4RhEfR9I9U y6gWMRzzFgKjxzdlbiZJmKu8CNEYOLqtFiWx9UxhrhFKVnD4yLMvrKaRU8H6hMhM2hGOxG xCbVgerXxoMvoVk+N829l1XbFmaooHX9l8XDasPaKIFoJnfPTLO00NUE15RoQkar98aS4b Lzd0GWPI/lzkDGKLL4FTtY5GiR4gE1YJ/I6Q4MY9ATk5RiZSwvjZ/8FnXys1kg== 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 4SZ8yy6sN3z3m1; Tue, 21 Nov 2023 03:30:34 +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 3AL3UY95035732; Tue, 21 Nov 2023 03:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AL3UYoe035729; Tue, 21 Nov 2023 03:30:34 GMT (envelope-from git) Date: Tue, 21 Nov 2023 03:30:34 GMT Message-Id: <202311210330.3AL3UYoe035729@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: 0abe05aeac29 - main - stand: bandaide for acpi 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0abe05aeac29d99786401b9078e97dcead35f7f3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0abe05aeac29d99786401b9078e97dcead35f7f3 commit 0abe05aeac29d99786401b9078e97dcead35f7f3 Author: Warner Losh AuthorDate: 2023-11-21 03:30:16 +0000 Commit: Warner Losh CommitDate: 2023-11-21 03:30:16 +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 --- UPDATING | 6 ++++++ stand/lua/core.lua | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 763f8f29a4f0..8b503e1ccfb6 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20231120: + 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. + 20231113: The WITHOUT_LLD_IS_LD option has been removed. When LLD is enabled it is always installed as /usr/bin/ld. diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 718783309687..f4a2815769c9 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