diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-04-10 03:15:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-10 22:03:57 +0200 |
| commit | 4a2712b2f0b6895f37c657e099936679d2bc7b6e (patch) | |
| tree | 30a80c6b2dea7ed97f22d079acc95b973335e845 /drivers/net/ethernet/faraday | |
| parent | ftgmac100: Cleanup tx queue handling (diff) | |
| download | linux-4a2712b2f0b6895f37c657e099936679d2bc7b6e.tar.xz linux-4a2712b2f0b6895f37c657e099936679d2bc7b6e.zip | |
ftgmac100: Move the barrier out of ftgmac100_txdes_set_dma_own()
We'll use variants of this accessor without barriers when
building series of descriptors for fragmented sends
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/faraday')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index add7462bf67d..60f285e444f8 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -485,11 +485,6 @@ static bool ftgmac100_txdes_owned_by_dma(struct ftgmac100_txdes *txdes) static void ftgmac100_txdes_set_dma_own(struct ftgmac100_txdes *txdes) { - /* - * Make sure dma own bit will not be set before any other - * descriptor fields. - */ - wmb(); txdes->txdes0 |= cpu_to_le32(FTGMAC100_TXDES0_TXDMA_OWN); } @@ -679,6 +674,10 @@ static int ftgmac100_hard_start_xmit(struct sk_buff *skb, } } + /* Order the previous packet and descriptor udpates + * before setting the OWN bit. + */ + dma_wmb(); ftgmac100_txdes_set_dma_own(txdes); /* Update next TX pointer */ |