Commit d13a15d5 authored by Eli Cohen's avatar Eli Cohen Committed by Michael S. Tsirkin
Browse files

vdpa/mlx5: Use the correct dma device when registering memory 



In cases where the vdpa instance uses a SF (sub function), the DMA
device is the parent device. Use a function to retrieve the correct DMA
device.

Fixes: 1958fc2f ("net/mlx5: SF, Add auxiliary device driver")
Signed-off-by: default avatarEli Cohen <elic@nvidia.com>
Reviewed-by: default avatarParav Pandit <parav@nvidia.com>
Link: https://lore.kernel.org/r/20210408091047.4269-3-elic@nvidia.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
parent d084d996

drivers/vdpa/mlx5/core/mr.c

+7 −2
Original line number Diff line number Diff line
@@ -219,6 +219,11 @@ static void destroy_indirect_key(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_m 
	mlx5_vdpa_destroy_mkey(mvdev, &mkey->mkey);

}



static struct device *get_dma_device(struct mlx5_vdpa_dev *mvdev)

{

	return &mvdev->mdev->pdev->dev;

}



static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr,

			 struct vhost_iotlb *iotlb)

{
@@ -234,7 +239,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr 
	u64 pa;

	u64 paend;

	struct scatterlist *sg;

	struct device *dma = mvdev->mdev->device;

	struct device *dma = get_dma_device(mvdev);



	for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1);

	     map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) {
@@ -291,7 +296,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr 


static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr)

{

	struct device *dma = mvdev->mdev->device;

	struct device *dma = get_dma_device(mvdev);



	destroy_direct_mr(mvdev, mr);

	dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);