From nobody Tue Jul 19 07:37:18 2022 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 4Ln9dp62bRz4WbTq; Tue, 19 Jul 2022 07:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ln9dp5ZBfz3pRN; Tue, 19 Jul 2022 07:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658216238; 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=SbUQOnFt7Yc2X0olxoHrYFqvS0ykPrMB3hO9Zso7K2s=; b=WZbb9tqhXyJ0oQcq4NdBu9VznbYqFOyZhnh62n9CQ6R0RH6q5B2OtRnPRL/SZQXLUn7Kwc O+gsHzuP/lzrczGo4ceQdzcl6lCSKoeXfsnTMHTdAfKFithvEkll1MiUI5CIqMs+iK1+tc Im4CcWmgmiUmTZpLwSjre68dZKxtE/PsA96dU1sGGeiFVOsuykvF7XncxG8iLzroNq1Myh 0i45OMQkIWT7W7ZsvH1zOX1Y430sNdrbpVTsrfnIQr3D81KFpCkvlh9dSbUHPHR3C69M1k xXbe2sYEwp9QOzRB/uElMlcJmumW80r4ath/sJYbTXJED3OWjMFdc9go0PGLSw== 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 4Ln9dp4MxZz19jS; Tue, 19 Jul 2022 07:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26J7bImq021430; Tue, 19 Jul 2022 07:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J7bIPV021429; Tue, 19 Jul 2022 07:37:18 GMT (envelope-from git) Date: Tue, 19 Jul 2022 07:37:18 GMT Message-Id: <202207190737.26J7bIPV021429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 2069f112f007 - stable/13 - Clean up in the pci host generic driver 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2069f112f0073e21fb47aa921a880d0404d69484 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658216238; 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=SbUQOnFt7Yc2X0olxoHrYFqvS0ykPrMB3hO9Zso7K2s=; b=hxOPAygc2Hwoi+QSm0XsW6R26H5mfx5g/Qgpwp+USHJ6iMiPUXr4NCB34GgDoSSssCzgHR GWv4/Wzkbsv+cC3sQFJ40ZvzKchxw08BU8WmZFRpSnDSTlDGdvGX18SA/UndEWwYcY+9bW HLzBRPrhM5r227HMsfV3wcm+Qt8MzTILQeA2DlTW3CbVJIQHZzUOJ91SMdiP7eiUaU2wyP 5ywgo5QAX7zgkTvjMn7EUNaZEKO1oHWWbeLBDSajBJXaEQDdTYX5MP4ZpnpTA9sZ/OCbR8 h/Qkqng4u27WxWBt113guAdR47JcHbnlCrEMeyV4dfkR4/zgs5Km2s9osVXjyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658216238; a=rsa-sha256; cv=none; b=TBbw/XOcpuAbdpqquXJ80EWC7cjqNoBy42hCdELXqUR5BR8cxOvYMb6VoBaAh7Y96rKbLf 2yUY4M6rhaJx5re0XIi4J2nr845F+3ppQMJHmUgOiwWkOKZxdj9fFAbTq/AchGb98ZyGq6 7zE336YwuSlP0yllIOHYDXRy64otEWsRwS51oqUHxpelNO+HOmxQ99mi1mBXUG26AQKwpP YsRCWNzWUnqFBIt2yw0A0Fv17J9yP/czxWWTBtGJHf6j3qTE+bcI5mkbDyNqoj89rgRuUJ CYYwxZ7f68jAtLaefhUVxwGSilRttkCVO1B6csrEMEn1kdbuTegX1fvExNBSxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2069f112f0073e21fb47aa921a880d0404d69484 commit 2069f112f0073e21fb47aa921a880d0404d69484 Author: Andrew Turner AuthorDate: 2022-05-23 09:41:36 +0000 Commit: Andrew Turner CommitDate: 2022-07-19 07:03:30 +0000 Clean up in the pci host generic driver Add clean up on failure and a detach function to the pci host generic driver. Reviewed by: jhb (earlier version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35291 (cherry picked from commit d843dd0e1addd2aa69a78be99e251147aafcfd80) --- sys/dev/pci/pci_host_generic.c | 51 ++++++++++++++++++++++++++++++++++-------- sys/dev/pci/pci_host_generic.h | 1 + 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 22b3ccdc17b1..f23173ce0a43 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -97,8 +97,9 @@ pci_host_generic_core_attach(device_t dev) rid = 0; sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->res == NULL) { - device_printf(dev, "could not map memory.\n"); - return (ENXIO); + device_printf(dev, "could not allocate memory.\n"); + error = ENXIO; + goto err_resource; } sc->bst = rman_get_bustag(sc->res); @@ -118,19 +119,19 @@ pci_host_generic_core_attach(device_t dev) error = rman_init(&sc->pmem_rman); if (error) { device_printf(dev, "rman_init() failed. error = %d\n", error); - return (error); + goto err_pmem_rman; } error = rman_init(&sc->mem_rman); if (error) { device_printf(dev, "rman_init() failed. error = %d\n", error); - return (error); + goto err_mem_rman; } error = rman_init(&sc->io_rman); if (error) { device_printf(dev, "rman_init() failed. error = %d\n", error); - return (error); + goto err_io_rman; } for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) { @@ -159,13 +160,43 @@ pci_host_generic_core_attach(device_t dev) if (error) { device_printf(dev, "rman_manage_region() failed." "error = %d\n", error); - rman_fini(&sc->pmem_rman); - rman_fini(&sc->mem_rman); - rman_fini(&sc->io_rman); - return (error); + goto err_rman_manage; } } + return (0); + +err_rman_manage: + rman_fini(&sc->io_rman); +err_io_rman: + rman_fini(&sc->mem_rman); +err_mem_rman: + rman_fini(&sc->pmem_rman); +err_pmem_rman: + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); +err_resource: + bus_dma_tag_destroy(sc->dmat); + return (error); +} + +int +pci_host_generic_core_detach(device_t dev) +{ + struct generic_pcie_core_softc *sc; + int error; + + sc = device_get_softc(dev); + + error = bus_generic_detach(dev); + if (error != 0) + return (error); + + rman_fini(&sc->io_rman); + rman_fini(&sc->mem_rman); + rman_fini(&sc->pmem_rman); + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); + bus_dma_tag_destroy(sc->dmat); + return (0); } @@ -522,6 +553,8 @@ generic_pcie_get_dma_tag(device_t dev, device_t child) static device_method_t generic_pcie_methods[] = { DEVMETHOD(device_attach, pci_host_generic_core_attach), + DEVMETHOD(device_detach, pci_host_generic_core_detach), + DEVMETHOD(bus_read_ivar, generic_pcie_read_ivar), DEVMETHOD(bus_write_ivar, generic_pcie_write_ivar), DEVMETHOD(bus_alloc_resource, pci_host_generic_core_alloc_resource), diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h index 20117cbe32e3..80da4f523165 100644 --- a/sys/dev/pci/pci_host_generic.h +++ b/sys/dev/pci/pci_host_generic.h @@ -94,6 +94,7 @@ struct generic_pcie_core_softc { DECLARE_CLASS(generic_pcie_core_driver); int pci_host_generic_core_attach(device_t); +int pci_host_generic_core_detach(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, int, int,