diff options
author | Jonas Jensen <jonas.jensen@gmail.com> | 2014-08-25 10:22:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-25 20:25:39 -0400 |
commit | 777fbc31447f111a1492c90fae2bc616f836d407 (patch) | |
tree | 46267cecb890c639fc2e690517a6d9388a01e075 | |
parent | 9fe1b3bc8d9182e950a744e4a47187420efa67f3 (diff) |
net: moxa: synchronize DMA memory
DMA memory should be synchronized before data is passed
to/from controller.
Add dma_sync_single_for_cpu(.., DMA_FROM_DEVICE) to RX path
and dma_sync_single_for_device(.., DMA_TO_DEVICE) to TX path.
Signed-off-by: Jonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/moxa/moxart_ether.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index d66058d5c429..983d01949795 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c | |||
@@ -226,6 +226,9 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) | |||
226 | if (len > RX_BUF_SIZE) | 226 | if (len > RX_BUF_SIZE) |
227 | len = RX_BUF_SIZE; | 227 | len = RX_BUF_SIZE; |
228 | 228 | ||
229 | dma_sync_single_for_cpu(&ndev->dev, | ||
230 | priv->rx_mapping[rx_head], | ||
231 | priv->rx_buf_size, DMA_FROM_DEVICE); | ||
229 | skb = netdev_alloc_skb_ip_align(ndev, len); | 232 | skb = netdev_alloc_skb_ip_align(ndev, len); |
230 | 233 | ||
231 | if (unlikely(!skb)) { | 234 | if (unlikely(!skb)) { |
@@ -348,6 +351,9 @@ static int moxart_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
348 | len = ETH_ZLEN; | 351 | len = ETH_ZLEN; |
349 | } | 352 | } |
350 | 353 | ||
354 | dma_sync_single_for_device(&ndev->dev, priv->tx_mapping[tx_head], | ||
355 | priv->tx_buf_size, DMA_TO_DEVICE); | ||
356 | |||
351 | txdes1 = TX_DESC1_LTS | TX_DESC1_FTS | (len & TX_DESC1_BUF_SIZE_MASK); | 357 | txdes1 = TX_DESC1_LTS | TX_DESC1_FTS | (len & TX_DESC1_BUF_SIZE_MASK); |
352 | if (tx_head == TX_DESC_NUM_MASK) | 358 | if (tx_head == TX_DESC_NUM_MASK) |
353 | txdes1 |= TX_DESC1_END; | 359 | txdes1 |= TX_DESC1_END; |