net/dpaa2: fix congestion ID for multiple traffic classes

[dpdk.git] / drivers / net / dpaa2 / dpaa2_ethdev.c

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index d241643..d9960b0 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -45,6 +45,7 @@ static uint64_t dev_rx_offloads_sup =
 
 /* Rx offloads which cannot be disabled */
 static uint64_t dev_rx_offloads_nodis =
+               DEV_RX_OFFLOAD_RSS_HASH |
                DEV_RX_OFFLOAD_SCATTER;
 
 /* Supported Tx offloads */
@@ -128,8 +129,8 @@ dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
        }
 
        if (on)
-               ret = dpni_add_vlan_id(dpni, CMD_PRI_LOW,
-                                      priv->token, vlan_id);
+               ret = dpni_add_vlan_id(dpni, CMD_PRI_LOW, priv->token,
+                                      vlan_id, 0, 0, 0);
        else
                ret = dpni_remove_vlan_id(dpni, CMD_PRI_LOW,
                                          priv->token, vlan_id);
@@ -274,6 +275,15 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->max_vmdq_pools = ETH_16_POOLS;
        dev_info->flow_type_rss_offloads = DPAA2_RSS_OFFLOAD_ALL;
 
+       dev_info->default_rxportconf.burst_size = dpaa2_dqrr_size;
+       /* same is rx size for best perf */
+       dev_info->default_txportconf.burst_size = dpaa2_dqrr_size;
+
+       dev_info->default_rxportconf.nb_queues = 1;
+       dev_info->default_txportconf.nb_queues = 1;
+       dev_info->default_txportconf.ring_size = CONG_ENTER_TX_THRESHOLD;
+       dev_info->default_rxportconf.ring_size = DPAA2_RX_DEFAULT_NBDESC;
+
        return 0;
 }
 
@@ -552,9 +562,6 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
        if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
                dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
 
-       /* update the current status */
-       dpaa2_dev_link_update(dev, 0);
-
        return 0;
 }
 
@@ -662,7 +669,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
                                                DPNI_CP_CONGESTION_GROUP,
                                                DPNI_QUEUE_RX,
                                                dpaa2_q->tc_index,
-                                               flow_id, &taildrop);
+                                               dpaa2_q->cgid, &taildrop);
                } else {
                        /*enabling per rx queue congestion control */
                        taildrop.threshold = CONG_THRESHOLD_RX_BYTES_Q;
@@ -689,7 +696,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
                        ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
                                        DPNI_CP_CONGESTION_GROUP, DPNI_QUEUE_RX,
                                        dpaa2_q->tc_index,
-                                       flow_id, &taildrop);
+                                       dpaa2_q->cgid, &taildrop);
                } else {
                        ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
                                        DPNI_CP_QUEUE, DPNI_QUEUE_RX,
@@ -884,12 +891,12 @@ dpaa2_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        struct qbman_fq_query_np_rslt state;
        uint32_t frame_cnt = 0;
 
-       PMD_INIT_FUNC_TRACE();
-
        if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
                ret = dpaa2_affine_qbman_swp();
                if (ret) {
-                       DPAA2_PMD_ERR("Failure in affining portal");
+                       DPAA2_PMD_ERR(
+                               "Failed to allocate IO portal, tid: %d\n",
+                               rte_gettid());
                        return -EINVAL;
                }
        }
@@ -899,7 +906,7 @@ dpaa2_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 
        if (qbman_fq_query_state(swp, dpaa2_q->fqid, &state) == 0) {
                frame_cnt = qbman_fq_state_frame_count(&state);
-               DPAA2_PMD_DEBUG("RX frame count for q(%d) is %u",
+               DPAA2_PMD_DP_DEBUG("RX frame count for q(%d) is %u",
                                rx_queue_id, frame_cnt);
        }
        return frame_cnt;
@@ -1288,7 +1295,7 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
                return -EINVAL;
 
        if (frame_size > RTE_ETHER_MAX_LEN)
-               dev->data->dev_conf.rxmode.offloads &=
+               dev->data->dev_conf.rxmode.offloads |=
                                                DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
                dev->data->dev_conf.rxmode.offloads &=
@@ -1326,8 +1333,8 @@ dpaa2_dev_add_mac_addr(struct rte_eth_dev *dev,
                return -1;
        }
 
-       ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW,
-                               priv->token, addr->addr_bytes);
+       ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW, priv->token,
+                               addr->addr_bytes, 0, 0, 0);
        if (ret)
                DPAA2_PMD_ERR(
                        "error: Adding the MAC ADDR failed: err = %d", ret);
@@ -1756,6 +1763,7 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
        /* changing tx burst function to start enqueues */
        dev->tx_pkt_burst = dpaa2_dev_tx;
        dev->data->dev_link.link_status = state.up;
+       dev->data->dev_link.link_speed = state.rate;
 
        if (state.up)
                DPAA2_PMD_INFO("Port %d Link is Up", dev->data->port_id);