[PATCH] priority improvement
From: Ivan Khoronzhuk <hidden>
Date: 2016-08-04 21:13:48
Also in:
linux-omap, lkml
Subsystem:
networking drivers, the rest, ti ethernet switch driver (cpsw) · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Signed-off-by: Ivan Khoronzhuk <redacted> --- drivers/net/ethernet/ti/cpsw.c | 45 +++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 27 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 9ddaccc..cd12f52 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c@@ -788,22 +788,16 @@ static int cpsw_tx_poll(struct napi_struct *napi_tx, int budget) { struct cpsw_priv *priv = napi_to_priv(napi_tx); int num_tx, ch; - u32 ch_map; + unsigned long ch_map; /* process every unprocessed channel */ - ch_map = cpdma_ctrl_txchs_state(priv->dma); - for (ch = 0, num_tx = 0; num_tx < budget; ch_map >>= 1, ch++) { - if (!ch_map) { - ch_map = cpdma_ctrl_txchs_state(priv->dma); - if (!ch_map) - break; - - ch = 0; - } - - if (!(ch_map & 0x01)) - continue; + for (num_tx = 0; num_tx < budget;) { + ch_map = cpdma_ctrl_txchs_state(priv->dma); + if (!ch_map) + break; + /* process beginning from higher priority queue */ + ch = __fls(ch_map); num_tx += cpdma_chan_process(priv->txch[ch], budget - num_tx); }
@@ -829,19 +823,13 @@ static int cpsw_rx_poll(struct napi_struct *napi_rx, int budget) u32 ch_map; /* process every unprocessed channel */ - ch_map = cpdma_ctrl_rxchs_state(priv->dma); - for (ch = 0, num_rx = 0; num_rx < budget; ch_map >>= 1, ch++) { - if (!ch_map) { - ch_map = cpdma_ctrl_rxchs_state(priv->dma); - if (!ch_map) - break; - - ch = 0; - } - - if (!(ch_map & 0x01)) - continue; + for (num_rx = 0; num_rx < budget;) { + ch_map = cpdma_ctrl_rxchs_state(priv->dma); + if (!ch_map) + break; + /* process beginning from higher priority queue */ + ch = __fls(ch_map); num_rx += cpdma_chan_process(priv->rxch[ch], budget - num_rx); }
@@ -1130,8 +1118,11 @@ cpsw_tx_queue_mapping(struct cpsw_priv *priv, struct sk_buff *skb) { unsigned int q_idx = skb_get_queue_mapping(skb); - if (q_idx >= priv->tx_ch_num) - q_idx = q_idx % priv->tx_ch_num; + /* cpsw h/w has backward order queue priority, 7 - highest */ + if (likely(q_idx < priv->tx_ch_num)) + q_idx = priv->tx_ch_num - q_idx - 1; + else + q_idx = 0; return priv->txch[q_idx]; }
--
1.9.1