net/mlx5: share Rx queue object modification

[dpdk.git] / drivers / net / mlx5 / mlx5_devx.c

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 5a3ac49..07922c2 100644 (file)
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -4,6 +4,7 @@
 
 #include <stddef.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
 #include <sys/queue.h>
@@ -24,46 +25,49 @@
 
 
 /**
- * Calculate the number of CQEs in CQ for the Rx queue.
+ * Modify RQ vlan stripping offload
  *
- *  @param rxq_data
- *     Pointer to receive queue structure.
+ * @param rxq_obj
+ *   Rx queue object.
  *
  * @return
- *   Number of CQEs in CQ.
+ *   0 on success, non-0 otherwise
  */
-static unsigned int
-mlx5_rxq_cqe_num(struct mlx5_rxq_data *rxq_data)
+static int
+mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
 {
-       unsigned int cqe_n;
-       unsigned int wqe_n = 1 << rxq_data->elts_n;
+       struct mlx5_devx_modify_rq_attr rq_attr;
 
-       if (mlx5_rxq_mprq_enabled(rxq_data))
-               cqe_n = wqe_n * (1 << rxq_data->strd_num_n) - 1;
-       else
-               cqe_n = wqe_n - 1;
-       return cqe_n;
+       memset(&rq_attr, 0, sizeof(rq_attr));
+       rq_attr.rq_state = MLX5_RQC_STATE_RDY;
+       rq_attr.state = MLX5_RQC_STATE_RDY;
+       rq_attr.vsd = (on ? 0 : 1);
+       rq_attr.modify_bitmask = MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD;
+       return mlx5_devx_cmd_modify_rq(rxq_obj->rq, &rq_attr);
 }
 
 /**
- * Modify RQ vlan stripping offload
+ * Modify RQ using DevX API.
  *
  * @param rxq_obj
- *   Rx queue object.
+ *   DevX Rx queue object.
  *
  * @return
- *   0 on success, non-0 otherwise
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
+mlx5_devx_modify_rq(struct mlx5_rxq_obj *rxq_obj, bool is_start)
 {
        struct mlx5_devx_modify_rq_attr rq_attr;
 
        memset(&rq_attr, 0, sizeof(rq_attr));
-       rq_attr.rq_state = MLX5_RQC_STATE_RDY;
-       rq_attr.state = MLX5_RQC_STATE_RDY;
-       rq_attr.vsd = (on ? 0 : 1);
-       rq_attr.modify_bitmask = MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD;
+       if (is_start) {
+               rq_attr.rq_state = MLX5_RQC_STATE_RST;
+               rq_attr.state = MLX5_RQC_STATE_RDY;
+       } else {
+               rq_attr.rq_state = MLX5_RQC_STATE_RDY;
+               rq_attr.state = MLX5_RQC_STATE_RST;
+       }
        return mlx5_devx_cmd_modify_rq(rxq_obj->rq, &rq_attr);
 }
 
@@ -121,24 +125,6 @@ rxq_release_devx_cq_resources(struct mlx5_rxq_ctrl *rxq_ctrl)
        }
 }
 
-/**
- * Release an Rx hairpin related resources.
- *
- * @param rxq_obj
- *   Hairpin Rx queue object.
- */
-static void
-mlx5_rxq_obj_hairpin_release(struct mlx5_rxq_obj *rxq_obj)
-{
-       struct mlx5_devx_modify_rq_attr rq_attr = { 0 };
-
-       MLX5_ASSERT(rxq_obj);
-       rq_attr.state = MLX5_RQC_STATE_RST;
-       rq_attr.rq_state = MLX5_RQC_STATE_RDY;
-       mlx5_devx_cmd_modify_rq(rxq_obj->rq, &rq_attr);
-       claim_zero(mlx5_devx_cmd_destroy(rxq_obj->rq));
-}
-
 /**
  * Release an Rx DevX queue object.
  *
@@ -151,7 +137,8 @@ mlx5_rxq_devx_obj_release(struct mlx5_rxq_obj *rxq_obj)
        MLX5_ASSERT(rxq_obj);
        MLX5_ASSERT(rxq_obj->rq);
        if (rxq_obj->type == MLX5_RXQ_OBJ_TYPE_DEVX_HAIRPIN) {
-               mlx5_rxq_obj_hairpin_release(rxq_obj);
+               mlx5_devx_modify_rq(rxq_obj, false);
+               claim_zero(mlx5_devx_cmd_destroy(rxq_obj->rq));
        } else {
                MLX5_ASSERT(rxq_obj->devx_cq);
                claim_zero(mlx5_devx_cmd_destroy(rxq_obj->rq));
@@ -559,7 +546,6 @@ mlx5_rxq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)
        struct mlx5_rxq_ctrl *rxq_ctrl =
                container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
        struct mlx5_rxq_obj *tmpl = rxq_ctrl->obj;
-       struct mlx5_devx_modify_rq_attr rq_attr = { 0 };
        int ret = 0;
 
        MLX5_ASSERT(rxq_data);
@@ -598,9 +584,7 @@ mlx5_rxq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)
                goto error;
        }
        /* Change queue state to ready. */
-       rq_attr.rq_state = MLX5_RQC_STATE_RST;
-       rq_attr.state = MLX5_RQC_STATE_RDY;
-       ret = mlx5_devx_cmd_modify_rq(tmpl->rq, &rq_attr);
+       ret = mlx5_devx_modify_rq(tmpl, true);
        if (ret)
                goto error;
        rxq_data->cq_arm_sn = 0;
@@ -627,5 +611,6 @@ struct mlx5_obj_ops devx_obj_ops = {
        .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_rq_vlan_strip,
        .rxq_obj_new = mlx5_rxq_devx_obj_new,
        .rxq_event_get = mlx5_rx_devx_get_event,
+       .rxq_obj_modify = mlx5_devx_modify_rq,
        .rxq_obj_release = mlx5_rxq_devx_obj_release,
 };