From nobody Thu Jun 4 05:15:41 2026 X-Original-To: dev-commits-src-main@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 4gWCSs6JNRz6fwKq for ; Thu, 04 Jun 2026 05:15:41 +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 4gWCSs2pDbz3T5h for ; Thu, 04 Jun 2026 05:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780550141; 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=TcHUMOtFCMOB0LIST+KKqUxkktoRu1CilLmD2L8sKGQ=; b=n/w3HYv2FPeKpSr+fLDsuYVJ8SB6XSVGgaCHDf5nZcpWjjNYPSgY9dAj7g3AZSGLxn/gFu Vo8hvRq92Q4BSFJO7u8cGHtpUNtPkUDyFNeKPYeJWExlyt99eVK6HLCFRMRxVBhv7493ul MloWQY64mMYuTR3ieNG+zL+ttwJMs4Iga3/AJlwPNz5wotcqBxDLrOYkDq2wtuZFLpgGuW 7IZXfbXxEdMd/uYBLipY8HLr+qvOi2ti1jnJLAb+kEwTg7y1MyPG4jZsBf8QdbkTf7wT8o hxw15r+AoNLVOenD2C//mnX8vU0UicTMgZgblCjJ8p6vn8d2sCh75iaP0MrfXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780550141; a=rsa-sha256; cv=none; b=vtZ8xUKOqLtdNPN0X3qDBMnCIzxNvVYTIfy23fAMA1QbafTLaYHvT/t7dVoFBlPolfygLT euoAeCKwhSSYxFRwMA+HnwoJeVXWhEJVCIN9r+NhiBvUE1jtx8Vta48eRM1Z25jwT769e5 hNMkhqumSd4/5xhboqaRMYm7AtVOqJeEIOakDehXYJbJLotdzmsUEaNlQkMGg1s1uNBtba UMYDpzhwvQRsxfY8jtPRIeaaDq+6wT9+9GeVVd2daHNi8Te9BvCcbA6ZthiYCHWqOFjmzP tw9chcMfPg5vzZIX+jS9TDMLIX0ZJ6WbwDAfJy2X/tqzY81q8MMapQR0NwTyNw== 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=1780550141; 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=TcHUMOtFCMOB0LIST+KKqUxkktoRu1CilLmD2L8sKGQ=; b=DDO4KFNXng5YnZJDqww5PsGykrNJ8TP7iB8NnMjc9IwbQyffVey3huBfYHgaOUOIzx1pyY PTssQJ4YMrD8aJ3fRXutBPCBGfbJ9l/1Kv+N9uZglnMA1asp1u+xGugIcLeWhLNFphnBlI BXKIwWNx3BPuVf1U0ecnfQKfJZA33brn28QE28KN4XwnmTI+tweH4f6RfLh0kn8fVq1fHX fjCYYHjuSWqQQJD9df8YqndypLvD9JqT5Cx+Jpe0BLuuLzMWho5CPsIFZ1U7EGcjcgWidS j4+E3Z+HecyJYJWBHZreuaP7pXIVkmdz5pjfyoaheaTirL1H5g1+7yODIYs7bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWCSs2GqGzl7D for ; Thu, 04 Jun 2026 05:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eacb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 05:15:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 31a94ec32b53 - main - pci: pci_host_generic: provide cleanup methods outside of detach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 31a94ec32b53ebf6227bc868ce4f7aa07650680d Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 05:15:41 +0000 Message-Id: <6a2109fd.1eacb.4f3b2888@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=31a94ec32b53ebf6227bc868ce4f7aa07650680d commit 31a94ec32b53ebf6227bc868ce4f7aa07650680d Author: Kyle Evans AuthorDate: 2026-05-09 02:46:24 +0000 Commit: Kyle Evans CommitDate: 2026-06-04 05:14:58 +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 Differential Revision: https://reviews.freebsd.org/D56896 --- 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 05cf47687b1d..dc6139cf22c0 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 aae60d8a1650..a97c1ab4319c 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 *);