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

Commit 38164b77 authored by Yishai Hadas's avatar Yishai Hadas Committed by Leon Romanovsky
Browse files

net/mlx5: mlx5_core_create_cq() enhancements 



Enhance mlx5_core_create_cq() to get the command out buffer from the
callers to let them use the output.

Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent c0670781

drivers/infiniband/hw/mlx5/cq.c

+2 −1
Original line number Diff line number Diff line
@@ -891,6 +891,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, 
	int entries = attr->cqe;

	int vector = attr->comp_vector;

	struct mlx5_ib_dev *dev = to_mdev(ibdev);

	u32 out[MLX5_ST_SZ_DW(create_cq_out)];

	struct mlx5_ib_cq *cq;

	int uninitialized_var(index);

	int uninitialized_var(inlen);
@@ -958,7 +959,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, 
	if (cq->create_flags & IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN)

		MLX5_SET(cqc, cqc, oi, 1);



	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen);

	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen, out, sizeof(out));

	if (err)

		goto err_cqb;

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

+3 −4
Original line number Diff line number Diff line
@@ -87,11 +87,10 @@ 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 *in, int inlen, u32 *out, int outlen)

{

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

	u32 dout[MLX5_ST_SZ_DW(destroy_cq_out)];

	u32 out[MLX5_ST_SZ_DW(create_cq_out)];

	u32 din[MLX5_ST_SZ_DW(destroy_cq_in)];

	struct mlx5_eq_comp *eq;

	int err;
@@ -100,9 +99,9 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
	if (IS_ERR(eq))

		return PTR_ERR(eq);



	memset(out, 0, sizeof(out));

	memset(out, 0, outlen);

	MLX5_SET(create_cq_in, in, opcode, MLX5_CMD_OP_CREATE_CQ);

	err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));

	err = mlx5_cmd_exec(dev, in, inlen, out, outlen);

	if (err)

		return err;

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

+2 −1
Original line number Diff line number Diff line
@@ -1517,6 +1517,7 @@ static void mlx5e_free_cq(struct mlx5e_cq *cq) 


static int mlx5e_create_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param)

{

	u32 out[MLX5_ST_SZ_DW(create_cq_out)];

	struct mlx5_core_dev *mdev = cq->mdev;

	struct mlx5_core_cq *mcq = &cq->mcq;
@@ -1551,7 +1552,7 @@ static int mlx5e_create_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 
					    MLX5_ADAPTER_PAGE_SHIFT);

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



	err = mlx5_core_create_cq(mdev, mcq, in, inlen);

	err = mlx5_core_create_cq(mdev, mcq, in, inlen, out, sizeof(out));



	kvfree(in);

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

+2 −1
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ static int mlx5_fpga_conn_create_cq(struct mlx5_fpga_conn *conn, int cq_size) 
	struct mlx5_fpga_device *fdev = conn->fdev;

	struct mlx5_core_dev *mdev = fdev->mdev;

	u32 temp_cqc[MLX5_ST_SZ_DW(cqc)] = {0};

	u32 out[MLX5_ST_SZ_DW(create_cq_out)];

	struct mlx5_wq_param wqp;

	struct mlx5_cqe64 *cqe;

	int inlen, err, eqn;
@@ -476,7 +477,7 @@ static int mlx5_fpga_conn_create_cq(struct mlx5_fpga_conn *conn, int cq_size) 
	pas = (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas);

	mlx5_fill_page_frag_array(&conn->cq.wq_ctrl.buf, pas);



	err = mlx5_core_create_cq(mdev, &conn->cq.mcq, in, inlen);

	err = mlx5_core_create_cq(mdev, &conn->cq.mcq, in, inlen, out, sizeof(out));

	kvfree(in);



	if (err)

include/linux/mlx5/cq.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static inline void mlx5_cq_put(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 *in, int inlen, u32 *out, int outlen);

int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq);

int mlx5_core_query_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,

		       u32 *out, int outlen);