From nobody Sat Mar 21 05:16:37 2026 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 4fd72Y3RH9z6WcDQ for ; Sat, 21 Mar 2026 05:16:37 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fd72Y2hNlz3kMp for ; Sat, 21 Mar 2026 05:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774070197; 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=vq9E5+lJ9WJjfuPrAy3j3BiRRUgvi1wELChQOjjOBN0=; b=gX4xlfktv46200syhMuRDAxVEr0YH1R7+tHJiHfBkz94eOXtZTdXh049YdihhemU8rJ7vs ZFVQjtGF/IyGtwLufrbtkyajDaBd6H/9AP/bsI4+T00PXMs6F26Gv93TTZtxjO0R4s4sBZ 958a2AdE6rllCb4ktJvOQRS69car7j2cEbW1FKUkrv8hEfDBynQ4xkMmPs7XT1zU6ZVoEq clSRq3Qc8RkOU+yzvgsq6LNTZ+WEeS9S28rB1R51BmAAbr/5mSpMZsn57VsRrc98EYGr2J XvCmvmURdnDp627Df8W/U/deaN6m2Rw0kWitJZeCNa3rkS6dqsfCfiw07nUJHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774070197; a=rsa-sha256; cv=none; b=lWmSVifvWkV6/grMVUEr+bK8guh1OXHlXCDNTNj7cnF3+esWJAPv2E60dTH47KUTInxHMM 1dD1s4H8PlzGho1PDEzF9KmNgxUWLPcitmTBX0S7qJti/27qwiuQbOGCydjUgh9DgstYdy Fg0EvekAF1INIhzqlMiBerqT60NcojY+8OYNcmuuZDWk5DCv+9zXGke2DzMu84xdpbfHUm 7FZrj+nm813yZmtV0Y50w7EsGecBVjJmPKnBt4AnUUMhBXYI2SVqseQN61rp24FBZJJLw8 reGN8WLBRPQCaQYHEgSI0ZMVrmhC6JeWWeI99ltWWlvQzWCiG0FnQN86214N6A== 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=1774070197; 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=vq9E5+lJ9WJjfuPrAy3j3BiRRUgvi1wELChQOjjOBN0=; b=RIvJQMUG7f398frSMR24e/97Kyi30PbpkoIqCmjSWSqFoz0+xjPMDrq0lduZLTz9mZ9BpM xpY8gj68giOxBN3SYQGb859uGCaUDDmGB+S+hN3GPCaJ8CUqP+ldFsUJPrJK6ObVsxY7nJ O8ExCMQPmpRknChs5vi5eoHtReLX7pyFVIoODGjSML2IPXppaJapkkGitOUn3e7IAprk0S nG5Fm79/UM89byoOGsuuO37NB4d+VqCxjVFHeWiLXGY/tLrNaLo/jYrL8D5kIx9ipdhRC1 FCnIypQuov0TcaXrkkrfEgQmd35vPgKI8PjnhR0HJ9TdinFEB6CbcDhjLtckmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fd72Y2DGhzyN7 for ; Sat, 21 Mar 2026 05:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 305c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Mar 2026 05:16:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 2547f9720221 - main - acpi.4: Update sysctl descriptions for new stypes 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2547f972022197012cb3170ab4d6dcd8cd0ee257 Auto-Submitted: auto-generated Date: Sat, 21 Mar 2026 05:16:37 +0000 Message-Id: <69be29b5.305c6.4dee7603@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=2547f972022197012cb3170ab4d6dcd8cd0ee257 commit 2547f972022197012cb3170ab4d6dcd8cd0ee257 Author: Aymeric Wibo AuthorDate: 2026-03-21 03:33:30 +0000 Commit: Aymeric Wibo CommitDate: 2026-03-21 05:16:06 +0000 acpi.4: Update sysctl descriptions for new stypes The previous S1-S5 options are still accepted for compatibility, but they are now deprecated in favour of the new generic sleep types. Reported by: markj Reviewed by: markj Approved by: markj Fixes: 97d152698f48 ("acpi: Use sleep types defined in sys/power.h") Event: AsiaBSDCon 2026 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56008 --- share/man/man4/acpi.4 | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index 9c24635c561d..91193d899200 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 15, 2024 +.Dd March 21, 2026 .Dt ACPI 4 .Os .Sh NAME @@ -122,22 +122,21 @@ Use the ACPI Reset Register capability to reboot the system. Some newer systems require use of this register, while some only work with legacy rebooting support. .It Va hw.acpi.lid_switch_state -Suspend state -.Pq Li S1 Ns \[en] Ns Li S5 +Sleep type +.Pq Li awake , Li standby , Li s2mem , Li s2idle , Li hibernate , Li poweroff to enter when the lid switch (i.e., a notebook screen) is closed, or .Dq Li NONE .Pq do nothing . Default is .Dq Li NONE . .It Va hw.acpi.power_button_state -Suspend state -.Pq Li S1 Ns \[en] Ns Li S5 +Sleep type +.Pq Li awake , Li standby , Li s2mem , Li s2idle , Li hibernate , Li poweroff to enter when the power button is pressed, or .Dq Li NONE .Pq do nothing . Default is -.Li S5 -(power-off nicely). +.Li poweroff . .It Va hw.acpi.reset_video Reset the video adapter from real mode during the resume path. Some systems need this help, others have display problems if it is enabled. @@ -152,19 +151,21 @@ Otherwise, the OS is responsible for suspending to disk Most current systems do not support .Li S4BIOS . .It Va hw.acpi.sleep_button_state -Suspend state -.Pq Li S1 Ns \[en] Ns Li S5 +Sleep type +.Pq Li awake , Li standby , Li s2mem , Li s2idle , Li hibernate , Li poweroff to enter when the sleep button is pressed. This is usually a special function button on the keyboard. -Default is -.Li S3 -(suspend-to-RAM). +Default is usually +.Li s2mem +if supported, and +.Li s2idle +if not. .It Va hw.acpi.sleep_delay Wait this number of seconds between preparing the system to suspend and actually entering the suspend state. Default is 1 second. .It Va hw.acpi.supported_sleep_state -Suspend states +ACPI S-states .Pq Li S1 Ns \[en] Ns Li S5 supported by the BIOS. .Bl -tag -width indent