upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

enetc: Wait for pending transmissions before disabling TX queues

Browse source 
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
This commit is contained in:
Kornel Duleba 2022-01-27 11:25:25 +01:00 committed by Wojciech Macek
parent a6bda3e1ef
commit 1a6d987b7f
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sys/dev/enetc/if_enetc.c
View file

@ -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