From nobody Sat Apr 25 16:15:33 2026 X-Original-To: dev-commits-src-all@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 4g2w0p2zMgz6blNr for ; Sat, 25 Apr 2026 16:15:38 +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 4g2w0p1l1Nz3x2K for ; Sat, 25 Apr 2026 16:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777133738; 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=rjpYR3EOOSNWx9h9L70QfBSFgcxEGjMLBfwINvJ8PDM=; b=pjN1YFJB5mIgM1Cxl/5vKqwDmPZDrVGk1wYJwAeo6twXAfNWcZ8kAZceyqiFPNdFrjXCmX SmJ73mc+MclS/fCbk4N0KryRoeHjqqqFul70Fje5ioqdjaUu/4qyMqxx3N7P7lzb2Wo48e QeFi/20zLQtj2KIpIK2eiTV7weCsRJLMdjwSkMLFM8cI9GjQ+R4h9pLTXuPGCF8l4RuB/t nMqVxWFEEe3PAx8p3clVir/c467RsVx90pPln64j9cLLLAgUXDhzogdXO/aXlvd7YX5scZ nO9gm8K2ZJPTts5l3Sp6F6Fad0oUlH3hZHmOhmKOTs6aAAlVmyNhtuz6tGSl8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777133738; a=rsa-sha256; cv=none; b=X8wAZbWgrB1IXKRvF/xTrloWQIPrk/PUnSaKkaZR+ZxLecV4kH4hx2X2KxkRqT8gJQwazt SFwVsmymJTV4NTZvXesxF5jihfylgq3VkKwmmjzS91zqCUgBdXF6pvHlKdzgK0F/+A//I1 ZkBbd8lr4dFvWVMpvFllvzUT7eNPA7zrWkjw33NZu+wOzj/00duAaPn9RLQBEse5smKn21 /FRvHnczjjZAvonLem64Tx8EnA0i6Wa6XwB3gC/J/MoLuKymRotYK2asNL+r4TUWKEujZ0 c1/BzT0kGw406nXx/NTgN5hrywZpteNEF9Qe3KC8Wnumr9n2ccjyGrq5G1GkLw== 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=1777133738; 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=rjpYR3EOOSNWx9h9L70QfBSFgcxEGjMLBfwINvJ8PDM=; b=wqC+epJXMrlUdAYZg2GxCmfZrxTj9/kDGXzyO1EPAynX82ZN6qrFpJtpLpMtEQEdr9sjwE rm6muzHHmi7Cb28NCVw+isqhrsb/608CEIZasKCSojS2FP3x8yqnQBq4mCxONOTJiVq/dV CjXxW4S13q8iJdU1UhmLE5l15CZnWR7bdstdaii0kaQXPAVib426gDFizrsKV4YvrY18fs r0x8/Fg+SIU+grn5k6fuG8Et57RQA3ZZPczXwgUhv/CbvwkZrx+6mYrIsmrvwCCWBMtCja Twdm89xwWkv/Aneo2NoyMaof9OFogSq+RFsn0EsJ4Kk4BNxe6VpOuAwds+8+Mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2w0j16GFzhnN for ; Sat, 25 Apr 2026 16:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41f63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:15:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 589ece518441 - stable/15 - asmc: resource cleanup simplifications List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 589ece518441d787a5267abfa8fe6f704171dd78 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:15:33 +0000 Message-Id: <69ece8a5.41f63.192ce6f8@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=589ece518441d787a5267abfa8fe6f704171dd78 commit 589ece518441d787a5267abfa8fe6f704171dd78 Author: Enji Cooper AuthorDate: 2026-01-30 06:55:08 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:14:50 +0000 asmc: resource cleanup simplifications This change makes `asmc_detach(..)` reentrant by setting freed resources to known invalid values when done, and makes `asmc_attach(..)` call `asmc_detach(..)` instead of attempting to the semi-equivalent way of cleaning up the driver resources allocated in `asmc_detach(..)`. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55413 (cherry picked from commit eda36ae09dd1fab78bd377739fc5d6c65c61f5d7) --- sys/dev/asmc/asmc.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 1623d2d9bf98..b874599dcc81 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -835,7 +835,7 @@ asmc_attach(device_t dev) if (sc->sc_irq == NULL) { device_printf(dev, "unable to allocate IRQ resource\n"); ret = ENXIO; - goto err2; + goto err; } ret = bus_setup_intr(dev, sc->sc_irq, @@ -845,18 +845,14 @@ asmc_attach(device_t dev) if (ret) { device_printf(dev, "unable to setup SMS IRQ\n"); - goto err1; + goto err; } + nosms: return (0); -err1: - bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid_irq, sc->sc_irq); -err2: - bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_rid_port, - sc->sc_ioport); - mtx_destroy(&sc->sc_mtx); - if (sc->sc_sms_tq) - taskqueue_free(sc->sc_sms_tq); + +err: + asmc_detach(dev); return (ret); } @@ -869,16 +865,25 @@ asmc_detach(device_t dev) if (sc->sc_sms_tq) { taskqueue_drain(sc->sc_sms_tq, &sc->sc_sms_task); taskqueue_free(sc->sc_sms_tq); + sc->sc_sms_tq = NULL; } - if (sc->sc_cookie) + if (sc->sc_cookie) { bus_teardown_intr(dev, sc->sc_irq, sc->sc_cookie); - if (sc->sc_irq) + sc->sc_cookie = NULL; + } + if (sc->sc_irq) { bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid_irq, sc->sc_irq); - if (sc->sc_ioport) + sc->sc_irq = NULL; + } + if (sc->sc_ioport) { bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_rid_port, sc->sc_ioport); - mtx_destroy(&sc->sc_mtx); + sc->sc_ioport = NULL; + } + if (mtx_initialized(&sc->sc_mtx)) { + mtx_destroy(&sc->sc_mtx); + } return (0); }