From nobody Wed Jun 10 04:01:18 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 4gZsXG6qYyz6gvkc for ; Wed, 10 Jun 2026 04:01:18 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZsXG3qyVz3wbj for ; Wed, 10 Jun 2026 04:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781064078; 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=TI+t30Vho13brqVy4EHLFiuzuwpDAA2WkoBQKFs9m2A=; b=RdOHCFvQ5klpvu2Ls+w9+6YIfLpGV37j+qJWq+7UWrANjlXogvF55cB57X/nAV4lNEDZ/C O0HyJNYTsWuzOtTFLYi+oJW7BQeIrzYIN7WJQyXQ6zQ7YtjaD0QqlJi5Pi7rEqBMWcv8fx yFrW4hVyWr9DJXeOnULFjlynx0Wh+QNqGVTTocmjdKkoEyQmAvzCIhuYgKv+RaDGfKFqMF 9ySBlCshBtpqIaXvlBqXOQLq9rOfxFiT1udeP0poTvdNDK4c2CeLR3VYByFLK3cMUKtTZs aGDUhO7WZaVyvbXzn5xb3/SyjC3SloI9vNMy9rno0ttbX99YtmmeXfFjRsftLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781064078; a=rsa-sha256; cv=none; b=wRvq6qQKN1oT0oS4E+ltAYAG/bZ/tqF4od+Jc4dc9GDTQpTDfFcchYs8av756ck2CdZ32m 4Lb1a5sG2qnUwQb2fYWlwWxp3WbhBzOUlORSyw4GQ2iY54u8bGy7KIpMUGIramWL6O0TQc b5bvf2Y+4DfcetYdezPwKrnvtWEYVC18Wks07i2MEnRmlN1gX1ag9o6fLohOyqWGd8mkjr f2ygO8ws9TTsq08r6c2W5aIKZKlMHU2NdsTV4JZEPC1cK9wI4W16YCdxxV91fW+Bwvc4Q8 7Bknfh1X3YXhgnISbNqjNoDPoXElxOno0uXdHjcRXdt6UN3p07kAE3Ot4PfuEQ== 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=1781064078; 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=TI+t30Vho13brqVy4EHLFiuzuwpDAA2WkoBQKFs9m2A=; b=JbGMWyhNAKhmOm+p2rkAiioRY8OkI7NSr0iR0B0drKyucNkDuzWkRGB6SK8IzvizMlixgT Knvind0XU03ueBBP4SjXQtj2xD0B0uiNQwZjSWM/PencW62v3gQGzjRscOiVuhPsfavoO4 MkFGyOc8gjTvrnvAUgY7Bc7p9kf62XWQzudMCItv97bXcsc6EPhLJbIUXlw1bJQSzIhErI j+KFYCe9DR1TPpF/6E/mz+8W5Lwu6g1UDK4lYLqw7QVY+C0Ea+sqEB6QbHeGhYzxN/92rD AmN4h3eFxKaRtBTjva2z9iyKcB1ynXTzTgf4CzRktnbJqkuFuUgFcezccY3NyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZsXG37ghz14hG for ; Wed, 10 Jun 2026 04:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27e8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 04:01:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: dc7494fb32df - stable/15 - pci: pci_host_generic: provide cleanup methods outside of detach 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dc7494fb32df309092a2f2f3e62c221f8c41551c Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 04:01:18 +0000 Message-Id: <6a28e18e.27e8b.37f9fa9e@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dc7494fb32df309092a2f2f3e62c221f8c41551c commit dc7494fb32df309092a2f2f3e62c221f8c41551c Author: Kyle Evans AuthorDate: 2026-05-09 02:46:24 +0000 Commit: Kyle Evans 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 *);