git: c96d316a888e - stable/14 - pci_host_generic: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Feb 2025 14:16:30 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=c96d316a888e41d1b266fd880383c7802aaf2bd8
commit c96d316a888e41d1b266fd880383c7802aaf2bd8
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-01-23 17:35:36 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-02-27 13:09:20 +0000
pci_host_generic: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D43429
(cherry picked from commit e9eb353b324a3d051f81dde91d9f9f0fc044d822)
---
sys/dev/pci/pci_host_generic.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c
index 082d083fc681..02ca010a14d7 100644
--- a/sys/dev/pci/pci_host_generic.c
+++ b/sys/dev/pci/pci_host_generic.c
@@ -517,9 +517,19 @@ static int
generic_pcie_activate_resource(device_t dev, device_t child, int type,
int rid, struct resource *r)
{
+#if defined(NEW_PCIB) && defined(PCI_RES_BUS)
+ struct generic_pcie_core_softc *sc;
+#endif
rman_res_t start, end;
int res;
+#if defined(NEW_PCIB) && defined(PCI_RES_BUS)
+ sc = device_get_softc(dev);
+ if (type == PCI_RES_BUS) {
+ return (pci_domain_activate_bus(sc->ecam, child, rid, r));
+ }
+#endif
+
if ((res = rman_activate_resource(r)) != 0)
return (res);
@@ -542,8 +552,17 @@ static int
generic_pcie_deactivate_resource(device_t dev, device_t child, int type,
int rid, struct resource *r)
{
+#if defined(NEW_PCIB) && defined(PCI_RES_BUS)
+ struct generic_pcie_core_softc *sc;
+#endif
int res;
+#if defined(NEW_PCIB) && defined(PCI_RES_BUS)
+ sc = device_get_softc(dev);
+ if (type == PCI_RES_BUS) {
+ return (pci_domain_deactivate_bus(sc->ecam, child, rid, r));
+ }
+#endif
if ((res = rman_deactivate_resource(r)) != 0)
return (res);