net/ngbe: support Rx/Tx burst mode info

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

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index b93fd4d..0a89a13 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -83,6 +83,11 @@ mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
        int i;
        int priority = 0;
 
+#if defined(HAVE_MLX5DV_DR_DEVX_PORT) || defined(HAVE_MLX5DV_DR_DEVX_PORT_V35)
+       /* If DevX supported, driver must support 16 verbs flow priorities. */
+       priority = RTE_DIM(priority_map_5);
+       goto out;
+#endif
        if (!drop->qp) {
                rte_errno = ENOTSUP;
                return -rte_errno;
@@ -109,6 +114,9 @@ mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
                        dev->data->port_id, priority);
                return -rte_errno;
        }
+#if defined(HAVE_MLX5DV_DR_DEVX_PORT) || defined(HAVE_MLX5DV_DR_DEVX_PORT_V35)
+out:
+#endif
        DRV_LOG(INFO, "port %u supported flow priorities:"
                " 0-%d for ingress or egress root table,"
                " 0-%d for non-root table or transfer root table.",
@@ -137,7 +145,7 @@ mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
        uint32_t res = 0;
        struct mlx5_priv *priv = dev->data->dev_private;
 
-       switch (priv->config.flow_prio) {
+       switch (priv->sh->flow_max_priority) {
        case RTE_DIM(priority_map_3):
                res = priority_map_3[priority][subpriority];
                break;
@@ -198,7 +206,7 @@ flow_verbs_counter_create(struct rte_eth_dev *dev,
 {
 #if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42)
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct ibv_context *ctx = priv->sh->ctx;
+       struct ibv_context *ctx = priv->sh->cdev->ctx;
        struct ibv_counter_set_init_attr init = {
                         .counter_set_id = counter->shared_info.id};
 
@@ -210,7 +218,7 @@ flow_verbs_counter_create(struct rte_eth_dev *dev,
        return 0;
 #elif defined(HAVE_IBV_DEVICE_COUNTERS_SET_V45)
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct ibv_context *ctx = priv->sh->ctx;
+       struct ibv_context *ctx = priv->sh->cdev->ctx;
        struct ibv_counters_init_attr init = {0};
        struct ibv_counter_attach_attr attach;
        int ret;
@@ -250,8 +258,6 @@ flow_verbs_counter_create(struct rte_eth_dev *dev,
  *
  * @param[in] dev
  *   Pointer to the Ethernet device structure.
- * @param[in] shared
- *   Indicate if this counter is shared with other flows.
  * @param[in] id
  *   Counter identifier.
  *
@@ -259,21 +265,17 @@ flow_verbs_counter_create(struct rte_eth_dev *dev,
  *   Index to the counter, 0 otherwise and rte_errno is set.
  */
 static uint32_t
-flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)
+flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t id __rte_unused)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_flow_counter_mng *cmng = &priv->sh->cmng;
        struct mlx5_flow_counter_pool *pool = NULL;
        struct mlx5_flow_counter *cnt = NULL;
-       union mlx5_l3t_data data;
        uint32_t n_valid = cmng->n_valid;
        uint32_t pool_idx, cnt_idx;
        uint32_t i;
        int ret;
 
-       if (shared && !mlx5_l3t_get_entry(priv->sh->cnt_id_tbl, id, &data) &&
-           data.dword)
-               return data.dword;
        for (pool_idx = 0; pool_idx < n_valid; ++pool_idx) {
                pool = cmng->pools[pool_idx];
                if (!pool)
@@ -320,13 +322,6 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)
        TAILQ_REMOVE(&pool->counters[0], cnt, next);
        i = MLX5_CNT_ARRAY_IDX(pool, cnt);
        cnt_idx = MLX5_MAKE_CNT_IDX(pool_idx, i);
-       if (shared) {
-               data.dword = cnt_idx;
-               if (mlx5_l3t_set_entry(priv->sh->cnt_id_tbl, id, &data))
-                       return 0;
-               cnt->shared_info.id = id;
-               cnt_idx |= MLX5_CNT_SHARED_OFFSET;
-       }
        /* Create counter with Verbs. */
        ret = flow_verbs_counter_create(dev, cnt);
        if (!ret) {
@@ -352,14 +347,10 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)
 static void
 flow_verbs_counter_release(struct rte_eth_dev *dev, uint32_t counter)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_flow_counter_pool *pool;
        struct mlx5_flow_counter *cnt;
 
        cnt = flow_verbs_counter_get_by_idx(dev, counter, &pool);
-       if (IS_LEGACY_SHARED_CNT(counter) &&
-           mlx5_l3t_clear_entry(priv->sh->cnt_id_tbl, cnt->shared_info.id))
-               return;
 #if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42)
        claim_zero(mlx5_glue->destroy_counter_set
                        ((struct ibv_counter_set *)cnt->dcs_when_active));
@@ -1198,8 +1189,7 @@ flow_verbs_translate_action_count(struct mlx5_flow *dev_flow,
 #endif
 
        if (!flow->counter) {
-               flow->counter = flow_verbs_counter_new(dev, count->shared,
-                                                      count->id);
+               flow->counter = flow_verbs_counter_new(dev, count->id);
                if (!flow->counter)
                        return rte_flow_error_set(error, rte_errno,
                                                  RTE_FLOW_ERROR_TYPE_ACTION,
@@ -1733,7 +1723,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
        MLX5_ASSERT(wks);
        rss_desc = &wks->rss_desc;
        if (priority == MLX5_FLOW_LOWEST_PRIO_INDICATOR)
-               priority = priv->config.flow_prio - 1;
+               priority = priv->sh->flow_max_priority - 1;
        for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
                int ret;
 
@@ -1834,7 +1824,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
                        if (dev_flow->hash_fields != 0)
                                dev_flow->hash_fields |=
                                        mlx5_flow_hashfields_adjust
-                                       (rss_desc, tunnel, ETH_RSS_TCP,
+                                       (rss_desc, tunnel, RTE_ETH_RSS_TCP,
                                         (IBV_RX_HASH_SRC_PORT_TCP |
                                          IBV_RX_HASH_DST_PORT_TCP));
                        item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP :
@@ -1847,7 +1837,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
                        if (dev_flow->hash_fields != 0)
                                dev_flow->hash_fields |=
                                        mlx5_flow_hashfields_adjust
-                                       (rss_desc, tunnel, ETH_RSS_UDP,
+                                       (rss_desc, tunnel, RTE_ETH_RSS_UDP,
                                         (IBV_RX_HASH_SRC_PORT_UDP |
                                          IBV_RX_HASH_DST_PORT_UDP));
                        item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_UDP :