From nobody Mon Jan 31 08:00:04 2022 X-Original-To: dev-commits-src-main@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 426A11991ABE; Mon, 31 Jan 2022 08:00:06 +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 4JnL851Pxlz4yR2; Mon, 31 Jan 2022 08:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643616005; 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=XWzuDZwOIwYTdLTvYJaxjGILR9pBGqwxvZ6tOlN0mOs=; b=cma5Hx4c8MX5yAwn/POmdzTWTVsfDwzcs3B5lgpJXcDD9fED0vbAL1mh+D1PvBr76Hkltl a5k6TIf2ETNDoL0zkGXtY48ViRDG+eDjgnXe7bAbbLQvN3G3H8my1CAV3ZhV+7tyn5QZ00 NgtE0Vtx3IJ0IAj7NpVajPSN7f4ourX6wb9lvpVBLkJ9tAnchG6SinwqoCwJj8VHapwoXE ATfb+JS6FCeLO/1eYKn1eRcARDVbHT9YGWsawP1nXDuLm0qmNYxJRKVvbzErQwn+/Tzd0X BJfUDGbSSgc4Mg3rsiKQ5Js3A55xGNWyu39oD5O+UZHloN00ib197I1imY1IBw== 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 9C29818C26; Mon, 31 Jan 2022 08:00:04 +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 20V804Rk024924; Mon, 31 Jan 2022 08:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20V804AL024922; Mon, 31 Jan 2022 08:00:04 GMT (envelope-from git) Date: Mon, 31 Jan 2022 08:00:04 GMT Message-Id: <202201310800.20V804AL024922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: 1a6d987b7f32 - main - enetc: Wait for pending transmissions before disabling TX queues List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a6d987b7f32d6e93ef1dd75bed0335d4e6c91fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643616005; 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=XWzuDZwOIwYTdLTvYJaxjGILR9pBGqwxvZ6tOlN0mOs=; b=n8TyviSZTUwnqZGzB2Bw2IiJCREO4nNssu04an6bmrr2k2Qlb/K57FxokqOsep4+DZKdGS QXlWH9Tm+TPPp+CL+5ytUaLJcprN6OnwKkREDCKGEGqe1eqi233qtWXsymE8tE2n++KUMT xvhZBLqaax+V/1qbXkvo/O6v2LUD7jAJpaE9UylKrPA/oAAt/QMM6m2v1mNs1mTKmSO9iO lu5ypbtgm3yA89praFofK6x2YRBMCvMo5aQBDWHzC0mN8ysxp05cIE1M3bJtscbZmMpuNy pjP1oX/2Xq0ZKysMWToC2VCrwFY26zyiRDU9lcQBdVmFKjSBKCvDoEZLbYLXig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643616005; a=rsa-sha256; cv=none; b=qXKX38GaGhfVBiCankMg2uTBjOsBvlQL97OkSXqe0nTBq81qQyGAkVP9SXDz421LRTIb8R AKEIFJM20soiP8UwRehm5dT5Bt3yS+vtdmJQZWNm7EHfgjuXsqH97tNVGgHAFxZ/9cjG4M bcfF9fGGSjyQWzcEGXY2gz3C4V7Ih5KfDkXjh0OxZscl6QoJzgXtf0BbpqVP1IgRrKi/rO Rh+zIjXyHdnJhnkzAbtDv2kMqBjJHNk91PplFxUBtIjYlKzb3RxMAsqxQEhlTqVtAD6Q84 eOl7FBYxa5Lfawb+kj++M6oyKfKjCV8ER3xhtf8z033mSb01aagP1x96s4QpvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6d987b7f32d6e93ef1dd75bed0335d4e6c91fa commit 1a6d987b7f32d6e93ef1dd75bed0335d4e6c91fa Author: Kornel Duleba AuthorDate: 2022-01-27 10:25:25 +0000 Commit: Wojciech Macek CommitDate: 2022-01-31 07:57:48 +0000 enetc: Wait for pending transmissions before disabling TX queues According to the RM it's not safe to disable a TX ring while it is busy transmitting frames. In order to be safe wait until the ring is empty. (cidx==pidx) Use this opportunity to remove a set-but-unused variable. Obtained from: Semihalf Sponsored by: Alstom Group --- sys/dev/enetc/if_enetc.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/sys/dev/enetc/if_enetc.c b/sys/dev/enetc/if_enetc.c index 75c582e81696..0f2f3a9d1270 100644 --- a/sys/dev/enetc/if_enetc.c +++ b/sys/dev/enetc/if_enetc.c @@ -364,7 +364,6 @@ enetc_setup_phy(struct enetc_softc *sc) static int enetc_attach_pre(if_ctx_t ctx) { - struct ifnet *ifp; if_softc_ctx_t scctx; struct enetc_softc *sc; int error, rid; @@ -374,7 +373,6 @@ enetc_attach_pre(if_ctx_t ctx) sc->ctx = ctx; sc->dev = iflib_get_dev(ctx); sc->shared = scctx; - ifp = iflib_get_ifp(ctx); mtx_init(&sc->mii_lock, "enetc_mdio", NULL, MTX_DEF); @@ -958,6 +956,29 @@ enetc_init(if_ctx_t ctx) enetc_promisc_set(ctx, if_getflags(ifp)); } +static void +enetc_disable_txq(struct enetc_softc *sc, int qid) +{ + qidx_t cidx, pidx; + int timeout = 10000; /* this * DELAY(100) = 1s */ + + /* At this point iflib shouldn't be enquing any more frames. */ + pidx = ENETC_TXQ_RD4(sc, qid, ENETC_TBPIR); + cidx = ENETC_TXQ_RD4(sc, qid, ENETC_TBCIR); + + while (pidx != cidx && timeout--) { + DELAY(100); + cidx = ENETC_TXQ_RD4(sc, qid, ENETC_TBCIR); + } + + if (timeout == 0) + device_printf(sc->dev, + "Timeout while waiting for txq%d to stop transmitting packets\n", + qid); + + ENETC_TXQ_WR4(sc, qid, ENETC_TBMR, 0); +} + static void enetc_stop(if_ctx_t ctx) { @@ -966,11 +987,11 @@ enetc_stop(if_ctx_t ctx) sc = iflib_get_softc(ctx); - for (i = 0; i < sc->tx_num_queues; i++) - ENETC_TXQ_WR4(sc, i, ENETC_TBMR, 0); - for (i = 0; i < sc->rx_num_queues; i++) ENETC_RXQ_WR4(sc, i, ENETC_RBMR, 0); + + for (i = 0; i < sc->tx_num_queues; i++) + enetc_disable_txq(sc, i); } static int