net/mlx5: support new global device syntax

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

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 7893b3e..abd8ce7 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -834,9 +834,6 @@ mlx5_rx_intr_vec_enable(struct rte_eth_dev *dev)
        unsigned int count = 0;
        struct rte_intr_handle *intr_handle = dev->intr_handle;
 
-       /* Representor shares dev->intr_handle with PF. */
-       if (priv->representor)
-               return 0;
        if (!dev->data->dev_conf.intr_conf.rxq)
                return 0;
        mlx5_rx_intr_vec_disable(dev);
@@ -917,9 +914,6 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)
        unsigned int rxqs_n = priv->rxqs_n;
        unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);
 
-       /* Representor shares dev->intr_handle with PF. */
-       if (priv->representor)
-               return;
        if (!dev->data->dev_conf.intr_conf.rxq)
                return;
        if (!intr_handle->intr_vec)
@@ -1240,7 +1234,7 @@ mlx5_mprq_alloc_mp(struct rte_eth_dev *dev)
        snprintf(name, sizeof(name), "port-%u-mprq", dev->data->port_id);
        mp = rte_mempool_create(name, obj_num, obj_size, MLX5_MPRQ_MP_CACHE_SZ,
                                0, NULL, NULL, mlx5_mprq_buf_init,
-                               (void *)(uintptr_t)(1 << strd_num_n),
+                               (void *)((uintptr_t)1 << strd_num_n),
                                dev->device->numa_node, 0);
        if (mp == NULL) {
                DRV_LOG(ERR,
@@ -1712,7 +1706,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_rxq_ctrl *rxq_ctrl;
 
-       if (!(*priv->rxqs)[idx])
+       if (priv->rxqs == NULL || (*priv->rxqs)[idx] == NULL)
                return 0;
        rxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq);
        if (__atomic_sub_fetch(&rxq_ctrl->refcnt, 1, __ATOMIC_RELAXED) > 1)
@@ -2086,7 +2080,7 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
 error:
        err = rte_errno;
        for (j = 0; j < i; j++)
-               mlx5_rxq_release(dev, ind_tbl->queues[j]);
+               mlx5_rxq_release(dev, queues[j]);
        rte_errno = err;
        DRV_LOG(DEBUG, "Port %u cannot setup indirection table.",
                dev->data->port_id);
@@ -2094,23 +2088,19 @@ error:
 }
 
 int
-mlx5_hrxq_match_cb(void *tool_ctx, struct mlx5_list_entry *entry, void *cb_ctx)
+mlx5_hrxq_match_cb(void *tool_ctx __rte_unused, struct mlx5_list_entry *entry,
+                  void *cb_ctx)
 {
-       struct rte_eth_dev *dev = tool_ctx;
        struct mlx5_flow_cb_ctx *ctx = cb_ctx;
        struct mlx5_flow_rss_desc *rss_desc = ctx->data;
        struct mlx5_hrxq *hrxq = container_of(entry, typeof(*hrxq), entry);
-       struct mlx5_ind_table_obj *ind_tbl;
 
-       if (hrxq->rss_key_len != rss_desc->key_len ||
+       return (hrxq->rss_key_len != rss_desc->key_len ||
            memcmp(hrxq->rss_key, rss_desc->key, rss_desc->key_len) ||
-           hrxq->hash_fields != rss_desc->hash_fields)
-               return 1;
-       ind_tbl = mlx5_ind_table_obj_get(dev, rss_desc->queue,
-                                        rss_desc->queue_num);
-       if (ind_tbl)
-               mlx5_ind_table_obj_release(dev, ind_tbl, hrxq->standalone);
-       return ind_tbl != hrxq->ind_table;
+           hrxq->hash_fields != rss_desc->hash_fields ||
+           hrxq->ind_table->queues_n != rss_desc->queue_num ||
+           memcmp(hrxq->ind_table->queues, rss_desc->queue,
+           rss_desc->queue_num * sizeof(rss_desc->queue[0])));
 }
 
 /**