You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
93 lines
3.2 KiB
Diff
93 lines
3.2 KiB
Diff
From 965b47cbf16a6d1bc8235e1bff038abc9b4cf142 Mon Sep 17 00:00:00 2001
|
|
From: Ioana Radulescu <ruxandra.radulescu@nxp.com>
|
|
Date: Wed, 4 Sep 2019 19:45:01 +0300
|
|
Subject: [PATCH] dpaa2-eth: Minor cleanup in dpaa2_eth_set_rx_taildrop()
|
|
|
|
Make clear the setting refers to FQ-based taildrop and the threshold
|
|
value is given in bytes (the default option).
|
|
|
|
Reverse the logic of the second argument (pass tx_pause transparently).
|
|
This will be helpful further on.
|
|
|
|
Also don't set the device's Rx taildrop flag unless configuration
|
|
succeeds.
|
|
|
|
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
|
|
---
|
|
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 19 +++++++++++--------
|
|
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 4 ++--
|
|
2 files changed, 13 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
|
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
|
@@ -1228,17 +1228,20 @@ static void disable_ch_napi(struct dpaa2
|
|
}
|
|
}
|
|
|
|
-static void dpaa2_eth_set_rx_taildrop(struct dpaa2_eth_priv *priv, bool enable)
|
|
+static void dpaa2_eth_set_rx_taildrop(struct dpaa2_eth_priv *priv,
|
|
+ bool tx_pause)
|
|
{
|
|
struct dpni_taildrop td = {0};
|
|
struct dpaa2_eth_fq *fq;
|
|
int i, err;
|
|
|
|
- if (priv->rx_td_enabled == enable)
|
|
+ td.enable = !tx_pause;
|
|
+ if (priv->rx_td_enabled == td.enable)
|
|
return;
|
|
|
|
- td.enable = enable;
|
|
- td.threshold = DPAA2_ETH_TAILDROP_THRESH;
|
|
+ /* FQ taildrop: thrshold is in bytes, per frame queue */
|
|
+ td.threshold = DPAA2_ETH_FQ_TAILDROP_THRESH;
|
|
+ td.units = DPNI_CONGESTION_UNIT_BYTES;
|
|
|
|
for (i = 0; i < priv->num_fqs; i++) {
|
|
fq = &priv->fq[i];
|
|
@@ -1249,12 +1252,12 @@ static void dpaa2_eth_set_rx_taildrop(st
|
|
fq->tc, fq->flowid, &td);
|
|
if (err) {
|
|
netdev_err(priv->net_dev,
|
|
- "dpni_set_taildrop() failed\n");
|
|
- break;
|
|
+ "dpni_set_taildrop(FQ) failed\n");
|
|
+ return;
|
|
}
|
|
}
|
|
|
|
- priv->rx_td_enabled = enable;
|
|
+ priv->rx_td_enabled = td.enable;
|
|
}
|
|
|
|
static void update_tx_fqids(struct dpaa2_eth_priv *priv);
|
|
@@ -1277,7 +1280,7 @@ static int link_state_update(struct dpaa
|
|
* only when pause frame generation is disabled.
|
|
*/
|
|
tx_pause = dpaa2_eth_tx_pause_enabled(state.options);
|
|
- dpaa2_eth_set_rx_taildrop(priv, !tx_pause);
|
|
+ dpaa2_eth_set_rx_taildrop(priv, tx_pause);
|
|
|
|
/* Chech link state; speed / duplex changes are not treated yet */
|
|
if (priv->link_state.up == state.up)
|
|
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
|
|
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
|
|
@@ -39,7 +39,7 @@
|
|
* frames in the Rx queues (length of the current frame is not
|
|
* taken into account when making the taildrop decision)
|
|
*/
|
|
-#define DPAA2_ETH_TAILDROP_THRESH (64 * 1024)
|
|
+#define DPAA2_ETH_FQ_TAILDROP_THRESH (64 * 1024)
|
|
|
|
/* Maximum number of Tx confirmation frames to be processed
|
|
* in a single NAPI call
|
|
@@ -51,7 +51,7 @@
|
|
* how many 64B frames fit inside the taildrop threshold and add a margin
|
|
* to accommodate the buffer refill delay.
|
|
*/
|
|
-#define DPAA2_ETH_MAX_FRAMES_PER_QUEUE (DPAA2_ETH_TAILDROP_THRESH / 64)
|
|
+#define DPAA2_ETH_MAX_FRAMES_PER_QUEUE (DPAA2_ETH_FQ_TAILDROP_THRESH / 64)
|
|
#define DPAA2_ETH_NUM_BUFS (DPAA2_ETH_MAX_FRAMES_PER_QUEUE + 256)
|
|
#define DPAA2_ETH_REFILL_THRESH \
|
|
(DPAA2_ETH_NUM_BUFS - DPAA2_ETH_BUFS_PER_CMD)
|