From nobody Thu Feb 19 10:29:38 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 4fGqPb2y1Qz6Sjqw for ; Thu, 19 Feb 2026 10:29:39 +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 4fGqPZ6FyJz3CkQ for ; Thu, 19 Feb 2026 10:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496978; 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=7wJPo+x7PLhIXh6syVG1XHgPNC03LwNRvh33MBFHMBg=; b=GRvM7A3jg1kApqUIjUETPfwX9go981i+5h/x0hfUf6bIMEiXzoBpQJyARHewWNbRRz2O1M wgSUnDmF0MymFRSgwDHf9cHSpzmMwocbeHDkafja8kNUjoYETqUHE4QMxejTzxwk5/bvlM yTr8xaG6w1+VQwjcCmlwerZU/qaWjqgR5wS9y04D/BljjCX+MWR7/AaKmB+7SGRz7GlvM7 Eda8DCgyfd2fcEZl3qOkH6EzyHTXyWCV/ypWsp/DcA18uUBm/4UJUCONeK48NPvBkVS7yv vE49RfczDROSgaR56NyIc3EoHj+owJUG00/Zf6cH8AGxvT9W5shR/pqjvjQuuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771496978; a=rsa-sha256; cv=none; b=Taa7DWL/q8G7VL/UwxKTYZAITYE3xO2ZyRGJqOL3uTxdSSRLJeu12SeFfD28NVWMU9efWg 1fAJ6AsWzCQOgotGaj+AzZKTe6UGLKKgJEruWCjJSjO8RIoQQ04FnaXUColCRtWchL7OoU ++jKwHw36YenXi8p+0BwS2f7o9fQM94c1KHIXJ5dRO7krTbNppwk78aJelr2Azs9a4ecyK 43o9ReeZOs8iQe+15yyhsx1shi+VnB5yPAQlCcWsaQAZlMVYieDOmtNs+Qhn6ZPxGV1van UiSSmN5+wM1ZwcMQK5X1C/2ZYK7EnbKj6l0MlPdPGYxwpG22DcGuKaqgqJIPaQ== 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=1771496978; 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=7wJPo+x7PLhIXh6syVG1XHgPNC03LwNRvh33MBFHMBg=; b=gUAhcD6CLlLO3dc9LY2zOcXZy9r8Ca2bPeXbRGWGpekGYEOXmTLs1vnW+qthxsWEIoyaPr ey4gLa/q6tSTOaroESRLeUdPCTnXwVjFUeXpDRsjX9exdWe9rsImCVkeoLcrb/hMT5L9uv T7c6jr/0U4na6+l1gvjUILMEFLOCG3tTV2zlv1ABbVDhKOTTSymGDgztS81ZVIx5nHMIBJ hFyutN+s/PBJjOe9BzuVORfwpjp7hODmisWVTc73FAfjkBLZlLE2GpSrFFlUS6SUY1H4av s7LZoVTHw4ZMalvOCEAkLaBlUbQi1tHIiNGqvWZsIFhxLQAZLVGaFOkaEtikrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPZ5jxXzfFs for ; Thu, 19 Feb 2026 10:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 10:29:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 781c9b0a595f - main - acpi: Factor out message printing on failure of AcpiEnterSleepStatePrep() 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: 781c9b0a595f9af501ad836a120aedba91c13a0b Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 10:29:38 +0000 Message-Id: <6996e612.24f0f.1490cce6@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=781c9b0a595f9af501ad836a120aedba91c13a0b commit 781c9b0a595f9af501ad836a120aedba91c13a0b Author: Olivier Certner AuthorDate: 2026-01-28 16:06:30 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 10:29:07 +0000 acpi: Factor out message printing on failure of AcpiEnterSleepStatePrep() To this end, create a small wrapper, acpi_EnterSleepStatePrep(), which itself prints the failure message. While here, when trying to power down (acpi_shutdown_final()), and AcpiEnterSleepStatePrep() failed, print an additional message more explicit about the power down request having failed. Reviewed by: obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55225 --- sys/dev/acpica/acpi.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 59ae4624f407..bbcf6ba34666 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2593,6 +2593,23 @@ acpi_fake_objhandler(ACPI_HANDLE h, void *data) { } +/* + * Simple wrapper around AcpiEnterSleepStatePrep() printing diagnostic on error. + */ +static ACPI_STATUS +acpi_EnterSleepStatePrep(device_t acpi_dev, UINT8 SleepState) +{ + ACPI_STATUS status; + + status = AcpiEnterSleepStatePrep(SleepState); + if (ACPI_FAILURE(status)) + device_printf(acpi_dev, + "AcpiEnterSleepStatePrep(%u) failed - %s\n", + SleepState, + AcpiFormatException(status)); + return (status); +} + static void acpi_shutdown_final(void *arg, int howto) { @@ -2606,9 +2623,9 @@ acpi_shutdown_final(void *arg, int howto) * an AP. */ if ((howto & RB_POWEROFF) != 0) { - status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); + status = acpi_EnterSleepStatePrep(sc->acpi_dev, ACPI_STATE_S5); if (ACPI_FAILURE(status)) { - device_printf(sc->acpi_dev, "AcpiEnterSleepStatePrep failed - %s\n", + device_printf(sc->acpi_dev, "Power-off preparation failed! - %s\n", AcpiFormatException(status)); return; } @@ -3659,12 +3676,9 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) slp_state |= ACPI_SS_DEV_SUSPEND; if (stype != POWER_STYPE_SUSPEND_TO_IDLE) { - status = AcpiEnterSleepStatePrep(acpi_sstate); - if (ACPI_FAILURE(status)) { - device_printf(sc->acpi_dev, "AcpiEnterSleepStatePrep failed - %s\n", - AcpiFormatException(status)); + status = acpi_EnterSleepStatePrep(sc->acpi_dev, acpi_sstate); + if (ACPI_FAILURE(status)) goto backout; - } slp_state |= ACPI_SS_SLP_PREP; }