Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3578fa0a authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

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: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarNelson, Shannon <shannon.nelson@intel.com>
Reviewed-by: default avatarWilliams, Mitch A <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d89d967f

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

		}

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

		}