net/mlx5e: Generalize SQ create/modify/destroy functions

In the next patches we will introduce different SQ types,
and we would want to reuse those functions, in this patch we make them
agnostic to SQ type (txq, xdp, ico).

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index d03afa53506450b05a9c9e9538a7a47ea214ff22..dcc67df54a5c6f629301dc55736d40155d1f357c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1057,10 +1057,19 @@ static void mlx5e_free_sq(struct mlx5e_sq *sq)
        mlx5_wq_destroy(&sq->wq_ctrl);
 }
 
-static int mlx5e_create_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param)
+struct mlx5e_create_sq_param {
+       struct mlx5_wq_ctrl        *wq_ctrl;
+       u32                         cqn;
+       u32                         tisn;
+       u8                          tis_lst_sz;
+       u8                          min_inline_mode;
+};
+
+static int mlx5e_create_sq(struct mlx5e_priv *priv,
+                          struct mlx5e_sq_param *param,
+                          struct mlx5e_create_sq_param *csp,
+                          u32 *sqn)
 {
-       struct mlx5e_channel *c = sq->channel;
-       struct mlx5e_priv *priv = c->priv;
        struct mlx5_core_dev *mdev = priv->mdev;
 
        void *in;
@@ -1070,7 +1079,7 @@ static int mlx5e_create_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param)
        int err;
 
        inlen = MLX5_ST_SZ_BYTES(create_sq_in) +
-               sizeof(u64) * sq->wq_ctrl.buf.npages;
+               sizeof(u64) * csp->wq_ctrl->buf.npages;
        in = mlx5_vzalloc(inlen);
        if (!in)
                return -ENOMEM;
@@ -1079,38 +1088,41 @@ static int mlx5e_create_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param)
        wq = MLX5_ADDR_OF(sqc, sqc, wq);
 
        memcpy(sqc, param->sqc, sizeof(param->sqc));
-
-       MLX5_SET(sqc,  sqc, tis_num_0, param->type == MLX5E_SQ_ICO ?
-                                      0 : priv->tisn[sq->tc]);
-       MLX5_SET(sqc,  sqc, cqn,                sq->cq.mcq.cqn);
+       MLX5_SET(sqc,  sqc, tis_lst_sz, csp->tis_lst_sz);
+       MLX5_SET(sqc,  sqc, tis_num_0, csp->tisn);
+       MLX5_SET(sqc,  sqc, cqn, csp->cqn);
 
        if (MLX5_CAP_ETH(mdev, wqe_inline_mode) == MLX5_CAP_INLINE_MODE_VPORT_CONTEXT)
-               MLX5_SET(sqc,  sqc, min_wqe_inline_mode, sq->min_inline_mode);
+               MLX5_SET(sqc,  sqc, min_wqe_inline_mode, csp->min_inline_mode);
 
-       MLX5_SET(sqc,  sqc, state,              MLX5_SQC_STATE_RST);
-       MLX5_SET(sqc,  sqc, tis_lst_sz, param->type == MLX5E_SQ_ICO ? 0 : 1);
+       MLX5_SET(sqc,  sqc, state, MLX5_SQC_STATE_RST);
 
        MLX5_SET(wq,   wq, wq_type,       MLX5_WQ_TYPE_CYCLIC);
-       MLX5_SET(wq,   wq, uar_page,      mdev->mlx5e_res.bfreg.index);
-       MLX5_SET(wq,   wq, log_wq_pg_sz,  sq->wq_ctrl.buf.page_shift -
+       MLX5_SET(wq,   wq, uar_page,      priv->mdev->mlx5e_res.bfreg.index);
+       MLX5_SET(wq,   wq, log_wq_pg_sz,  csp->wq_ctrl->buf.page_shift -
                                          MLX5_ADAPTER_PAGE_SHIFT);
-       MLX5_SET64(wq, wq, dbr_addr,      sq->wq_ctrl.db.dma);
+       MLX5_SET64(wq, wq, dbr_addr,      csp->wq_ctrl->db.dma);
 
-       mlx5_fill_page_array(&sq->wq_ctrl.buf,
-                            (__be64 *)MLX5_ADDR_OF(wq, wq, pas));
+       mlx5_fill_page_array(&csp->wq_ctrl->buf, (__be64 *)MLX5_ADDR_OF(wq, wq, pas));
 
-       err = mlx5_core_create_sq(mdev, in, inlen, &sq->sqn);
+       err = mlx5_core_create_sq(mdev, in, inlen, sqn);
 
        kvfree(in);
 
        return err;
 }
 
-static int mlx5e_modify_sq(struct mlx5e_sq *sq, int curr_state,
-                          int next_state, bool update_rl, int rl_index)
+struct mlx5e_modify_sq_param {
+       int curr_state;
+       int next_state;
+       bool rl_update;
+       int rl_index;
+};
+
+static int mlx5e_modify_sq(struct mlx5e_priv *priv,
+                          u32 sqn,
+                          struct mlx5e_modify_sq_param *p)
 {
-       struct mlx5e_channel *c = sq->channel;
-       struct mlx5e_priv *priv = c->priv;
        struct mlx5_core_dev *mdev = priv->mdev;
 
        void *in;
@@ -1125,29 +1137,24 @@ static int mlx5e_modify_sq(struct mlx5e_sq *sq, int curr_state,
 
        sqc = MLX5_ADDR_OF(modify_sq_in, in, ctx);
 
-       MLX5_SET(modify_sq_in, in, sq_state, curr_state);
-       MLX5_SET(sqc, sqc, state, next_state);
-       if (update_rl && next_state == MLX5_SQC_STATE_RDY) {
+       MLX5_SET(modify_sq_in, in, sq_state, p->curr_state);
+       MLX5_SET(sqc, sqc, state, p->next_state);
+       if (p->rl_update && p->next_state == MLX5_SQC_STATE_RDY) {
                MLX5_SET64(modify_sq_in, in, modify_bitmask, 1);
-               MLX5_SET(sqc,  sqc, packet_pacing_rate_limit_index, rl_index);
+               MLX5_SET(sqc,  sqc, packet_pacing_rate_limit_index, p->rl_index);
        }
 
-       err = mlx5_core_modify_sq(mdev, sq->sqn, in, inlen);
+       err = mlx5_core_modify_sq(mdev, sqn, in, inlen);
 
        kvfree(in);
 
        return err;
 }
 
-static void mlx5e_destroy_sq(struct mlx5e_sq *sq)
-{
-       struct mlx5e_channel *c = sq->channel;
-       struct mlx5e_priv *priv = c->priv;
-       struct mlx5_core_dev *mdev = priv->mdev;
 
-       mlx5_core_destroy_sq(mdev, sq->sqn);
-       if (sq->rate_limit)
-               mlx5_rl_remove_rate(mdev, sq->rate_limit);
+static void mlx5e_destroy_sq(struct mlx5e_priv *priv, u32 sqn)
+{
+       mlx5_core_destroy_sq(priv->mdev, sqn);
 }
 
 static int mlx5e_open_sq(struct mlx5e_channel *c,
@@ -1155,19 +1162,29 @@ static int mlx5e_open_sq(struct mlx5e_channel *c,
                         struct mlx5e_sq_param *param,
                         struct mlx5e_sq *sq)
 {
+       struct mlx5e_create_sq_param csp = {0};
+       struct mlx5e_modify_sq_param msp = {0};
+       struct mlx5e_priv *priv = c->priv;
        int err;
 
        err = mlx5e_alloc_sq(c, tc, param, sq);
        if (err)
                return err;
 
-       err = mlx5e_create_sq(sq, param);
+       csp.tisn            = param->type == MLX5E_SQ_ICO ? 0 : priv->tisn[sq->tc];
+       csp.tis_lst_sz      = param->type == MLX5E_SQ_ICO ? 0 : 1;
+       csp.cqn             = sq->cq.mcq.cqn;
+       csp.wq_ctrl         = &sq->wq_ctrl;
+       csp.min_inline_mode = sq->min_inline_mode;
+
+       err = mlx5e_create_sq(c->priv, param, &csp, &sq->sqn);
        if (err)
                goto err_free_sq;
 
        set_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
-       err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RST, MLX5_SQC_STATE_RDY,
-                             false, 0);
+       msp.curr_state = MLX5_SQC_STATE_RST;
+       msp.next_state = MLX5_SQC_STATE_RDY;
+       err = mlx5e_modify_sq(priv, sq->sqn, &msp);
        if (err)
                goto err_destroy_sq;
 
@@ -1180,7 +1197,7 @@ static int mlx5e_open_sq(struct mlx5e_channel *c,
 
 err_destroy_sq:
        clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
-       mlx5e_destroy_sq(sq);
+       mlx5e_destroy_sq(priv, sq->sqn);
 err_free_sq:
        mlx5e_free_sq(sq);
 
@@ -1196,9 +1213,13 @@ static inline void netif_tx_disable_queue(struct netdev_queue *txq)
 
 static void mlx5e_close_sq(struct mlx5e_sq *sq)
 {
+       struct mlx5e_channel *c = sq->channel;
+       struct mlx5e_priv *priv = c->priv;
+       struct mlx5_core_dev *mdev = priv->mdev;
+
        clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
        /* prevent netif_tx_wake_queue */
-       napi_synchronize(&sq->channel->napi);
+       napi_synchronize(&c->napi);
 
        if (sq->txq) {
                netif_tx_disable_queue(sq->txq);
@@ -1213,7 +1234,9 @@ static void mlx5e_close_sq(struct mlx5e_sq *sq)
                }
        }
 
-       mlx5e_destroy_sq(sq);
+       mlx5e_destroy_sq(priv, sq->sqn);
+       if (sq->rate_limit)
+               mlx5_rl_remove_rate(mdev, sq->rate_limit);
        mlx5e_free_sq_descs(sq);
        mlx5e_free_sq(sq);
 }
@@ -1439,6 +1462,7 @@ static int mlx5e_set_sq_maxrate(struct net_device *dev,
 {
        struct mlx5e_priv *priv = netdev_priv(dev);
        struct mlx5_core_dev *mdev = priv->mdev;
+       struct mlx5e_modify_sq_param msp = {0};
        u16 rl_index = 0;
        int err;
 
@@ -1461,8 +1485,11 @@ static int mlx5e_set_sq_maxrate(struct net_device *dev,
                }
        }
 
-       err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RDY,
-                             MLX5_SQC_STATE_RDY, true, rl_index);
+       msp.curr_state = MLX5_SQC_STATE_RDY;
+       msp.next_state = MLX5_SQC_STATE_RDY;
+       msp.rl_index   = rl_index;
+       msp.rl_update  = true;
+       err = mlx5e_modify_sq(priv, sq->sqn, &msp);
        if (err) {
                netdev_err(dev, "Failed configuring rate %u: %d\n",
                           rate, err);