Commit 2f6b379c authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Fill mlx5e_create_cq_param in a function 



Create a function to fill the fields of struct mlx5e_create_cq_param
based on a channel. The purpose is code reuse between normal CQs, XSK
CQs and the upcoming QoS CQs.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent c28e3bd4

drivers/net/ethernet/mellanox/mlx5/core/en/params.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev, 


/* Build queue parameters */



void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct mlx5e_channel *c);

void mlx5e_build_rq_param(struct mlx5e_priv *priv,

			  struct mlx5e_params *params,

			  struct mlx5e_xsk_param *xsk,

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

+2 −5
Original line number Diff line number Diff line
@@ -48,14 +48,11 @@ int mlx5e_open_xsk(struct mlx5e_priv *priv, struct mlx5e_params *params, 
		   struct mlx5e_xsk_param *xsk, struct xsk_buff_pool *pool,

		   struct mlx5e_channel *c)

{

	struct mlx5e_create_cq_param ccp = {};

	struct mlx5e_channel_param *cparam;

	struct mlx5e_create_cq_param ccp;

	int err;



	ccp.napi = &c->napi;

	ccp.ch_stats = c->stats;

	ccp.node = cpu_to_node(c->cpu);

	ccp.ix = c->ix;

	mlx5e_build_create_cq_param(&ccp, c);



	if (!mlx5e_validate_xsk_param(params, xsk, priv->mdev))

		return -EINVAL;

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

+12 −5
Original line number Diff line number Diff line
@@ -1806,18 +1806,25 @@ static int mlx5e_set_tx_maxrate(struct net_device *dev, int index, u32 rate) 
	return err;

}



void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct mlx5e_channel *c)

{

	*ccp = (struct mlx5e_create_cq_param) {

		.napi = &c->napi,

		.ch_stats = c->stats,

		.node = cpu_to_node(c->cpu),

		.ix = c->ix,

	};

}



static int mlx5e_open_queues(struct mlx5e_channel *c,

			     struct mlx5e_params *params,

			     struct mlx5e_channel_param *cparam)

{

	struct dim_cq_moder icocq_moder = {0, 0};

	struct mlx5e_create_cq_param ccp = {};

	struct mlx5e_create_cq_param ccp;

	int err;



	ccp.napi = &c->napi;

	ccp.ch_stats = c->stats;

	ccp.node = cpu_to_node(c->cpu);

	ccp.ix = c->ix;

	mlx5e_build_create_cq_param(&ccp, c);



	err = mlx5e_open_cq(c->priv, icocq_moder, &cparam->icosq.cqp, &ccp,

			    &c->async_icosq.cq);