From nobody Mon Jun 22 21:42:43 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 4gkhWR3mQfz6j5hh for ; Mon, 22 Jun 2026 21:42:43 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkhWR1bLHz3M1l for ; Mon, 22 Jun 2026 21:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782164563; 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=o3k6r9Wu3Rzq4FwOrobtFQpNGDgmuTuntFrzCK52cmo=; b=gNc5KZo7/DVjMi3pPJFgn6xSG+p55h2b5IMZAiTIpV2h0HaZ0MgxVVfZCqg+57CtHmQ3O1 tV5v+5Ggsl67w6RMLJGSa5FFh5biQOoReQmIEsJbWQlT0LnWSBgHyXyVfSN/F8LAr1UNWc TTdxYZYSwtlOe1dQx/7xpOK+31cGPn92oVYkmKG6EE0TJ5L7RtPKKu1ordtTVdpTqiaIWQ ewGMnZkYJUtSE9XJ1hob53u1w0TFBBaQrdJywPbeWDqBDy60k9IGQUD1BBDuIlBNyFD2Y7 VCGtzyw7ejeiHCoJm0ukRx75691D0hRylSFK1Vr2Lrw2JJAqVKHQhzsOWaY7Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782164563; a=rsa-sha256; cv=none; b=hw3rNqg5r7h7KS8cMLMAW0kRQ1MdzEG1oL73Kl+gBu42rbvHVqB9d0360oQyXOJkb2NOle fagVmr++XbXI+gT8qyiwuTOajxy0d/TrBT2mr1H9Hgf4Dvav7bQpdVAKMBtYurPrOMPoOE vs1dWQafOXDoqpiBVQ4FJoZEh/CDZ8LLRx0aTMzdKAdAxxqe5CYdv98+Lxs8AZK0enUIIb W4nucNDFtyvO56WyKp+A6q7jssrpjrG2JrAzhR18M2tnjMGAZwy5B+u8QLsddCZFP9wH92 TsNJr3HkixyvIqJ4N5L0WYpm7+Z575ude7rZjQ72ba14TExgK3Ys7oDcVBVfNA== 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=1782164563; 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=o3k6r9Wu3Rzq4FwOrobtFQpNGDgmuTuntFrzCK52cmo=; b=MRtK9qgoKNslGz9Jm7oHcb3rjOsbIsNe+52h4ja0LTqwmMcGEJAMruwJ2AE8IA7XuVvPf6 E3Eis+YvYik0zjYX+XIXQarDhG8N9T72+coBTtPGjyLbyPxPNbMAWIE9zkeDBfkyc4Cbjj z5M1w9yPgNOauFe/NYSvXWOHVdYGVmbsd5sHlhUZWbttt9IHYIIz/pJBZEq5mQr51K6n+V 6aM4pCCGRWhzOaes3Bk5z4fqJ992QMcz49AS8N4cX64b5sSGQB7qmvzi5w1xeVEuY2OBes qYAgD/t4dTGQnPEjMWIuMFOlRcvGQKMOVLrXodCS9CwiUAOYpt79Ip1i+jd3YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkhWR0g9Xz14kV for ; Mon, 22 Jun 2026 21:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ff06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 21:42:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 95ff2acb5555 - main - acpi: Set 'acpi_sstate' closer to setting 'acpi_stype' 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95ff2acb5555c6b165e7a32249c403cd339697d8 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 21:42:43 +0000 Message-Id: <6a39ac53.1ff06.390703cd@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=95ff2acb5555c6b165e7a32249c403cd339697d8 commit 95ff2acb5555c6b165e7a32249c403cd339697d8 Author: Olivier Certner AuthorDate: 2026-06-04 07:37:57 +0000 Commit: Olivier Certner CommitDate: 2026-06-22 21:40:14 +0000 acpi: Set 'acpi_sstate' closer to setting 'acpi_stype' Makes on-going modifications for hibernate easier. No functional change (intended). Reviewed by: obiwac Event: Halifax Hackathon 202606 Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/OlCe2/freebsd-src/pull/8 --- sys/dev/acpica/acpi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index b689e936916b..0033ba734dc1 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -3641,8 +3641,6 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) return (AE_SUPPORT); } - acpi_sstate = acpi_stype_to_sstate(sc, stype); - /* Re-entry once we're suspending is not allowed. */ status = acpi_sleep_disable(sc); if (ACPI_FAILURE(status)) { @@ -3678,15 +3676,15 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) } #endif + slp_state = ACPI_SS_NONE; + sc->acpi_stype = stype; + acpi_sstate = acpi_stype_to_sstate(sc, stype); + /* * Be sure to hold bus topology lock across DEVICE_SUSPEND/RESUME. */ bus_topo_lock(); - slp_state = ACPI_SS_NONE; - - sc->acpi_stype = stype; - /* Enable any GPEs as appropriate and requested by the user. */ acpi_wake_prep_walk(sc, stype); slp_state |= ACPI_SS_GPE_SET;