| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889 |
- From fb04db35447d1e8ff557c8e57139164cecab7de5 Mon Sep 17 00:00:00 2001
- From: Christian Marangi <[email protected]>
- Date: Wed, 27 Sep 2023 15:38:31 +0200
- Subject: [PATCH 2/4] net: stmmac: move TX timer arm after DMA enable
- Move TX timer arm call after DMA interrupt is enabled again.
- The TX timer arm function changed logic and now is skipped if a napi is
- already scheduled. By moving the TX timer arm call after DMA is enabled,
- we permit to correctly skip if a DMA interrupt has been fired and a napi
- has been scheduled again.
- Signed-off-by: Christian Marangi <[email protected]>
- ---
- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
- --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
- +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
- @@ -2530,7 +2530,8 @@ static void stmmac_bump_dma_threshold(st
- * @queue: TX queue index
- * Description: it reclaims the transmit resources after transmission completes.
- */
- -static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue)
- +static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue,
- + bool *pending_packets)
- {
- struct stmmac_tx_queue *tx_q = &priv->dma_conf.tx_queue[queue];
- unsigned int bytes_compl = 0, pkts_compl = 0;
- @@ -2693,7 +2694,7 @@ static int stmmac_tx_clean(struct stmmac
-
- /* We still have pending packets, let's call for a new scheduling */
- if (tx_q->dirty_tx != tx_q->cur_tx)
- - stmmac_tx_timer_arm(priv, queue);
- + *pending_packets = true;
-
- __netif_tx_unlock_bh(netdev_get_tx_queue(priv->dev, queue));
-
- @@ -5476,12 +5477,13 @@ static int stmmac_napi_poll_tx(struct na
- struct stmmac_channel *ch =
- container_of(napi, struct stmmac_channel, tx_napi);
- struct stmmac_priv *priv = ch->priv_data;
- + bool pending_packets = false;
- u32 chan = ch->index;
- int work_done;
-
- priv->xstats.napi_poll++;
-
- - work_done = stmmac_tx_clean(priv, budget, chan);
- + work_done = stmmac_tx_clean(priv, budget, chan, &pending_packets);
- work_done = min(work_done, budget);
-
- if (work_done < budget && napi_complete_done(napi, work_done)) {
- @@ -5492,6 +5494,10 @@ static int stmmac_napi_poll_tx(struct na
- spin_unlock_irqrestore(&ch->lock, flags);
- }
-
- + /* TX still have packet to handle, check if we need to arm tx timer */
- + if (pending_packets)
- + stmmac_tx_timer_arm(priv, chan);
- +
- return work_done;
- }
-
- @@ -5501,11 +5507,12 @@ static int stmmac_napi_poll_rxtx(struct
- container_of(napi, struct stmmac_channel, rxtx_napi);
- struct stmmac_priv *priv = ch->priv_data;
- int rx_done, tx_done, rxtx_done;
- + bool tx_pending_packets = false;
- u32 chan = ch->index;
-
- priv->xstats.napi_poll++;
-
- - tx_done = stmmac_tx_clean(priv, budget, chan);
- + tx_done = stmmac_tx_clean(priv, budget, chan, &tx_pending_packets);
- tx_done = min(tx_done, budget);
-
- rx_done = stmmac_rx_zc(priv, budget, chan);
- @@ -5530,6 +5537,10 @@ static int stmmac_napi_poll_rxtx(struct
- spin_unlock_irqrestore(&ch->lock, flags);
- }
-
- + /* TX still have packet to handle, check if we need to arm tx timer */
- + if (tx_pending_packets)
- + stmmac_tx_timer_arm(priv, chan);
- +
- return min(rxtx_done, budget - 1);
- }
-
|
