net/ice/base: use package info from ice segment metadata

[dpdk.git] / drivers / net / dpaa2 / base / dpaa2_hw_dpni.c

diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
index 9f0dad6..25b1d2b 100644 (file)
--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
@@ -85,10 +85,24 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
 {
        struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
        struct fsl_mc_io *dpni = priv->hw;
-       struct dpni_rx_tc_dist_cfg tc_cfg;
+       struct dpni_rx_dist_cfg tc_cfg;
        struct dpkg_profile_cfg kg_cfg;
        void *p_params;
-       int ret;
+       int ret, tc_dist_queues;
+
+       /*TC distribution size is set with dist_queues or
+        * nb_rx_queues % dist_queues in order of TC priority index.
+        * Calculating dist size for this tc_index:-
+        */
+       tc_dist_queues = eth_dev->data->nb_rx_queues -
+               tc_index * priv->dist_queues;
+       if (tc_dist_queues <= 0) {
+               DPAA2_PMD_INFO("No distribution on TC%d", tc_index);
+               return 0;
+       }
+
+       if (tc_dist_queues > priv->dist_queues)
+               tc_dist_queues = priv->dist_queues;
 
        p_params = rte_malloc(
                NULL, DIST_PARAM_IOVA_SIZE, RTE_CACHE_LINE_SIZE);
@@ -96,8 +110,9 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
                DPAA2_PMD_ERR("Unable to allocate flow-dist parameters");
                return -ENOMEM;
        }
+
        memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
-       memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg));
+       memset(&tc_cfg, 0, sizeof(struct dpni_rx_dist_cfg));
 
        ret = dpaa2_distset_to_dpkg_profile_cfg(req_dist_set, &kg_cfg);
        if (ret) {
@@ -106,9 +121,11 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
                rte_free(p_params);
                return ret;
        }
+
        tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params));
-       tc_cfg.dist_size = priv->dist_queues;
-       tc_cfg.dist_mode = DPNI_DIST_MODE_HASH;
+       tc_cfg.dist_size = tc_dist_queues;
+       tc_cfg.enable = true;
+       tc_cfg.tc = tc_index;
 
        ret = dpkg_prepare_key_cfg(&kg_cfg, p_params);
        if (ret) {
@@ -117,8 +134,7 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
                return ret;
        }
 
-       ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW, priv->token, tc_index,
-                                 &tc_cfg);
+       ret = dpni_set_rx_hash_dist(dpni, CMD_PRI_LOW, priv->token, &tc_cfg);
        rte_free(p_params);
        if (ret) {
                DPAA2_PMD_ERR(
@@ -136,7 +152,7 @@ int dpaa2_remove_flow_dist(
 {
        struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
        struct fsl_mc_io *dpni = priv->hw;
-       struct dpni_rx_tc_dist_cfg tc_cfg;
+       struct dpni_rx_dist_cfg tc_cfg;
        struct dpkg_profile_cfg kg_cfg;
        void *p_params;
        int ret;
@@ -147,13 +163,15 @@ int dpaa2_remove_flow_dist(
                DPAA2_PMD_ERR("Unable to allocate flow-dist parameters");
                return -ENOMEM;
        }
-       memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
-       memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg));
-       kg_cfg.num_extracts = 0;
-       tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params));
+
+       memset(&tc_cfg, 0, sizeof(struct dpni_rx_dist_cfg));
        tc_cfg.dist_size = 0;
-       tc_cfg.dist_mode = DPNI_DIST_MODE_NONE;
+       tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params));
+       tc_cfg.enable = true;
+       tc_cfg.tc = tc_index;
 
+       memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
+       kg_cfg.num_extracts = 0;
        ret = dpkg_prepare_key_cfg(&kg_cfg, p_params);
        if (ret) {
                DPAA2_PMD_ERR("Unable to prepare extract parameters");
@@ -161,8 +179,8 @@ int dpaa2_remove_flow_dist(
                return ret;
        }
 
-       ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW, priv->token, tc_index,
-                                 &tc_cfg);
+       ret = dpni_set_rx_hash_dist(dpni, CMD_PRI_LOW, priv->token,
+                       &tc_cfg);
        rte_free(p_params);
        if (ret)
                DPAA2_PMD_ERR(