git: dc7494fb32df - stable/15 - pci: pci_host_generic: provide cleanup methods outside of detach

The branch stable/15 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=dc7494fb32df309092a2f2f3e62c221f8c41551c

commit dc7494fb32df309092a2f2f3e62c221f8c41551c
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2026-05-09 02:46:24 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2026-06-10 04:00:38 +0000

    pci: pci_host_generic: provide cleanup methods outside of detach
    
    If device_attach() fails, we're expected to actually cleanup after
    ourselves because device_detach() will not be called.  Factor out the
    cleanup bits that don't rely on attach having actually succeeded so
    that we can cleanup properly in bcm2838_pci.
    
    Reviewed by:    andrew, imp
    
    (cherry picked from commit 31a94ec32b53ebf6227bc868ce4f7aa07650680d)
---
 sys/dev/pci/pci_host_generic.c     | 15 +++++++++++----
 sys/dev/pci/pci_host_generic.h     |  1 +
 sys/dev/pci/pci_host_generic_fdt.c | 19 +++++++++++++++++++
 sys/dev/pci/pci_host_generic_fdt.h |  1 +
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c
index 49b131cd2299..d7854671bfd7 100644
--- a/sys/dev/pci/pci_host_generic.c
+++ b/sys/dev/pci/pci_host_generic.c
@@ -250,15 +250,22 @@ err_resource:
 int
 pci_host_generic_core_detach(device_t dev)
 {
-	struct generic_pcie_core_softc *sc;
-	int error, rid, tuple;
-
-	sc = device_get_softc(dev);
+	int error;
 
 	error = bus_generic_detach(dev);
 	if (error != 0)
 		return (error);
 
+	return (pci_host_generic_core_free(dev));
+}
+
+int
+pci_host_generic_core_free(device_t dev)
+{
+	struct generic_pcie_core_softc *sc;
+	int rid, tuple;
+
+	sc = device_get_softc(dev);
 	for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) {
 		rid = sc->ranges[tuple].rid;
 		if (sc->ranges[tuple].size == 0) {
diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h
index 6579cd0918c4..73314e2feccd 100644
--- a/sys/dev/pci/pci_host_generic.h
+++ b/sys/dev/pci/pci_host_generic.h
@@ -94,6 +94,7 @@ DECLARE_CLASS(generic_pcie_core_driver);
 
 int pci_host_generic_core_attach(device_t);
 int pci_host_generic_core_detach(device_t);
+int pci_host_generic_core_free(device_t);
 struct resource *pci_host_generic_core_alloc_resource(device_t, device_t, int,
     int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 int pci_host_generic_core_release_resource(device_t, device_t,
diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c
index ffe63b82a234..c6b9371698b6 100644
--- a/sys/dev/pci/pci_host_generic_fdt.c
+++ b/sys/dev/pci/pci_host_generic_fdt.c
@@ -104,6 +104,25 @@ generic_pcie_fdt_probe(device_t dev)
 	return (ENXIO);
 }
 
+void
+pci_host_generic_destroy_fdt(device_t dev)
+{
+	struct generic_pcie_fdt_softc *sc;
+	struct pci_ofw_devinfo *di;
+
+	sc = device_get_softc(dev);
+	while (!STAILQ_EMPTY(&sc->pci_ofw_devlist)) {
+		di = STAILQ_FIRST(&sc->pci_ofw_devlist);
+		STAILQ_REMOVE_HEAD(&sc->pci_ofw_devlist, pci_ofw_link);
+
+		ofw_bus_gen_destroy_devinfo(&di->di_dinfo);
+		free(di, M_DEVBUF);
+	}
+
+	ofw_bus_destroy_iinfo(&sc->pci_iinfo);
+	(void)pci_host_generic_core_free(dev);
+}
+
 int
 pci_host_generic_setup_fdt(device_t dev)
 {
diff --git a/sys/dev/pci/pci_host_generic_fdt.h b/sys/dev/pci/pci_host_generic_fdt.h
index cc6e575f6056..790f781b23f0 100644
--- a/sys/dev/pci/pci_host_generic_fdt.h
+++ b/sys/dev/pci/pci_host_generic_fdt.h
@@ -46,6 +46,7 @@ DECLARE_CLASS(generic_pcie_fdt_driver);
 struct resource *pci_host_generic_alloc_resource(device_t,
     device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 int pci_host_generic_setup_fdt(device_t);
+void pci_host_generic_destroy_fdt(device_t);
 int pci_host_generic_fdt_attach(device_t);
 int generic_pcie_get_id(device_t, device_t, enum pci_id_type, uintptr_t *);