|
@@ -18,7 +18,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
|
-@@ -2541,9 +2541,13 @@ static void stmmac_bump_dma_threshold(st
|
|
|
+@@ -2542,9 +2542,13 @@ static void stmmac_bump_dma_threshold(st
|
|
|
* @priv: driver private structure
|
|
|
* @budget: napi budget limiting this functions packet handling
|
|
|
* @queue: TX queue index
|
|
@@ -33,7 +33,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
{
|
|
|
struct stmmac_tx_queue *tx_q = &priv->dma_conf.tx_queue[queue];
|
|
|
struct stmmac_txq_stats *txq_stats = &priv->xstats.txq_stats[queue];
|
|
|
-@@ -2703,7 +2707,7 @@ static int stmmac_tx_clean(struct stmmac
|
|
|
+@@ -2704,7 +2708,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)
|
|
@@ -42,7 +42,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
|
|
|
u64_stats_update_begin(&txq_stats->napi_syncp);
|
|
|
u64_stats_add(&txq_stats->napi.tx_packets, tx_packets);
|
|
|
-@@ -5609,6 +5613,7 @@ static int stmmac_napi_poll_tx(struct na
|
|
|
+@@ -5611,6 +5615,7 @@ static int stmmac_napi_poll_tx(struct na
|
|
|
container_of(napi, struct stmmac_channel, tx_napi);
|
|
|
struct stmmac_priv *priv = ch->priv_data;
|
|
|
struct stmmac_txq_stats *txq_stats;
|
|
@@ -50,7 +50,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
u32 chan = ch->index;
|
|
|
int work_done;
|
|
|
|
|
|
-@@ -5617,7 +5622,7 @@ static int stmmac_napi_poll_tx(struct na
|
|
|
+@@ -5619,7 +5624,7 @@ static int stmmac_napi_poll_tx(struct na
|
|
|
u64_stats_inc(&txq_stats->napi.poll);
|
|
|
u64_stats_update_end(&txq_stats->napi_syncp);
|
|
|
|
|
@@ -59,7 +59,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
work_done = min(work_done, budget);
|
|
|
|
|
|
if (work_done < budget && napi_complete_done(napi, work_done)) {
|
|
|
-@@ -5628,6 +5633,10 @@ static int stmmac_napi_poll_tx(struct na
|
|
|
+@@ -5630,6 +5635,10 @@ static int stmmac_napi_poll_tx(struct na
|
|
|
spin_unlock_irqrestore(&ch->lock, flags);
|
|
|
}
|
|
|
|
|
@@ -70,7 +70,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
return work_done;
|
|
|
}
|
|
|
|
|
|
-@@ -5636,6 +5645,7 @@ static int stmmac_napi_poll_rxtx(struct
|
|
|
+@@ -5638,6 +5647,7 @@ static int stmmac_napi_poll_rxtx(struct
|
|
|
struct stmmac_channel *ch =
|
|
|
container_of(napi, struct stmmac_channel, rxtx_napi);
|
|
|
struct stmmac_priv *priv = ch->priv_data;
|
|
@@ -78,7 +78,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
int rx_done, tx_done, rxtx_done;
|
|
|
struct stmmac_rxq_stats *rxq_stats;
|
|
|
struct stmmac_txq_stats *txq_stats;
|
|
|
-@@ -5651,7 +5661,7 @@ static int stmmac_napi_poll_rxtx(struct
|
|
|
+@@ -5653,7 +5663,7 @@ static int stmmac_napi_poll_rxtx(struct
|
|
|
u64_stats_inc(&txq_stats->napi.poll);
|
|
|
u64_stats_update_end(&txq_stats->napi_syncp);
|
|
|
|
|
@@ -87,7 +87,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
|
|
|
tx_done = min(tx_done, budget);
|
|
|
|
|
|
rx_done = stmmac_rx_zc(priv, budget, chan);
|
|
|
-@@ -5676,6 +5686,10 @@ static int stmmac_napi_poll_rxtx(struct
|
|
|
+@@ -5678,6 +5688,10 @@ static int stmmac_napi_poll_rxtx(struct
|
|
|
spin_unlock_irqrestore(&ch->lock, flags);
|
|
|
}
|
|
|
|