Commit 1b1e4868 authored by Or Har-Toov's avatar Or Har-Toov Committed by Jason Gunthorpe
Browse files

net/mlx5e: Use query_special_contexts for mkeys 

Use query_sepcial_contexts in order to get the correct value of
terminate_scatter_list_mkey, as FW will change it for certain
configurations.

Link: https://lore.kernel.org/r/fff70d94258233effb0e34f3d62cb08a692f5af5.1673960981.git.leon@kernel.org


Signed-off-by: default avatarOr Har-Toov <ohartoov@nvidia.com>
Reviewed-by: default avatarMichael Guralnik <michaelgur@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent a419bfb7

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

+21 −2
Original line number Diff line number Diff line
@@ -665,6 +665,26 @@ static void mlx5e_rq_free_shampo(struct mlx5e_rq *rq) 
	mlx5e_rq_shampo_hd_free(rq);

}



static __be32 mlx5e_get_terminate_scatter_list_mkey(struct mlx5_core_dev *dev)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {};

	u32 in[MLX5_ST_SZ_DW(query_special_contexts_in)] = {};

	int res;



	if (!MLX5_CAP_GEN(dev, terminate_scatter_list_mkey))

		return MLX5_TERMINATE_SCATTER_LIST_LKEY;



	MLX5_SET(query_special_contexts_in, in, opcode,

		 MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);

	res = mlx5_cmd_exec_inout(dev, query_special_contexts, in, out);

	if (res)

		return MLX5_TERMINATE_SCATTER_LIST_LKEY;



	res = MLX5_GET(query_special_contexts_out, out,

		       terminate_scatter_list_mkey);

	return cpu_to_be32(res);

}



static int mlx5e_alloc_rq(struct mlx5e_params *params,

			  struct mlx5e_xsk_param *xsk,

			  struct mlx5e_rq_param *rqp,
@@ -829,8 +849,7 @@ static int mlx5e_alloc_rq(struct mlx5e_params *params, 
			/* check if num_frags is not a pow of two */

			if (rq->wqe.info.num_frags < (1 << rq->wqe.info.log_num_frags)) {

				wqe->data[f].byte_count = 0;

				wqe->data[f].lkey =

					MLX5_TERMINATE_SCATTER_LIST_LKEY;

				wqe->data[f].lkey = mlx5e_get_terminate_scatter_list_mkey(mdev);

				wqe->data[f].addr = 0;

			}

		}