i40e: fix bug in dma sync

Driver was using an offset based off a DMA handle while mapping and
unmapping using sync_single_range_for[cpu|device], where it should
be using DMA handle (returned from alloc_coherent) and the offset of the
memory to be sync'd.

Change-ID: I208256565b1595ff0e9171ab852de06b997917c6
Signed-off-by: Jesse Brandeburg <[email protected]>
Reviewed-by: Nelson, Shannon <[email protected]>
Reviewed-by: Williams, Mitch A <[email protected]>
Tested-by: Andrew Bowers <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 6234136fe052315844240693a55e39c45d007e99..f2e6afce8aae2a549dab03811ab7482c06047565 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1226,8 +1226,8 @@ void i40e_alloc_rx_buffers_ps(struct i40e_ring *rx_ring, u16 cleaned_count)
                }
 
                dma_sync_single_range_for_device(rx_ring->dev,
-                                                bi->dma,
-                                                0,
+                                                rx_ring->rx_bi[0].dma,
+                                                i * rx_ring->rx_hdr_len,
                                                 rx_ring->rx_hdr_len,
                                                 DMA_FROM_DEVICE);
                /* Refresh the desc even if buffer_addrs didn't change
@@ -1542,8 +1542,8 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)
                        skb_record_rx_queue(skb, rx_ring->queue_index);
                        /* we are reusing so sync this buffer for CPU use */
                        dma_sync_single_range_for_cpu(rx_ring->dev,
-                                                     rx_bi->dma,
-                                                     0,
+                                                     rx_ring->rx_bi[0].dma,
+                                                     i * rx_ring->rx_hdr_len,
                                                      rx_ring->rx_hdr_len,
                                                      DMA_FROM_DEVICE);
                }

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 3e692352f38d7f473818838b591b3b41e855fd49..69fb85ff346fe8a72bf07b82e2fa79a08607f6e2 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -700,8 +700,8 @@ void i40evf_alloc_rx_buffers_ps(struct i40e_ring *rx_ring, u16 cleaned_count)
                }
 
                dma_sync_single_range_for_device(rx_ring->dev,
-                                                bi->dma,
-                                                0,
+                                                rx_ring->rx_bi[0].dma,
+                                                i * rx_ring->rx_hdr_len,
                                                 rx_ring->rx_hdr_len,
                                                 DMA_FROM_DEVICE);
                /* Refresh the desc even if buffer_addrs didn't change
@@ -1007,8 +1007,8 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)
                        skb_record_rx_queue(skb, rx_ring->queue_index);
                        /* we are reusing so sync this buffer for CPU use */
                        dma_sync_single_range_for_cpu(rx_ring->dev,
-                                                     rx_bi->dma,
-                                                     0,
+                                                     rx_ring->rx_bi[0].dma,
+                                                     i * rx_ring->rx_hdr_len,
                                                      rx_ring->rx_hdr_len,
                                                      DMA_FROM_DEVICE);
                }