Commit 616d5769 authored by Tal Gilboa's avatar Tal Gilboa Committed by Leon Romanovsky
Browse files

IB/mlx5: Rename is_apu_thread_cq function to is_apu_cq 



is_apu_thread_cq() used to detect CQs which are attached to APU
threads. This was extended to support other elements as well,
so the function was renamed to is_apu_cq().

c_eqn_or_apu_element was extended from 8 bits to 32 bits, which wan't
reflected when the APU support was first introduced.

Acked-by: Michael S. Tsirkin <mst@redhat.com> # vdpa
Signed-off-by: default avatarTal Gilboa <talgi@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent 96cd2dd6

drivers/infiniband/hw/mlx5/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -997,7 +997,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
				  MLX5_IB_CQ_PR_FLAGS_CQE_128_PAD));

	MLX5_SET(cqc, cqc, log_cq_size, ilog2(entries));

	MLX5_SET(cqc, cqc, uar_page, index);

	MLX5_SET(cqc, cqc, c_eqn, eqn);

	MLX5_SET(cqc, cqc, c_eqn_or_apu_element, eqn);

	MLX5_SET64(cqc, cqc, dbr_addr, cq->db.dma);

	if (cq->create_flags & IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN)

		MLX5_SET(cqc, cqc, oi, 1);

drivers/infiniband/hw/mlx5/devx.c

+3 −4
Original line number Diff line number Diff line
@@ -1437,11 +1437,10 @@ static void devx_cq_comp(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe) 
	rcu_read_unlock();

}



static bool is_apu_thread_cq(struct mlx5_ib_dev *dev, const void *in)

static bool is_apu_cq(struct mlx5_ib_dev *dev, const void *in)

{

	if (!MLX5_CAP_GEN(dev->mdev, apu) ||

	    !MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context),

		      apu_thread_cq))

	    !MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context), apu_cq))

		return false;



	return true;
@@ -1501,7 +1500,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 
		err = mlx5_core_create_dct(dev, &obj->core_dct, cmd_in,

					   cmd_in_len, cmd_out, cmd_out_len);

	} else if (opcode == MLX5_CMD_OP_CREATE_CQ &&

		   !is_apu_thread_cq(dev, cmd_in)) {

		   !is_apu_cq(dev, cmd_in)) {

		obj->flags |= DEVX_OBJ_FLAGS_CQ;

		obj->core_cq.comp = devx_cq_comp;

		err = mlx5_core_create_cq(dev->mdev, &obj->core_cq,

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

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ static void mlx5_add_cq_to_tasklet(struct mlx5_core_cq *cq, 
int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,

			u32 *in, int inlen, u32 *out, int outlen)

{

	int eqn = MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context), c_eqn);

	int eqn = MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context),

			   c_eqn_or_apu_element);

	u32 din[MLX5_ST_SZ_DW(destroy_cq_in)] = {};

	struct mlx5_eq_comp *eq;

	int err;

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

+1 −1
Original line number Diff line number Diff line
@@ -1627,7 +1627,7 @@ static int mlx5e_create_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 
				  (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas));



	MLX5_SET(cqc,   cqc, cq_period_mode, param->cq_period_mode);

	MLX5_SET(cqc,   cqc, c_eqn,         eqn);

	MLX5_SET(cqc,   cqc, c_eqn_or_apu_element, eqn);

	MLX5_SET(cqc,   cqc, uar_page,      mdev->priv.uar->index);

	MLX5_SET(cqc,   cqc, log_page_size, cq->wq_ctrl.buf.page_shift -

					    MLX5_ADAPTER_PAGE_SHIFT);

drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static int mlx5_fpga_conn_create_cq(struct mlx5_fpga_conn *conn, int cq_size) 


	cqc = MLX5_ADDR_OF(create_cq_in, in, cq_context);

	MLX5_SET(cqc, cqc, log_cq_size, ilog2(cq_size));

	MLX5_SET(cqc, cqc, c_eqn, eqn);

	MLX5_SET(cqc, cqc, c_eqn_or_apu_element, eqn);

	MLX5_SET(cqc, cqc, uar_page, fdev->conn_res.uar->index);

	MLX5_SET(cqc, cqc, log_page_size, conn->cq.wq_ctrl.buf.page_shift -

			   MLX5_ADAPTER_PAGE_SHIFT);