From nobody Tue Jan 27 14:44:25 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 4f0p894ZpQz6PwV9 for ; Tue, 27 Jan 2026 14:44:25 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0p893ljLz3yfC for ; Tue, 27 Jan 2026 14:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769525065; 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=9OAc04DRHfpPUkNv4ixqRcJST7lLPVOPC4o4EfbmT9c=; b=OVe8MPoqCpyww6GrttA2VYF3VavAKV/TwL2mOnz26/Vbml1a8jiEUWLB2sFRdCpDAENbXq jES59RPICWGFPTYpD4ACxI9SvfEC8zhIXKFqqsZsEkoeEuoBaVK1Yjz4NsVe9U01pjrp5E GMMbuyRAmuAzRv1VKtQcwfLwDZxyhPbVuhSlfMod4Aau7ueFc9RyM4i8vQm9oJ4nIiRhaZ 5M/c3GGnZEoRcZE7ZaKXLRYbnphrx/CYBPd36KKHwwtK/r8xg3L2IikhhhiRlUyqKJOMju r0emn/Dl+3YN0nZNNsrZ4Kfe3ZGBfUY1gfh/q+NwqFS+Cws8SvQNY4yBOeP/9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769525065; 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=9OAc04DRHfpPUkNv4ixqRcJST7lLPVOPC4o4EfbmT9c=; b=SKXq8ql92JVijkbO7rdCRGBE9TOJCRdeqk5gD0WUj76+BwQiM/bMUcsEcT/rHn7bAwI0ml xzIHCLtfT8Flkq1P/TuylR6L9HOOzTulaGXOAQ72vidRKzDqvv2tnD3acryBEysIf5lwFF 3dNzyHXC0845IQ9O0xyUgwVYPR6pLj1eFBIRH3tAhy8pTe7Eo+UPfXWmGKMdyr5OP/6wjJ pt9K8PRWNAam6IKYz3gmFN+0/MQ+cBHG+x1RkgXPfWpaButkcK44cmy+7j7HtoAo4/ydzg A78YfKZ1tkYgZhacDZb5DHTzh2QvfM8OYnfO22BtokNKLZAZcQJidDczOd3ZNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769525065; a=rsa-sha256; cv=none; b=gphRRbX9MZpTCR6TytXifsgU6+OgCs9iubElIF0MLDqTVGrn96MMLGnTbCeQ8Hxakf/aa2 Zxf1Rc5/fXGADCI5KC5Z+pWlbzv3gkqFXZMv4C6Y2hRRtDAkA8oTvXWv94yhMBPQ5R3IcU xG0HbHLnhtaogvgIy6b7wAKxzKkoF+a01qeklIVzbrz0sLmoBacTAntPs5xJfPhiCYYfUS WbvRq6UJkHJuZsDOI5i2yWhXvZZ06PGUkAkNrqRBhKbI30eIcIlJVEi7j4UKvNyD3JJjy9 7QLulO+qVC8KiJ9/SIpr4GGx4XbRGJbnRdBJ3WHWea19+5s5ELIgg8wcu0GZfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0p892dlYz19Tg for ; Tue, 27 Jan 2026 14:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 303c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 14:44:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 18d1e673fbbb - stable/14 - genet: Add a detach routine 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18d1e673fbbb26dbf364b6ae5147e638fc16e871 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 14:44:25 +0000 Message-Id: <6978cf49.303c1.133beb89@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=18d1e673fbbb26dbf364b6ae5147e638fc16e871 commit 18d1e673fbbb26dbf364b6ae5147e638fc16e871 Author: John Baldwin AuthorDate: 2025-08-01 20:07:30 +0000 Commit: John Baldwin CommitDate: 2026-01-27 14:32:57 +0000 genet: Add a detach routine PR: 288309 Co-authored by: Mike Belanger MFC after: 2 weeks (cherry picked from commit 96a550e9dd892f24a479da00ead93fbfaafb7733) --- sys/arm64/broadcom/genet/if_genet.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index 9846861e7c67..fe81cfbd4989 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -202,6 +202,7 @@ struct gen_softc { static void gen_init(void *softc); static void gen_start(if_t ifp); +static void gen_stop(struct gen_softc *sc); static void gen_destroy(struct gen_softc *sc); static int gen_encap(struct gen_softc *sc, struct mbuf **mp); static int gen_parse_tx(struct mbuf *m, int csum_flags); @@ -383,6 +384,39 @@ gen_destroy(struct gen_softc *sc) } } +static int +gen_detach(device_t dev) +{ + struct gen_softc *sc; + int error; + + sc = device_get_softc(dev); + + GEN_LOCK(sc); + gen_stop(sc); + GEN_UNLOCK(sc); + callout_drain(&sc->stat_ch); + ether_ifdetach(sc->ifp); + + /* Detach the miibus */ + error = bus_generic_detach(dev); + if (error != 0) + return (error); + + /* clean up dma */ + gen_bus_dma_teardown(sc); + + /* Release bus resources. */ + bus_teardown_intr(sc->dev, sc->res[_RES_IRQ1], sc->ih); + bus_teardown_intr(sc->dev, sc->res[_RES_IRQ2], sc->ih2); + bus_release_resources(sc->dev, gen_spec, sc->res); + + if (sc->ifp != NULL) + if_free(sc->ifp); + mtx_destroy(&sc->mtx); + return (0); +} + static int gen_get_phy_mode(device_t dev) { @@ -1809,6 +1843,7 @@ static device_method_t gen_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gen_probe), DEVMETHOD(device_attach, gen_attach), + DEVMETHOD(device_detach, gen_detach), /* MII interface */ DEVMETHOD(miibus_readreg, gen_miibus_readreg),