From nobody Fri Aug 1 20:09:15 2025 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 4btxqc098dz633f4; Fri, 01 Aug 2025 20:09:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4btxqb6HFcz4Q3k; Fri, 01 Aug 2025 20:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754078955; 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=gWBwtcursSAmCQwcHX/HOIQ7SxNRB+0i8Qu7Uqfo4GU=; b=toJ7Hoy5hftBfyCyAxfOjxuo4B3ODaq5oPjCIA5CwkoMvo9e3KYmSetywI2yt77pswKTDG 2ew2+8ns0YIorox1WCFGjdM9/3G4BAn3vGEGTJ2UCXpEQEu7WfaEt6rkc66JeW/oDlm3vv WtXlDltjb4FrK/DsCVSH4/5I9EoywxxLGOd5wcEyeJ3x/Orcx/+WAxqWjJsRjDS/cT/4ut 6QVzJBGuntweuCbr/pSEVRR+y6XzdIybN8b7UnudSVg+vY51pDJmJnk0t1c3YhsLc+G7QF 97cB+RyqCA/bi2bn4ehNiklhb5e6/QnWTL/J/8ozd5RfaQC9FOIDZFdVvDVbIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754078955; 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=gWBwtcursSAmCQwcHX/HOIQ7SxNRB+0i8Qu7Uqfo4GU=; b=QUbNcM5U1wYLp9YaLhE0l5OrU8hOs0cIeEYD8oyX7bSYNer7G7mjzMvVFIDZTVGecCNdLW /RJLTAp0MYNBxMPKT5Y7znkzwgCnNqI7oKtWH9D//CqKMQY6YahYINFr2n0oGArY9Nx9vh J6b8rqFdYOOFYLdmOTySJCHv9UUkt7P6LDiZoM/fgWUP+icnFLmwPyxy9F3SaaNKchgc6Y Z706IiO7wmiUDNbgf9uwWDFUJXrsTVAcAA+KmMR6hALwHkT+Y+kHk0lu1JpfYdWiEZtG3A 2e5QY7BKAIhnL9iHuQCX6ngno61koYY9zgRa3emuixaSTeCQlREDarmgkXxgvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754078955; a=rsa-sha256; cv=none; b=vNIwXNinubR4vmERUzA0bbz9vWCS+YR4TcC0eb6aSCV6pHyIob3mVRz55Hbll6tN2gsBme TcmpsszP+BXBI+UsuJDSBKfaJQRPZYR7UkvNU8vm8NiambbYHD+uUSdxjjA6NkztDEPvxO yYAHaWEpmCBVR7zSjNpu40pXVnv/3/IsmS8WHuE0wuj563GjgJ4awMAsrLsshrLQ7ATp1A EWqybw5JNl3lZbGn4WlIRJKuhMkPNUQrLqrfeDOPYyBrtXluc6MzKEC6Ap69ZjhBON0KqT RtZPov0elW/x20Yn7GjgMiwm62BTiSOhFLDqGkI0PjclZWfQGYSbVfqijc1Sow== 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 4btxqb5nYKz12kq; Fri, 01 Aug 2025 20:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 571K9Fnn097695; Fri, 1 Aug 2025 20:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 571K9FBP097692; Fri, 1 Aug 2025 20:09:15 GMT (envelope-from git) Date: Fri, 1 Aug 2025 20:09:15 GMT Message-Id: <202508012009.571K9FBP097692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 96a550e9dd89 - main - genet: Add a detach routine 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96a550e9dd892f24a479da00ead93fbfaafb7733 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=96a550e9dd892f24a479da00ead93fbfaafb7733 commit 96a550e9dd892f24a479da00ead93fbfaafb7733 Author: John Baldwin AuthorDate: 2025-08-01 20:07:30 +0000 Commit: John Baldwin CommitDate: 2025-08-01 20:07:30 +0000 genet: Add a detach routine PR: 288309 Co-authored by: Mike Belanger MFC after: 2 weeks --- 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 182b5582fb7c..013573f1551b 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -201,6 +201,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); @@ -379,6 +380,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) { @@ -1805,6 +1839,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),