Commit 7be3412a authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: Use dma device access helper 



Use the PCI device directly for dma accesses as non PCI device unlikely
support IOMMU and dma mappings.
Introduce and use helper routine to access DMA device.

Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
Reviewed-by: default avatarVu Pham <vuhuong@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 036e19b9

drivers/net/ethernet/mellanox/mlx5/core/alloc.c

+6 −6
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ static void *mlx5_dma_zalloc_coherent_node(struct mlx5_core_dev *dev, 
					   size_t size, dma_addr_t *dma_handle,

					   int node)

{

	struct device *device = mlx5_core_dma_dev(dev);

	struct mlx5_priv *priv = &dev->priv;

	struct device *device = dev->device;

	int original_node;

	void *cpu_handle;
@@ -111,7 +111,7 @@ EXPORT_SYMBOL(mlx5_buf_alloc); 


void mlx5_buf_free(struct mlx5_core_dev *dev, struct mlx5_frag_buf *buf)

{

	dma_free_coherent(dev->device, buf->size, buf->frags->buf,

	dma_free_coherent(mlx5_core_dma_dev(dev), buf->size, buf->frags->buf,

			  buf->frags->map);



	kfree(buf->frags);
@@ -140,7 +140,7 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size, 
		if (!frag->buf)

			goto err_free_buf;

		if (frag->map & ((1 << buf->page_shift) - 1)) {

			dma_free_coherent(dev->device, frag_sz,

			dma_free_coherent(mlx5_core_dma_dev(dev), frag_sz,

					  buf->frags[i].buf, buf->frags[i].map);

			mlx5_core_warn(dev, "unexpected map alignment: %pad, page_shift=%d\n",

				       &frag->map, buf->page_shift);
@@ -153,7 +153,7 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size, 


err_free_buf:

	while (i--)

		dma_free_coherent(dev->device, PAGE_SIZE, buf->frags[i].buf,

		dma_free_coherent(mlx5_core_dma_dev(dev), PAGE_SIZE, buf->frags[i].buf,

				  buf->frags[i].map);

	kfree(buf->frags);

err_out:
@@ -169,7 +169,7 @@ void mlx5_frag_buf_free(struct mlx5_core_dev *dev, struct mlx5_frag_buf *buf) 
	for (i = 0; i < buf->npages; i++) {

		int frag_sz = min_t(int, size, PAGE_SIZE);



		dma_free_coherent(dev->device, frag_sz, buf->frags[i].buf,

		dma_free_coherent(mlx5_core_dma_dev(dev), frag_sz, buf->frags[i].buf,

				  buf->frags[i].map);

		size -= frag_sz;

	}
@@ -275,7 +275,7 @@ void mlx5_db_free(struct mlx5_core_dev *dev, struct mlx5_db *db) 
	__set_bit(db->index, db->u.pgdir->bitmap);



	if (bitmap_full(db->u.pgdir->bitmap, db_per_page)) {

		dma_free_coherent(dev->device, PAGE_SIZE,

		dma_free_coherent(mlx5_core_dma_dev(dev), PAGE_SIZE,

				  db->u.pgdir->db_page, db->u.pgdir->db_dma);

		list_del(&db->u.pgdir->list);

		bitmap_free(db->u.pgdir->bitmap);

drivers/net/ethernet/mellanox/mlx5/core/cmd.c

+5 −9
Original line number Diff line number Diff line
@@ -1899,9 +1899,7 @@ static void create_msg_cache(struct mlx5_core_dev *dev) 


static int alloc_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd)

{

	struct device *ddev = dev->device;



	cmd->cmd_alloc_buf = dma_alloc_coherent(ddev, MLX5_ADAPTER_PAGE_SIZE,

	cmd->cmd_alloc_buf = dma_alloc_coherent(mlx5_core_dma_dev(dev), MLX5_ADAPTER_PAGE_SIZE,

						&cmd->alloc_dma, GFP_KERNEL);

	if (!cmd->cmd_alloc_buf)

		return -ENOMEM;
@@ -1914,9 +1912,9 @@ static int alloc_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd) 
		return 0;

	}



	dma_free_coherent(ddev, MLX5_ADAPTER_PAGE_SIZE, cmd->cmd_alloc_buf,

	dma_free_coherent(mlx5_core_dma_dev(dev), MLX5_ADAPTER_PAGE_SIZE, cmd->cmd_alloc_buf,

			  cmd->alloc_dma);

	cmd->cmd_alloc_buf = dma_alloc_coherent(ddev,

	cmd->cmd_alloc_buf = dma_alloc_coherent(mlx5_core_dma_dev(dev),

						2 * MLX5_ADAPTER_PAGE_SIZE - 1,

						&cmd->alloc_dma, GFP_KERNEL);

	if (!cmd->cmd_alloc_buf)
@@ -1930,9 +1928,7 @@ static int alloc_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd) 


static void free_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd)

{

	struct device *ddev = dev->device;



	dma_free_coherent(ddev, cmd->alloc_size, cmd->cmd_alloc_buf,

	dma_free_coherent(mlx5_core_dma_dev(dev), cmd->alloc_size, cmd->cmd_alloc_buf,

			  cmd->alloc_dma);

}
@@ -1964,7 +1960,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
	if (!cmd->stats)

		return -ENOMEM;



	cmd->pool = dma_pool_create("mlx5_cmd", dev->device, size, align, 0);

	cmd->pool = dma_pool_create("mlx5_cmd", mlx5_core_dma_dev(dev), size, align, 0);

	if (!cmd->pool) {

		err = -ENOMEM;

		goto dma_pool_err;

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+4 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void mlx5_fw_tracer_ownership_release(struct mlx5_fw_tracer *tracer) 
static int mlx5_fw_tracer_create_log_buf(struct mlx5_fw_tracer *tracer)

{

	struct mlx5_core_dev *dev = tracer->dev;

	struct device *ddev = &dev->pdev->dev;

	struct device *ddev;

	dma_addr_t dma;

	void *buff;

	gfp_t gfp;
@@ -142,6 +142,7 @@ static int mlx5_fw_tracer_create_log_buf(struct mlx5_fw_tracer *tracer) 
	}

	tracer->buff.log_buf = buff;



	ddev = mlx5_core_dma_dev(dev);

	dma = dma_map_single(ddev, buff, tracer->buff.size, DMA_FROM_DEVICE);

	if (dma_mapping_error(ddev, dma)) {

		mlx5_core_warn(dev, "FWTracer: Unable to map DMA: %d\n",
@@ -162,11 +163,12 @@ free_pages: 
static void mlx5_fw_tracer_destroy_log_buf(struct mlx5_fw_tracer *tracer)

{

	struct mlx5_core_dev *dev = tracer->dev;

	struct device *ddev = &dev->pdev->dev;

	struct device *ddev;



	if (!tracer->buff.log_buf)

		return;



	ddev = mlx5_core_dma_dev(dev);

	dma_unmap_single(ddev, tracer->buff.dma, tracer->buff.size, DMA_FROM_DEVICE);

	free_pages((unsigned long)tracer->buff.log_buf, get_order(tracer->buff.size));

}

drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int mlx5_rsc_dump_trigger(struct mlx5_core_dev *dev, struct mlx5_rsc_dump 
				 struct page *page)

{

	struct mlx5_rsc_dump *rsc_dump = dev->rsc_dump;

	struct device *ddev = &dev->pdev->dev;

	struct device *ddev = mlx5_core_dma_dev(dev);

	u32 out_seq_num;

	u32 in_seq_num;

	dma_addr_t dma;

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
static int mlx5e_xsk_map_pool(struct mlx5e_priv *priv,

			      struct xsk_buff_pool *pool)

{

	struct device *dev = priv->mdev->device;

	struct device *dev = mlx5_core_dma_dev(priv->mdev);



	return xsk_pool_dma_map(pool, dev, 0);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE