From owner-svn-src-head@freebsd.org Fri Feb 16 04:03:16 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4DE6F10B16; Fri, 16 Feb 2018 04:03:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6AEFE81FFD; Fri, 16 Feb 2018 04:03:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65C284EB; Fri, 16 Feb 2018 04:03:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1G43G7x011580; Fri, 16 Feb 2018 04:03:16 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1G43GKn011579; Fri, 16 Feb 2018 04:03:16 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802160403.w1G43GKn011579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 16 Feb 2018 04:03:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329351 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329351 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Feb 2018 04:03:16 -0000 Author: kevans Date: Fri Feb 16 04:03:15 2018 New Revision: 329351 URL: https://svnweb.freebsd.org/changeset/base/329351 Log: stand/lua: Set reasonable ACPI default based on presence Set it based on hint.acpi.0.rsdp. Initially, hint.acpi.0.disabled will be respected. "Using System Defaults" will override whether it's explicitly disabled by hint and re-load it based on whether it's present on the system. Unlike the 4th version, this is not restricted to x86. I have no strong reasoning for this, so this is definitely open to change. Modified: head/stand/lua/core.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Fri Feb 16 03:14:23 2018 (r329350) +++ head/stand/lua/core.lua Fri Feb 16 04:03:15 2018 (r329351) @@ -58,6 +58,20 @@ function core.setSingleUser(b) core.su = b; end +function core.getACPIPresent(checkingSystemDefaults) + local c = loader.getenv("hint.acpi.0.rsdp"); + + if (c ~= nil) then + if (checkingSystemDefaults == true) then + return true; + end + -- Otherwise, respect disabled if it's set + c = loader.getenv("hint.acpi.0.disabled"); + return (c == nil) or (tonumber(c) ~= 1); + end + return false; +end + function core.setACPI(b) if (b == nil) then b = not core.acpi; @@ -120,7 +134,7 @@ function core.kernelList() end function core.setDefaults() - core.setACPI(true); + core.setACPI(core.getACPIPresent(true)); core.setSafeMode(false); core.setSingleUser(false); core.setVerbose(false); @@ -155,4 +169,5 @@ function core.bootserial() return false; end +core.acpi = core.getACPIPresent(false) return core