leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ravb: do not invalidate cache for RX buffer twice

Browse Source 
First, dma_sync_single_for_cpu() shouldn't have been called in the first place
(it's a streaming DMA API), dma_unmap_single() should have been called instead.
Second, dma_unmap_single() call after handing the buffer to napi_gro_receive()
makes little sense.  Moreover desc->dptr might not be valid at this point.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sergei Shtylyov 2015-07-15 00:56:52 +03:00 committed by David S. Miller
parent 15afb10df4
commit e2370f07cf
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/renesas/ravb_main.c
View File

@ -543,10 +543,9 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q)
skb = priv->rx_skb[q][entry]; skb = priv->rx_skb[q][entry];
priv->rx_skb[q][entry] = NULL; priv->rx_skb[q][entry] = NULL;
dma_sync_single_for_cpu(&ndev->dev, dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),
le32_to_cpu(desc->dptr), ALIGN(PKT_BUF_SZ, 16),
ALIGN(PKT_BUF_SZ, 16), DMA_FROM_DEVICE);
DMA_FROM_DEVICE);
get_ts &= (q == RAVB_NC) ? get_ts &= (q == RAVB_NC) ?
RAVB_RXTSTAMP_TYPE_V2_L2_EVENT : RAVB_RXTSTAMP_TYPE_V2_L2_EVENT :
~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT; ~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT;
@ -584,9 +583,6 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q)
if (!skb) if (!skb)
break; /* Better luck next round. */ break; /* Better luck next round. */
ravb_set_buffer_align(skb); ravb_set_buffer_align(skb);
dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),
ALIGN(PKT_BUF_SZ, 16),
DMA_FROM_DEVICE);
dma_addr = dma_map_single(&ndev->dev, skb->data, dma_addr = dma_map_single(&ndev->dev, skb->data,
le16_to_cpu(desc->ds_cc), le16_to_cpu(desc->ds_cc),
DMA_FROM_DEVICE); DMA_FROM_DEVICE);