From nobody Thu Feb 19 10:29:39 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 4fGqPc23J0z6Sjtn for ; Thu, 19 Feb 2026 10:29:40 +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 4fGqPb6ycTz3Ckc for ; Thu, 19 Feb 2026 10:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496980; 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=ODpcPsxPoeo53GZVgxsIiDXsEnj77wTQkNvS5EUV3Fc=; b=F1gBgIXEiDuNUe6dlNhOOHgLWQI/q2oMERbJepN/VGOoVD1EY6Kyk5qXokRRyoMmjfBv9V 8C/ExpsfAp+Vjh6aw2g31wP7OBjPndMPIgvsXihdvEy45laEdke7DAzc575ckHUDiQE3Sv Xh+ciD2qPAI/Ok9B1zsQ1tASoAOmmZ9nNeGQR6CMc+csOJ/gd145icsS8pOEJ6N0JRXqLR MJUvdt5oXNpaE7Rzz+A3NBSI9jxMIBCmYkCkjmWIBdMBf4I7NO1EWBl/VcAo+c87dhYMS4 O6v1jzsH/JfkB0XicF3Ub/WmaopvudCDDz5VyPPiQsCwbK5hmvVaJYEJxt3taQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771496980; a=rsa-sha256; cv=none; b=H0K4pBQ3raXVpIzVWt4WQ5pKiOq3DfwBrIlRbnjd+sPGgymQ51KRppJ3K0U64AjDR2vlGi wbfTTbyJkuxlYu+ZSDy+/MIx/27AEEsIdLAuigpzlCXu8aNBvdTesUSrNFxO1J1zBy4iPS UXYpXbf4XrNaPPR+QWYyRlxr/oabSdoAtUrfxSvk0SxNnFmQstkTamkCjGBeLoFD1jitLc gxRJI5VNVuoq8sCGW9duWlKDgxcsfVDU2ZVaa8th1rOJZbd2MhsImtTVUIZyD9xhxHT9bk jO+FWB9pts9ftc6N8pFCJKiZ8ukP/UOW93H3NlxWNFUIy354mZNJP8raYp4XJA== 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=1771496980; 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=ODpcPsxPoeo53GZVgxsIiDXsEnj77wTQkNvS5EUV3Fc=; b=R9CCHVjx/U78tttEUYex3fqi5VjObTc6bgO9YFjVcOZKZJLXRbwHoSWhtTjmyf1r4CqzD5 FGz67AoA34IffFLuna+naRoUSVN9gV+/d31r2f6cwbHxG5HwwrvCZanWvzCMVYuM0Nws2A +LotVLpbNOQF8Oi3xJUk1U1YqBcawbn4oyhtJIDA6agJPn9+YhSlpiTN1HEHtTbNOPQ09Q kZXKFRFwJxRUTOFgdWV1BQ7h+UsH2olJxsRqaaBcCXJVtBFB061XAXx8DqguX9T/q8dHjm T//vrMAeMLfXK5z3GEWDfsaOkbkaapsWAOS/edKpO2VHivd6Y0peos/k/JhVzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPb6YQzzdvb for ; Thu, 19 Feb 2026 10:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f15 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 10:29:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ffdfca5982b6 - main - acpi: Factor out the power off code into acpi_poweroff() 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffdfca5982b60cb4145a53f965b8c51600d2f323 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 10:29:39 +0000 Message-Id: <6996e613.24f15.74e7371b@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ffdfca5982b60cb4145a53f965b8c51600d2f323 commit ffdfca5982b60cb4145a53f965b8c51600d2f323 Author: Olivier Certner AuthorDate: 2026-01-28 16:40:51 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 10:29:07 +0000 acpi: Factor out the power off code into acpi_poweroff() While here, make it print that we are trying to power off upfront, not really treating differently power off preparation via acpi_EnterSleepStatePrep() and actual power off via AcpiEnterSleepState(), which the user does not care about. While here, capitalize the messages. Reviewed by: obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55226 --- sys/dev/acpica/acpi.c | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index bbcf6ba34666..f903f265f9fa 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2610,11 +2610,37 @@ acpi_EnterSleepStatePrep(device_t acpi_dev, UINT8 SleepState) return (status); } +/* Return from this function indicates failure. */ +static void +acpi_poweroff(device_t acpi_dev) +{ + register_t intr; + ACPI_STATUS status; + + device_printf(acpi_dev, "Powering system off...\n"); + status = acpi_EnterSleepStatePrep(acpi_dev, ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + device_printf(acpi_dev, "Power-off preparation failed! - %s\n", + AcpiFormatException(status)); + return; + } + intr = intr_disable(); + status = AcpiEnterSleepState(ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + intr_restore(intr); + device_printf(acpi_dev, "Power-off failed! - %s\n", + AcpiFormatException(status)); + } else { + DELAY(1000000); + intr_restore(intr); + device_printf(acpi_dev, "Power-off failed! - timeout\n"); + } +} + static void acpi_shutdown_final(void *arg, int howto) { struct acpi_softc *sc = (struct acpi_softc *)arg; - register_t intr; ACPI_STATUS status; /* @@ -2623,24 +2649,7 @@ acpi_shutdown_final(void *arg, int howto) * an AP. */ if ((howto & RB_POWEROFF) != 0) { - status = acpi_EnterSleepStatePrep(sc->acpi_dev, ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - device_printf(sc->acpi_dev, "Power-off preparation failed! - %s\n", - AcpiFormatException(status)); - return; - } - device_printf(sc->acpi_dev, "Powering system off\n"); - intr = intr_disable(); - status = AcpiEnterSleepState(ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - intr_restore(intr); - device_printf(sc->acpi_dev, "power-off failed - %s\n", - AcpiFormatException(status)); - } else { - DELAY(1000000); - intr_restore(intr); - device_printf(sc->acpi_dev, "power-off failed - timeout\n"); - } + acpi_poweroff(sc->acpi_dev); } else if ((howto & RB_HALT) == 0 && sc->acpi_handle_reboot) { /* Reboot using the reset register. */ status = AcpiReset();