net/dpaa2: add support for firmware version get
[dpdk.git] / drivers / net / dpaa2 / dpaa2_ethdev.c
index c816076..4de1e0c 100644 (file)
 #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"
 
 static struct rte_dpaa2_driver rte_dpaa2_pmd;
+static int dpaa2_dev_uninit(struct rte_eth_dev *eth_dev);
+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;
+}
+
+static int
+dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return -1;
+       }
+
+       if (on)
+               ret = dpni_add_vlan_id(dpni, CMD_PRI_LOW,
+                                      priv->token, vlan_id);
+       else
+               ret = dpni_remove_vlan_id(dpni, CMD_PRI_LOW,
+                                         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);
+
+       return ret;
+}
+
+static void
+dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
+{
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = priv->hw;
+       int ret;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (mask & ETH_VLAN_FILTER_MASK) {
+               if (dev->data->dev_conf.rxmode.hw_vlan_filter)
+                       ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
+                                                     priv->token, true);
+               else
+                       ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
+                                                     priv->token, false);
+               if (ret < 0)
+                       RTE_LOG(ERR, PMD, "Unable to set vlan filter ret = %d",
+                               ret);
+       }
+}
+
+static int
+dpaa2_fw_version_get(struct rte_eth_dev *dev,
+                    char *fw_version,
+                    size_t fw_size)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = priv->hw;
+       struct mc_soc_version mc_plat_info = {0};
+       struct mc_version mc_ver_info = {0};
+
+       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");
+
+       if (mc_get_version(dpni, CMD_PRI_LOW, &mc_ver_info))
+               RTE_LOG(WARNING, PMD, "\tmc_get_version failed\n");
+
+       ret = snprintf(fw_version, fw_size,
+                      "%x-%d.%d.%d",
+                      mc_plat_info.svr,
+                      mc_ver_info.major,
+                      mc_ver_info.minor,
+                      mc_ver_info.revision);
+
+       ret += 1; /* add the size of '\0' */
+       if (fw_size < (uint32_t)ret)
+               return ret;
+       else
+               return 0;
+}
 
 static void
 dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
@@ -68,7 +208,17 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->min_rx_bufsize = DPAA2_MIN_RX_BUF_SIZE;
        dev_info->max_rx_queues = (uint16_t)priv->nb_rx_queues;
        dev_info->max_tx_queues = (uint16_t)priv->nb_tx_queues;
-
+       dev_info->rx_offload_capa =
+               DEV_RX_OFFLOAD_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_UDP_CKSUM |
+               DEV_RX_OFFLOAD_TCP_CKSUM |
+               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
+       dev_info->tx_offload_capa =
+               DEV_TX_OFFLOAD_IPV4_CKSUM |
+               DEV_TX_OFFLOAD_UDP_CKSUM |
+               DEV_TX_OFFLOAD_TCP_CKSUM |
+               DEV_TX_OFFLOAD_SCTP_CKSUM |
+               DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
        dev_info->speed_capa = ETH_LINK_SPEED_1G |
                        ETH_LINK_SPEED_2_5G |
                        ETH_LINK_SPEED_10G;
@@ -107,15 +257,19 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
 
                memset(dpaa2_q->q_storage, 0,
                       sizeof(struct queue_storage_info_t));
-               dpaa2_q->q_storage->dq_storage[0] = rte_malloc(NULL,
-                       DPAA2_DQRR_RING_SIZE * sizeof(struct qbman_result),
-                       RTE_CACHE_LINE_SIZE);
+               if (dpaa2_alloc_dq_storage(dpaa2_q->q_storage))
+                       goto fail;
        }
 
        for (i = 0; i < priv->nb_tx_queues; i++) {
                mc_q->dev = dev;
-               mc_q->flow_id = DPNI_NEW_FLOW_ID;
+               mc_q->flow_id = 0xffff;
                priv->tx_vq[i] = mc_q++;
+               dpaa2_q = (struct dpaa2_queue *)priv->tx_vq[i];
+               dpaa2_q->cscn = rte_malloc(NULL,
+                                          sizeof(struct qbman_result), 16);
+               if (!dpaa2_q->cscn)
+                       goto fail_tx;
        }
 
        vq_id = 0;
@@ -128,12 +282,20 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
        }
 
        return 0;
+fail_tx:
+       i -= 1;
+       while (i >= 0) {
+               dpaa2_q = (struct dpaa2_queue *)priv->tx_vq[i];
+               rte_free(dpaa2_q->cscn);
+               priv->tx_vq[i--] = NULL;
+       }
+       i = priv->nb_rx_queues;
 fail:
        i -= 1;
        mc_q = priv->rx_vq[0];
        while (i >= 0) {
                dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[i];
-               rte_free(dpaa2_q->q_storage->dq_storage[0]);
+               dpaa2_free_dq_storage(dpaa2_q->q_storage);
                rte_free(dpaa2_q->q_storage);
                priv->rx_vq[i--] = NULL;
        }
@@ -150,6 +312,20 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
 
+       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);
+                       if (ret) {
+                               PMD_INIT_LOG(ERR,
+                                            "unable to set mtu. check config\n");
+                               return ret;
+                       }
+               } else {
+                       return -1;
+               }
+       }
+
        /* Check for correct configuration */
        if (eth_conf->rxmode.mq_mode != ETH_MQ_RX_RSS &&
            data->nb_rx_queues > 1) {
@@ -215,6 +391,17 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
        options = options | DPNI_QUEUE_OPT_USER_CTX;
        cfg.user_context = (uint64_t)(dpaa2_q);
 
+       /*if ls2088 or rev2 device, enable the stashing */
+       if ((qbman_get_version() & 0xFFFF0000) > QMAN_REV_4000) {
+               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
+                */
+               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) {
@@ -222,6 +409,25 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
                return -1;
        }
 
+       if (!(priv->flags & DPAA2_RX_TAILDROP_OFF)) {
+               struct dpni_taildrop taildrop;
+
+               taildrop.enable = 1;
+               /*enabling per rx queue congestion control */
+               taildrop.threshold = CONG_THRESHOLD_RX_Q;
+               taildrop.units = DPNI_CONGESTION_UNIT_BYTES;
+               PMD_INIT_LOG(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);
+                       return -1;
+               }
+       }
+
        dev->data->rx_queues[rx_queue_id] = dpaa2_q;
        return 0;
 }
@@ -246,14 +452,19 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        /* Return if queue already configured */
-       if (dpaa2_q->flow_id != DPNI_NEW_FLOW_ID)
+       if (dpaa2_q->flow_id != 0xffff)
                return 0;
 
        memset(&tx_conf_cfg, 0, sizeof(struct dpni_queue));
        memset(&tx_flow_cfg, 0, sizeof(struct dpni_queue));
 
-       tc_id = 0;
-       flow_id = tx_queue_id;
+       if (priv->num_tc == 1) {
+               tc_id = 0;
+               flow_id = tx_queue_id % priv->num_dist_per_tc[tc_id];
+       } else {
+               tc_id = tx_queue_id;
+               flow_id = 0;
+       }
 
        ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX,
                             tc_id, flow_id, options, &tx_flow_cfg);
@@ -279,6 +490,36 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
        }
        dpaa2_q->tc_index = tc_id;
 
+       if (priv->flags & DPAA2_TX_CGR_SUPPORT) {
+               struct dpni_congestion_notification_cfg cong_notif_cfg;
+
+               cong_notif_cfg.units = DPNI_CONGESTION_UNIT_BYTES;
+               /* Notify about congestion when the queue size is 32 KB */
+               cong_notif_cfg.threshold_entry = CONG_ENTER_TX_THRESHOLD;
+               /* Notify that the queue is not congested when the data in
+                * the queue is below this thershold.
+                */
+               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.dest_cfg.dest_type = DPNI_DEST_NONE;
+               cong_notif_cfg.notification_mode =
+                                        DPNI_CONG_OPT_WRITE_MEM_ON_ENTER |
+                                        DPNI_CONG_OPT_WRITE_MEM_ON_EXIT |
+                                        DPNI_CONG_OPT_COHERENT_WRITE;
+
+               ret = dpni_set_congestion_notification(dpni, CMD_PRI_LOW,
+                                                      priv->token,
+                                                      DPNI_QUEUE_TX,
+                                                      tc_id,
+                                                      &cong_notif_cfg);
+               if (ret) {
+                       PMD_INIT_LOG(ERR,
+                          "Error in setting tx congestion notification: = %d",
+                          -ret);
+                       return -ret;
+               }
+       }
        dev->data->tx_queues[tx_queue_id] = dpaa2_q;
        return 0;
 }
@@ -295,6 +536,28 @@ dpaa2_dev_tx_queue_release(void *q __rte_unused)
        PMD_INIT_FUNC_TRACE();
 }
 
+static const uint32_t *
+dpaa2_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,
+               RTE_PTYPE_L4_ICMP,
+               RTE_PTYPE_UNKNOWN
+       };
+
+       if (dev->rx_pkt_burst == dpaa2_dev_prefetch_rx)
+               return ptypes;
+       return NULL;
+}
+
 static int
 dpaa2_dev_start(struct rte_eth_dev *dev)
 {
@@ -302,6 +565,7 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
        struct dpaa2_dev_priv *priv = data->dev_private;
        struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
        struct dpni_queue cfg;
+       struct dpni_error_cfg   err_cfg;
        uint16_t qdid;
        struct dpni_queue_id qid;
        struct dpaa2_queue *dpaa2_q;
@@ -316,6 +580,9 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
                return ret;
        }
 
+       /* Power up the phy. Needed to make the link go Up */
+       dpaa2_dev_set_link_up(dev);
+
        ret = dpni_get_qdid(dpni, CMD_PRI_LOW, priv->token,
                            DPNI_QUEUE_TX, &qdid);
        if (ret) {
@@ -337,6 +604,51 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
                dpaa2_q->fqid = qid.fqid;
        }
 
+       ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
+                              DPNI_OFF_RX_L3_CSUM, true);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "Error to set RX l3 csum:Error = %d\n", ret);
+               return ret;
+       }
+
+       ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
+                              DPNI_OFF_RX_L4_CSUM, true);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "Error to get RX l4 csum:Error = %d\n", 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);
+               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);
+               return ret;
+       }
+
+       /*checksum errors, send them to normal path and set it in annotation */
+       err_cfg.errors = DPNI_ERROR_L3CE | DPNI_ERROR_L4CE;
+
+       err_cfg.error_action = DPNI_ERROR_ACTION_CONTINUE;
+       err_cfg.set_frame_annotation = true;
+
+       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);
+               return ret;
+       }
+       /* VLAN Offload Settings */
+       if (priv->max_vlan_filters)
+               dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
+
        return 0;
 }
 
@@ -350,26 +662,44 @@ dpaa2_dev_stop(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;
        int ret;
+       struct rte_eth_link link;
 
        PMD_INIT_FUNC_TRACE();
 
+       dpaa2_dev_set_link_down(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);
                return;
        }
+
+       /* clear the recorded link status */
+       memset(&link, 0, sizeof(link));
+       dpaa2_dev_atomic_write_link_status(dev, &link);
 }
 
 static void
 dpaa2_dev_close(struct rte_eth_dev *dev)
 {
+       struct rte_eth_dev_data *data = dev->data;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
        struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
-       int ret;
+       int i, ret;
+       struct rte_eth_link link;
+       struct dpaa2_queue *dpaa2_q;
 
        PMD_INIT_FUNC_TRACE();
 
+       for (i = 0; i < data->nb_tx_queues; i++) {
+               dpaa2_q = (struct dpaa2_queue *)data->tx_queues[i];
+               if (!dpaa2_q->cscn) {
+                       rte_free(dpaa2_q->cscn);
+                       dpaa2_q->cscn = NULL;
+               }
+       }
+
        /* Clean the device first */
        ret = dpni_reset(dpni, CMD_PRI_LOW, priv->token);
        if (ret) {
@@ -377,6 +707,595 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
                             " error code %d\n", ret);
                return;
        }
+
+       memset(&link, 0, sizeof(link));
+       dpaa2_dev_atomic_write_link_status(dev, &link);
+}
+
+static void
+dpaa2_dev_promiscuous_enable(
+               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;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "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", 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", ret);
+}
+
+static void
+dpaa2_dev_promiscuous_disable(
+               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;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "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", 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",
+                               ret);
+       }
+}
+
+static void
+dpaa2_dev_allmulticast_enable(
+               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;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "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", ret);
+}
+
+static void
+dpaa2_dev_allmulticast_disable(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;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       /* must remain on for all promiscuous */
+       if (dev->data->promiscuous == 1)
+               return;
+
+       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", ret);
+}
+
+static int
+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;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return -EINVAL;
+       }
+
+       /* check that mtu is within the allowed range */
+       if ((mtu < ETHER_MIN_MTU) || (frame_size > DPAA2_MAX_RX_PKT_LEN))
+               return -EINVAL;
+
+       if (frame_size > ETHER_MAX_LEN)
+               dev->data->dev_conf.rxmode.jumbo_frame = 1;
+       else
+               dev->data->dev_conf.rxmode.jumbo_frame = 0;
+
+       /* 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);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "setting the max frame length failed");
+               return -1;
+       }
+       PMD_DRV_LOG(INFO, "MTU is configured %d for the device\n", mtu);
+       return 0;
+}
+
+static int
+dpaa2_dev_add_mac_addr(struct rte_eth_dev *dev,
+                      struct ether_addr *addr,
+                      __rte_unused uint32_t index,
+                      __rte_unused uint32_t pool)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "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", ret);
+       return 0;
+}
+
+static void
+dpaa2_dev_remove_mac_addr(struct rte_eth_dev *dev,
+                         uint32_t index)
+{
+       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_dev_data *data = dev->data;
+       struct ether_addr *macaddr;
+
+       PMD_INIT_FUNC_TRACE();
+
+       macaddr = &data->mac_addrs[index];
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "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", ret);
+}
+
+static void
+dpaa2_dev_set_mac_addr(struct rte_eth_dev *dev,
+                      struct ether_addr *addr)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       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", ret);
+}
+static
+void dpaa2_dev_stats_get(struct rte_eth_dev *dev,
+                        struct rte_eth_stats *stats)
+{
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       int32_t  retcode;
+       uint8_t page0 = 0, page1 = 1, page2 = 2;
+       union dpni_statistics value;
+
+       memset(&value, 0, sizeof(union dpni_statistics));
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (!dpni) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       if (!stats) {
+               RTE_LOG(ERR, PMD, "stats is NULL");
+               return;
+       }
+
+       /*Get Counters from page_0*/
+       retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token,
+                                     page0, &value);
+       if (retcode)
+               goto err;
+
+       stats->ipackets = value.page_0.ingress_all_frames;
+       stats->ibytes = value.page_0.ingress_all_bytes;
+
+       /*Get Counters from page_1*/
+       retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token,
+                                     page1, &value);
+       if (retcode)
+               goto err;
+
+       stats->opackets = value.page_1.egress_all_frames;
+       stats->obytes = value.page_1.egress_all_bytes;
+
+       /*Get Counters from page_2*/
+       retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token,
+                                     page2, &value);
+       if (retcode)
+               goto err;
+
+       /* Ingress drop frame count due to configured rules */
+       stats->ierrors = value.page_2.ingress_filtered_frames;
+       /* Ingress drop frame count due to error */
+       stats->ierrors += value.page_2.ingress_discarded_frames;
+
+       stats->oerrors = value.page_2.egress_discarded_frames;
+       stats->imissed = value.page_2.ingress_nobuffer_discards;
+
+       return;
+
+err:
+       RTE_LOG(ERR, PMD, "Operation not completed:Error Code = %d\n", retcode);
+       return;
+};
+
+static
+void dpaa2_dev_stats_reset(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;
+       int32_t  retcode;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       retcode =  dpni_reset_statistics(dpni, CMD_PRI_LOW, priv->token);
+       if (retcode)
+               goto error;
+
+       return;
+
+error:
+       RTE_LOG(ERR, PMD, "Operation not completed:Error Code = %d\n", retcode);
+       return;
+};
+
+/* return 0 means link status changed, -1 means not changed */
+static int
+dpaa2_dev_link_update(struct rte_eth_dev *dev,
+                       int wait_to_complete __rte_unused)
+{
+       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 dpni_link_state state = {0};
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "error : 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", ret);
+               return -1;
+       }
+
+       if ((old.link_status == state.up) && (old.link_speed == state.rate)) {
+               RTE_LOG(DEBUG, PMD, "No change in status\n");
+               return -1;
+       }
+
+       memset(&link, 0, sizeof(struct rte_eth_link));
+       link.link_status = state.up;
+       link.link_speed = state.rate;
+
+       if (state.options & DPNI_LINK_OPT_HALF_DUPLEX)
+               link.link_duplex = ETH_LINK_HALF_DUPLEX;
+       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);
+       else
+               PMD_DRV_LOG(INFO, "Port %d Link is Down\n", dev->data->port_id);
+       return 0;
+}
+
+/**
+ * Toggle the DPNI to enable, if not already enabled.
+ * This is not strictly PHY up/down - it is more of logical toggling.
+ */
+static int
+dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
+{
+       int ret = -EINVAL;
+       struct dpaa2_dev_priv *priv;
+       struct fsl_mc_io *dpni;
+       int en = 0;
+
+       PMD_INIT_FUNC_TRACE();
+
+       priv = dev->data->dev_private;
+       dpni = (struct fsl_mc_io *)priv->hw;
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "Device has not yet been configured");
+               return ret;
+       }
+
+       /* Check if DPNI is currently enabled */
+       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);
+               return -EINVAL;
+       }
+
+       /* Enable link if not already enabled */
+       if (!en) {
+               ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Interface Link UP failed (%d)", ret);
+                       return -EINVAL;
+               }
+       }
+       /* changing tx burst function to start enqueues */
+       dev->tx_pkt_burst = dpaa2_dev_tx;
+       dev->data->dev_link.link_status = 1;
+
+       PMD_DRV_LOG(INFO, "Port %d Link UP successful", dev->data->port_id);
+       return ret;
+}
+
+/**
+ * Toggle the DPNI to disable, if not already disabled.
+ * This is not strictly PHY up/down - it is more of logical toggling.
+ */
+static int
+dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
+{
+       int ret = -EINVAL;
+       struct dpaa2_dev_priv *priv;
+       struct fsl_mc_io *dpni;
+       int dpni_enabled = 0;
+       int retries = 10;
+
+       PMD_INIT_FUNC_TRACE();
+
+       priv = dev->data->dev_private;
+       dpni = (struct fsl_mc_io *)priv->hw;
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "Device has not yet been configured");
+               return ret;
+       }
+
+       /*changing  tx burst function to avoid any more enqueues */
+       dev->tx_pkt_burst = dummy_dev_tx;
+
+       /* Loop while dpni_disable() attempts to drain the egress FQs
+        * and confirm them back to us.
+        */
+       do {
+               ret = dpni_disable(dpni, 0, priv->token);
+               if (ret) {
+                       PMD_DRV_LOG(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);
+                       return ret;
+               }
+               if (dpni_enabled)
+                       /* Allow the MC some slack */
+                       rte_delay_us(100 * 1000);
+       } while (dpni_enabled && --retries);
+
+       if (!retries) {
+               PMD_DRV_LOG(WARNING, "Retry count exceeded disabling DPNI\n");
+               /* todo- we may have to manually cleanup queues.
+                */
+       } else {
+               PMD_DRV_LOG(INFO, "Port %d Link DOWN successful",
+                           dev->data->port_id);
+       }
+
+       dev->data->dev_link.link_status = 0;
+
+       return ret;
+}
+
+static int
+dpaa2_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+{
+       int ret = -EINVAL;
+       struct dpaa2_dev_priv *priv;
+       struct fsl_mc_io *dpni;
+       struct dpni_link_state state = {0};
+
+       PMD_INIT_FUNC_TRACE();
+
+       priv = dev->data->dev_private;
+       dpni = (struct fsl_mc_io *)priv->hw;
+
+       if (dpni == NULL || fc_conf == NULL) {
+               RTE_LOG(ERR, PMD, "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", ret);
+               return ret;
+       }
+
+       memset(fc_conf, 0, sizeof(struct rte_eth_fc_conf));
+       if (state.options & DPNI_LINK_OPT_PAUSE) {
+               /* DPNI_LINK_OPT_PAUSE set
+                *  if ASYM_PAUSE not set,
+                *      RX Side flow control (handle received Pause frame)
+                *      TX side flow control (send Pause frame)
+                *  if ASYM_PAUSE set,
+                *      RX Side flow control (handle received Pause frame)
+                *      No TX side flow control (send Pause frame disabled)
+                */
+               if (!(state.options & DPNI_LINK_OPT_ASYM_PAUSE))
+                       fc_conf->mode = RTE_FC_FULL;
+               else
+                       fc_conf->mode = RTE_FC_RX_PAUSE;
+       } else {
+               /* DPNI_LINK_OPT_PAUSE not set
+                *  if ASYM_PAUSE set,
+                *      TX side flow control (send Pause frame)
+                *      No RX side flow control (No action on pause frame rx)
+                *  if ASYM_PAUSE not set,
+                *      Flow control disabled
+                */
+               if (state.options & DPNI_LINK_OPT_ASYM_PAUSE)
+                       fc_conf->mode = RTE_FC_TX_PAUSE;
+               else
+                       fc_conf->mode = RTE_FC_NONE;
+       }
+
+       return ret;
+}
+
+static int
+dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+{
+       int ret = -EINVAL;
+       struct dpaa2_dev_priv *priv;
+       struct fsl_mc_io *dpni;
+       struct dpni_link_state state = {0};
+       struct dpni_link_cfg cfg = {0};
+
+       PMD_INIT_FUNC_TRACE();
+
+       priv = dev->data->dev_private;
+       dpni = (struct fsl_mc_io *)priv->hw;
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return ret;
+       }
+
+       /* It is necessary to obtain the current state before setting fc_conf
+        * as MC would return error in case rate, autoneg or duplex values are
+        * different.
+        */
+       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)", ret);
+               return -1;
+       }
+
+       /* Disable link before setting configuration */
+       dpaa2_dev_set_link_down(dev);
+
+       /* Based on fc_conf, update cfg */
+       cfg.rate = state.rate;
+       cfg.options = state.options;
+
+       /* update cfg with fc_conf */
+       switch (fc_conf->mode) {
+       case RTE_FC_FULL:
+               /* Full flow control;
+                * OPT_PAUSE set, ASYM_PAUSE not set
+                */
+               cfg.options |= DPNI_LINK_OPT_PAUSE;
+               cfg.options &= ~DPNI_LINK_OPT_ASYM_PAUSE;
+       case RTE_FC_TX_PAUSE:
+               /* Enable RX flow control
+                * OPT_PAUSE not set;
+                * ASYM_PAUSE set;
+                */
+               cfg.options |= DPNI_LINK_OPT_ASYM_PAUSE;
+               cfg.options &= ~DPNI_LINK_OPT_PAUSE;
+               break;
+       case RTE_FC_RX_PAUSE:
+               /* Enable TX Flow control
+                * OPT_PAUSE set
+                * ASYM_PAUSE set
+                */
+               cfg.options |= DPNI_LINK_OPT_PAUSE;
+               cfg.options |= DPNI_LINK_OPT_ASYM_PAUSE;
+               break;
+       case RTE_FC_NONE:
+               /* Disable Flow control
+                * OPT_PAUSE not set
+                * ASYM_PAUSE not set
+                */
+               cfg.options &= ~DPNI_LINK_OPT_PAUSE;
+               cfg.options &= ~DPNI_LINK_OPT_ASYM_PAUSE;
+               break;
+       default:
+               RTE_LOG(ERR, PMD, "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)",
+                       ret);
+
+       /* Enable link */
+       dpaa2_dev_set_link_up(dev);
+
+       return ret;
 }
 
 static struct eth_dev_ops dpaa2_ethdev_ops = {
@@ -384,11 +1303,30 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {
        .dev_start            = dpaa2_dev_start,
        .dev_stop             = dpaa2_dev_stop,
        .dev_close            = dpaa2_dev_close,
+       .promiscuous_enable   = dpaa2_dev_promiscuous_enable,
+       .promiscuous_disable  = dpaa2_dev_promiscuous_disable,
+       .allmulticast_enable  = dpaa2_dev_allmulticast_enable,
+       .allmulticast_disable = dpaa2_dev_allmulticast_disable,
+       .dev_set_link_up      = dpaa2_dev_set_link_up,
+       .dev_set_link_down    = dpaa2_dev_set_link_down,
+       .link_update       = dpaa2_dev_link_update,
+       .stats_get             = dpaa2_dev_stats_get,
+       .stats_reset       = dpaa2_dev_stats_reset,
+       .fw_version_get    = dpaa2_fw_version_get,
        .dev_infos_get     = dpaa2_dev_info_get,
+       .dev_supported_ptypes_get = dpaa2_supported_ptypes_get,
+       .mtu_set           = dpaa2_dev_mtu_set,
+       .vlan_filter_set      = dpaa2_vlan_filter_set,
+       .vlan_offload_set     = dpaa2_vlan_offload_set,
        .rx_queue_setup    = dpaa2_dev_rx_queue_setup,
        .rx_queue_release  = dpaa2_dev_rx_queue_release,
        .tx_queue_setup    = dpaa2_dev_tx_queue_setup,
        .tx_queue_release  = dpaa2_dev_tx_queue_release,
+       .flow_ctrl_get        = dpaa2_flow_ctrl_get,
+       .flow_ctrl_set        = dpaa2_flow_ctrl_set,
+       .mac_addr_add         = dpaa2_dev_add_mac_addr,
+       .mac_addr_remove      = dpaa2_dev_remove_mac_addr,
+       .mac_addr_set         = dpaa2_dev_set_mac_addr,
 };
 
 static int
@@ -401,7 +1339,6 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
        struct dpni_buffer_layout layout;
        int i, ret, hw_id;
-       int tot_size;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -413,7 +1350,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
 
        hw_id = dpaa2_dev->object_id;
 
-       dpni_dev = (struct fsl_mc_io *)malloc(sizeof(struct fsl_mc_io));
+       dpni_dev = rte_malloc(NULL, sizeof(struct fsl_mc_io), 0);
        if (!dpni_dev) {
                PMD_INIT_LOG(ERR, "malloc failed for dpni device\n");
                return -1;
@@ -422,24 +1359,28 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        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 device with"
-                       " error code %d\n", hw_id, ret);
+               PMD_INIT_LOG(ERR,
+                            "Failure in opening dpni@%d with err code %d\n",
+                            hw_id, ret);
+               rte_free(dpni_dev);
                return -1;
        }
 
        /* Clean the device first */
        ret = dpni_reset(dpni_dev, CMD_PRI_LOW, priv->token);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Failure cleaning dpni@%d device with"
-                       " error code %d\n", hw_id, ret);
-               return -1;
+               PMD_INIT_LOG(ERR,
+                            "Failure cleaning dpni@%d with err code %d\n",
+                            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 getting dpni@%d attribute, "
-                       " error code %d\n", hw_id, ret);
-               return -1;
+               PMD_INIT_LOG(ERR,
+                            "Failure in get dpni@%d attribute, err code %d\n",
+                            hw_id, ret);
+               goto init_err;
        }
 
        priv->num_tc = attr.num_tcs;
@@ -453,7 +1394,13 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
         */
        priv->nb_rx_queues = priv->num_dist_per_tc[DPAA2_DEF_TC];
 
-       priv->nb_tx_queues = attr.num_queues;
+       if (attr.num_tcs == 1)
+               priv->nb_tx_queues = attr.num_queues;
+       else
+               priv->nb_tx_queues = attr.num_tcs;
+
+       PMD_INIT_LOG(DEBUG, "num_tc %d", priv->num_tc);
+       PMD_INIT_LOG(DEBUG, "nb_rx_queues %d", priv->nb_rx_queues);
 
        priv->hw = dpni_dev;
        priv->hw_id = hw_id;
@@ -462,55 +1409,34 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        priv->max_vlan_filters = attr.vlan_filter_entries;
        priv->flags = 0;
 
+       priv->flags |= DPAA2_TX_CGR_SUPPORT;
+       PMD_INIT_LOG(INFO, "Enable the tx congestion control support");
+
        /* 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");
-               return -ret;
+               goto init_err;
        }
 
        /* Allocate memory for storing MAC addresses */
        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, "Failed to allocate %d bytes needed to "
-                                               "store MAC addresses",
-                               ETHER_ADDR_LEN * attr.mac_filter_entries);
-               return -ENOMEM;
+               PMD_INIT_LOG(ERR,
+                  "Failed to allocate %d bytes needed to store MAC addresses",
+                            ETHER_ADDR_LEN * attr.mac_filter_entries);
+               ret = -ENOMEM;
+               goto init_err;
        }
 
        ret = dpni_get_primary_mac_addr(dpni_dev, CMD_PRI_LOW,
                                        priv->token,
                        (uint8_t *)(eth_dev->data->mac_addrs[0].addr_bytes));
        if (ret) {
-               PMD_INIT_LOG(ERR, "DPNI get mac address failed:"
-                                       " Error Code = %d\n", ret);
-               return -ret;
-       }
-
-       /* ... rx buffer layout ... */
-       tot_size = DPAA2_HW_BUF_RESERVE + RTE_PKTMBUF_HEADROOM;
-       tot_size = RTE_ALIGN_CEIL(tot_size,
-                                 DPAA2_PACKET_LAYOUT_ALIGN);
-
-       memset(&layout, 0, sizeof(struct dpni_buffer_layout));
-       layout.options = DPNI_BUF_LAYOUT_OPT_FRAME_STATUS |
-                               DPNI_BUF_LAYOUT_OPT_PARSER_RESULT |
-                               DPNI_BUF_LAYOUT_OPT_DATA_HEAD_ROOM |
-                               DPNI_BUF_LAYOUT_OPT_PRIVATE_DATA_SIZE;
-
-       layout.pass_frame_status = 1;
-       layout.data_head_room = tot_size
-               - DPAA2_FD_PTA_SIZE - DPAA2_MBUF_HW_ANNOTATION;
-       layout.private_data_size = DPAA2_FD_PTA_SIZE;
-       layout.pass_parser_result = 1;
-       PMD_INIT_LOG(DEBUG, "Tot_size = %d, head room = %d, private = %d",
-                    tot_size, layout.data_head_room, layout.private_data_size);
-       ret = dpni_set_buffer_layout(dpni_dev, CMD_PRI_LOW, priv->token,
-                                    DPNI_QUEUE_RX, &layout);
-       if (ret) {
-               PMD_INIT_LOG(ERR, "Err(%d) in setting rx buffer layout", ret);
-               return -1;
+               PMD_INIT_LOG(ERR, "DPNI get mac address failed:Err Code = %d\n",
+                            ret);
+               goto init_err;
        }
 
        /* ... tx buffer layout ... */
@@ -520,9 +1446,9 @@ 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);
-               return -1;
+               PMD_INIT_LOG(ERR, "Error (%d) in setting tx buffer layout",
+                            ret);
+               goto init_err;
        }
 
        /* ... tx-conf and error buffer layout ... */
@@ -532,15 +1458,22 @@ 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", ret);
-               return -1;
+               PMD_INIT_LOG(ERR, "Error (%d) in setting tx-conf buffer layout",
+                            ret);
+               goto init_err;
        }
 
        eth_dev->dev_ops = &dpaa2_ethdev_ops;
        eth_dev->data->drv_name = rte_dpaa2_pmd.driver.name;
 
+       eth_dev->rx_pkt_burst = dpaa2_dev_prefetch_rx;
+       eth_dev->tx_pkt_burst = dpaa2_dev_tx;
+       rte_fslmc_vfio_dmamap();
+
        return 0;
+init_err:
+       dpaa2_dev_uninit(eth_dev);
+       return ret;
 }
 
 static int
@@ -575,24 +1508,27 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
                priv->rx_vq[0] = NULL;
        }
 
-       /* Allocate memory for storing MAC addresses */
+       /* free memory for storing MAC addresses */
        if (eth_dev->data->mac_addrs) {
                rte_free(eth_dev->data->mac_addrs);
                eth_dev->data->mac_addrs = NULL;
        }
 
-       /*Close the device at underlying layer*/
+       /* 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"
-                       " error code %d\n", ret);
+               PMD_INIT_LOG(ERR,
+                            "Failure closing dpni device with err code %d\n",
+                            ret);
        }
 
-       /*Free the allocated memory for ethernet private data and dpni*/
+       /* Free the allocated memory for ethernet private data and dpni*/
        priv->hw = NULL;
-       free(dpni);
+       rte_free(dpni);
 
        eth_dev->dev_ops = NULL;
+       eth_dev->rx_pkt_burst = NULL;
+       eth_dev->tx_pkt_burst = NULL;
 
        return 0;
 }