aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2017-04-10 11:15:24 +1000
committerDavid S. Miller <davem@davemloft.net>2017-04-10 16:03:57 -0400
commite92455397237c4e680302950fe1d7970b6c063a0 (patch)
tree898cffb624f8a9691febd6b7aa4d6947ad56b67d
parentftgmac100: Split tx packet freeing from ftgmac100_tx_complete_packet() (diff)
downloadlinux-dev-e92455397237c4e680302950fe1d7970b6c063a0.tar.xz
linux-dev-e92455397237c4e680302950fe1d7970b6c063a0.zip
ftgmac100: Don't clear tx desc fields unnecessarily
Those are non-cachable stores, let's avoid those we don't need. Remove the helper, it's not particularly helpful and since it uses "priv" I can't move it to the header file. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/faraday/ftgmac100.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 802f5e73006c..d303c597e9b8 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -468,16 +468,6 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed)
return true;
}
-static void ftgmac100_txdes_reset(const struct ftgmac100 *priv,
- struct ftgmac100_txdes *txdes)
-{
- /* clear all except end of ring bit */
- txdes->txdes0 &= cpu_to_le32(priv->txdes0_edotr_mask);
- txdes->txdes1 = 0;
- txdes->txdes2 = 0;
- txdes->txdes3 = 0;
-}
-
static bool ftgmac100_txdes_owned_by_dma(struct ftgmac100_txdes *txdes)
{
return txdes->txdes0 & cpu_to_le32(FTGMAC100_TXDES0_TXDMA_OWN);
@@ -577,7 +567,12 @@ static void ftgmac100_free_tx_packet(struct ftgmac100 *priv,
dev_kfree_skb(skb);
priv->tx_skbs[pointer] = NULL;
- ftgmac100_txdes_reset(priv, txdes);
+ /* Clear txdes0 except end of ring bit, clear txdes1 as we
+ * only "OR" into it, leave 2 and 3 alone as 2 is unused
+ * and 3 will be overwritten entirely
+ */
+ txdes->txdes0 &= cpu_to_le32(priv->txdes0_edotr_mask);
+ txdes->txdes1 = 0;
}
static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv)