net/mlx5: move Linux-specific functions

[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 9817c93..2f031ec 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -284,6 +284,13 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->default_txportconf.ring_size = CONG_ENTER_TX_THRESHOLD;
        dev_info->default_rxportconf.ring_size = DPAA2_RX_DEFAULT_NBDESC;
 
+       if (dpaa2_svr_family == SVR_LX2160A) {
+               dev_info->speed_capa |= ETH_LINK_SPEED_25G |
+                               ETH_LINK_SPEED_40G |
+                               ETH_LINK_SPEED_50G |
+                               ETH_LINK_SPEED_100G;
+       }
+
        return 0;
 }
 
@@ -669,7 +676,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;
@@ -696,7 +703,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,
@@ -891,12 +898,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;
                }
        }
@@ -906,7 +913,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;
@@ -2336,7 +2343,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
                DPAA2_PMD_ERR("Memory allocation failed for dpni device");
                return -1;
        }
-       dpni_dev->regs = rte_mcp_ptr_list[0];
+       dpni_dev->regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);
        eth_dev->process_private = (void *)dpni_dev;
 
        /* For secondary processes, the primary has done all the work */