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

Commit e727f5cd authored by Roland Dreier's avatar Roland Dreier
Browse files

mlx4_core: Fix dma_sync_single_for_cpu() with matching for_device() calls 



Commit 5d23a1d2 ("net: replace dma_sync_single with
dma_sync_single_for_cpu") replaced uses of the deprectated function
dma_sync_single() with calls to dma_sync_single_for_cpu().  However,
to be correct, the code should do a sync for_cpu() before touching the
memory and for_device() after it's done.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 65795efb

drivers/net/mlx4/mr.c

+10 −4
Original line number Diff line number Diff line
@@ -399,10 +399,13 @@ static int mlx4_write_mtt_chunk(struct mlx4_dev *dev, struct mlx4_mtt *mtt, 
	if (!mtts)

		return -ENOMEM;



	dma_sync_single_for_cpu(&dev->pdev->dev, dma_handle,

				npages * sizeof (u64), DMA_TO_DEVICE);



	for (i = 0; i < npages; ++i)

		mtts[i] = cpu_to_be64(page_list[i] | MLX4_MTT_FLAG_PRESENT);



	dma_sync_single_for_cpu(&dev->pdev->dev, dma_handle,

	dma_sync_single_for_device(&dev->pdev->dev, dma_handle,

				   npages * sizeof (u64), DMA_TO_DEVICE);



	return 0;
@@ -547,10 +550,13 @@ int mlx4_map_phys_fmr(struct mlx4_dev *dev, struct mlx4_fmr *fmr, u64 *page_list 
	/* Make sure MPT status is visible before writing MTT entries */

	wmb();



	dma_sync_single_for_cpu(&dev->pdev->dev, fmr->dma_handle,

				npages * sizeof(u64), DMA_TO_DEVICE);



	for (i = 0; i < npages; ++i)

		fmr->mtts[i] = cpu_to_be64(page_list[i] | MLX4_MTT_FLAG_PRESENT);



	dma_sync_single_for_cpu(&dev->pdev->dev, fmr->dma_handle,

	dma_sync_single_for_device(&dev->pdev->dev, fmr->dma_handle,

				   npages * sizeof(u64), DMA_TO_DEVICE);



	fmr->mpt->key    = cpu_to_be32(key);