From nobody Wed May 27 08:17:56 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 4gQMtr2Lnbz6fchw for ; Wed, 27 May 2026 08:17:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQMtr1sJkz3Qgk for ; Wed, 27 May 2026 08:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779869876; 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=D5NnEdmFlO1EubbHge46t5fl7bjrrTObXk/6SCeYEjY=; b=ZRd8xfezzwPKonuSeuTfqHZqC1PmzUNoczDjr7bUXfRIgyD1hGNj/H1m08d44CVmbDcdz/ MuBedjkBDEovCgGYC8lXM/xl+ICNpyi53FoQVcryqTnoh38eWKBjpBZ98bnYHNaleMIPf2 NgS5UXcqMGAvwlzuhnrr4VYxcCIa/fWNKjvXzYCc4T/2IGbR9hpgCBeEVshlt6YvYCqaiF W8XuEgLItO7VyhTSVirK1/V/mqTtxPog7HaA+2jqLoMcROCoPORM8cVtNsnSOLKXR/CIZ4 28NICjHjfCv7olELMZ45UtZk2C5ZJFTdK012mPhBedqrdu0PfozkKko1eTHqIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779869876; a=rsa-sha256; cv=none; b=Eco9DWTRIcnO3zatk8uTmjdSZB+dQpN5ip8VgBaSzUX4FxigCTu4+OE0tTX5rhHwXI46CB zyZ3JckCBV8FTmt35rrnSdCbyM9phDFzKJkYVUYmjzbilEpryajygfIHkUvrdbFwecHuxs jo0NBom+KM31MK2SaYixrL44+Q8xsixgTsBxk/O9S7BPtG3T3vtnQZiksdN2k2cQ1KPBpb zeXyZA3OM7yF+4Ic0xUdA33F0elACgL62jxQYEhrqtuGHCJ3eHj8ItCXn8046DcfjuFTL6 /r8qaH5lFYs94fMTAqfNolF8KedJ93c06I9QaRwbSjiOgCqRfb9YCRXYmLBUqQ== 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=1779869876; 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=D5NnEdmFlO1EubbHge46t5fl7bjrrTObXk/6SCeYEjY=; b=Q5TNdryaR3niVf/uqJxpHAHSjfmsuhxG2LLcyKWl6Mf4M5GgPfaoCCKtc1I9FdhiKs7jqX D8DRIfS3gTJUg8ggq7coFm66aB6MNMAttfRoZHs/XaTOVsRC1DLmh3l52uXxJROEEpKo3B qabJwmeeG4dYxgTP8IwyIZhAxH9MhjFYSTObiT1tbntbDdEoNmSuHbCafcCbXP15Gd7vBH xt5tHw99AmnaZNGao4aLdgc31HZUlvP6g+o0MHl1Z5hp2/M2MLQMzExRfy8xYxoDvU+g3g ZmqnJ6elMcfGacwNfjkerpgVz9Qc36jHTYhr5x9zjRwOMunLWGZwnU5O68AMNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQMtr13j2zrX9 for ; Wed, 27 May 2026 08:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22767 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 08:17:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: e4328c1398e5 - main - acpi: Update s2idle strings to new name 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4328c1398e5ea47d039fbcffffe1a64ed92b981 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 08:17:56 +0000 Message-Id: <6a16a8b4.22767.4b401681@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4328c1398e5ea47d039fbcffffe1a64ed92b981 commit e4328c1398e5ea47d039fbcffffe1a64ed92b981 Author: Tom Jones AuthorDate: 2026-05-27 08:16:49 +0000 Commit: Tom Jones CommitDate: 2026-05-27 08:16:49 +0000 acpi: Update s2idle strings to new name Reviewed by: obiwac, emaste, olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57232 --- sys/dev/acpica/acpi.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 4c6d0c3679c9..5cb0afa581ca 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -666,10 +666,11 @@ acpi_attach(device_t dev) /* * Pick the first valid sleep type for the sleep button default. If that - * type was hibernate and we support s2idle, set it to that. The sleep - * button prefers s2mem instead of s2idle at the moment as s2idle may not - * yet work reliably on all machines. In the future, we should set this to - * s2idle when ACPI_FADT_LOW_POWER_S0 is set. + * type was hibernate and we support suspend_to_idle , set it to that. The + * sleep button prefers fw_suspend instead of suspend_to_idle at the moment + * as suspend_to_idle may not yet work reliably on all machines. In the + * future, we should set this to suspend_to_idle when + * ACPI_FADT_LOW_POWER_S0 is set. */ sc->acpi_sleep_button_stype = POWER_STYPE_UNKNOWN; for (stype = POWER_STYPE_STANDBY; stype <= POWER_STYPE_FW_HIBERNATE; stype++) @@ -743,7 +744,7 @@ acpi_attach(device_t dev) OID_AUTO, "lid_switch_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, &sc->acpi_lid_switch_stype, 0, acpi_stype_sysctl, "A", - "Lid ACPI sleep state. Set to s2idle or s2mem if you want to suspend " + "Lid ACPI sleep state. Set to suspend_to_idle or fw_suspend if you want to suspend " "your laptop when you close the lid."); SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "suspend_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, @@ -2154,9 +2155,9 @@ acpi_device_pwr_for_sleep_sxd(device_t dev, ACPI_HANDLE handle, int state, * we are currently entering (sc->acpi_stype is set in acpi_EnterSleepState * before the ACPI bus gets suspended, and thus before this function is called). * - * If entering s2idle, we will try to enter whichever D-state we would've been - * transitioning to in S3. If we are entering an ACPI S-state, we evaluate the - * relevant _SxD state instead (ACPI 7.3.16 - 7.3.19). + * If entering suspend_to_idle, we will try to enter whichever D-state we + * would've been transitioning to in S3. If we are entering an ACPI S-state, we + * evaluate the relevant _SxD state instead (ACPI 7.3.16 - 7.3.19). */ int acpi_device_pwr_for_sleep(device_t bus, device_t dev, int *dstate)