ethdev: return diagnostic when setting MAC address
[dpdk.git] / drivers / net / dpaa2 / dpaa2_ethdev.c
index 39c32b3..4225339 100644 (file)
@@ -1,41 +1,15 @@
-/*-
- *   BSD LICENSE
+/* * SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2016 NXP.
+ *   Copyright 2016 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.
  */
 
 #include <time.h>
 #include <net/if.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 #include <rte_dev.h>
 #include <rte_fslmc.h>
 
-#include <fslmc_logs.h>
+#include "dpaa2_pmd_logs.h"
 #include <fslmc_vfio.h>
 #include <dpaa2_hw_pvt.h>
 #include <dpaa2_hw_mempool.h>
 #include <dpaa2_hw_dpio.h>
 #include <mc/fsl_dpmng.h>
 #include "dpaa2_ethdev.h"
+#include <fsl_qbman_debug.h>
 
 struct rte_dpaa2_xstats_name_off {
        char name[RTE_ETH_XSTATS_NAME_SIZE];
@@ -82,57 +57,7 @@ static int dpaa2_dev_set_link_up(struct rte_eth_dev *dev);
 static int dpaa2_dev_set_link_down(struct rte_eth_dev *dev);
 static int dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
 
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- *   - Pointer to the structure rte_eth_dev to read from.
- *   - Pointer to the buffer to be saved with the link status.
- *
- * @return
- *   - On success, zero.
- *   - On failure, negative value.
- */
-static inline int
-dpaa2_dev_atomic_read_link_status(struct rte_eth_dev *dev,
-                                 struct rte_eth_link *link)
-{
-       struct rte_eth_link *dst = link;
-       struct rte_eth_link *src = &dev->data->dev_link;
-
-       if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
-                               *(uint64_t *)src) == 0)
-               return -1;
-
-       return 0;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- *   - Pointer to the structure rte_eth_dev to read from.
- *   - Pointer to the buffer to be saved with the link status.
- *
- * @return
- *   - On success, zero.
- *   - On failure, negative value.
- */
-static inline int
-dpaa2_dev_atomic_write_link_status(struct rte_eth_dev *dev,
-                                  struct rte_eth_link *link)
-{
-       struct rte_eth_link *dst = &dev->data->dev_link;
-       struct rte_eth_link *src = link;
-
-       if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
-                               *(uint64_t *)src) == 0)
-               return -1;
-
-       return 0;
-}
+int dpaa2_logtype_pmd;
 
 static int
 dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
@@ -144,7 +69,7 @@ dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return -1;
        }
 
@@ -156,13 +81,13 @@ dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
                                          priv->token, vlan_id);
 
        if (ret < 0)
-               PMD_DRV_LOG(ERR, "ret = %d Unable to add/rem vlan %d hwid =%d",
-                           ret, vlan_id, priv->hw_id);
+               DPAA2_PMD_ERR("ret = %d Unable to add/rem vlan %d hwid =%d",
+                             ret, vlan_id, priv->hw_id);
 
        return ret;
 }
 
-static void
+static int
 dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
@@ -172,6 +97,12 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
        PMD_INIT_FUNC_TRACE();
 
        if (mask & ETH_VLAN_FILTER_MASK) {
+               /* VLAN Filter not avaialble */
+               if (!priv->max_vlan_filters) {
+                       DPAA2_PMD_INFO("VLAN filter not available");
+                       goto next_mask;
+               }
+
                if (dev->data->dev_conf.rxmode.hw_vlan_filter)
                        ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
                                                      priv->token, true);
@@ -179,15 +110,15 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
                        ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
                                                      priv->token, false);
                if (ret < 0)
-                       RTE_LOG(ERR, PMD, "Unable to set vlan filter = %d\n",
-                               ret);
+                       DPAA2_PMD_INFO("Unable to set vlan filter = %d", ret);
        }
-
+next_mask:
        if (mask & ETH_VLAN_EXTEND_MASK) {
                if (dev->data->dev_conf.rxmode.hw_vlan_extend)
-                       RTE_LOG(INFO, PMD,
-                               "VLAN extend offload not supported\n");
+                       DPAA2_PMD_INFO("VLAN extend offload not supported");
        }
+
+       return 0;
 }
 
 static int
@@ -204,10 +135,10 @@ dpaa2_fw_version_get(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        if (mc_get_soc_version(dpni, CMD_PRI_LOW, &mc_plat_info))
-               RTE_LOG(WARNING, PMD, "\tmc_get_soc_version failed\n");
+               DPAA2_PMD_WARN("\tmc_get_soc_version failed");
 
        if (mc_get_version(dpni, CMD_PRI_LOW, &mc_ver_info))
-               RTE_LOG(WARNING, PMD, "\tmc_get_version failed\n");
+               DPAA2_PMD_WARN("\tmc_get_version failed");
 
        ret = snprintf(fw_version, fw_size,
                       "%x-%d.%d.%d",
@@ -270,7 +201,7 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
        mc_q = rte_malloc(NULL, sizeof(struct dpaa2_queue) * tot_queues,
                          RTE_CACHE_LINE_SIZE);
        if (!mc_q) {
-               PMD_INIT_LOG(ERR, "malloc failed for rx/tx queues\n");
+               DPAA2_PMD_ERR("Memory allocation failed for rx/tx queues");
                return -1;
        }
 
@@ -344,11 +275,11 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
 
        if (eth_conf->rxmode.jumbo_frame == 1) {
                if (eth_conf->rxmode.max_rx_pkt_len <= DPAA2_MAX_RX_PKT_LEN) {
-                       ret = dpaa2_dev_mtu_set(dev,
-                                       eth_conf->rxmode.max_rx_pkt_len);
+                       ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW,
+                               priv->token, eth_conf->rxmode.max_rx_pkt_len);
                        if (ret) {
-                               PMD_INIT_LOG(ERR,
-                                            "unable to set mtu. check config\n");
+                               DPAA2_PMD_ERR(
+                                       "Unable to set mtu. check config");
                                return ret;
                        }
                } else {
@@ -360,8 +291,8 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
                ret = dpaa2_setup_flow_dist(dev,
                                eth_conf->rx_adv_conf.rss_conf.rss_hf);
                if (ret) {
-                       PMD_INIT_LOG(ERR, "unable to set flow distribution."
-                                    "please check queue config\n");
+                       DPAA2_PMD_ERR("Unable to set flow distribution."
+                                     "Check queue config");
                        return ret;
                }
        }
@@ -372,31 +303,49 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
        ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
                               DPNI_OFF_RX_L3_CSUM, rx_ip_csum_offload);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error to set RX l3 csum:Error = %d\n", ret);
+               DPAA2_PMD_ERR("Error to set RX l3 csum:Error = %d", ret);
                return ret;
        }
 
        ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
                               DPNI_OFF_RX_L4_CSUM, rx_ip_csum_offload);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error to get RX l4 csum:Error = %d\n", ret);
+               DPAA2_PMD_ERR("Error to get RX l4 csum:Error = %d", ret);
                return ret;
        }
 
        ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
                               DPNI_OFF_TX_L3_CSUM, true);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error to set TX l3 csum:Error = %d\n", ret);
+               DPAA2_PMD_ERR("Error to set TX l3 csum:Error = %d", ret);
                return ret;
        }
 
        ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
                               DPNI_OFF_TX_L4_CSUM, true);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error to get TX l4 csum:Error = %d\n", ret);
+               DPAA2_PMD_ERR("Error to get TX l4 csum:Error = %d", ret);
                return ret;
        }
 
+       /* Enabling hash results in FD requires setting DPNI_FLCTYPE_HASH in
+        * dpni_set_offload API. Setting this FLCTYPE for DPNI sets the FD[SC]
+        * to 0 for LS2 in the hardware thus disabling data/annotation
+        * stashing. For LX2 this is fixed in hardware and thus hash result and
+        * parse results can be received in FD using this option.
+        */
+       if (dpaa2_svr_family == SVR_LX2160A) {
+               ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
+                                      DPNI_FLCTYPE_HASH, true);
+               if (ret) {
+                       DPAA2_PMD_ERR("Error setting FLCTYPE: Err = %d", ret);
+                       return ret;
+               }
+       }
+
+       if (eth_conf->rxmode.hw_vlan_filter)
+               dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
+
        /* update the current status */
        dpaa2_dev_link_update(dev, 0);
 
@@ -416,7 +365,6 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
        struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
-       struct mc_soc_version mc_plat_info = {0};
        struct dpaa2_queue *dpaa2_q;
        struct dpni_queue cfg;
        uint8_t options = 0;
@@ -426,8 +374,8 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
 
        PMD_INIT_FUNC_TRACE();
 
-       PMD_DRV_LOG(DEBUG, "dev =%p, queue =%d, pool = %p, conf =%p",
-                   dev, rx_queue_id, mb_pool, rx_conf);
+       DPAA2_PMD_DEBUG("dev =%p, queue =%d, pool = %p, conf =%p",
+                       dev, rx_queue_id, mb_pool, rx_conf);
 
        if (!priv->bp_list || priv->bp_list->mp != mb_pool) {
                bpid = mempool_to_bpid(mb_pool);
@@ -444,27 +392,29 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
        memset(&cfg, 0, sizeof(struct dpni_queue));
 
        options = options | DPNI_QUEUE_OPT_USER_CTX;
-       cfg.user_context = (uint64_t)(dpaa2_q);
+       cfg.user_context = (size_t)(dpaa2_q);
 
        /*if ls2088 or rev2 device, enable the stashing */
 
-       if (mc_get_soc_version(dpni, CMD_PRI_LOW, &mc_plat_info))
-               PMD_INIT_LOG(ERR, "\tmc_get_soc_version failed\n");
-
-       if ((mc_plat_info.svr & 0xffff0000) != SVR_LS2080A) {
+       if ((dpaa2_svr_family & 0xffff0000) != SVR_LS2080A) {
                options |= DPNI_QUEUE_OPT_FLC;
                cfg.flc.stash_control = true;
                cfg.flc.value &= 0xFFFFFFFFFFFFFFC0;
                /* 00 00 00 - last 6 bit represent annotation, context stashing,
-                * data stashing setting 01 01 00 (0x14) to enable
-                * 1 line data, 1 line annotation
+                * data stashing setting 01 01 00 (0x14)
+                * (in following order ->DS AS CS)
+                * to enable 1 line data, 1 line annotation.
+                * For LX2, this setting should be 01 00 00 (0x10)
                 */
-               cfg.flc.value |= 0x14;
+               if ((dpaa2_svr_family & 0xffff0000) == SVR_LX2160A)
+                       cfg.flc.value |= 0x10;
+               else
+                       cfg.flc.value |= 0x14;
        }
        ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_RX,
                             dpaa2_q->tc_index, flow_id, options, &cfg);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error in setting the rx flow: = %d\n", ret);
+               DPAA2_PMD_ERR("Error in setting the rx flow: = %d", ret);
                return -1;
        }
 
@@ -476,14 +426,14 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
                taildrop.threshold = CONG_THRESHOLD_RX_Q;
                taildrop.units = DPNI_CONGESTION_UNIT_BYTES;
                taildrop.oal = CONG_RX_OAL;
-               PMD_DRV_LOG(DEBUG, "Enabling Early Drop on queue = %d",
-                           rx_queue_id);
+               DPAA2_PMD_DEBUG("Enabling Early Drop on queue = %d",
+                               rx_queue_id);
                ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
                                        DPNI_CP_QUEUE, DPNI_QUEUE_RX,
                                        dpaa2_q->tc_index, flow_id, &taildrop);
                if (ret) {
-                       PMD_INIT_LOG(ERR, "Error in setting the rx flow"
-                                    " err : = %d\n", ret);
+                       DPAA2_PMD_ERR("Error in setting taildrop. err=(%d)",
+                                     ret);
                        return -1;
                }
        }
@@ -512,8 +462,10 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        /* Return if queue already configured */
-       if (dpaa2_q->flow_id != 0xffff)
+       if (dpaa2_q->flow_id != 0xffff) {
+               dev->data->tx_queues[tx_queue_id] = dpaa2_q;
                return 0;
+       }
 
        memset(&tx_conf_cfg, 0, sizeof(struct dpni_queue));
        memset(&tx_flow_cfg, 0, sizeof(struct dpni_queue));
@@ -524,9 +476,9 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
        ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX,
                             tc_id, flow_id, options, &tx_flow_cfg);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error in setting the tx flow: "
-                            "tc_id=%d, flow =%d ErrorCode = %x\n",
-                            tc_id, flow_id, -ret);
+               DPAA2_PMD_ERR("Error in setting the tx flow: "
+                             "tc_id=%d, flow=%d err=%d",
+                             tc_id, flow_id, ret);
                        return -1;
        }
 
@@ -538,8 +490,8 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
                                                    priv->token,
                                                    DPNI_CONF_DISABLE);
                if (ret) {
-                       PMD_INIT_LOG(ERR, "Error in set tx conf mode settings"
-                                    " ErrorCode = %x", ret);
+                       DPAA2_PMD_ERR("Error in set tx conf mode settings: "
+                                     "err=%d", ret);
                        return -1;
                }
        }
@@ -555,7 +507,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
                 */
                cong_notif_cfg.threshold_exit = CONG_EXIT_TX_THRESHOLD;
                cong_notif_cfg.message_ctx = 0;
-               cong_notif_cfg.message_iova = (uint64_t)dpaa2_q->cscn;
+               cong_notif_cfg.message_iova = (size_t)dpaa2_q->cscn;
                cong_notif_cfg.dest_cfg.dest_type = DPNI_DEST_NONE;
                cong_notif_cfg.notification_mode =
                                         DPNI_CONG_OPT_WRITE_MEM_ON_ENTER |
@@ -568,9 +520,9 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
                                                       tc_id,
                                                       &cong_notif_cfg);
                if (ret) {
-                       PMD_INIT_LOG(ERR,
-                          "Error in setting tx congestion notification: = %d",
-                          -ret);
+                       DPAA2_PMD_ERR(
+                          "Error in setting tx congestion notification: "
+                          "err=%d", ret);
                        return -ret;
                }
        }
@@ -590,6 +542,37 @@ dpaa2_dev_tx_queue_release(void *q __rte_unused)
        PMD_INIT_FUNC_TRACE();
 }
 
+static uint32_t
+dpaa2_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+       int32_t ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct dpaa2_queue *dpaa2_q;
+       struct qbman_swp *swp;
+       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");
+                       return -EINVAL;
+               }
+       }
+       swp = DPAA2_PER_LCORE_PORTAL;
+
+       dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[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",
+                               rx_queue_id, frame_cnt);
+       }
+       return frame_cnt;
+}
+
 static const uint32_t *
 dpaa2_supported_ptypes_get(struct rte_eth_dev *dev)
 {
@@ -634,14 +617,14 @@ dpaa2_interrupt_handler(void *param)
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL");
+               DPAA2_PMD_ERR("dpni is NULL");
                return;
        }
 
        ret = dpni_get_irq_status(dpni, CMD_PRI_LOW, priv->token,
                                  irq_index, &status);
        if (unlikely(ret)) {
-               RTE_LOG(ERR, PMD, "Can't get irq status (err %d)", ret);
+               DPAA2_PMD_ERR("Can't get irq status (err %d)", ret);
                clear = 0xffffffff;
                goto out;
        }
@@ -651,13 +634,13 @@ dpaa2_interrupt_handler(void *param)
                dpaa2_dev_link_update(dev, 0);
                /* calling all the apps registered for link status event */
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
        }
 out:
        ret = dpni_clear_irq_status(dpni, CMD_PRI_LOW, priv->token,
                                    irq_index, clear);
        if (unlikely(ret))
-               RTE_LOG(ERR, PMD, "Can't clear irq status (err %d)", ret);
+               DPAA2_PMD_ERR("Can't clear irq status (err %d)", ret);
 }
 
 static int
@@ -674,16 +657,16 @@ dpaa2_eth_setup_irqs(struct rte_eth_dev *dev, int enable)
        err = dpni_set_irq_mask(dpni, CMD_PRI_LOW, priv->token,
                                irq_index, mask);
        if (err < 0) {
-               PMD_INIT_LOG(ERR, "Error: dpni_set_irq_mask():%d (%s)", err,
-                            strerror(-err));
+               DPAA2_PMD_ERR("Error: dpni_set_irq_mask():%d (%s)", err,
+                             strerror(-err));
                return err;
        }
 
        err = dpni_set_irq_enable(dpni, CMD_PRI_LOW, priv->token,
                                  irq_index, enable);
        if (err < 0)
-               PMD_INIT_LOG(ERR, "Error: dpni_set_irq_enable():%d (%s)", err,
-                            strerror(-err));
+               DPAA2_PMD_ERR("Error: dpni_set_irq_enable():%d (%s)", err,
+                             strerror(-err));
 
        return err;
 }
@@ -711,8 +694,8 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
 
        ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Failure %d in enabling dpni %d device\n",
-                            ret, priv->hw_id);
+               DPAA2_PMD_ERR("Failure in enabling dpni %d device: err=%d",
+                             priv->hw_id, ret);
                return ret;
        }
 
@@ -722,7 +705,7 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
        ret = dpni_get_qdid(dpni, CMD_PRI_LOW, priv->token,
                            DPNI_QUEUE_TX, &qdid);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error to get qdid:ErrorCode = %d\n", ret);
+               DPAA2_PMD_ERR("Error in getting qdid: err=%d", ret);
                return ret;
        }
        priv->qdid = qdid;
@@ -733,8 +716,8 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
                                     DPNI_QUEUE_RX, dpaa2_q->tc_index,
                                       dpaa2_q->flow_id, &cfg, &qid);
                if (ret) {
-                       PMD_INIT_LOG(ERR, "Error to get flow "
-                                    "information Error code = %d\n", ret);
+                       DPAA2_PMD_ERR("Error in getting flow information: "
+                                     "err=%d", ret);
                        return ret;
                }
                dpaa2_q->fqid = qid.fqid;
@@ -749,13 +732,10 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
        ret = dpni_set_errors_behavior(dpni, CMD_PRI_LOW,
                                       priv->token, &err_cfg);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error to dpni_set_errors_behavior:"
-                            "code = %d\n", ret);
+               DPAA2_PMD_ERR("Error to dpni_set_errors_behavior: code = %d",
+                             ret);
                return ret;
        }
-       /* VLAN Offload Settings */
-       if (priv->max_vlan_filters)
-               dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
 
        /* if the interrupts were configured on this devices*/
        if (intr_handle && (intr_handle->fd) &&
@@ -812,14 +792,14 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
 
        ret = dpni_disable(dpni, CMD_PRI_LOW, priv->token);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Failure (ret %d) in disabling dpni %d dev\n",
-                            ret, priv->hw_id);
+               DPAA2_PMD_ERR("Failure (ret %d) in disabling dpni %d dev",
+                             ret, priv->hw_id);
                return;
        }
 
        /* clear the recorded link status */
        memset(&link, 0, sizeof(link));
-       dpaa2_dev_atomic_write_link_status(dev, &link);
+       rte_eth_linkstatus_set(dev, &link);
 }
 
 static void
@@ -845,13 +825,12 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
        /* Clean the device first */
        ret = dpni_reset(dpni, CMD_PRI_LOW, priv->token);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Failure cleaning dpni device with"
-                            " error code %d\n", ret);
+               DPAA2_PMD_ERR("Failure cleaning dpni device: err=%d", ret);
                return;
        }
 
        memset(&link, 0, sizeof(link));
-       dpaa2_dev_atomic_write_link_status(dev, &link);
+       rte_eth_linkstatus_set(dev, &link);
 }
 
 static void
@@ -865,17 +844,17 @@ dpaa2_dev_promiscuous_enable(
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return;
        }
 
        ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
        if (ret < 0)
-               RTE_LOG(ERR, PMD, "Unable to enable U promisc mode %d\n", ret);
+               DPAA2_PMD_ERR("Unable to enable U promisc mode %d", ret);
 
        ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
        if (ret < 0)
-               RTE_LOG(ERR, PMD, "Unable to enable M promisc mode %d\n", ret);
+               DPAA2_PMD_ERR("Unable to enable M promisc mode %d", ret);
 }
 
 static void
@@ -889,21 +868,20 @@ dpaa2_dev_promiscuous_disable(
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return;
        }
 
        ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, false);
        if (ret < 0)
-               RTE_LOG(ERR, PMD, "Unable to disable U promisc mode %d\n", ret);
+               DPAA2_PMD_ERR("Unable to disable U promisc mode %d", ret);
 
        if (dev->data->all_multicast == 0) {
                ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW,
                                                 priv->token, false);
                if (ret < 0)
-                       RTE_LOG(ERR, PMD,
-                               "Unable to disable M promisc mode %d\n",
-                               ret);
+                       DPAA2_PMD_ERR("Unable to disable M promisc mode %d",
+                                     ret);
        }
 }
 
@@ -918,13 +896,13 @@ dpaa2_dev_allmulticast_enable(
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return;
        }
 
        ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
        if (ret < 0)
-               RTE_LOG(ERR, PMD, "Unable to enable multicast mode %d\n", ret);
+               DPAA2_PMD_ERR("Unable to enable multicast mode %d", ret);
 }
 
 static void
@@ -937,7 +915,7 @@ dpaa2_dev_allmulticast_disable(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return;
        }
 
@@ -947,7 +925,7 @@ dpaa2_dev_allmulticast_disable(struct rte_eth_dev *dev)
 
        ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, false);
        if (ret < 0)
-               RTE_LOG(ERR, PMD, "Unable to disable multicast mode %d\n", ret);
+               DPAA2_PMD_ERR("Unable to disable multicast mode %d", ret);
 }
 
 static int
@@ -956,12 +934,13 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
        struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
-       uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN
+                               + VLAN_TAG_SIZE;
 
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return -EINVAL;
        }
 
@@ -974,16 +953,18 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        else
                dev->data->dev_conf.rxmode.jumbo_frame = 0;
 
+       dev->data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
+
        /* Set the Max Rx frame length as 'mtu' +
         * Maximum Ethernet header length
         */
        ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW, priv->token,
-                                       mtu + ETH_VLAN_HLEN);
+                                       frame_size);
        if (ret) {
-               PMD_DRV_LOG(ERR, "setting the max frame length failed");
+               DPAA2_PMD_ERR("Setting the max frame length failed");
                return -1;
        }
-       PMD_DRV_LOG(INFO, "MTU is configured %d for the device", mtu);
+       DPAA2_PMD_INFO("MTU configured for the device: %d", mtu);
        return 0;
 }
 
@@ -1000,15 +981,15 @@ dpaa2_dev_add_mac_addr(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return -1;
        }
 
        ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW,
                                priv->token, addr->addr_bytes);
        if (ret)
-               RTE_LOG(ERR, PMD,
-                       "error: Adding the MAC ADDR failed: err = %d\n", ret);
+               DPAA2_PMD_ERR(
+                       "error: Adding the MAC ADDR failed: err = %d", ret);
        return 0;
 }
 
@@ -1027,18 +1008,18 @@ dpaa2_dev_remove_mac_addr(struct rte_eth_dev *dev,
        macaddr = &data->mac_addrs[index];
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return;
        }
 
        ret = dpni_remove_mac_addr(dpni, CMD_PRI_LOW,
                                   priv->token, macaddr->addr_bytes);
        if (ret)
-               RTE_LOG(ERR, PMD,
-                       "error: Removing the MAC ADDR failed: err = %d\n", ret);
+               DPAA2_PMD_ERR(
+                       "error: Removing the MAC ADDR failed: err = %d", ret);
 }
 
-static void
+static int
 dpaa2_dev_set_mac_addr(struct rte_eth_dev *dev,
                       struct ether_addr *addr)
 {
@@ -1049,19 +1030,22 @@ dpaa2_dev_set_mac_addr(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
-               return;
+               DPAA2_PMD_ERR("dpni is NULL");
+               return -EINVAL;
        }
 
        ret = dpni_set_primary_mac_addr(dpni, CMD_PRI_LOW,
                                        priv->token, addr->addr_bytes);
 
        if (ret)
-               RTE_LOG(ERR, PMD,
-                       "error: Setting the MAC ADDR failed %d\n", ret);
+               DPAA2_PMD_ERR(
+                       "error: Setting the MAC ADDR failed %d", ret);
+
+       return ret;
 }
+
 static
-void dpaa2_dev_stats_get(struct rte_eth_dev *dev,
+int dpaa2_dev_stats_get(struct rte_eth_dev *dev,
                         struct rte_eth_stats *stats)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
@@ -1075,13 +1059,13 @@ void dpaa2_dev_stats_get(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        if (!dpni) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
-               return;
+               DPAA2_PMD_ERR("dpni is NULL");
+               return -EINVAL;
        }
 
        if (!stats) {
-               RTE_LOG(ERR, PMD, "stats is NULL\n");
-               return;
+               DPAA2_PMD_ERR("stats is NULL");
+               return -EINVAL;
        }
 
        /*Get Counters from page_0*/
@@ -1116,11 +1100,11 @@ void dpaa2_dev_stats_get(struct rte_eth_dev *dev,
        stats->oerrors = value.page_2.egress_discarded_frames;
        stats->imissed = value.page_2.ingress_nobuffer_discards;
 
-       return;
+       return 0;
 
 err:
-       RTE_LOG(ERR, PMD, "Operation not completed:Error Code = %d\n", retcode);
-       return;
+       DPAA2_PMD_ERR("Operation not completed:Error Code = %d", retcode);
+       return retcode;
 };
 
 static int
@@ -1133,12 +1117,12 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
        union dpni_statistics value[3] = {};
        unsigned int i = 0, num = RTE_DIM(dpaa2_xstats_strings);
 
-       if (xstats == NULL)
-               return 0;
-
        if (n < num)
                return num;
 
+       if (xstats == NULL)
+               return 0;
+
        /* Get Counters from page_0*/
        retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token,
                                      0, 0, &value[0]);
@@ -1164,17 +1148,20 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
        }
        return i;
 err:
-       RTE_LOG(ERR, PMD, "Error in obtaining extended stats (%d)\n", retcode);
+       DPAA2_PMD_ERR("Error in obtaining extended stats (%d)", retcode);
        return retcode;
 }
 
 static int
 dpaa2_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
                       struct rte_eth_xstat_name *xstats_names,
-                      __rte_unused unsigned int limit)
+                      unsigned int limit)
 {
        unsigned int i, stat_cnt = RTE_DIM(dpaa2_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,
@@ -1233,7 +1220,7 @@ dpaa2_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
 
        for (i = 0; i < n; i++) {
                if (ids[i] >= stat_cnt) {
-                       PMD_INIT_LOG(ERR, "id value isn't valid");
+                       DPAA2_PMD_ERR("xstats id value isn't valid");
                        return -1;
                }
                values[i] = values_copy[ids[i]];
@@ -1258,7 +1245,7 @@ dpaa2_xstats_get_names_by_id(
 
        for (i = 0; i < limit; i++) {
                if (ids[i] >= stat_cnt) {
-                       PMD_INIT_LOG(ERR, "id value isn't valid");
+                       DPAA2_PMD_ERR("xstats id value isn't valid");
                        return -1;
                }
                strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name);
@@ -1276,7 +1263,7 @@ dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return;
        }
 
@@ -1287,7 +1274,7 @@ dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
        return;
 
 error:
-       RTE_LOG(ERR, PMD, "Operation not completed:Error Code = %d\n", retcode);
+       DPAA2_PMD_ERR("Operation not completed:Error Code = %d", retcode);
        return;
 };
 
@@ -1299,24 +1286,17 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
        struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
-       struct rte_eth_link link, old;
+       struct rte_eth_link link;
        struct dpni_link_state state = {0};
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return 0;
        }
-       memset(&old, 0, sizeof(old));
-       dpaa2_dev_atomic_read_link_status(dev, &old);
 
        ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
        if (ret < 0) {
-               RTE_LOG(ERR, PMD, "error: dpni_get_link_state %d\n", ret);
-               return -1;
-       }
-
-       if ((old.link_status == state.up) && (old.link_speed == state.rate)) {
-               RTE_LOG(DEBUG, PMD, "No change in status\n");
+               DPAA2_PMD_ERR("error: dpni_get_link_state %d", ret);
                return -1;
        }
 
@@ -1329,13 +1309,14 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
        else
                link.link_duplex = ETH_LINK_FULL_DUPLEX;
 
-       dpaa2_dev_atomic_write_link_status(dev, &link);
-
-       if (link.link_status)
-               PMD_DRV_LOG(INFO, "Port %d Link is Up\n", dev->data->port_id);
+       ret = rte_eth_linkstatus_set(dev, &link);
+       if (ret == -1)
+               DPAA2_PMD_DEBUG("No change in status");
        else
-               PMD_DRV_LOG(INFO, "Port %d Link is Down", dev->data->port_id);
-       return 0;
+               DPAA2_PMD_INFO("Port %d Link is %s\n", dev->data->port_id,
+                              link.link_status ? "Up" : "Down");
+
+       return ret;
 }
 
 /**
@@ -1355,7 +1336,7 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
        dpni = (struct fsl_mc_io *)priv->hw;
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "DPNI is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return ret;
        }
 
@@ -1363,7 +1344,7 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
        ret = dpni_is_enabled(dpni, CMD_PRI_LOW, priv->token, &en);
        if (ret) {
                /* Unable to obtain dpni status; Not continuing */
-               PMD_DRV_LOG(ERR, "Interface Link UP failed (%d)", ret);
+               DPAA2_PMD_ERR("Interface Link UP failed (%d)", ret);
                return -EINVAL;
        }
 
@@ -1371,13 +1352,13 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
        if (!en) {
                ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token);
                if (ret) {
-                       PMD_DRV_LOG(ERR, "Interface Link UP failed (%d)", ret);
+                       DPAA2_PMD_ERR("Interface Link UP failed (%d)", ret);
                        return -EINVAL;
                }
        }
        ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
        if (ret < 0) {
-               RTE_LOG(ERR, PMD, "error: dpni_get_link_state %d\n", ret);
+               DPAA2_PMD_ERR("Unable to get link state (%d)", ret);
                return -1;
        }
 
@@ -1386,10 +1367,9 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
        dev->data->dev_link.link_status = state.up;
 
        if (state.up)
-               PMD_DRV_LOG(INFO, "Port %d Link is set as UP",
-                           dev->data->port_id);
+               DPAA2_PMD_INFO("Port %d Link is Up", dev->data->port_id);
        else
-               PMD_DRV_LOG(INFO, "Port %d Link is DOWN", dev->data->port_id);
+               DPAA2_PMD_INFO("Port %d Link is Down", dev->data->port_id);
        return ret;
 }
 
@@ -1412,7 +1392,7 @@ dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
        dpni = (struct fsl_mc_io *)priv->hw;
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "Device has not yet been configured\n");
+               DPAA2_PMD_ERR("Device has not yet been configured");
                return ret;
        }
 
@@ -1425,12 +1405,12 @@ dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
        do {
                ret = dpni_disable(dpni, 0, priv->token);
                if (ret) {
-                       PMD_DRV_LOG(ERR, "dpni disable failed (%d)", ret);
+                       DPAA2_PMD_ERR("dpni disable failed (%d)", ret);
                        return ret;
                }
                ret = dpni_is_enabled(dpni, 0, priv->token, &dpni_enabled);
                if (ret) {
-                       PMD_DRV_LOG(ERR, "dpni_is_enabled failed (%d)", ret);
+                       DPAA2_PMD_ERR("dpni enable check failed (%d)", ret);
                        return ret;
                }
                if (dpni_enabled)
@@ -1439,12 +1419,12 @@ dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
        } while (dpni_enabled && --retries);
 
        if (!retries) {
-               PMD_DRV_LOG(WARNING, "Retry count exceeded disabling DPNI\n");
+               DPAA2_PMD_WARN("Retry count exceeded disabling dpni");
                /* todo- we may have to manually cleanup queues.
                 */
        } else {
-               PMD_DRV_LOG(INFO, "Port %d Link DOWN successful",
-                           dev->data->port_id);
+               DPAA2_PMD_INFO("Port %d Link DOWN successful",
+                              dev->data->port_id);
        }
 
        dev->data->dev_link.link_status = 0;
@@ -1466,13 +1446,13 @@ dpaa2_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        dpni = (struct fsl_mc_io *)priv->hw;
 
        if (dpni == NULL || fc_conf == NULL) {
-               RTE_LOG(ERR, PMD, "device not configured\n");
+               DPAA2_PMD_ERR("device not configured");
                return ret;
        }
 
        ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
        if (ret) {
-               RTE_LOG(ERR, PMD, "error: dpni_get_link_state %d\n", ret);
+               DPAA2_PMD_ERR("error: dpni_get_link_state %d", ret);
                return ret;
        }
 
@@ -1522,7 +1502,7 @@ dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        dpni = (struct fsl_mc_io *)priv->hw;
 
        if (dpni == NULL) {
-               RTE_LOG(ERR, PMD, "dpni is NULL\n");
+               DPAA2_PMD_ERR("dpni is NULL");
                return ret;
        }
 
@@ -1532,7 +1512,7 @@ dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
         */
        ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
        if (ret) {
-               RTE_LOG(ERR, PMD, "Unable to get link state (err=%d)\n", ret);
+               DPAA2_PMD_ERR("Unable to get link state (err=%d)", ret);
                return -1;
        }
 
@@ -1577,16 +1557,15 @@ dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
                cfg.options &= ~DPNI_LINK_OPT_ASYM_PAUSE;
                break;
        default:
-               RTE_LOG(ERR, PMD, "Incorrect Flow control flag (%d)\n",
-                       fc_conf->mode);
+               DPAA2_PMD_ERR("Incorrect Flow control flag (%d)",
+                             fc_conf->mode);
                return -1;
        }
 
        ret = dpni_set_link_cfg(dpni, CMD_PRI_LOW, priv->token, &cfg);
        if (ret)
-               RTE_LOG(ERR, PMD,
-                       "Unable to set Link configuration (err=%d)\n",
-                       ret);
+               DPAA2_PMD_ERR("Unable to set Link configuration (err=%d)",
+                             ret);
 
        /* Enable link */
        dpaa2_dev_set_link_up(dev);
@@ -1607,13 +1586,13 @@ dpaa2_dev_rss_hash_update(struct rte_eth_dev *dev,
        if (rss_conf->rss_hf) {
                ret = dpaa2_setup_flow_dist(dev, rss_conf->rss_hf);
                if (ret) {
-                       PMD_INIT_LOG(ERR, "unable to set flow dist");
+                       DPAA2_PMD_ERR("Unable to set flow dist");
                        return ret;
                }
        } else {
                ret = dpaa2_remove_flow_dist(dev, 0);
                if (ret) {
-                       PMD_INIT_LOG(ERR, "unable to remove flow dist");
+                       DPAA2_PMD_ERR("Unable to remove flow dist");
                        return ret;
                }
        }
@@ -1634,6 +1613,75 @@ dpaa2_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
        return 0;
 }
 
+int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
+               int eth_rx_queue_id,
+               uint16_t dpcon_id,
+               const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
+{
+       struct dpaa2_dev_priv *eth_priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)eth_priv->hw;
+       struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id];
+       uint8_t flow_id = dpaa2_ethq->flow_id;
+       struct dpni_queue cfg;
+       uint8_t options;
+       int ret;
+
+       if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_PARALLEL)
+               dpaa2_ethq->cb = dpaa2_dev_process_parallel_event;
+       else if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_ATOMIC)
+               dpaa2_ethq->cb = dpaa2_dev_process_atomic_event;
+       else
+               return -EINVAL;
+
+       memset(&cfg, 0, sizeof(struct dpni_queue));
+       options = DPNI_QUEUE_OPT_DEST;
+       cfg.destination.type = DPNI_DEST_DPCON;
+       cfg.destination.id = dpcon_id;
+       cfg.destination.priority = queue_conf->ev.priority;
+
+       if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_ATOMIC) {
+               options |= DPNI_QUEUE_OPT_HOLD_ACTIVE;
+               cfg.destination.hold_active = 1;
+       }
+
+       options |= DPNI_QUEUE_OPT_USER_CTX;
+       cfg.user_context = (size_t)(dpaa2_ethq);
+
+       ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX,
+                            dpaa2_ethq->tc_index, flow_id, options, &cfg);
+       if (ret) {
+               DPAA2_PMD_ERR("Error in dpni_set_queue: ret: %d", ret);
+               return ret;
+       }
+
+       memcpy(&dpaa2_ethq->ev, &queue_conf->ev, sizeof(struct rte_event));
+
+       return 0;
+}
+
+int dpaa2_eth_eventq_detach(const struct rte_eth_dev *dev,
+               int eth_rx_queue_id)
+{
+       struct dpaa2_dev_priv *eth_priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)eth_priv->hw;
+       struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id];
+       uint8_t flow_id = dpaa2_ethq->flow_id;
+       struct dpni_queue cfg;
+       uint8_t options;
+       int ret;
+
+       memset(&cfg, 0, sizeof(struct dpni_queue));
+       options = DPNI_QUEUE_OPT_DEST;
+       cfg.destination.type = DPNI_DEST_NONE;
+
+       ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX,
+                            dpaa2_ethq->tc_index, flow_id, options, &cfg);
+       if (ret)
+               DPAA2_PMD_ERR("Error in dpni_set_queue: ret: %d", ret);
+
+       return ret;
+}
+
 static struct eth_dev_ops dpaa2_ethdev_ops = {
        .dev_configure    = dpaa2_eth_dev_configure,
        .dev_start            = dpaa2_dev_start,
@@ -1663,6 +1711,7 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {
        .rx_queue_release  = dpaa2_dev_rx_queue_release,
        .tx_queue_setup    = dpaa2_dev_tx_queue_setup,
        .tx_queue_release  = dpaa2_dev_tx_queue_release,
+       .rx_queue_count       = dpaa2_dev_rx_queue_count,
        .flow_ctrl_get        = dpaa2_flow_ctrl_get,
        .flow_ctrl_set        = dpaa2_flow_ctrl_set,
        .mac_addr_add         = dpaa2_dev_add_mac_addr,
@@ -1695,15 +1744,15 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
 
        dpni_dev = rte_malloc(NULL, sizeof(struct fsl_mc_io), 0);
        if (!dpni_dev) {
-               PMD_INIT_LOG(ERR, "malloc failed for dpni device\n");
+               DPAA2_PMD_ERR("Memory allocation failed for dpni device");
                return -1;
        }
 
        dpni_dev->regs = rte_mcp_ptr_list[0];
        ret = dpni_open(dpni_dev, CMD_PRI_LOW, hw_id, &priv->token);
        if (ret) {
-               PMD_INIT_LOG(ERR,
-                            "Failure in opening dpni@%d with err code %d\n",
+               DPAA2_PMD_ERR(
+                            "Failure in opening dpni@%d with err code %d",
                             hw_id, ret);
                rte_free(dpni_dev);
                return -1;
@@ -1712,16 +1761,15 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        /* Clean the device first */
        ret = dpni_reset(dpni_dev, CMD_PRI_LOW, priv->token);
        if (ret) {
-               PMD_INIT_LOG(ERR,
-                            "Failure cleaning dpni@%d with err code %d\n",
-                            hw_id, ret);
+               DPAA2_PMD_ERR("Failure cleaning dpni@%d with err code %d",
+                             hw_id, ret);
                goto init_err;
        }
 
        ret = dpni_get_attributes(dpni_dev, CMD_PRI_LOW, priv->token, &attr);
        if (ret) {
-               PMD_INIT_LOG(ERR,
-                            "Failure in get dpni@%d attribute, err code %d\n",
+               DPAA2_PMD_ERR(
+                            "Failure in get dpni@%d attribute, err code %d",
                             hw_id, ret);
                goto init_err;
        }
@@ -1737,8 +1785,9 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        /* Using number of TX queues as number of TX TCs */
        priv->nb_tx_queues = attr.num_tx_tcs;
 
-       PMD_DRV_LOG(DEBUG, "RX-TC= %d, nb_rx_queues= %d, nb_tx_queues=%d",
-                   priv->num_rx_tc, priv->nb_rx_queues, priv->nb_tx_queues);
+       DPAA2_PMD_DEBUG("RX-TC= %d, nb_rx_queues= %d, nb_tx_queues=%d",
+                       priv->num_rx_tc, priv->nb_rx_queues,
+                       priv->nb_tx_queues);
 
        priv->hw = dpni_dev;
        priv->hw_id = hw_id;
@@ -1750,7 +1799,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        /* Allocate memory for hardware structure for queues */
        ret = dpaa2_alloc_rx_tx_queues(eth_dev);
        if (ret) {
-               PMD_INIT_LOG(ERR, "dpaa2_alloc_rx_tx_queuesFailed\n");
+               DPAA2_PMD_ERR("Queue allocation Failed");
                goto init_err;
        }
 
@@ -1758,9 +1807,9 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        eth_dev->data->mac_addrs = rte_zmalloc("dpni",
                ETHER_ADDR_LEN * attr.mac_filter_entries, 0);
        if (eth_dev->data->mac_addrs == NULL) {
-               PMD_INIT_LOG(ERR,
+               DPAA2_PMD_ERR(
                   "Failed to allocate %d bytes needed to store MAC addresses",
-                            ETHER_ADDR_LEN * attr.mac_filter_entries);
+                  ETHER_ADDR_LEN * attr.mac_filter_entries);
                ret = -ENOMEM;
                goto init_err;
        }
@@ -1769,7 +1818,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
                                        priv->token,
                        (uint8_t *)(eth_dev->data->mac_addrs[0].addr_bytes));
        if (ret) {
-               PMD_INIT_LOG(ERR, "DPNI get mac address failed:Err Code = %d\n",
+               DPAA2_PMD_ERR("DPNI get mac address failed:Err Code = %d",
                             ret);
                goto init_err;
        }
@@ -1781,8 +1830,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        ret = dpni_set_buffer_layout(dpni_dev, CMD_PRI_LOW, priv->token,
                                     DPNI_QUEUE_TX, &layout);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error (%d) in setting tx buffer layout",
-                            ret);
+               DPAA2_PMD_ERR("Error (%d) in setting tx buffer layout", ret);
                goto init_err;
        }
 
@@ -1793,19 +1841,17 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        ret = dpni_set_buffer_layout(dpni_dev, CMD_PRI_LOW, priv->token,
                                     DPNI_QUEUE_TX_CONFIRM, &layout);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Error (%d) in setting tx-conf buffer layout",
+               DPAA2_PMD_ERR("Error (%d) in setting tx-conf buffer layout",
                             ret);
                goto init_err;
        }
 
        eth_dev->dev_ops = &dpaa2_ethdev_ops;
-       eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
 
        eth_dev->rx_pkt_burst = dpaa2_dev_prefetch_rx;
        eth_dev->tx_pkt_burst = dpaa2_dev_tx;
-       rte_fslmc_vfio_dmamap();
 
-       RTE_LOG(INFO, PMD, "%s: netdev created\n", eth_dev->data->name);
+       DPAA2_PMD_INFO("%s: netdev created", eth_dev->data->name);
        return 0;
 init_err:
        dpaa2_dev_uninit(eth_dev);
@@ -1826,7 +1872,7 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
                return 0;
 
        if (!dpni) {
-               PMD_INIT_LOG(WARNING, "Already closed or not started");
+               DPAA2_PMD_WARN("Already closed or not started");
                return -1;
        }
 
@@ -1853,8 +1899,8 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
        /* Close the device at underlying layer*/
        ret = dpni_close(dpni, CMD_PRI_LOW, priv->token);
        if (ret) {
-               PMD_INIT_LOG(ERR,
-                            "Failure closing dpni device with err code %d\n",
+               DPAA2_PMD_ERR(
+                            "Failure closing dpni device with err code %d",
                             ret);
        }
 
@@ -1866,7 +1912,7 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
        eth_dev->rx_pkt_burst = NULL;
        eth_dev->tx_pkt_burst = NULL;
 
-       RTE_LOG(INFO, PMD, "%s: netdev created\n", eth_dev->data->name);
+       DPAA2_PMD_INFO("%s: netdev deleted", eth_dev->data->name);
        return 0;
 }
 
@@ -1886,8 +1932,8 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
                                                sizeof(struct dpaa2_dev_priv),
                                                RTE_CACHE_LINE_SIZE);
                if (eth_dev->data->dev_private == NULL) {
-                       PMD_INIT_LOG(CRIT, "Cannot allocate memzone for"
-                                    " private port data\n");
+                       DPAA2_PMD_CRIT(
+                               "Unable to allocate memory for private data");
                        rte_eth_dev_release_port(eth_dev);
                        return -ENOMEM;
                }
@@ -1903,6 +1949,9 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
        dpaa2_dev->eth_dev = eth_dev;
        eth_dev->data->rx_mbuf_alloc_failed = 0;
 
+       if (dpaa2_drv->drv_flags & RTE_DPAA2_DRV_INTR_LSC)
+               eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
+
        /* Invoke PMD device initialization function */
        diag = dpaa2_dev_init(eth_dev);
        if (diag == 0)
@@ -1930,9 +1979,19 @@ rte_dpaa2_remove(struct rte_dpaa2_device *dpaa2_dev)
 }
 
 static struct rte_dpaa2_driver rte_dpaa2_pmd = {
+       .drv_flags = RTE_DPAA2_DRV_INTR_LSC | RTE_DPAA2_DRV_IOVA_AS_VA,
        .drv_type = DPAA2_ETH,
        .probe = rte_dpaa2_probe,
        .remove = rte_dpaa2_remove,
 };
 
 RTE_PMD_REGISTER_DPAA2(net_dpaa2, rte_dpaa2_pmd);
+
+RTE_INIT(dpaa2_pmd_init_log);
+static void
+dpaa2_pmd_init_log(void)
+{
+       dpaa2_logtype_pmd = rte_log_register("pmd.net.dpaa2");
+       if (dpaa2_logtype_pmd >= 0)
+               rte_log_set_level(dpaa2_logtype_pmd, RTE_LOG_NOTICE);
+}