Commit db52aa6d authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Decouple CQ from priv 



Make CQ struct and methods independent of "priv", use more basic
arguments instead.
This will ease the transition to netdev with multiple mdevs.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent b1a33e65

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

+4 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ struct mlx5e_cq { 
	/* control */

	struct net_device         *netdev;

	struct mlx5_core_dev      *mdev;

	struct mlx5e_priv         *priv;

	struct workqueue_struct   *workqueue;

	struct mlx5_wq_ctrl        wq_ctrl;

} ____cacheline_aligned_in_smp;
@@ -1043,6 +1043,8 @@ int mlx5e_open_xdpsq(struct mlx5e_channel *c, struct mlx5e_params *params, 
void mlx5e_close_xdpsq(struct mlx5e_xdpsq *sq);



struct mlx5e_create_cq_param {

	struct net_device *netdev;

	struct workqueue_struct *wq;

	struct napi_struct *napi;

	struct mlx5e_ch_stats *ch_stats;

	int node;
@@ -1050,7 +1052,7 @@ struct mlx5e_create_cq_param { 
};



struct mlx5e_cq_param;

int mlx5e_open_cq(struct mlx5e_priv *priv, struct dim_cq_moder moder,

int mlx5e_open_cq(struct mlx5_core_dev *mdev, struct dim_cq_moder moder,

		  struct mlx5e_cq_param *param, struct mlx5e_create_cq_param *ccp,

		  struct mlx5e_cq *cq);

void mlx5e_close_cq(struct mlx5e_cq *cq);

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

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ void mlx5e_build_rq_params(struct mlx5_core_dev *mdev, 
void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct mlx5e_channel *c)

{

	*ccp = (struct mlx5e_create_cq_param) {

		.netdev = c->netdev,

		.wq = c->priv->wq,

		.napi = &c->napi,

		.ch_stats = c->stats,

		.node = cpu_to_node(c->cpu),

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

+7 −3
Original line number Diff line number Diff line
@@ -557,6 +557,8 @@ static int mlx5e_ptp_open_tx_cqs(struct mlx5e_ptp *c, 


	num_tc = mlx5e_get_dcb_num_tc(params);



	ccp.netdev   = c->netdev;

	ccp.wq       = c->priv->wq;

	ccp.node     = dev_to_node(mlx5_core_dma_dev(c->mdev));

	ccp.ch_stats = c->stats;

	ccp.napi     = &c->napi;
@@ -567,7 +569,7 @@ static int mlx5e_ptp_open_tx_cqs(struct mlx5e_ptp *c, 
	for (tc = 0; tc < num_tc; tc++) {

		struct mlx5e_cq *cq = &c->ptpsq[tc].txqsq.cq;



		err = mlx5e_open_cq(c->priv, ptp_moder, cq_param, &ccp, cq);

		err = mlx5e_open_cq(c->mdev, ptp_moder, cq_param, &ccp, cq);

		if (err)

			goto out_err_txqsq_cq;

	}
@@ -576,7 +578,7 @@ static int mlx5e_ptp_open_tx_cqs(struct mlx5e_ptp *c, 
		struct mlx5e_cq *cq = &c->ptpsq[tc].ts_cq;

		struct mlx5e_ptpsq *ptpsq = &c->ptpsq[tc];



		err = mlx5e_open_cq(c->priv, ptp_moder, cq_param, &ccp, cq);

		err = mlx5e_open_cq(c->mdev, ptp_moder, cq_param, &ccp, cq);

		if (err)

			goto out_err_ts_cq;
@@ -604,6 +606,8 @@ static int mlx5e_ptp_open_rx_cq(struct mlx5e_ptp *c, 
	struct mlx5e_cq_param *cq_param;

	struct mlx5e_cq *cq = &c->rq.cq;



	ccp.netdev   = c->netdev;

	ccp.wq       = c->priv->wq;

	ccp.node     = dev_to_node(mlx5_core_dma_dev(c->mdev));

	ccp.ch_stats = c->stats;

	ccp.napi     = &c->napi;
@@ -611,7 +615,7 @@ static int mlx5e_ptp_open_rx_cq(struct mlx5e_ptp *c, 


	cq_param = &cparams->rq_param.cqp;



	return mlx5e_open_cq(c->priv, ptp_moder, cq_param, &ccp, cq);

	return mlx5e_open_cq(c->mdev, ptp_moder, cq_param, &ccp, cq);

}



static void mlx5e_ptp_close_tx_cqs(struct mlx5e_ptp *c)

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ int mlx5e_open_qos_sq(struct mlx5e_priv *priv, struct mlx5e_channels *chs, 
	memset(&param_cq, 0, sizeof(param_cq));

	mlx5e_build_sq_param(priv->mdev, params, &param_sq);

	mlx5e_build_tx_cq_param(priv->mdev, params, &param_cq);

	err = mlx5e_open_cq(priv, params->tx_cq_moderation, &param_cq, &ccp, &sq->cq);

	err = mlx5e_open_cq(c->mdev, params->tx_cq_moderation, &param_cq, &ccp, &sq->cq);

	if (err)

		goto err_free_sq;

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

+3 −1
Original line number Diff line number Diff line
@@ -68,11 +68,13 @@ static int mlx5e_open_trap_rq(struct mlx5e_priv *priv, struct mlx5e_trap *t) 


	node = dev_to_node(mdev->device);



	ccp.netdev   = priv->netdev;

	ccp.wq       = priv->wq;

	ccp.node     = node;

	ccp.ch_stats = t->stats;

	ccp.napi     = &t->napi;

	ccp.ix       = 0;

	err = mlx5e_open_cq(priv, trap_moder, &rq_param->cqp, &ccp, &rq->cq);

	err = mlx5e_open_cq(priv->mdev, trap_moder, &rq_param->cqp, &ccp, &rq->cq);

	if (err)

		return err;