From nobody Sun Sep 13 01:53:14 2026 X-Original-To: dev-commits-src-branches@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 4hjBBf1ZQjz6rQ3B for ; Sun, 13 Sep 2026 01:53:14 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hjBBf14cvz3JXJ for ; Sun, 13 Sep 2026 01:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789264394; 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=oHZ9w1CFZQ+AITyzsoc42sH5DNDjnP+1c93iPkboo+I=; b=eBgiRdwQwWUMO1pqKRFvfxRxnUsDxcVMHJbExIOJTaY30LRYn7hZTYGRs+7iuBnGJsrOxz N4Pe5Hrp2CJCIX45vyzVy2QxaA5e+6arLDJwX5hxNjGFQV7EAGSrdP3JhI5onxg5uIbLur 6nbNsq+qn/+RPzFceC+ngjW63KtFppQmt7wE4q4wyszhfeqf1qMyt3tGIjkVmuo/odUE/2 UbhAPeIHH6k/qp2ek/zU3e91rP3VsbYaj1Cn77WAnk72iqzVys/Io4pNe6Lhg4dpfPV+P1 AmOa/x3mVrXk3nvFSw6YazQyIUlNXG9Nts8p/D0MUCPwhjQIkkV6JCg9RZzg9g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789264394; b=fmLYByUcqZd1iQbgUz9+ckdkqiiP7iy4q30Y7M+xHUBok/zrDogtDjxl0dFpyNE7a8rMsR UPBYIUAIh5faMZLTUqIwLyqAh83he6q8N9E75lTxNBzDHLvlzBnHPA+DuefUCu6yn0X9qv O9gvhtqFaGZEADqnjsg8Xg/ClwHTdeyosELUi+6f1WRqP3ypCNeF2iO/SIIYAbI6yFv/bT /UOFvQSPV74WRSA7bw28afFUJ9wjx0An9NmDmiMsMA0um1MhM+nI4cDb1X5n/ves7b2Ein N1ttOm3NDuctfTBkGTYqptCdGRaFloZl9QqiayezYrmWBbB4CgyF/dmdAhJMqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789264394; 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=oHZ9w1CFZQ+AITyzsoc42sH5DNDjnP+1c93iPkboo+I=; b=PFtqxTzxLN5NWDkUnmq32KZu3kI0k8foa8nOC+m5sbbXX7zUqDXbOnL+wY9+Ukmn7gaDFN aLINmoncgjebcQXeyTj3CftgbjLZsPHLSv88Qi97irlBVoG8uN4Aor5VQhAdkyrVIb9Nne GmMfpYmq6yEWGoxDNVP/G4cJmMGnV+WMyWA3sDO/RxiSU7feSysdUmfJdAVnztAZTv2p+x Y40YF9t121svnGHfpHPCsi8MsF8wEsSAO35CU1uySV24aQytw9PjrHI9fzmR3RCRlQ/sjx j9HoRKm06bM6LMCA+bvpa2+gpJvvLQBPuNL3x0ph+w0HOuMoxWJtIhh04nZ12A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hjBBf06ctzMWB for ; Sun, 13 Sep 2026 01:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2297f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 13 Sep 2026 01:53:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 3e271569ab62 - stable/14 - pci: Adapt PME capability queries to stable/14 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e271569ab62ab38cf42d4cd2e88c75ddacc5e59 Auto-Submitted: auto-generated Date: Sun, 13 Sep 2026 01:53:14 +0000 Message-Id: <6aa6020a.2297f.61c8daac@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3e271569ab62ab38cf42d4cd2e88c75ddacc5e59 commit 3e271569ab62ab38cf42d4cd2e88c75ddacc5e59 Author: Kevin Bowling AuthorDate: 2026-09-13 01:47:39 +0000 Commit: Kevin Bowling CommitDate: 2026-09-13 01:50:42 +0000 pci: Adapt PME capability queries to stable/14 Add explicit D3hot and D3cold names and the bounds needed by pci_has_pme(), while retaining PCI_POWERSTATE_D3 == 3. D3cold is a capability-query state here, not a newly supported power transition. This avoids importing the ACPI D3cold changes for the PME and igc Wake-on-LAN backports. Use pci_has_pm() to check capability presence instead of pp_location, which is not present in stable/14. Keep the PCI configuration structure layout unchanged. Fixes: d831cb2ad3d8 ("pci: Expose PME support by power state") Fixes: 443dc80b712c ("igc: Correct Wake-on-LAN filter programming") --- sys/dev/pci/pci.c | 2 +- sys/dev/pci/pcivar.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index a6df0ff2ebc7..38d80a87b48e 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -3017,7 +3017,7 @@ pci_has_pme(device_t dev, int state) if (state < PCI_POWERSTATE_D0 || state > PCI_POWERSTATE_MAX) return (false); - return (cfg->pp.pp_location != 0 && + return (pci_has_pm(dev) && (cfg->pp.pp_cap & pme_mask[state]) != 0); } diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index b71814f79aed..592e926d0d0d 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -517,6 +517,11 @@ pci_is_vga_memory_range(rman_res_t start, rman_res_t end) #define PCI_POWERSTATE_D1 1 #define PCI_POWERSTATE_D2 2 #define PCI_POWERSTATE_D3 3 +#define PCI_POWERSTATE_D3_HOT PCI_POWERSTATE_D3 +/* D3cold is a PME query state, not a supported power-state transition. */ +#define PCI_POWERSTATE_D3_COLD 4 +#define PCI_POWERSTATE_MAX PCI_POWERSTATE_D3_COLD +#define PCI_POWERSTATE_COUNT 5 #define PCI_POWERSTATE_UNKNOWN -1 static __inline int