Commit d1f62050 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Update cq.c to new cmd interface 



Do mass update of cq.c to reuse newly introduced
mlx5_cmd_exec_in*() interfaces.

Reviewed-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 5d1c9a11

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

+9 −13
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ 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);

	u32 dout[MLX5_ST_SZ_DW(destroy_cq_out)];

	u32 din[MLX5_ST_SZ_DW(destroy_cq_in)];

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

	struct mlx5_eq_comp *eq;

	int err;
@@ -141,20 +140,17 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
err_cq_add:

	mlx5_eq_del_cq(&eq->core, cq);

err_cmd:

	memset(din, 0, sizeof(din));

	memset(dout, 0, sizeof(dout));

	MLX5_SET(destroy_cq_in, din, opcode, MLX5_CMD_OP_DESTROY_CQ);

	MLX5_SET(destroy_cq_in, din, cqn, cq->cqn);

	MLX5_SET(destroy_cq_in, din, uid, cq->uid);

	mlx5_cmd_exec(dev, din, sizeof(din), dout, sizeof(dout));

	mlx5_cmd_exec_in(dev, destroy_cq, din);

	return err;

}

EXPORT_SYMBOL(mlx5_core_create_cq);



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

{

	u32 out[MLX5_ST_SZ_DW(destroy_cq_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(destroy_cq_in)] = {0};

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

	int err;



	mlx5_eq_del_cq(mlx5_get_async_eq(dev), cq);
@@ -163,7 +159,7 @@ int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq) 
	MLX5_SET(destroy_cq_in, in, opcode, MLX5_CMD_OP_DESTROY_CQ);

	MLX5_SET(destroy_cq_in, in, cqn, cq->cqn);

	MLX5_SET(destroy_cq_in, in, uid, cq->uid);

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

	err = mlx5_cmd_exec_in(dev, destroy_cq, in);

	if (err)

		return err;
@@ -178,20 +174,20 @@ int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq) 
EXPORT_SYMBOL(mlx5_core_destroy_cq);



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

		       u32 *out, int outlen)

		       u32 *out)

{

	u32 in[MLX5_ST_SZ_DW(query_cq_in)] = {0};

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



	MLX5_SET(query_cq_in, in, opcode, MLX5_CMD_OP_QUERY_CQ);

	MLX5_SET(query_cq_in, in, cqn, cq->cqn);

	return mlx5_cmd_exec(dev, in, sizeof(in), out, outlen);

	return mlx5_cmd_exec_inout(dev, query_cq, in, out);

}

EXPORT_SYMBOL(mlx5_core_query_cq);



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

			u32 *in, int inlen)

{

	u32 out[MLX5_ST_SZ_DW(modify_cq_out)] = {0};

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



	MLX5_SET(modify_cq_in, in, opcode, MLX5_CMD_OP_MODIFY_CQ);

	MLX5_SET(modify_cq_in, in, uid, cq->uid);
@@ -204,7 +200,7 @@ int mlx5_core_modify_cq_moderation(struct mlx5_core_dev *dev, 
				   u16 cq_period,

				   u16 cq_max_count)

{

	u32 in[MLX5_ST_SZ_DW(modify_cq_in)] = {0};

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

	void *cqc;



	MLX5_SET(modify_cq_in, in, cqn, cq->cqn);

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

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static u64 cq_read_field(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
	if (!out)

		return param;



	err = mlx5_core_query_cq(dev, cq, out, outlen);

	err = mlx5_core_query_cq(dev, cq, out);

	if (err) {

		mlx5_core_warn(dev, "failed to query cq\n");

		goto out;

drivers/net/ethernet/mellanox/mlx5/core/en/health.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg) 
	void *cqc;

	int err;



	err = mlx5_core_query_cq(priv->mdev, &cq->mcq, out, sizeof(out));

	err = mlx5_core_query_cq(priv->mdev, &cq->mcq, out);

	if (err)

		return err;

include/linux/mlx5/cq.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
			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);

		       u32 *out);

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

			u32 *in, int inlen);

int mlx5_core_modify_cq_moderation(struct mlx5_core_dev *dev,