ethdev: return diagnostic when setting MAC address
[dpdk.git] / drivers / net / dpaa / dpaa_ethdev.c
index 69361eb..9242f5a 100644 (file)
@@ -1,34 +1,8 @@
-/*-
- *   BSD LICENSE
+/* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2017 NXP.
+ *   Copyright 2017 NXP
  *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of  Freescale Semiconductor, Inc nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /* System headers */
 #include <stdio.h>
@@ -41,7 +15,6 @@
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-#include <rte_config.h>
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 
@@ -66,6 +38,7 @@
 
 #include <dpaa_ethdev.h>
 #include <dpaa_rxtx.h>
+#include <rte_pmd_dpaa.h>
 
 #include <fsl_usd.h>
 #include <fsl_qman.h>
 
 /* Keep track of whether QMAN and BMAN have been globally initialized */
 static int is_global_init;
+/* At present we only allow up to 4 push mode queues - as each of this queue
+ * need dedicated portal and we are short of portals.
+ */
+#define DPAA_MAX_PUSH_MODE_QUEUE       4
+
+static int dpaa_push_mode_max_queue = DPAA_MAX_PUSH_MODE_QUEUE;
+static int dpaa_push_queue_idx; /* Queue index which are in push mode*/
+
+
+/* Per FQ Taildrop in frame count */
+static unsigned int td_threshold = CGR_RX_PERFQ_THRESH;
+
+struct rte_dpaa_xstats_name_off {
+       char name[RTE_ETH_XSTATS_NAME_SIZE];
+       uint32_t offset;
+};
+
+static const struct rte_dpaa_xstats_name_off dpaa_xstats_strings[] = {
+       {"rx_align_err",
+               offsetof(struct dpaa_if_stats, raln)},
+       {"rx_valid_pause",
+               offsetof(struct dpaa_if_stats, rxpf)},
+       {"rx_fcs_err",
+               offsetof(struct dpaa_if_stats, rfcs)},
+       {"rx_vlan_frame",
+               offsetof(struct dpaa_if_stats, rvlan)},
+       {"rx_frame_err",
+               offsetof(struct dpaa_if_stats, rerr)},
+       {"rx_drop_err",
+               offsetof(struct dpaa_if_stats, rdrp)},
+       {"rx_undersized",
+               offsetof(struct dpaa_if_stats, rund)},
+       {"rx_oversize_err",
+               offsetof(struct dpaa_if_stats, rovr)},
+       {"rx_fragment_pkt",
+               offsetof(struct dpaa_if_stats, rfrg)},
+       {"tx_valid_pause",
+               offsetof(struct dpaa_if_stats, txpf)},
+       {"tx_fcs_err",
+               offsetof(struct dpaa_if_stats, terr)},
+       {"tx_vlan_frame",
+               offsetof(struct dpaa_if_stats, tvlan)},
+       {"rx_undersized",
+               offsetof(struct dpaa_if_stats, tund)},
+};
+
+static struct rte_dpaa_driver rte_dpaa_pmd;
+
+static inline void
+dpaa_poll_queue_default_config(struct qm_mcc_initfq *opts)
+{
+       memset(opts, 0, sizeof(struct qm_mcc_initfq));
+       opts->we_mask = QM_INITFQ_WE_FQCTRL | QM_INITFQ_WE_CONTEXTA;
+       opts->fqd.fq_ctrl = QM_FQCTRL_AVOIDBLOCK | QM_FQCTRL_CTXASTASHING |
+                          QM_FQCTRL_PREFERINCACHE;
+       opts->fqd.context_a.stashing.exclusive = 0;
+       if (dpaa_svr_family != SVR_LS1046A_FAMILY)
+               opts->fqd.context_a.stashing.annotation_cl =
+                                               DPAA_IF_RX_ANNOTATION_STASH;
+       opts->fqd.context_a.stashing.data_cl = DPAA_IF_RX_DATA_STASH;
+       opts->fqd.context_a.stashing.context_cl = DPAA_IF_RX_CONTEXT_STASH;
+}
 
 static int
 dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN
+                               + VLAN_TAG_SIZE;
 
        PMD_INIT_FUNC_TRACE();
 
-       if (mtu < ETHER_MIN_MTU)
+       if (mtu < ETHER_MIN_MTU || frame_size > DPAA_MAX_RX_PKT_LEN)
                return -EINVAL;
-       if (mtu > ETHER_MAX_LEN)
+       if (frame_size > ETHER_MAX_LEN)
                dev->data->dev_conf.rxmode.jumbo_frame = 1;
        else
                dev->data->dev_conf.rxmode.jumbo_frame = 0;
 
-       dev->data->dev_conf.rxmode.max_rx_pkt_len = mtu;
+       dev->data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
 
-       fman_if_set_maxfrm(dpaa_intf->fif, mtu);
+       fman_if_set_maxfrm(dpaa_intf->fif, frame_size);
 
        return 0;
 }
@@ -99,19 +136,45 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 static int
 dpaa_eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
 {
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
        PMD_INIT_FUNC_TRACE();
 
        if (dev->data->dev_conf.rxmode.jumbo_frame == 1) {
                if (dev->data->dev_conf.rxmode.max_rx_pkt_len <=
-                   DPAA_MAX_RX_PKT_LEN)
-                       return dpaa_mtu_set(dev,
+                   DPAA_MAX_RX_PKT_LEN) {
+                       fman_if_set_maxfrm(dpaa_intf->fif,
                                dev->data->dev_conf.rxmode.max_rx_pkt_len);
-               else
+                       return 0;
+               } else {
                        return -1;
+               }
        }
        return 0;
 }
 
+static const uint32_t *
+dpaa_supported_ptypes_get(struct rte_eth_dev *dev)
+{
+       static const uint32_t ptypes[] = {
+               /*todo -= add more types */
+               RTE_PTYPE_L2_ETHER,
+               RTE_PTYPE_L3_IPV4,
+               RTE_PTYPE_L3_IPV4_EXT,
+               RTE_PTYPE_L3_IPV6,
+               RTE_PTYPE_L3_IPV6_EXT,
+               RTE_PTYPE_L4_TCP,
+               RTE_PTYPE_L4_UDP,
+               RTE_PTYPE_L4_SCTP
+       };
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dev->rx_pkt_burst == dpaa_eth_queue_rx)
+               return ptypes;
+       return NULL;
+}
+
 static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
@@ -142,6 +205,39 @@ static void dpaa_eth_dev_close(struct rte_eth_dev *dev)
        dpaa_eth_dev_stop(dev);
 }
 
+static int
+dpaa_fw_version_get(struct rte_eth_dev *dev __rte_unused,
+                    char *fw_version,
+                    size_t fw_size)
+{
+       int ret;
+       FILE *svr_file = NULL;
+       unsigned int svr_ver = 0;
+
+       PMD_INIT_FUNC_TRACE();
+
+       svr_file = fopen(DPAA_SOC_ID_FILE, "r");
+       if (!svr_file) {
+               DPAA_PMD_ERR("Unable to open SoC device");
+               return -ENOTSUP; /* Not supported on this infra */
+       }
+       if (fscanf(svr_file, "svr:%x", &svr_ver) > 0)
+               dpaa_svr_family = svr_ver & SVR_MASK;
+       else
+               DPAA_PMD_ERR("Unable to read SoC device");
+
+       fclose(svr_file);
+
+       ret = snprintf(fw_version, fw_size, "SVR:%x-fman-v%x",
+                      svr_ver, fman_ip_rev);
+       ret += 1; /* add the size of '\0' */
+
+       if (fw_size < (uint32_t)ret)
+               return ret;
+       else
+               return 0;
+}
+
 static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
                              struct rte_eth_dev_info *dev_info)
 {
@@ -157,8 +253,17 @@ static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
        dev_info->max_hash_mac_addrs = 0;
        dev_info->max_vfs = 0;
        dev_info->max_vmdq_pools = ETH_16_POOLS;
+       dev_info->flow_type_rss_offloads = DPAA_RSS_OFFLOAD_ALL;
        dev_info->speed_capa = (ETH_LINK_SPEED_1G |
                                ETH_LINK_SPEED_10G);
+       dev_info->rx_offload_capa =
+               (DEV_RX_OFFLOAD_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_UDP_CKSUM   |
+               DEV_RX_OFFLOAD_TCP_CKSUM);
+       dev_info->tx_offload_capa =
+               (DEV_TX_OFFLOAD_IPV4_CKSUM  |
+               DEV_TX_OFFLOAD_UDP_CKSUM   |
+               DEV_TX_OFFLOAD_TCP_CKSUM);
 }
 
 static int dpaa_eth_link_update(struct rte_eth_dev *dev,
@@ -170,9 +275,9 @@ static int dpaa_eth_link_update(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        if (dpaa_intf->fif->mac_type == fman_mac_1g)
-               link->link_speed = 1000;
+               link->link_speed = ETH_SPEED_NUM_1G;
        else if (dpaa_intf->fif->mac_type == fman_mac_10g)
-               link->link_speed = 10000;
+               link->link_speed = ETH_SPEED_NUM_10G;
        else
                DPAA_PMD_ERR("invalid link_speed: %s, %d",
                             dpaa_intf->name, dpaa_intf->fif->mac_type);
@@ -183,14 +288,181 @@ static int dpaa_eth_link_update(struct rte_eth_dev *dev,
        return 0;
 }
 
+static int dpaa_eth_stats_get(struct rte_eth_dev *dev,
+                              struct rte_eth_stats *stats)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       fman_if_stats_get(dpaa_intf->fif, stats);
+       return 0;
+}
+
+static void dpaa_eth_stats_reset(struct rte_eth_dev *dev)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       fman_if_stats_reset(dpaa_intf->fif);
+}
+
+static int
+dpaa_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
+                   unsigned int n)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       unsigned int i = 0, num = RTE_DIM(dpaa_xstats_strings);
+       uint64_t values[sizeof(struct dpaa_if_stats) / 8];
+
+       if (xstats == NULL)
+               return 0;
+
+       if (n < num)
+               return num;
+
+       fman_if_stats_get_all(dpaa_intf->fif, values,
+                             sizeof(struct dpaa_if_stats) / 8);
+
+       for (i = 0; i < num; i++) {
+               xstats[i].id = i;
+               xstats[i].value = values[dpaa_xstats_strings[i].offset / 8];
+       }
+       return i;
+}
+
+static int
+dpaa_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
+                     struct rte_eth_xstat_name *xstats_names,
+                     unsigned int limit)
+{
+       unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings);
+
+       if (limit < stat_cnt)
+               return stat_cnt;
+
+       if (xstats_names != NULL)
+               for (i = 0; i < stat_cnt; i++)
+                       snprintf(xstats_names[i].name,
+                                sizeof(xstats_names[i].name),
+                                "%s",
+                                dpaa_xstats_strings[i].name);
+
+       return stat_cnt;
+}
+
+static int
+dpaa_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+                     uint64_t *values, unsigned int n)
+{
+       unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings);
+       uint64_t values_copy[sizeof(struct dpaa_if_stats) / 8];
+
+       if (!ids) {
+               struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+               if (n < stat_cnt)
+                       return stat_cnt;
+
+               if (!values)
+                       return 0;
+
+               fman_if_stats_get_all(dpaa_intf->fif, values_copy,
+                                     sizeof(struct dpaa_if_stats) / 8);
+
+               for (i = 0; i < stat_cnt; i++)
+                       values[i] =
+                               values_copy[dpaa_xstats_strings[i].offset / 8];
+
+               return stat_cnt;
+       }
+
+       dpaa_xstats_get_by_id(dev, NULL, values_copy, stat_cnt);
+
+       for (i = 0; i < n; i++) {
+               if (ids[i] >= stat_cnt) {
+                       DPAA_PMD_ERR("id value isn't valid");
+                       return -1;
+               }
+               values[i] = values_copy[ids[i]];
+       }
+       return n;
+}
+
+static int
+dpaa_xstats_get_names_by_id(
+       struct rte_eth_dev *dev,
+       struct rte_eth_xstat_name *xstats_names,
+       const uint64_t *ids,
+       unsigned int limit)
+{
+       unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings);
+       struct rte_eth_xstat_name xstats_names_copy[stat_cnt];
+
+       if (!ids)
+               return dpaa_xstats_get_names(dev, xstats_names, limit);
+
+       dpaa_xstats_get_names(dev, xstats_names_copy, limit);
+
+       for (i = 0; i < limit; i++) {
+               if (ids[i] >= stat_cnt) {
+                       DPAA_PMD_ERR("id value isn't valid");
+                       return -1;
+               }
+               strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name);
+       }
+       return limit;
+}
+
+static void dpaa_eth_promiscuous_enable(struct rte_eth_dev *dev)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       fman_if_promiscuous_enable(dpaa_intf->fif);
+}
+
+static void dpaa_eth_promiscuous_disable(struct rte_eth_dev *dev)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       fman_if_promiscuous_disable(dpaa_intf->fif);
+}
+
+static void dpaa_eth_multicast_enable(struct rte_eth_dev *dev)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       fman_if_set_mcast_filter_table(dpaa_intf->fif);
+}
+
+static void dpaa_eth_multicast_disable(struct rte_eth_dev *dev)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       fman_if_reset_mcast_filter_table(dpaa_intf->fif);
+}
+
 static
 int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
-                           uint16_t nb_desc __rte_unused,
+                           uint16_t nb_desc,
                            unsigned int socket_id __rte_unused,
                            const struct rte_eth_rxconf *rx_conf __rte_unused,
                            struct rte_mempool *mp)
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct qman_fq *rxq = &dpaa_intf->rx_queues[queue_idx];
+       struct qm_mcc_initfq opts = {0};
+       u32 flags = 0;
+       int ret;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -226,7 +498,153 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                            dpaa_intf->name, fd_offset,
                        fman_if_get_fdoff(dpaa_intf->fif));
        }
-       dev->data->rx_queues[queue_idx] = &dpaa_intf->rx_queues[queue_idx];
+       /* checking if push mode only, no error check for now */
+       if (dpaa_push_mode_max_queue > dpaa_push_queue_idx) {
+               dpaa_push_queue_idx++;
+               opts.we_mask = QM_INITFQ_WE_FQCTRL | QM_INITFQ_WE_CONTEXTA;
+               opts.fqd.fq_ctrl = QM_FQCTRL_AVOIDBLOCK |
+                                  QM_FQCTRL_CTXASTASHING |
+                                  QM_FQCTRL_PREFERINCACHE;
+               opts.fqd.context_a.stashing.exclusive = 0;
+               /* In muticore scenario stashing becomes a bottleneck on LS1046.
+                * So do not enable stashing in this case
+                */
+               if (dpaa_svr_family != SVR_LS1046A_FAMILY)
+                       opts.fqd.context_a.stashing.annotation_cl =
+                                               DPAA_IF_RX_ANNOTATION_STASH;
+               opts.fqd.context_a.stashing.data_cl = DPAA_IF_RX_DATA_STASH;
+               opts.fqd.context_a.stashing.context_cl =
+                                               DPAA_IF_RX_CONTEXT_STASH;
+
+               /*Create a channel and associate given queue with the channel*/
+               qman_alloc_pool_range((u32 *)&rxq->ch_id, 1, 1, 0);
+               opts.we_mask = opts.we_mask | QM_INITFQ_WE_DESTWQ;
+               opts.fqd.dest.channel = rxq->ch_id;
+               opts.fqd.dest.wq = DPAA_IF_RX_PRIORITY;
+               flags = QMAN_INITFQ_FLAG_SCHED;
+
+               /* Configure tail drop */
+               if (dpaa_intf->cgr_rx) {
+                       opts.we_mask |= QM_INITFQ_WE_CGID;
+                       opts.fqd.cgid = dpaa_intf->cgr_rx[queue_idx].cgrid;
+                       opts.fqd.fq_ctrl |= QM_FQCTRL_CGE;
+               }
+               ret = qman_init_fq(rxq, flags, &opts);
+               if (ret)
+                       DPAA_PMD_ERR("Channel/Queue association failed. fqid %d"
+                                    " ret: %d", rxq->fqid, ret);
+               rxq->cb.dqrr_dpdk_pull_cb = dpaa_rx_cb;
+               rxq->cb.dqrr_prepare = dpaa_rx_cb_prepare;
+               rxq->is_static = true;
+       }
+       dev->data->rx_queues[queue_idx] = rxq;
+
+       /* configure the CGR size as per the desc size */
+       if (dpaa_intf->cgr_rx) {
+               struct qm_mcc_initcgr cgr_opts = {0};
+
+               /* Enable tail drop with cgr on this queue */
+               qm_cgr_cs_thres_set64(&cgr_opts.cgr.cs_thres, nb_desc, 0);
+               ret = qman_modify_cgr(dpaa_intf->cgr_rx, 0, &cgr_opts);
+               if (ret) {
+                       DPAA_PMD_WARN(
+                               "rx taildrop modify fail on fqid %d (ret=%d)",
+                               rxq->fqid, ret);
+               }
+       }
+
+       return 0;
+}
+
+int __rte_experimental
+dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,
+               int eth_rx_queue_id,
+               u16 ch_id,
+               const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
+{
+       int ret;
+       u32 flags = 0;
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct qman_fq *rxq = &dpaa_intf->rx_queues[eth_rx_queue_id];
+       struct qm_mcc_initfq opts = {0};
+
+       if (dpaa_push_mode_max_queue)
+               DPAA_PMD_WARN("PUSH mode already enabled for first %d queues.\n"
+                             "To disable set DPAA_PUSH_QUEUES_NUMBER to 0\n",
+                             dpaa_push_mode_max_queue);
+
+       dpaa_poll_queue_default_config(&opts);
+
+       switch (queue_conf->ev.sched_type) {
+       case RTE_SCHED_TYPE_ATOMIC:
+               opts.fqd.fq_ctrl |= QM_FQCTRL_HOLDACTIVE;
+               /* Reset FQCTRL_AVOIDBLOCK bit as it is unnecessary
+                * configuration with HOLD_ACTIVE setting
+                */
+               opts.fqd.fq_ctrl &= (~QM_FQCTRL_AVOIDBLOCK);
+               rxq->cb.dqrr_dpdk_cb = dpaa_rx_cb_atomic;
+               break;
+       case RTE_SCHED_TYPE_ORDERED:
+               DPAA_PMD_ERR("Ordered queue schedule type is not supported\n");
+               return -1;
+       default:
+               opts.fqd.fq_ctrl |= QM_FQCTRL_AVOIDBLOCK;
+               rxq->cb.dqrr_dpdk_cb = dpaa_rx_cb_parallel;
+               break;
+       }
+
+       opts.we_mask = opts.we_mask | QM_INITFQ_WE_DESTWQ;
+       opts.fqd.dest.channel = ch_id;
+       opts.fqd.dest.wq = queue_conf->ev.priority;
+
+       if (dpaa_intf->cgr_rx) {
+               opts.we_mask |= QM_INITFQ_WE_CGID;
+               opts.fqd.cgid = dpaa_intf->cgr_rx[eth_rx_queue_id].cgrid;
+               opts.fqd.fq_ctrl |= QM_FQCTRL_CGE;
+       }
+
+       flags = QMAN_INITFQ_FLAG_SCHED;
+
+       ret = qman_init_fq(rxq, flags, &opts);
+       if (ret) {
+               DPAA_PMD_ERR("Channel/Queue association failed. fqid %d ret:%d",
+                            rxq->fqid, ret);
+               return ret;
+       }
+
+       /* copy configuration which needs to be filled during dequeue */
+       memcpy(&rxq->ev, &queue_conf->ev, sizeof(struct rte_event));
+       dev->data->rx_queues[eth_rx_queue_id] = rxq;
+
+       return ret;
+}
+
+int __rte_experimental
+dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
+               int eth_rx_queue_id)
+{
+       struct qm_mcc_initfq opts;
+       int ret;
+       u32 flags = 0;
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct qman_fq *rxq = &dpaa_intf->rx_queues[eth_rx_queue_id];
+
+       dpaa_poll_queue_default_config(&opts);
+
+       if (dpaa_intf->cgr_rx) {
+               opts.we_mask |= QM_INITFQ_WE_CGID;
+               opts.fqd.cgid = dpaa_intf->cgr_rx[eth_rx_queue_id].cgrid;
+               opts.fqd.fq_ctrl |= QM_FQCTRL_CGE;
+       }
+
+       ret = qman_init_fq(rxq, flags, &opts);
+       if (ret) {
+               DPAA_PMD_ERR("init rx fqid %d failed with ret: %d",
+                            rxq->fqid, ret);
+       }
+
+       rxq->cb.dqrr_dpdk_cb = NULL;
+       dev->data->rx_queues[eth_rx_queue_id] = NULL;
 
        return 0;
 }
@@ -257,6 +675,22 @@ static void dpaa_eth_tx_queue_release(void *txq __rte_unused)
        PMD_INIT_FUNC_TRACE();
 }
 
+static uint32_t
+dpaa_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct qman_fq *rxq = &dpaa_intf->rx_queues[rx_queue_id];
+       u32 frm_cnt = 0;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (qman_query_fq_frm_cnt(rxq, &frm_cnt) == 0) {
+               RTE_LOG(DEBUG, PMD, "RX frame count for q(%d) is %u\n",
+                       rx_queue_id, frm_cnt);
+       }
+       return frm_cnt;
+}
+
 static int dpaa_link_down(struct rte_eth_dev *dev)
 {
        PMD_INIT_FUNC_TRACE();
@@ -273,30 +707,252 @@ static int dpaa_link_up(struct rte_eth_dev *dev)
        return 0;
 }
 
+static int
+dpaa_flow_ctrl_set(struct rte_eth_dev *dev,
+                  struct rte_eth_fc_conf *fc_conf)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct rte_eth_fc_conf *net_fc;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (!(dpaa_intf->fc_conf)) {
+               dpaa_intf->fc_conf = rte_zmalloc(NULL,
+                       sizeof(struct rte_eth_fc_conf), MAX_CACHELINE);
+               if (!dpaa_intf->fc_conf) {
+                       DPAA_PMD_ERR("unable to save flow control info");
+                       return -ENOMEM;
+               }
+       }
+       net_fc = dpaa_intf->fc_conf;
+
+       if (fc_conf->high_water < fc_conf->low_water) {
+               DPAA_PMD_ERR("Incorrect Flow Control Configuration");
+               return -EINVAL;
+       }
+
+       if (fc_conf->mode == RTE_FC_NONE) {
+               return 0;
+       } else if (fc_conf->mode == RTE_FC_TX_PAUSE ||
+                fc_conf->mode == RTE_FC_FULL) {
+               fman_if_set_fc_threshold(dpaa_intf->fif, fc_conf->high_water,
+                                        fc_conf->low_water,
+                               dpaa_intf->bp_info->bpid);
+               if (fc_conf->pause_time)
+                       fman_if_set_fc_quanta(dpaa_intf->fif,
+                                             fc_conf->pause_time);
+       }
+
+       /* Save the information in dpaa device */
+       net_fc->pause_time = fc_conf->pause_time;
+       net_fc->high_water = fc_conf->high_water;
+       net_fc->low_water = fc_conf->low_water;
+       net_fc->send_xon = fc_conf->send_xon;
+       net_fc->mac_ctrl_frame_fwd = fc_conf->mac_ctrl_frame_fwd;
+       net_fc->mode = fc_conf->mode;
+       net_fc->autoneg = fc_conf->autoneg;
+
+       return 0;
+}
+
+static int
+dpaa_flow_ctrl_get(struct rte_eth_dev *dev,
+                  struct rte_eth_fc_conf *fc_conf)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct rte_eth_fc_conf *net_fc = dpaa_intf->fc_conf;
+       int ret;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (net_fc) {
+               fc_conf->pause_time = net_fc->pause_time;
+               fc_conf->high_water = net_fc->high_water;
+               fc_conf->low_water = net_fc->low_water;
+               fc_conf->send_xon = net_fc->send_xon;
+               fc_conf->mac_ctrl_frame_fwd = net_fc->mac_ctrl_frame_fwd;
+               fc_conf->mode = net_fc->mode;
+               fc_conf->autoneg = net_fc->autoneg;
+               return 0;
+       }
+       ret = fman_if_get_fc_threshold(dpaa_intf->fif);
+       if (ret) {
+               fc_conf->mode = RTE_FC_TX_PAUSE;
+               fc_conf->pause_time = fman_if_get_fc_quanta(dpaa_intf->fif);
+       } else {
+               fc_conf->mode = RTE_FC_NONE;
+       }
+
+       return 0;
+}
+
+static int
+dpaa_dev_add_mac_addr(struct rte_eth_dev *dev,
+                            struct ether_addr *addr,
+                            uint32_t index,
+                            __rte_unused uint32_t pool)
+{
+       int ret;
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       ret = fman_if_add_mac_addr(dpaa_intf->fif, addr->addr_bytes, index);
+
+       if (ret)
+               RTE_LOG(ERR, PMD, "error: Adding the MAC ADDR failed:"
+                       " err = %d", ret);
+       return 0;
+}
+
+static void
+dpaa_dev_remove_mac_addr(struct rte_eth_dev *dev,
+                         uint32_t index)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       fman_if_clear_mac_addr(dpaa_intf->fif, index);
+}
+
+static int
+dpaa_dev_set_mac_addr(struct rte_eth_dev *dev,
+                      struct ether_addr *addr)
+{
+       int ret;
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
+
+       ret = fman_if_add_mac_addr(dpaa_intf->fif, addr->addr_bytes, 0);
+       if (ret)
+               RTE_LOG(ERR, PMD, "error: Setting the MAC ADDR failed %d", ret);
+
+       return ret;
+}
+
 static struct eth_dev_ops dpaa_devops = {
        .dev_configure            = dpaa_eth_dev_configure,
        .dev_start                = dpaa_eth_dev_start,
        .dev_stop                 = dpaa_eth_dev_stop,
        .dev_close                = dpaa_eth_dev_close,
        .dev_infos_get            = dpaa_eth_dev_info,
+       .dev_supported_ptypes_get = dpaa_supported_ptypes_get,
 
        .rx_queue_setup           = dpaa_eth_rx_queue_setup,
        .tx_queue_setup           = dpaa_eth_tx_queue_setup,
        .rx_queue_release         = dpaa_eth_rx_queue_release,
        .tx_queue_release         = dpaa_eth_tx_queue_release,
+       .rx_queue_count           = dpaa_dev_rx_queue_count,
+
+       .flow_ctrl_get            = dpaa_flow_ctrl_get,
+       .flow_ctrl_set            = dpaa_flow_ctrl_set,
 
        .link_update              = dpaa_eth_link_update,
+       .stats_get                = dpaa_eth_stats_get,
+       .xstats_get               = dpaa_dev_xstats_get,
+       .xstats_get_by_id         = dpaa_xstats_get_by_id,
+       .xstats_get_names_by_id   = dpaa_xstats_get_names_by_id,
+       .xstats_get_names         = dpaa_xstats_get_names,
+       .xstats_reset             = dpaa_eth_stats_reset,
+       .stats_reset              = dpaa_eth_stats_reset,
+       .promiscuous_enable       = dpaa_eth_promiscuous_enable,
+       .promiscuous_disable      = dpaa_eth_promiscuous_disable,
+       .allmulticast_enable      = dpaa_eth_multicast_enable,
+       .allmulticast_disable     = dpaa_eth_multicast_disable,
        .mtu_set                  = dpaa_mtu_set,
        .dev_set_link_down        = dpaa_link_down,
        .dev_set_link_up          = dpaa_link_up,
+       .mac_addr_add             = dpaa_dev_add_mac_addr,
+       .mac_addr_remove          = dpaa_dev_remove_mac_addr,
+       .mac_addr_set             = dpaa_dev_set_mac_addr,
+
+       .fw_version_get           = dpaa_fw_version_get,
 };
 
+static bool
+is_device_supported(struct rte_eth_dev *dev, struct rte_dpaa_driver *drv)
+{
+       if (strcmp(dev->device->driver->name,
+                  drv->driver.name))
+               return false;
+
+       return true;
+}
+
+static bool
+is_dpaa_supported(struct rte_eth_dev *dev)
+{
+       return is_device_supported(dev, &rte_dpaa_pmd);
+}
+
+int __rte_experimental
+rte_pmd_dpaa_set_tx_loopback(uint8_t port, uint8_t on)
+{
+       struct rte_eth_dev *dev;
+       struct dpaa_if *dpaa_intf;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+       dev = &rte_eth_devices[port];
+
+       if (!is_dpaa_supported(dev))
+               return -ENOTSUP;
+
+       dpaa_intf = dev->data->dev_private;
+
+       if (on)
+               fman_if_loopback_enable(dpaa_intf->fif);
+       else
+               fman_if_loopback_disable(dpaa_intf->fif);
+
+       return 0;
+}
+
+static int dpaa_fc_set_default(struct dpaa_if *dpaa_intf)
+{
+       struct rte_eth_fc_conf *fc_conf;
+       int ret;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (!(dpaa_intf->fc_conf)) {
+               dpaa_intf->fc_conf = rte_zmalloc(NULL,
+                       sizeof(struct rte_eth_fc_conf), MAX_CACHELINE);
+               if (!dpaa_intf->fc_conf) {
+                       DPAA_PMD_ERR("unable to save flow control info");
+                       return -ENOMEM;
+               }
+       }
+       fc_conf = dpaa_intf->fc_conf;
+       ret = fman_if_get_fc_threshold(dpaa_intf->fif);
+       if (ret) {
+               fc_conf->mode = RTE_FC_TX_PAUSE;
+               fc_conf->pause_time = fman_if_get_fc_quanta(dpaa_intf->fif);
+       } else {
+               fc_conf->mode = RTE_FC_NONE;
+       }
+
+       return 0;
+}
+
 /* Initialise an Rx FQ */
-static int dpaa_rx_queue_init(struct qman_fq *fq,
+static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx,
                              uint32_t fqid)
 {
-       struct qm_mcc_initfq opts;
+       struct qm_mcc_initfq opts = {0};
        int ret;
+       u32 flags = 0;
+       struct qm_mcc_initcgr cgr_opts = {
+               .we_mask = QM_CGR_WE_CS_THRES |
+                               QM_CGR_WE_CSTD_EN |
+                               QM_CGR_WE_MODE,
+               .cgr = {
+                       .cstd_en = QM_CGR_EN,
+                       .mode = QMAN_CGR_MODE_FRAME
+               }
+       };
 
        PMD_INIT_FUNC_TRACE();
 
@@ -314,24 +970,28 @@ static int dpaa_rx_queue_init(struct qman_fq *fq,
                        fqid, ret);
                return ret;
        }
+       fq->is_static = false;
 
-       opts.we_mask = QM_INITFQ_WE_DESTWQ | QM_INITFQ_WE_FQCTRL |
-                      QM_INITFQ_WE_CONTEXTA;
+       dpaa_poll_queue_default_config(&opts);
 
-       opts.fqd.dest.wq = DPAA_IF_RX_PRIORITY;
-       opts.fqd.fq_ctrl = QM_FQCTRL_AVOIDBLOCK | QM_FQCTRL_CTXASTASHING |
-                          QM_FQCTRL_PREFERINCACHE;
-       opts.fqd.context_a.stashing.exclusive = 0;
-       opts.fqd.context_a.stashing.annotation_cl = DPAA_IF_RX_ANNOTATION_STASH;
-       opts.fqd.context_a.stashing.data_cl = DPAA_IF_RX_DATA_STASH;
-       opts.fqd.context_a.stashing.context_cl = DPAA_IF_RX_CONTEXT_STASH;
-
-       /*Enable tail drop */
-       opts.we_mask = opts.we_mask | QM_INITFQ_WE_TDTHRESH;
-       opts.fqd.fq_ctrl = opts.fqd.fq_ctrl | QM_FQCTRL_TDE;
-       qm_fqd_taildrop_set(&opts.fqd.td, CONG_THRESHOLD_RX_Q, 1);
-
-       ret = qman_init_fq(fq, 0, &opts);
+       if (cgr_rx) {
+               /* Enable tail drop with cgr on this queue */
+               qm_cgr_cs_thres_set64(&cgr_opts.cgr.cs_thres, td_threshold, 0);
+               cgr_rx->cb = NULL;
+               ret = qman_create_cgr(cgr_rx, QMAN_CGR_FLAG_USE_INIT,
+                                     &cgr_opts);
+               if (ret) {
+                       DPAA_PMD_WARN(
+                               "rx taildrop init fail on rx fqid %d (ret=%d)",
+                               fqid, ret);
+                       goto without_cgr;
+               }
+               opts.we_mask |= QM_INITFQ_WE_CGID;
+               opts.fqd.cgid = cgr_rx->cgrid;
+               opts.fqd.fq_ctrl |= QM_FQCTRL_CGE;
+       }
+without_cgr:
+       ret = qman_init_fq(fq, flags, &opts);
        if (ret)
                DPAA_PMD_ERR("init rx fqid %d failed with ret: %d", fqid, ret);
        return ret;
@@ -341,7 +1001,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq,
 static int dpaa_tx_queue_init(struct qman_fq *fq,
                              struct fman_if *fman_intf)
 {
-       struct qm_mcc_initfq opts;
+       struct qm_mcc_initfq opts = {0};
        int ret;
 
        PMD_INIT_FUNC_TRACE();
@@ -368,6 +1028,39 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
        return ret;
 }
 
+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+/* Initialise a DEBUG FQ ([rt]x_error, rx_default). */
+static int dpaa_debug_queue_init(struct qman_fq *fq, uint32_t fqid)
+{
+       struct qm_mcc_initfq opts = {0};
+       int ret;
+
+       PMD_INIT_FUNC_TRACE();
+
+       ret = qman_reserve_fqid(fqid);
+       if (ret) {
+               DPAA_PMD_ERR("Reserve debug fqid %d failed with ret: %d",
+                       fqid, ret);
+               return -EINVAL;
+       }
+       /* "map" this Rx FQ to one of the interfaces Tx FQID */
+       DPAA_PMD_DEBUG("Creating debug fq %p, fqid %d", fq, fqid);
+       ret = qman_create_fq(fqid, QMAN_FQ_FLAG_NO_ENQUEUE, fq);
+       if (ret) {
+               DPAA_PMD_ERR("create debug fqid %d failed with ret: %d",
+                       fqid, ret);
+               return ret;
+       }
+       opts.we_mask = QM_INITFQ_WE_DESTWQ | QM_INITFQ_WE_FQCTRL;
+       opts.fqd.dest.wq = DPAA_IF_DEBUG_PRIORITY;
+       ret = qman_init_fq(fq, 0, &opts);
+       if (ret)
+               DPAA_PMD_ERR("init debug fqid %d failed with ret: %d",
+                           fqid, ret);
+       return ret;
+}
+#endif
+
 /* Initialise a network interface */
 static int
 dpaa_dev_init(struct rte_eth_dev *eth_dev)
@@ -380,6 +1073,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        struct fm_eth_port_cfg *cfg;
        struct fman_if *fman_intf;
        struct fman_if_bpool *bp, *tmp_bp;
+       uint32_t cgrid[DPAA_MAX_NUM_PCD_QUEUES];
 
        PMD_INIT_FUNC_TRACE();
 
@@ -406,48 +1100,104 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        else
                num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
 
-       /* Each device can not have more than DPAA_PCD_FQID_MULTIPLIER RX
+       /* if push mode queues to be enabled. Currenly we are allowing only
+        * one queue per thread.
+        */
+       if (getenv("DPAA_PUSH_QUEUES_NUMBER")) {
+               dpaa_push_mode_max_queue =
+                               atoi(getenv("DPAA_PUSH_QUEUES_NUMBER"));
+               if (dpaa_push_mode_max_queue > DPAA_MAX_PUSH_MODE_QUEUE)
+                       dpaa_push_mode_max_queue = DPAA_MAX_PUSH_MODE_QUEUE;
+       }
+
+       /* Each device can not have more than DPAA_MAX_NUM_PCD_QUEUES RX
         * queues.
         */
-       if (num_rx_fqs <= 0 || num_rx_fqs > DPAA_PCD_FQID_MULTIPLIER) {
+       if (num_rx_fqs <= 0 || num_rx_fqs > DPAA_MAX_NUM_PCD_QUEUES) {
                DPAA_PMD_ERR("Invalid number of RX queues\n");
                return -EINVAL;
        }
 
        dpaa_intf->rx_queues = rte_zmalloc(NULL,
                sizeof(struct qman_fq) * num_rx_fqs, MAX_CACHELINE);
+       if (!dpaa_intf->rx_queues) {
+               DPAA_PMD_ERR("Failed to alloc mem for RX queues\n");
+               return -ENOMEM;
+       }
+
+       /* If congestion control is enabled globally*/
+       if (td_threshold) {
+               dpaa_intf->cgr_rx = rte_zmalloc(NULL,
+                       sizeof(struct qman_cgr) * num_rx_fqs, MAX_CACHELINE);
+               if (!dpaa_intf->cgr_rx) {
+                       DPAA_PMD_ERR("Failed to alloc mem for cgr_rx\n");
+                       ret = -ENOMEM;
+                       goto free_rx;
+               }
+
+               ret = qman_alloc_cgrid_range(&cgrid[0], num_rx_fqs, 1, 0);
+               if (ret != num_rx_fqs) {
+                       DPAA_PMD_WARN("insufficient CGRIDs available");
+                       ret = -EINVAL;
+                       goto free_rx;
+               }
+       } else {
+               dpaa_intf->cgr_rx = NULL;
+       }
+
        for (loop = 0; loop < num_rx_fqs; loop++) {
                fqid = DPAA_PCD_FQID_START + dpaa_intf->ifid *
                        DPAA_PCD_FQID_MULTIPLIER + loop;
-               ret = dpaa_rx_queue_init(&dpaa_intf->rx_queues[loop], fqid);
+
+               if (dpaa_intf->cgr_rx)
+                       dpaa_intf->cgr_rx[loop].cgrid = cgrid[loop];
+
+               ret = dpaa_rx_queue_init(&dpaa_intf->rx_queues[loop],
+                       dpaa_intf->cgr_rx ? &dpaa_intf->cgr_rx[loop] : NULL,
+                       fqid);
                if (ret)
-                       return ret;
+                       goto free_rx;
                dpaa_intf->rx_queues[loop].dpaa_intf = dpaa_intf;
        }
        dpaa_intf->nb_rx_queues = num_rx_fqs;
 
-       /* Initialise Tx FQs. Have as many Tx FQ's as number of cores */
+       /* Initialise Tx FQs.free_rx Have as many Tx FQ's as number of cores */
        num_cores = rte_lcore_count();
        dpaa_intf->tx_queues = rte_zmalloc(NULL, sizeof(struct qman_fq) *
                num_cores, MAX_CACHELINE);
-       if (!dpaa_intf->tx_queues)
-               return -ENOMEM;
+       if (!dpaa_intf->tx_queues) {
+               DPAA_PMD_ERR("Failed to alloc mem for TX queues\n");
+               ret = -ENOMEM;
+               goto free_rx;
+       }
 
        for (loop = 0; loop < num_cores; loop++) {
                ret = dpaa_tx_queue_init(&dpaa_intf->tx_queues[loop],
                                         fman_intf);
                if (ret)
-                       return ret;
+                       goto free_tx;
                dpaa_intf->tx_queues[loop].dpaa_intf = dpaa_intf;
        }
        dpaa_intf->nb_tx_queues = num_cores;
 
+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+       dpaa_debug_queue_init(&dpaa_intf->debug_queues[
+               DPAA_DEBUG_FQ_RX_ERROR], fman_intf->fqid_rx_err);
+       dpaa_intf->debug_queues[DPAA_DEBUG_FQ_RX_ERROR].dpaa_intf = dpaa_intf;
+       dpaa_debug_queue_init(&dpaa_intf->debug_queues[
+               DPAA_DEBUG_FQ_TX_ERROR], fman_intf->fqid_tx_err);
+       dpaa_intf->debug_queues[DPAA_DEBUG_FQ_TX_ERROR].dpaa_intf = dpaa_intf;
+#endif
+
        DPAA_PMD_DEBUG("All frame queues created");
 
+       /* Get the initial configuration for flow control */
+       dpaa_fc_set_default(dpaa_intf);
+
        /* reset bpool list, initialize bpool dynamically */
        list_for_each_entry_safe(bp, tmp_bp, &cfg->fman_if->bpool_list, node) {
                list_del(&bp->node);
-               rte_free(bp);
+               free(bp);
        }
 
        /* Populate ethdev structure */
@@ -462,13 +1212,8 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
                DPAA_PMD_ERR("Failed to allocate %d bytes needed to "
                                                "store MAC addresses",
                                ETHER_ADDR_LEN * DPAA_MAX_MAC_FILTER);
-               rte_free(dpaa_intf->rx_queues);
-               rte_free(dpaa_intf->tx_queues);
-               dpaa_intf->rx_queues = NULL;
-               dpaa_intf->tx_queues = NULL;
-               dpaa_intf->nb_rx_queues = 0;
-               dpaa_intf->nb_tx_queues = 0;
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto free_tx;
        }
 
        /* copy the primary mac address */
@@ -494,12 +1239,25 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        fman_if_stats_reset(fman_intf);
 
        return 0;
+
+free_tx:
+       rte_free(dpaa_intf->tx_queues);
+       dpaa_intf->tx_queues = NULL;
+       dpaa_intf->nb_tx_queues = 0;
+
+free_rx:
+       rte_free(dpaa_intf->cgr_rx);
+       rte_free(dpaa_intf->rx_queues);
+       dpaa_intf->rx_queues = NULL;
+       dpaa_intf->nb_rx_queues = 0;
+       return ret;
 }
 
 static int
 dpaa_dev_uninit(struct rte_eth_dev *dev)
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       int loop;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -517,6 +1275,18 @@ dpaa_dev_uninit(struct rte_eth_dev *dev)
        if (dpaa_intf->fc_conf)
                rte_free(dpaa_intf->fc_conf);
 
+       /* Release RX congestion Groups */
+       if (dpaa_intf->cgr_rx) {
+               for (loop = 0; loop < dpaa_intf->nb_rx_queues; loop++)
+                       qman_delete_cgr(&dpaa_intf->cgr_rx[loop]);
+
+               qman_release_cgrid_range(dpaa_intf->cgr_rx[loop].cgrid,
+                                        dpaa_intf->nb_rx_queues);
+       }
+
+       rte_free(dpaa_intf->cgr_rx);
+       dpaa_intf->cgr_rx = NULL;
+
        rte_free(dpaa_intf->rx_queues);
        dpaa_intf->rx_queues = NULL;
 
@@ -573,10 +1343,12 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv,
                is_global_init = 1;
        }
 
-       ret = rte_dpaa_portal_init((void *)1);
-       if (ret) {
-               DPAA_PMD_ERR("Unable to initialize portal");
-               return ret;
+       if (unlikely(!RTE_PER_LCORE(dpaa_io))) {
+               ret = rte_dpaa_portal_init((void *)1);
+               if (ret) {
+                       DPAA_PMD_ERR("Unable to initialize portal");
+                       return ret;
+               }
        }
 
        eth_dev = rte_eth_dev_allocate(dpaa_dev->name);