Skip to content

L
linux
Commit 3b77235b authored by Saeed Mahameed's avatar Saeed Mahameed Committed by David S. Miller
Browse files
Options

net/mlx5e: Proper names for SQ/RQ/CQ functions 

Rename mlx5e_{create,destroy}_{sq,rq,cq} to
mlx5e_{alloc,free}_{sq,rq,cq}.

Rename mlx5e_{enable,disable}_{sq,rq,cq} to
mlx5e_{create,destroy}_{sq,rq,cq}.

mlx5e_{enable,disable}_{sq,rq,cq} used to actually create/destroy the SQ
in FW, so we rename them to align the functions names with FW semantics.
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 864b2d71
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 63 deletions
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View file @ 3b77235b
...@@ -539,9 +539,9 @@ static int mlx5e_create_rq_umr_mkey(struct mlx5e_rq *rq) ...@@ -539,9 +539,9 @@ static int mlx5e_create_rq_umr_mkey(struct mlx5e_rq *rq)
return mlx5e_create_umr_mkey(priv, num_mtts, PAGE_SHIFT, &rq->umr_mkey); return mlx5e_create_umr_mkey(priv, num_mtts, PAGE_SHIFT, &rq->umr_mkey);
} }
static int mlx5e_create_rq(struct mlx5e_channel *c, static int mlx5e_alloc_rq(struct mlx5e_channel *c,
struct mlx5e_rq_param *param, struct mlx5e_rq_param *param,
struct mlx5e_rq *rq) struct mlx5e_rq *rq)
{ {
struct mlx5e_priv *priv = c->priv; struct mlx5e_priv *priv = c->priv;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
...@@ -674,7 +674,7 @@ static int mlx5e_create_rq(struct mlx5e_channel *c, ...@@ -674,7 +674,7 @@ static int mlx5e_create_rq(struct mlx5e_channel *c,
return err; return err;
} }
static void mlx5e_destroy_rq(struct mlx5e_rq *rq) static void mlx5e_free_rq(struct mlx5e_rq *rq)
{ {
int i; int i;
...@@ -699,7 +699,7 @@ static void mlx5e_destroy_rq(struct mlx5e_rq *rq) ...@@ -699,7 +699,7 @@ static void mlx5e_destroy_rq(struct mlx5e_rq *rq)
mlx5_wq_destroy(&rq->wq_ctrl); mlx5_wq_destroy(&rq->wq_ctrl);
} }
static int mlx5e_enable_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param) static int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param)
{ {
struct mlx5e_priv *priv = rq->priv; struct mlx5e_priv *priv = rq->priv;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
...@@ -798,7 +798,7 @@ static int mlx5e_modify_rq_vsd(struct mlx5e_rq *rq, bool vsd) ...@@ -798,7 +798,7 @@ static int mlx5e_modify_rq_vsd(struct mlx5e_rq *rq, bool vsd)
return err; return err;
} }
static void mlx5e_disable_rq(struct mlx5e_rq *rq) static void mlx5e_destroy_rq(struct mlx5e_rq *rq)
{ {
mlx5_core_destroy_rq(rq->priv->mdev, rq->rqn); mlx5_core_destroy_rq(rq->priv->mdev, rq->rqn);
} }
...@@ -850,18 +850,18 @@ static int mlx5e_open_rq(struct mlx5e_channel *c, ...@@ -850,18 +850,18 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
struct mlx5e_tx_wqe *nopwqe; struct mlx5e_tx_wqe *nopwqe;
int err; int err;
err = mlx5e_create_rq(c, param, rq); err = mlx5e_alloc_rq(c, param, rq);
if (err) if (err)
return err; return err;
err = mlx5e_enable_rq(rq, param); err = mlx5e_create_rq(rq, param);
if (err) if (err)
goto err_destroy_rq; goto err_free_rq;
set_bit(MLX5E_RQ_STATE_ENABLED, &rq->state); set_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
err = mlx5e_modify_rq_state(rq, MLX5_RQC_STATE_RST, MLX5_RQC_STATE_RDY); err = mlx5e_modify_rq_state(rq, MLX5_RQC_STATE_RST, MLX5_RQC_STATE_RDY);
if (err) if (err)
goto err_disable_rq; goto err_destroy_rq;
if (param->am_enabled) if (param->am_enabled)
set_bit(MLX5E_RQ_STATE_AM, &c->rq.state); set_bit(MLX5E_RQ_STATE_AM, &c->rq.state);
...@@ -873,11 +873,11 @@ static int mlx5e_open_rq(struct mlx5e_channel *c, ...@@ -873,11 +873,11 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
sq->stats.nop++; /* TODO no need for SQ stats in ico */ sq->stats.nop++; /* TODO no need for SQ stats in ico */
return 0; return 0;
err_disable_rq:
clear_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
mlx5e_disable_rq(rq);
err_destroy_rq: err_destroy_rq:
clear_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
mlx5e_destroy_rq(rq); mlx5e_destroy_rq(rq);
err_free_rq:
mlx5e_free_rq(rq);
return err; return err;
} }
...@@ -888,9 +888,9 @@ static void mlx5e_close_rq(struct mlx5e_rq *rq) ...@@ -888,9 +888,9 @@ static void mlx5e_close_rq(struct mlx5e_rq *rq)
napi_synchronize(&rq->channel->napi); /* prevent mlx5e_post_rx_wqes */ napi_synchronize(&rq->channel->napi); /* prevent mlx5e_post_rx_wqes */
cancel_work_sync(&rq->am.work); cancel_work_sync(&rq->am.work);
mlx5e_disable_rq(rq);
mlx5e_free_rx_descs(rq);
mlx5e_destroy_rq(rq); mlx5e_destroy_rq(rq);
mlx5e_free_rx_descs(rq);
mlx5e_free_rq(rq);
} }
static void mlx5e_free_sq_xdp_db(struct mlx5e_sq *sq) static void mlx5e_free_sq_xdp_db(struct mlx5e_sq *sq)
...@@ -997,10 +997,10 @@ static int mlx5e_sq_get_max_wqebbs(u8 sq_type) ...@@ -997,10 +997,10 @@ static int mlx5e_sq_get_max_wqebbs(u8 sq_type)
return MLX5_SEND_WQE_MAX_WQEBBS; return MLX5_SEND_WQE_MAX_WQEBBS;
} }
static int mlx5e_create_sq(struct mlx5e_channel *c, static int mlx5e_alloc_sq(struct mlx5e_channel *c,
int tc, int tc,
struct mlx5e_sq_param *param, struct mlx5e_sq_param *param,
struct mlx5e_sq *sq) struct mlx5e_sq *sq)
{ {
struct mlx5e_priv *priv = c->priv; struct mlx5e_priv *priv = c->priv;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
...@@ -1051,13 +1051,13 @@ static int mlx5e_create_sq(struct mlx5e_channel *c, ...@@ -1051,13 +1051,13 @@ static int mlx5e_create_sq(struct mlx5e_channel *c,
return err; return err;
} }
static void mlx5e_destroy_sq(struct mlx5e_sq *sq) static void mlx5e_free_sq(struct mlx5e_sq *sq)
{ {
mlx5e_free_sq_db(sq); mlx5e_free_sq_db(sq);
mlx5_wq_destroy(&sq->wq_ctrl); mlx5_wq_destroy(&sq->wq_ctrl);
} }
static int mlx5e_enable_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param) static int mlx5e_create_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param)
{ {
struct mlx5e_channel *c = sq->channel; struct mlx5e_channel *c = sq->channel;
struct mlx5e_priv *priv = c->priv; struct mlx5e_priv *priv = c->priv;
...@@ -1139,7 +1139,7 @@ static int mlx5e_modify_sq(struct mlx5e_sq *sq, int curr_state, ...@@ -1139,7 +1139,7 @@ static int mlx5e_modify_sq(struct mlx5e_sq *sq, int curr_state,
return err; return err;
} }
static void mlx5e_disable_sq(struct mlx5e_sq *sq) static void mlx5e_destroy_sq(struct mlx5e_sq *sq)
{ {
struct mlx5e_channel *c = sq->channel; struct mlx5e_channel *c = sq->channel;
struct mlx5e_priv *priv = c->priv; struct mlx5e_priv *priv = c->priv;
...@@ -1157,19 +1157,19 @@ static int mlx5e_open_sq(struct mlx5e_channel *c, ...@@ -1157,19 +1157,19 @@ static int mlx5e_open_sq(struct mlx5e_channel *c,
{ {
int err; int err;
err = mlx5e_create_sq(c, tc, param, sq); err = mlx5e_alloc_sq(c, tc, param, sq);
if (err) if (err)
return err; return err;
err = mlx5e_enable_sq(sq, param); err = mlx5e_create_sq(sq, param);
if (err) if (err)
goto err_destroy_sq; goto err_free_sq;
set_bit(MLX5E_SQ_STATE_ENABLED, &sq->state); set_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RST, MLX5_SQC_STATE_RDY, err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RST, MLX5_SQC_STATE_RDY,
false, 0); false, 0);
if (err) if (err)
goto err_disable_sq; goto err_destroy_sq;
if (sq->txq) { if (sq->txq) {
netdev_tx_reset_queue(sq->txq); netdev_tx_reset_queue(sq->txq);
...@@ -1178,11 +1178,11 @@ static int mlx5e_open_sq(struct mlx5e_channel *c, ...@@ -1178,11 +1178,11 @@ static int mlx5e_open_sq(struct mlx5e_channel *c,
return 0; return 0;
err_disable_sq:
clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
mlx5e_disable_sq(sq);
err_destroy_sq: err_destroy_sq:
clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
mlx5e_destroy_sq(sq); mlx5e_destroy_sq(sq);
err_free_sq:
mlx5e_free_sq(sq);
return err; return err;
} }
...@@ -1213,14 +1213,14 @@ static void mlx5e_close_sq(struct mlx5e_sq *sq) ...@@ -1213,14 +1213,14 @@ static void mlx5e_close_sq(struct mlx5e_sq *sq)
} }
} }
mlx5e_disable_sq(sq);
mlx5e_free_sq_descs(sq);
mlx5e_destroy_sq(sq); mlx5e_destroy_sq(sq);
mlx5e_free_sq_descs(sq);
mlx5e_free_sq(sq);
} }
static int mlx5e_create_cq(struct mlx5e_channel *c, static int mlx5e_alloc_cq(struct mlx5e_channel *c,
struct mlx5e_cq_param *param, struct mlx5e_cq_param *param,
struct mlx5e_cq *cq) struct mlx5e_cq *cq)
{ {
struct mlx5e_priv *priv = c->priv; struct mlx5e_priv *priv = c->priv;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
...@@ -1265,12 +1265,12 @@ static int mlx5e_create_cq(struct mlx5e_channel *c, ...@@ -1265,12 +1265,12 @@ static int mlx5e_create_cq(struct mlx5e_channel *c,
return 0; return 0;
} }
static void mlx5e_destroy_cq(struct mlx5e_cq *cq) static void mlx5e_free_cq(struct mlx5e_cq *cq)
{ {
mlx5_cqwq_destroy(&cq->wq_ctrl); mlx5_cqwq_destroy(&cq->wq_ctrl);
} }
static int mlx5e_enable_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) static int mlx5e_create_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param)
{ {
struct mlx5e_priv *priv = cq->priv; struct mlx5e_priv *priv = cq->priv;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
...@@ -1317,7 +1317,7 @@ static int mlx5e_enable_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) ...@@ -1317,7 +1317,7 @@ static int mlx5e_enable_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param)
return 0; return 0;
} }
static void mlx5e_disable_cq(struct mlx5e_cq *cq) static void mlx5e_destroy_cq(struct mlx5e_cq *cq)
{ {
struct mlx5e_priv *priv = cq->priv; struct mlx5e_priv *priv = cq->priv;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
...@@ -1334,13 +1334,13 @@ static int mlx5e_open_cq(struct mlx5e_channel *c, ...@@ -1334,13 +1334,13 @@ static int mlx5e_open_cq(struct mlx5e_channel *c,
struct mlx5e_priv *priv = c->priv; struct mlx5e_priv *priv = c->priv;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
err = mlx5e_create_cq(c, param, cq); err = mlx5e_alloc_cq(c, param, cq);
if (err) if (err)
return err; return err;
err = mlx5e_enable_cq(cq, param); err = mlx5e_create_cq(cq, param);
if (err) if (err)
goto err_destroy_cq; goto err_free_cq;
if (MLX5_CAP_GEN(mdev, cq_moderation)) if (MLX5_CAP_GEN(mdev, cq_moderation))
mlx5_core_modify_cq_moderation(mdev, &cq->mcq, mlx5_core_modify_cq_moderation(mdev, &cq->mcq,
...@@ -1348,16 +1348,16 @@ static int mlx5e_open_cq(struct mlx5e_channel *c, ...@@ -1348,16 +1348,16 @@ static int mlx5e_open_cq(struct mlx5e_channel *c,
moderation.pkts); moderation.pkts);
return 0; return 0;
err_destroy_cq: err_free_cq:
mlx5e_destroy_cq(cq); mlx5e_free_cq(cq);
return err; return err;
} }
static void mlx5e_close_cq(struct mlx5e_cq *cq) static void mlx5e_close_cq(struct mlx5e_cq *cq)
{ {
mlx5e_disable_cq(cq);
mlx5e_destroy_cq(cq); mlx5e_destroy_cq(cq);
mlx5e_free_cq(cq);
} }
static int mlx5e_get_cpu(struct mlx5e_priv *priv, int ix) static int mlx5e_get_cpu(struct mlx5e_priv *priv, int ix)
...@@ -2422,9 +2422,9 @@ int mlx5e_close(struct net_device *netdev) ...@@ -2422,9 +2422,9 @@ int mlx5e_close(struct net_device *netdev)
return err; return err;
} }
static int mlx5e_create_drop_rq(struct mlx5e_priv *priv, static int mlx5e_alloc_drop_rq(struct mlx5e_priv *priv,
struct mlx5e_rq *rq, struct mlx5e_rq *rq,
struct mlx5e_rq_param *param) struct mlx5e_rq_param *param)
{ {
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
void *rqc = param->rqc; void *rqc = param->rqc;
...@@ -2443,9 +2443,9 @@ static int mlx5e_create_drop_rq(struct mlx5e_priv *priv, ...@@ -2443,9 +2443,9 @@ static int mlx5e_create_drop_rq(struct mlx5e_priv *priv,
return 0; return 0;
} }
static int mlx5e_create_drop_cq(struct mlx5e_priv *priv, static int mlx5e_alloc_drop_cq(struct mlx5e_priv *priv,
struct mlx5e_cq *cq, struct mlx5e_cq *cq,
struct mlx5e_cq_param *param) struct mlx5e_cq_param *param)
{ {
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
struct mlx5_core_cq *mcq = &cq->mcq; struct mlx5_core_cq *mcq = &cq->mcq;
...@@ -2487,42 +2487,42 @@ static int mlx5e_open_drop_rq(struct mlx5e_priv *priv) ...@@ -2487,42 +2487,42 @@ static int mlx5e_open_drop_rq(struct mlx5e_priv *priv)
memset(&rq_param, 0, sizeof(rq_param)); memset(&rq_param, 0, sizeof(rq_param));
mlx5e_build_drop_rq_param(&rq_param); mlx5e_build_drop_rq_param(&rq_param);
err = mlx5e_create_drop_cq(priv, cq, &cq_param); err = mlx5e_alloc_drop_cq(priv, cq, &cq_param);
if (err) if (err)
return err; return err;
err = mlx5e_enable_cq(cq, &cq_param); err = mlx5e_create_cq(cq, &cq_param);
if (err) if (err)
goto err_destroy_cq; goto err_free_cq;
err = mlx5e_create_drop_rq(priv, rq, &rq_param); err = mlx5e_alloc_drop_rq(priv, rq, &rq_param);
if (err) if (err)
goto err_disable_cq; goto err_destroy_cq;
err = mlx5e_enable_rq(rq, &rq_param); err = mlx5e_create_rq(rq, &rq_param);
if (err) if (err)
goto err_destroy_rq; goto err_free_rq;
return 0; return 0;
err_destroy_rq: err_free_rq:
mlx5e_destroy_rq(&priv->drop_rq); mlx5e_free_rq(&priv->drop_rq);
err_disable_cq:
mlx5e_disable_cq(&priv->drop_rq.cq);
err_destroy_cq: err_destroy_cq:
mlx5e_destroy_cq(&priv->drop_rq.cq); mlx5e_destroy_cq(&priv->drop_rq.cq);
err_free_cq:
mlx5e_free_cq(&priv->drop_rq.cq);
return err; return err;
} }
static void mlx5e_close_drop_rq(struct mlx5e_priv *priv) static void mlx5e_close_drop_rq(struct mlx5e_priv *priv)
{ {
mlx5e_disable_rq(&priv->drop_rq);
mlx5e_destroy_rq(&priv->drop_rq); mlx5e_destroy_rq(&priv->drop_rq);
mlx5e_disable_cq(&priv->drop_rq.cq); mlx5e_free_rq(&priv->drop_rq);
mlx5e_destroy_cq(&priv->drop_rq.cq); mlx5e_destroy_cq(&priv->drop_rq.cq);
mlx5e_free_cq(&priv->drop_rq.cq);
} }
static int mlx5e_create_tis(struct mlx5e_priv *priv, int tc) static int mlx5e_create_tis(struct mlx5e_priv *priv, int tc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7