From nobody Fri Aug 8 22:31:42 2025 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 4bzJfk2l8Pz64Gld; Fri, 08 Aug 2025 22:31:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bzJfk22khz3yfQ; Fri, 08 Aug 2025 22:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754692302; 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=EtmUG81pUqYfMN13chtY5/65Jnrn2voUNV7PF6ggh28=; b=LK8DZf2jP72/RVGlCT5PSpdbPqdR3PmwTAuPWbd5pVN1hg3eWBzmH9V8nvchTJNPZTPvOM 0CgMaY1M+AEXfUarcqHfrFkIxtXiVGmUBU0fo4+tkNaSRyuDfq3fPadDCnhrcmQfcrzmCw aErGuc4Pvncq+wpvZtlfoWgKl31qJ0c3j5lYaLVu7nJBCVJIwJa38BMfPfw9egZRFtT8ZR Pth5AnN9M8DqLPzFAa3TW+G/DTYfE9lYZUat1Uy6PqsWlHA9tMTPDTfsWMb2RCwSRdNq4U UCXF/ZUCWeZavRJ3vBVdMxOVkCYpxmxfAYWjvUzfFdHCzph1L7i+VmvxHrGqNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754692302; 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=EtmUG81pUqYfMN13chtY5/65Jnrn2voUNV7PF6ggh28=; b=si0YC21v0vEVn/yFbOtgIlIq3I+xzNC8N4a7G0jEDRShysq8X4TvAdoh3RkllGOaAOeLOg ztHMJQb2VEd0LKmiAn8/NHxkG6HMYhBQhg7XiFEFe5rElynetwT3HAiDq3A7TvWArZcf0N Dt9NJ2xTfbhW71O6fkLVHP49Xa/0b2ZfaXpRi0x2mgXwuLXtThB9wslwDCjQwzZhfJd0cj RMFPLgZ8HHOOBGoP5OPM/wg40VXW0i96Un8uXI5sFE7czNJTXcvWcMd3R4YxEtE/LO6JIB G7CNhlY0eOT/sb1VjeTOXPZXRXQF3/zaJHEBu0e9hqzDXzTANu3OsWGS52lspA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754692302; a=rsa-sha256; cv=none; b=Yn715ETxdpb1v77YZFlcftqdigjnMM8Q57SwrmPGPo1jf6kTDPAAx5WfMftDFOgY5TmpQH XdWuUsiGcOGG4ZaGyKcgnZwHewEKNt8iLIrPOIGECXsqQH+wH4kNI25km0IAr3OzJa2Nru Z5MDPEbjup7GbKtxc96CAVXuLQ1KqDIPGjdLV4gp6hFT8jdVuv5SDflYSGwnnQoEoYYhN4 7Vp7Xl4VQ408hm4h6jajjed6JACUhERJh5QIH1M8vSeWmNzXHkygooZls+IIEM3SiyaHRE NzMh+0ESoN5fmuoh4xD3hAc/upsc/ZopvhtlZW64xsa7pHTHOOymT8yExZSROw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bzJfk1fCbzvRD; Fri, 08 Aug 2025 22:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 578MVgjM042687; Fri, 8 Aug 2025 22:31:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578MVggA042684; Fri, 8 Aug 2025 22:31:42 GMT (envelope-from git) Date: Fri, 8 Aug 2025 22:31:42 GMT Message-Id: <202508082231.578MVggA042684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 6882fc4cc436 - main - pci: Fix dependency on ACPICA for non-ACPI builds 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: 6882fc4cc43653dd52f6d49e15db9dada423455a Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=6882fc4cc43653dd52f6d49e15db9dada423455a commit 6882fc4cc43653dd52f6d49e15db9dada423455a Author: Aymeric Wibo AuthorDate: 2025-08-08 20:15:58 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-08 22:30:06 +0000 pci: Fix dependency on ACPICA for non-ACPI builds Commit 84bbfc32a3f4 introduced a dependency on ACPICA for non-ACPI builds. This removes that unintended dependency. While here, print "D3hot" for D3hot in ACPI code instead of just "D3", as it was unclear whether that referred to D3hot or D3cold and was inconsistent with the `PCI_POWERSTATE_D3` and `ACPI_D_STATE_D3` defines. Reported by: jrtc27, freebsd@sysctl.cz Reviewed by: jrtc27, des, jrm (mentor) Approved by: jrtc27, jrm (mentor) Fixes: 84bbfc32a3f4 ("acpi_powerres: D3cold support") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51823 --- sys/dev/acpica/acpivar.h | 3 ++- sys/dev/pci/pci.c | 6 ++---- sys/dev/pci/pcivar.h | 12 ++++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 39432731cbcc..6887f080311d 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -520,7 +520,8 @@ acpi_get_verbose(struct acpi_softc *sc) static __inline const char * acpi_d_state_to_str(int state) { - const char *strs[ACPI_D_STATE_COUNT] = {"D0", "D1", "D2", "D3", "D3cold"}; + const char *strs[ACPI_D_STATE_COUNT] = {"D0", "D1", "D2", "D3hot", + "D3cold"}; MPASS(state >= ACPI_STATE_D0 && state <= ACPI_D_STATES_MAX); return (strs[state]); diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 4629165f34b2..9e43a4c1909f 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -81,9 +81,6 @@ #include -#include -#include - #include "pcib_if.h" #include "pci_if.h" @@ -2900,7 +2897,8 @@ pci_set_powerstate_method(device_t dev, device_t child, int state) if (bootverbose) pci_printf(cfg, "Transition from %s to %s\n", - acpi_d_state_to_str(oldstate), acpi_d_state_to_str(state)); + pci_powerstate_to_str(oldstate), + pci_powerstate_to_str(state)); PCI_WRITE_CONFIG(dev, child, cfg->pp.pp_location + PCIR_POWER_STATUS, status, 2); diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 832305b9adee..4abb5e977346 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -516,8 +516,20 @@ pci_is_vga_memory_range(rman_res_t start, rman_res_t end) #define PCI_POWERSTATE_D3_HOT 3 #define PCI_POWERSTATE_D3_COLD 4 #define PCI_POWERSTATE_D3 PCI_POWERSTATE_D3_COLD +#define PCI_POWERSTATE_MAX PCI_POWERSTATE_D3_COLD +#define PCI_POWERSTATE_COUNT 5 #define PCI_POWERSTATE_UNKNOWN -1 +static __inline const char * +pci_powerstate_to_str(int state) +{ + const char *strs[PCI_POWERSTATE_COUNT] = {"D0", "D1", "D2", "D3hot", + "D3cold"}; + + MPASS(state >= PCI_POWERSTATE_D0 && state <= PCI_POWERSTATE_MAX); + return (strs[state]); +} + static __inline int pci_set_powerstate(device_t dev, int state) {