From nobody Sun Sep 13 00:48:46 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 4hj8mH1k9Qz6rHxn for ; Sun, 13 Sep 2026 00:48:47 +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 4hj8mG75g3z4nc9 for ; Sun, 13 Sep 2026 00:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789260527; 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=8p5kXQBGKX5aB41XfCiCE1AQXQLbcKcS+FtAqFaxNrQ=; b=soRN2MWuurCis8yzLEfFE4gTThSv1ST5TH9hyjVEHZAhG169dS53axS22EJYNXXtyWYJDt JbElSTzTSU+UmOnjr1gU+j/gR3MRZxTZbHLLeRVLixcvftjPtmDk5/uUJfr814vHqDwJBt bCsMc+SlLxuFqI4++e/IWphWdI67q0n/EZSB1mjhKmbFwicBEN+0fThddfFg6mjB798HJr 0UsXnXmuBSgg+KWq+lA+M3FwkN7DWZ4V2zvJvnXKr9/haumj/uBTCiPRb8pvzfG28h7EFf A5yplm8dLzgnay2/iSVXIz0JA84+wtcDhY2a6jqtTViFF/EA0wDu8wEq3C9/Uw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789260527; b=a0x0Olm3gXPsQgA7smb/jfbLtyM6cs6BB0Vf1wM6EFXQSHiCzYgTL2HWBwH95vnlZvNxhq aVefRVgyRpGB9uQj0jq1XAd2iYl65nLi6IYR1D8cvOssvJ8IkUzrW41JS1jCO5aTDYSTkg ib0t0LnhHVdWzgXsl3Gmc8HLnNK3/D6uV2MgI66D+xZk5HGBHA4OTxGhkzwKVIsn0L5i41 HLdyoC69iX4ycVuWA2KfKK4yWbpaAFJFO9VHlk6CFwJgqjhqflBkBvEGjZRnms8MHNPQ+Y lKI7qhOnrTdEGhVtFJqFtWHaNC2+i9kkKa3A9hGSfxWBxwJO26AgY36thfBHpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789260527; 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=8p5kXQBGKX5aB41XfCiCE1AQXQLbcKcS+FtAqFaxNrQ=; b=L99K5S7MVz51yW3gG1CZVtuHlSdyizTjLGeV0YhCdkJi3ASAQeCtu5kAqa+tRfL+MdKhBY QSN8b3PbEVcLwNP/aFL2EBbD3szWIY1bqn0HjfE7/yMS3GGPbyJ3gKOOP/g/5QagzvgsKh 6XaIG2RfCb0MEpyBAKoQie5psY8WaRIEigc7UjgNCzdeErfQBP81gTVYQFyJGjNGO0ehf5 s2eNml10slltZH+jmU3XsJbmfhIY81JNp6DccjpzJzfDqWTfon881VpDezVaialgdDvUOz QEJRXXQHarz0Yzy8PKZjTnGSz+wZrxNaXGI/J2dSZWzSlq9v6xS9ZvERIBj4Jw== 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 4hj8mG5cHzzJfS for ; Sun, 13 Sep 2026 00:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 13 Sep 2026 00:48:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: d831cb2ad3d8 - stable/14 - pci: Expose PME support by power state 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: d831cb2ad3d8caa31b9338cf6a4c11dc88290255 Auto-Submitted: auto-generated Date: Sun, 13 Sep 2026 00:48:46 +0000 Message-Id: <6aa5f2ee.1d0b4.387b3e5a@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d831cb2ad3d8caa31b9338cf6a4c11dc88290255 commit d831cb2ad3d8caa31b9338cf6a4c11dc88290255 Author: Kevin Bowling AuthorDate: 2026-08-30 08:18:10 +0000 Commit: Kevin Bowling CommitDate: 2026-09-13 00:48:24 +0000 pci: Expose PME support by power state The presence of the PCI power management capability does not imply that a function can signal PME# from every power state. Drivers which advertise wake based only on pci_has_pm() can consequently expose wake modes that cannot work. Add pci_has_pme() to query the PME_Support bitmap for a specific state. Use it to implement LinuxKPI pci_pme_capable(), removing its duplicate PME_Support decoder. Validated the helper against PCI PMC capability values from 82571EB, 82573L, 82579LM, I210, I225, and I226-V controllers. The 82571 and 82573 reported PMC 0xc822, while the I226-V reported 0xc823. In both values, bits 15, 14, and 11 advertise PME from D3cold, D3hot, and D0; the low-bit difference is only the PM capability version. Sponsored by: BBOX.io (cherry picked from commit c4e24e95c3f905b817d4bfc6e93457eb297bfa4b) --- share/man/man9/Makefile | 1 + share/man/man9/pci.9 | 19 ++++++++++++++++++- sys/compat/linuxkpi/common/include/linux/pci.h | 20 ++------------------ sys/dev/pci/pci.c | 19 +++++++++++++++++++ sys/dev/pci/pcivar.h | 1 + 5 files changed, 41 insertions(+), 19 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index a6f3f016c1b4..5d2efec76ed1 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1810,6 +1810,7 @@ MLINKS+=pci.9 is_pci_device.9 \ pci.9 pci_get_vpd_ident.9 \ pci.9 pci_get_vpd_readonly.9 \ pci.9 pci_has_pm.9 \ + pci.9 pci_has_pme.9 \ pci.9 pci_iov_attach.9 \ pci.9 pci_iov_attach_name.9 \ pci.9 pci_iov_detach.9 \ diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 9e45b37b7580..97a8c6a02cfb 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 15, 2026 +.Dd August 30, 2026 .Dt PCI 9 .Os .Sh NAME @@ -54,6 +54,7 @@ .Nm pci_get_vpd_ident , .Nm pci_get_vpd_readonly , .Nm pci_has_pm , +.Nm pci_has_pme , .Nm pci_iov_attach , .Nm pci_iov_attach_name , .Nm pci_iov_detach , @@ -134,6 +135,8 @@ .Fn pci_get_vpd_readonly "device_t dev" "const char *kw" "const char **vptr" .Ft bool .Fn pci_has_pm "device_t dev" +.Ft bool +.Fn pci_has_pme "device_t dev" "int state" .Ft int .Fn pci_msi_count "device_t dev" .Ft int @@ -391,6 +394,20 @@ function returns true if supports power management. .Pp The +.Fn pci_has_pme +function returns true if +.Fa dev +can generate a power management event from the PCI power state +.Fa state . +The state must be one of +.Dv PCI_POWERSTATE_D0 , +.Dv PCI_POWERSTATE_D1 , +.Dv PCI_POWERSTATE_D2 , +.Dv PCI_POWERSTATE_D3_HOT , +or +.Dv PCI_POWERSTATE_D3_COLD . +.Pp +The .Fn pci_find_extcap function is used to locate the first instance of a PCI-express extended capability register set for the device diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 247057f0fedf..d6b4ee846950 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -632,26 +632,10 @@ pci_find_ext_capability(struct pci_dev *pdev, int capid) return (reg); } -#define PCIM_PCAP_PME_SHIFT 11 static __inline bool -pci_pme_capable(struct pci_dev *pdev, uint32_t flag) +pci_pme_capable(struct pci_dev *pdev, pci_power_t state) { - struct pci_devinfo *dinfo; - pcicfgregs *cfg; - - if (flag > (PCIM_PCAP_D3PME_COLD >> PCIM_PCAP_PME_SHIFT)) - return (false); - - dinfo = device_get_ivars(pdev->dev.bsddev); - cfg = &dinfo->cfg; - - if (cfg->pp.pp_cap == 0) - return (false); - - if ((cfg->pp.pp_cap & (1 << (PCIM_PCAP_PME_SHIFT + flag))) != 0) - return (true); - - return (false); + return (pci_has_pme(pdev->dev.bsddev, state)); } static inline int diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index becda495f92a..a6df0ff2ebc7 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -3002,6 +3002,25 @@ pci_has_pm(device_t dev) return (cfg->pp.pp_cap != 0); } +bool +pci_has_pme(device_t dev, int state) +{ + static const uint16_t pme_mask[PCI_POWERSTATE_COUNT] = { + [PCI_POWERSTATE_D0] = PCIM_PCAP_D0PME, + [PCI_POWERSTATE_D1] = PCIM_PCAP_D1PME, + [PCI_POWERSTATE_D2] = PCIM_PCAP_D2PME, + [PCI_POWERSTATE_D3_HOT] = PCIM_PCAP_D3PME_HOT, + [PCI_POWERSTATE_D3_COLD] = PCIM_PCAP_D3PME_COLD, + }; + struct pci_devinfo *dinfo = device_get_ivars(dev); + pcicfgregs *cfg = &dinfo->cfg; + + if (state < PCI_POWERSTATE_D0 || state > PCI_POWERSTATE_MAX) + return (false); + return (cfg->pp.pp_location != 0 && + (cfg->pp.pp_cap & pme_mask[state]) != 0); +} + /* * Some convenience functions for PCI device drivers. */ diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 7701b82cc688..b71814f79aed 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -691,6 +691,7 @@ int pci_power_reset(device_t dev); void pci_clear_pme(device_t dev); void pci_enable_pme(device_t dev); bool pci_has_pm(device_t dev); +bool pci_has_pme(device_t dev, int state); uint32_t pcie_read_config(device_t dev, int reg, int width); void pcie_write_config(device_t dev, int reg, uint32_t value, int width); uint32_t pcie_adjust_config(device_t dev, int reg, uint32_t mask,