From nobody Tue Apr 29 18:30:48 2025 X-Original-To: dev-commits-src-all@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 4Zn85R2LTbz5vMt6; Tue, 29 Apr 2025 18:30:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn85P0ssbz4Hkb; Tue, 29 Apr 2025 18:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745951449; 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=evga1ykIU5zxr/w59P2afWD6vMvc9ZnIAlUPWXUL7lA=; b=gaXkPXaRsTZoBs/osaQCOj74U9yNb9QqYZvZ/K+FoaC0aST9B1mhjOimlf0UyhNPPxAxwv 0/wn2iFCjMjZa/sUhS6fKDHM9V2vbaoTwS/SAeCrPYtB4FCdlbtBg+2Z4QdmHo+OArFN8e ZDeLSOpD/cEHBjGSnGpMAjEz6lxDIL4J5LEBwKegZiteVOHoyOyCy2Oxosrd1uG9a9mEjE +YREGyEdBCHyjcYdv1UMKPz9hoIlw/RcsQSOUt+Sv+GGD+CKWs4UpuqW4W6urSeE5qRwd0 pkQVCmzjQH6CeYV8jI1sLI34ExGqP1FAjMusOGqWl9b+d06aMuSCLsaSPMtJIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745951449; a=rsa-sha256; cv=none; b=uEppboFxLTHQa+QVhoDGg0D97jJ60aeO7aYVqX7ZR5yejjMHLEHv8YCGBAxAVKkChkIW8w uHYHVS/JutI2N4r+Sufp4xs14FkgCExYKudEYS8Ory0w8O+v1Tbj8fsM9oEp0FprJDUOTH Cz6ZP4zvR5GCtb4Q8fxmUOu2at92h0z/MN4phOkaXUow2eeQajNXzbAj2nODpMe+p9tU+X z2QeX0Y0VuyObTFo6obTKjlcQ/x6mOI0JnfuLIybkGzda0X+ivhy+uYCre0ehS9pdMK2ll 0oI9gPYlYihzs17vma5HDTb7i0utSKlFKahe7X47EtUgjF1qrUxKLXmGJFQZWw== 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=1745951449; 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=evga1ykIU5zxr/w59P2afWD6vMvc9ZnIAlUPWXUL7lA=; b=vNX5Wl4grrOV2aiIaDTnLF/YPAetiyC10agn/ZFleUcq3PZegLMErE5VXNgbeMipaZb0qg KQJKWDoXadqvujwnaiprwPvbquEcjZDwCgFRYccYDgW/zMiQY2B5cFrFJdvRApUZ4n6knq XlQtJ1AsalHcXXZWBCQpGk69ZP5OvrfJCMM0/iU2SL8t9VSF7C81L0m9Yyb+y/p+hZmtfO H+FEL4VzO0AyLQhEX5LVVsbAIQQdLPWGVZnmBZZQjxCOhY6QTTcZHKxw/xtkmncFAgGtJ6 MaSXjfj+1wgj20T2YlD0Q1wq/WFY3bG2IxM6kE3O9PLfbSS+5OexLRmSYJzpBg== 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 4Zn85N6b9ZzXqZ; Tue, 29 Apr 2025 18:30:48 +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 53TIUmtE022904; Tue, 29 Apr 2025 18:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TIUmi4022901; Tue, 29 Apr 2025 18:30:48 GMT (envelope-from git) Date: Tue, 29 Apr 2025 18:30:48 GMT Message-Id: <202504291830.53TIUmi4022901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b8b5dbdb93f8 - stable/14 - pci: Add helper routines to manage PME in device drivers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b8b5dbdb93f871948651828c4cee7d733e649ff2 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b8b5dbdb93f871948651828c4cee7d733e649ff2 commit b8b5dbdb93f871948651828c4cee7d733e649ff2 Author: John Baldwin AuthorDate: 2025-03-27 20:53:58 +0000 Commit: John Baldwin CommitDate: 2025-04-29 14:44:58 +0000 pci: Add helper routines to manage PME in device drivers pci_has_pm is a quick check that returns true if a PCI device supports the power management capability. pci_enable_pme can be used in DEVICE_SUSPEND driver methods to enable PME# during suspend. Reviewed by: Krzysztof Galazka x Differential Revision: https://reviews.freebsd.org/D49250 (cherry picked from commit e5cbf0e881fa1851912be77c62aa7ab17f844c3d) --- share/man/man9/Makefile | 2 ++ share/man/man9/pci.9 | 19 ++++++++++++++++++- sys/dev/pci/pci.c | 24 ++++++++++++++++++++++++ sys/dev/pci/pcivar.h | 2 ++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index dcaf1d4ac5ed..6993b34e5b4a 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1786,6 +1786,7 @@ MLINKS+=pci.9 pci_alloc_msi.9 \ pci.9 pci_disable_io.9 \ pci.9 pci_enable_busmaster.9 \ pci.9 pci_enable_io.9 \ + pci.9 pci_enable_pme.9 \ pci.9 pci_find_bsf.9 \ pci.9 pci_find_cap.9 \ pci.9 pci_find_dbsf.9 \ @@ -1798,6 +1799,7 @@ MLINKS+=pci.9 pci_alloc_msi.9 \ pci.9 pci_get_powerstate.9 \ pci.9 pci_get_vpd_ident.9 \ pci.9 pci_get_vpd_readonly.9 \ + pci.9 pci_has_pm.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 0f3fc92c23e7..8f772e76ba99 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 May 20, 2021 +.Dd March 27, 2025 .Dt PCI 9 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nm pci_disable_io , .Nm pci_enable_busmaster , .Nm pci_enable_io , +.Nm pci_enable_pme , .Nm pci_find_bsf , .Nm pci_find_cap , .Nm pci_find_dbsf , @@ -51,6 +52,7 @@ .Nm pci_get_powerstate , .Nm pci_get_vpd_ident , .Nm pci_get_vpd_readonly , +.Nm pci_has_pm , .Nm pci_iov_attach , .Nm pci_iov_attach_name , .Nm pci_iov_detach , @@ -92,6 +94,8 @@ .Fn pci_enable_busmaster "device_t dev" .Ft int .Fn pci_enable_io "device_t dev" "int space" +.Ft void +.Fn pci_enable_pme "device_t dev" .Ft device_t .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func" .Ft int @@ -124,6 +128,8 @@ .Fn pci_get_vpd_ident "device_t dev" "const char **identptr" .Ft int .Fn pci_get_vpd_readonly "device_t dev" "const char *kw" "const char **vptr" +.Ft bool +.Fn pci_has_pm "device_t dev" .Ft int .Fn pci_msi_count "device_t dev" .Ft int @@ -358,6 +364,12 @@ When no more instances are located returns an error. .Pp The +.Fn pci_has_pm +function returns true if +.Fa dev +supports power management. +.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 @@ -678,6 +690,11 @@ function is used to clear any pending PME# signal and disable generation of power management events. .Pp The +.Fn pci_enable_pme +function is used to enable generation of power management events before +suspending a device. +.Pp +The .Fn pci_iov_attach function is used to advertise that the given device .Pq and associated device driver diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index a99c34271f96..649ac6286865 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -2937,6 +2937,30 @@ pci_clear_pme(device_t dev) } } +/* Clear any active PME# and enable PME# generation. */ +void +pci_enable_pme(device_t dev) +{ + struct pci_devinfo *dinfo = device_get_ivars(dev); + pcicfgregs *cfg = &dinfo->cfg; + uint16_t status; + + if (cfg->pp.pp_cap != 0) { + status = pci_read_config(dev, dinfo->cfg.pp.pp_status, 2); + status |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE; + pci_write_config(dev, dinfo->cfg.pp.pp_status, status, 2); + } +} + +bool +pci_has_pm(device_t dev) +{ + struct pci_devinfo *dinfo = device_get_ivars(dev); + pcicfgregs *cfg = &dinfo->cfg; + + return (cfg->pp.pp_cap != 0); +} + /* * Some convenience functions for PCI device drivers. */ diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index d365b9132069..c69f2b1e09bd 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -686,6 +686,8 @@ void pci_save_state(device_t dev); int pci_set_max_read_req(device_t dev, int size); 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); 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,