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

Commit b3778ba8 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

mlx5: Drop mlx5_ib_alloc_fast_reg_mr 



Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent fc279959

drivers/infiniband/hw/mlx5/main.c

+0 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,6 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	dev->ib_dev.detach_mcast	= mlx5_ib_mcg_detach;

	dev->ib_dev.process_mad		= mlx5_ib_process_mad;

	dev->ib_dev.alloc_mr		= mlx5_ib_alloc_mr;

	dev->ib_dev.alloc_fast_reg_mr	= mlx5_ib_alloc_fast_reg_mr;

	dev->ib_dev.alloc_fast_reg_page_list = mlx5_ib_alloc_fast_reg_page_list;

	dev->ib_dev.free_fast_reg_page_list  = mlx5_ib_free_fast_reg_page_list;

	dev->ib_dev.check_mr_status	= mlx5_ib_check_mr_status;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+0 −2
Original line number Diff line number Diff line
@@ -576,8 +576,6 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr); 
struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd,

			       enum ib_mr_type mr_type,

			       u32 max_num_sg);

struct ib_mr *mlx5_ib_alloc_fast_reg_mr(struct ib_pd *pd,

					int max_page_list_len);

struct ib_fast_reg_page_list *mlx5_ib_alloc_fast_reg_page_list(struct ib_device *ibdev,

							       int page_list_len);

void mlx5_ib_free_fast_reg_page_list(struct ib_fast_reg_page_list *page_list);

drivers/infiniband/hw/mlx5/mr.c

+0 −44
Original line number Diff line number Diff line
@@ -1337,50 +1337,6 @@ struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd, 
	return ERR_PTR(err);

}



struct ib_mr *mlx5_ib_alloc_fast_reg_mr(struct ib_pd *pd,

					int max_page_list_len)

{

	struct mlx5_ib_dev *dev = to_mdev(pd->device);

	struct mlx5_create_mkey_mbox_in *in;

	struct mlx5_ib_mr *mr;

	int err;



	mr = kzalloc(sizeof(*mr), GFP_KERNEL);

	if (!mr)

		return ERR_PTR(-ENOMEM);



	in = kzalloc(sizeof(*in), GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		goto err_free;

	}



	in->seg.status = MLX5_MKEY_STATUS_FREE;

	in->seg.xlt_oct_size = cpu_to_be32((max_page_list_len + 1) / 2);

	in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);

	in->seg.flags = MLX5_PERM_UMR_EN | MLX5_ACCESS_MODE_MTT;

	in->seg.flags_pd = cpu_to_be32(to_mpd(pd)->pdn);

	/*

	 * TBD not needed - issue 197292 */

	in->seg.log2_page_size = PAGE_SHIFT;



	err = mlx5_core_create_mkey(dev->mdev, &mr->mmr, in, sizeof(*in), NULL,

				    NULL, NULL);

	kfree(in);

	if (err)

		goto err_free;



	mr->ibmr.lkey = mr->mmr.key;

	mr->ibmr.rkey = mr->mmr.key;

	mr->umem = NULL;



	return &mr->ibmr;



err_free:

	kfree(mr);

	return ERR_PTR(err);

}



struct ib_fast_reg_page_list *mlx5_ib_alloc_fast_reg_page_list(struct ib_device *ibdev,

							       int page_list_len)

{