From nobody Sat Apr 25 16:26:54 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 4g2wFq00tDz6blvv for ; Sat, 25 Apr 2026 16:26:55 +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 4g2wFp3wznz42Gw for ; Sat, 25 Apr 2026 16:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777134414; 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=NHLHjL4qjr4Adr12vTFaDi8WC3Lauy+2hrT0bBp+nZM=; b=UPIPa6l9p/IOHmhLDkcJQDaXr1dZaaaM1aIjuEDsOBu+rqZW2/QERqEglzjmB8j3X3yOc/ 5YOElZ6D/yLhHJtloNQNaMSrOjLoihEV62gn+GsQZMOlU7GtlZTuGbNfj5/fz59Kq8kUt5 hMiLAzQKixjldLnzPBuerVHWDgsqIK3AKSdr7GVT6hSdZzmaj6w5pillIEXAUcsMFRLArX wFcNEVfx/4/FonNL1JlMqYcFUtNdlJQ6moY+dXkSM3vAUKk0T1Mj2x1yMxpjm1p/5xLORO syukyfcQTaYtfg2zh40TTTuYdLN15ljCtJ3u0OZ8QuyeE66PDSZMKLCy1Azp8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777134414; a=rsa-sha256; cv=none; b=bjdMAJ6dyqbjSQ0Wyw6EqLz6d5AeEiT683FuOTQ4bAL4zu55xY0cxz/OgQ4f4XeoNIeX7S JFsWZb+B4xzQCOv4dSW120uHt4LA5jfrjcVJNBHHwqAZhEx0/UeuHjRectkP/clWRxBXlU ORPzOlezaXF/fZ7/srbsRReLNyhA1K2pG3g6rX1bmohqm1lG/9OTO9Jcbc27ekoYDUOBXm zPUtZiLKzquLUkc+up9Q+PbJ44xkhFRGoxTLT3ByTabgHH+M3UECbENW1wzf5LGGI6efyM pq1vYtx1HVIej/PUcnKzwDPIMALeLki3upNuuDzTxq7mauW5Me2gJ3sss4diTg== 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=1777134414; 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=NHLHjL4qjr4Adr12vTFaDi8WC3Lauy+2hrT0bBp+nZM=; b=Otdg5W7YUvSGSI4qSBzWk/Px6ub/jbWchc3Uzan4KqTD30m5r1XBcAiAI+l1hwtjWbMklG 7SbqpjSyPMU/FoeaOBfQPv1tVOVh/NNm663KHRZpw6vO9PmyxiW18R1j0P+jhAbMi4/a6c viGRe3KcjQlzpYGLnopucAimS/4Y3EhKMiwo4KjPVTel8GpIjqWyA6XrQpbPs4PDn4cHgr fDfcwZkVKXxlnBqudUfPS6IIFWoFNWvBX3Sj2zzV7/G3+gmFwKYx5e1M+64pgY37PaI7oa 16Jw/9yiovtaac5hIjgU+SAfBkMld0MsMydq++C68g9DM89l73aSRlXEY0vyEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2wFp3VLYzhXG for ; Sat, 25 Apr 2026 16:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44a9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:26:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 4c91d2e1a42e - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 4c91d2e1a42e0b1be49578e01cf6fde5827abbc0 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:26:54 +0000 Message-Id: <69eceb4e.44a9a.f2c02c0@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=4c91d2e1a42e0b1be49578e01cf6fde5827abbc0 commit 4c91d2e1a42e0b1be49578e01cf6fde5827abbc0 Author: Enji Cooper AuthorDate: 2026-01-30 06:55:08 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:25:43 +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 40aa74202a67..91a4ebe454ae 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -834,7 +834,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, @@ -844,18 +844,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); } @@ -868,16 +864,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); }