net/bnxt: allow group ID 0 for RSS action
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index eb87011..fc3f1a8 100644 (file)
@@ -11,9 +11,9 @@
 #include <rte_ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
+#include <rte_alarm.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_irq.h"
 #include "bnxt_vnic.h"
 #include "hsi_struct_def_dpdk.h"
 #include "bnxt_nvm_defs.h"
-#include "bnxt_util.h"
 
 #define DRV_MODULE_NAME                "bnxt"
 static const char bnxt_version[] =
        "Broadcom NetXtreme driver " DRV_MODULE_NAME;
 int bnxt_logtype_driver;
 
-#define PCI_VENDOR_ID_BROADCOM 0x14E4
-
-#define BROADCOM_DEV_ID_STRATUS_NIC_VF1 0x1606
-#define BROADCOM_DEV_ID_STRATUS_NIC_VF2 0x1609
-#define BROADCOM_DEV_ID_STRATUS_NIC 0x1614
-#define BROADCOM_DEV_ID_57414_VF 0x16c1
-#define BROADCOM_DEV_ID_57301 0x16c8
-#define BROADCOM_DEV_ID_57302 0x16c9
-#define BROADCOM_DEV_ID_57304_PF 0x16ca
-#define BROADCOM_DEV_ID_57304_VF 0x16cb
-#define BROADCOM_DEV_ID_57417_MF 0x16cc
-#define BROADCOM_DEV_ID_NS2 0x16cd
-#define BROADCOM_DEV_ID_57311 0x16ce
-#define BROADCOM_DEV_ID_57312 0x16cf
-#define BROADCOM_DEV_ID_57402 0x16d0
-#define BROADCOM_DEV_ID_57404 0x16d1
-#define BROADCOM_DEV_ID_57406_PF 0x16d2
-#define BROADCOM_DEV_ID_57406_VF 0x16d3
-#define BROADCOM_DEV_ID_57402_MF 0x16d4
-#define BROADCOM_DEV_ID_57407_RJ45 0x16d5
-#define BROADCOM_DEV_ID_57412 0x16d6
-#define BROADCOM_DEV_ID_57414 0x16d7
-#define BROADCOM_DEV_ID_57416_RJ45 0x16d8
-#define BROADCOM_DEV_ID_57417_RJ45 0x16d9
-#define BROADCOM_DEV_ID_5741X_VF 0x16dc
-#define BROADCOM_DEV_ID_57412_MF 0x16de
-#define BROADCOM_DEV_ID_57314 0x16df
-#define BROADCOM_DEV_ID_57317_RJ45 0x16e0
-#define BROADCOM_DEV_ID_5731X_VF 0x16e1
-#define BROADCOM_DEV_ID_57417_SFP 0x16e2
-#define BROADCOM_DEV_ID_57416_SFP 0x16e3
-#define BROADCOM_DEV_ID_57317_SFP 0x16e4
-#define BROADCOM_DEV_ID_57404_MF 0x16e7
-#define BROADCOM_DEV_ID_57406_MF 0x16e8
-#define BROADCOM_DEV_ID_57407_SFP 0x16e9
-#define BROADCOM_DEV_ID_57407_MF 0x16ea
-#define BROADCOM_DEV_ID_57414_MF 0x16ec
-#define BROADCOM_DEV_ID_57416_MF 0x16ee
-#define BROADCOM_DEV_ID_57508 0x1750
-#define BROADCOM_DEV_ID_57504 0x1751
-#define BROADCOM_DEV_ID_57502 0x1752
-#define BROADCOM_DEV_ID_57500_VF1 0x1806
-#define BROADCOM_DEV_ID_57500_VF2 0x1807
-#define BROADCOM_DEV_ID_58802 0xd802
-#define BROADCOM_DEV_ID_58804 0xd804
-#define BROADCOM_DEV_ID_58808 0x16f0
-#define BROADCOM_DEV_ID_58802_VF 0xd800
-
+/*
+ * The set of PCI devices this driver supports
+ */
 static const struct rte_pci_id bnxt_pci_id_map[] = {
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM,
                         BROADCOM_DEV_ID_STRATUS_NIC_VF1) },
@@ -129,6 +83,12 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57502) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57500_VF1) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57500_VF2) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57508_MF1) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57504_MF1) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57502_MF1) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57508_MF2) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57504_MF2) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57502_MF2) },
        { .vendor_id = 0, /* sentinel */ },
 };
 
@@ -150,6 +110,7 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
                                     DEV_TX_OFFLOAD_GRE_TNL_TSO | \
                                     DEV_TX_OFFLOAD_IPIP_TNL_TSO | \
                                     DEV_TX_OFFLOAD_GENEVE_TNL_TSO | \
+                                    DEV_TX_OFFLOAD_QINQ_INSERT | \
                                     DEV_TX_OFFLOAD_MULTI_SEGS)
 
 #define BNXT_DEV_RX_OFFLOAD_SUPPORT (DEV_RX_OFFLOAD_VLAN_FILTER | \
@@ -160,12 +121,28 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
                                     DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | \
                                     DEV_RX_OFFLOAD_JUMBO_FRAME | \
                                     DEV_RX_OFFLOAD_KEEP_CRC | \
-                                    DEV_RX_OFFLOAD_TCP_LRO)
+                                    DEV_RX_OFFLOAD_VLAN_EXTEND | \
+                                    DEV_RX_OFFLOAD_TCP_LRO | \
+                                    DEV_RX_OFFLOAD_SCATTER | \
+                                    DEV_RX_OFFLOAD_RSS_HASH)
 
 static int bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask);
 static void bnxt_print_link_info(struct rte_eth_dev *eth_dev);
-static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu);
 static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);
+static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev);
+static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
+static void bnxt_cancel_fw_health_check(struct bnxt *bp);
+static int bnxt_restore_vlan_filters(struct bnxt *bp);
+
+int is_bnxt_in_error(struct bnxt *bp)
+{
+       if (bp->flags & BNXT_FLAG_FATAL_ERROR)
+               return -EIO;
+       if (bp->flags & BNXT_FLAG_FW_RESET)
+               return -EBUSY;
+
+       return 0;
+}
 
 /***********************/
 
@@ -173,7 +150,7 @@ static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);
  * High level utility functions
  */
 
-static uint16_t bnxt_rss_ctxts(const struct bnxt *bp)
+uint16_t bnxt_rss_ctxts(const struct bnxt *bp)
 {
        if (!BNXT_CHIP_THOR(bp))
                return 1;
@@ -191,22 +168,36 @@ static uint16_t  bnxt_rss_hash_tbl_size(const struct bnxt *bp)
        return bnxt_rss_ctxts(bp) * BNXT_RSS_ENTRIES_PER_CTX_THOR;
 }
 
-static void bnxt_free_mem(struct bnxt *bp)
+static void bnxt_free_mem(struct bnxt *bp, bool reconfig)
 {
        bnxt_free_filter_mem(bp);
        bnxt_free_vnic_attributes(bp);
        bnxt_free_vnic_mem(bp);
 
-       bnxt_free_stats(bp);
-       bnxt_free_tx_rings(bp);
-       bnxt_free_rx_rings(bp);
+       /* tx/rx rings are configured as part of *_queue_setup callbacks.
+        * If the number of rings change across fw update,
+        * we don't have much choice except to warn the user.
+        */
+       if (!reconfig) {
+               bnxt_free_stats(bp);
+               bnxt_free_tx_rings(bp);
+               bnxt_free_rx_rings(bp);
+       }
        bnxt_free_async_cp_ring(bp);
+       bnxt_free_rxtx_nq_ring(bp);
+
+       rte_free(bp->grp_info);
+       bp->grp_info = NULL;
 }
 
-static int bnxt_alloc_mem(struct bnxt *bp)
+static int bnxt_alloc_mem(struct bnxt *bp, bool reconfig)
 {
        int rc;
 
+       rc = bnxt_alloc_ring_grps(bp);
+       if (rc)
+               goto alloc_mem_err;
+
        rc = bnxt_alloc_async_ring_struct(bp);
        if (rc)
                goto alloc_mem_err;
@@ -227,21 +218,112 @@ static int bnxt_alloc_mem(struct bnxt *bp)
        if (rc)
                goto alloc_mem_err;
 
+       rc = bnxt_alloc_rxtx_nq_ring(bp);
+       if (rc)
+               goto alloc_mem_err;
+
        return 0;
 
 alloc_mem_err:
-       bnxt_free_mem(bp);
+       bnxt_free_mem(bp, reconfig);
        return rc;
 }
 
-static int bnxt_init_chip(struct bnxt *bp)
+static int bnxt_setup_one_vnic(struct bnxt *bp, uint16_t vnic_id)
 {
+       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+       struct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];
+       uint64_t rx_offloads = dev_conf->rxmode.offloads;
        struct bnxt_rx_queue *rxq;
+       unsigned int j;
+       int rc;
+
+       rc = bnxt_vnic_grp_alloc(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       PMD_DRV_LOG(DEBUG, "vnic[%d] = %p vnic->fw_grp_ids = %p\n",
+                   vnic_id, vnic, vnic->fw_grp_ids);
+
+       rc = bnxt_hwrm_vnic_alloc(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       /* Alloc RSS context only if RSS mode is enabled */
+       if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {
+               int j, nr_ctxs = bnxt_rss_ctxts(bp);
+
+               rc = 0;
+               for (j = 0; j < nr_ctxs; j++) {
+                       rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, j);
+                       if (rc)
+                               break;
+               }
+               if (rc) {
+                       PMD_DRV_LOG(ERR,
+                                   "HWRM vnic %d ctx %d alloc failure rc: %x\n",
+                                   vnic_id, j, rc);
+                       goto err_out;
+               }
+               vnic->num_lb_ctxts = nr_ctxs;
+       }
+
+       /*
+        * Firmware sets pf pair in default vnic cfg. If the VLAN strip
+        * setting is not available at this time, it will not be
+        * configured correctly in the CFA.
+        */
+       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
+               vnic->vlan_strip = true;
+       else
+               vnic->vlan_strip = false;
+
+       rc = bnxt_hwrm_vnic_cfg(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       rc = bnxt_set_hwrm_vnic_filters(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       for (j = 0; j < bp->rx_num_qs_per_vnic; j++) {
+               rxq = bp->eth_dev->data->rx_queues[j];
+
+               PMD_DRV_LOG(DEBUG,
+                           "rxq[%d]->vnic=%p vnic->fw_grp_ids=%p\n",
+                           j, rxq->vnic, rxq->vnic->fw_grp_ids);
+
+               if (BNXT_HAS_RING_GRPS(bp) && rxq->rx_deferred_start)
+                       rxq->vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
+               else
+                       vnic->rx_queue_cnt++;
+       }
+
+       PMD_DRV_LOG(DEBUG, "vnic->rx_queue_cnt = %d\n", vnic->rx_queue_cnt);
+
+       rc = bnxt_vnic_rss_configure(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       bnxt_hwrm_vnic_plcmode_cfg(bp, vnic);
+
+       if (rx_offloads & DEV_RX_OFFLOAD_TCP_LRO)
+               bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 1);
+       else
+               bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 0);
+
+       return 0;
+err_out:
+       PMD_DRV_LOG(ERR, "HWRM vnic %d cfg failure rc: %x\n",
+                   vnic_id, rc);
+       return rc;
+}
+
+static int bnxt_init_chip(struct bnxt *bp)
+{
        struct rte_eth_link new;
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
-       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
-       uint64_t rx_offloads = dev_conf->rxmode.offloads;
        uint32_t intr_vector = 0;
        uint32_t queue_id, base = BNXT_MISC_VEC_ID;
        uint32_t vec = BNXT_MISC_VEC_ID;
@@ -282,108 +364,38 @@ static int bnxt_init_chip(struct bnxt *bp)
                goto err_out;
        }
 
-       rc = bnxt_mq_rx_configure(bp);
-       if (rc) {
-               PMD_DRV_LOG(ERR, "MQ mode configure failure rc: %x\n", rc);
-               goto err_out;
-       }
-
-       /* VNIC configuration */
-       for (i = 0; i < bp->nr_vnics; i++) {
-               struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
-               struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-               uint32_t size = sizeof(*vnic->fw_grp_ids) * bp->max_ring_grps;
-
-               vnic->fw_grp_ids = rte_zmalloc("vnic_fw_grp_ids", size, 0);
-               if (!vnic->fw_grp_ids) {
-                       PMD_DRV_LOG(ERR,
-                                   "Failed to alloc %d bytes for group ids\n",
-                                   size);
-                       rc = -ENOMEM;
-                       goto err_out;
-               }
-               memset(vnic->fw_grp_ids, -1, size);
-
-               PMD_DRV_LOG(DEBUG, "vnic[%d] = %p vnic->fw_grp_ids = %p\n",
-                           i, vnic, vnic->fw_grp_ids);
-
-               rc = bnxt_hwrm_vnic_alloc(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR, "HWRM vnic %d alloc failure rc: %x\n",
-                               i, rc);
-                       goto err_out;
-               }
+       if (!(bp->vnic_cap_flags & BNXT_VNIC_CAP_COS_CLASSIFY))
+               goto skip_cosq_cfg;
 
-               /* Alloc RSS context only if RSS mode is enabled */
-               if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {
-                       int j, nr_ctxs = bnxt_rss_ctxts(bp);
+       for (j = 0, i = 0; i < BNXT_COS_QUEUE_COUNT; i++) {
+               if (bp->rx_cos_queue[i].id != 0xff) {
+                       struct bnxt_vnic_info *vnic = &bp->vnic_info[j++];
 
-                       rc = 0;
-                       for (j = 0; j < nr_ctxs; j++) {
-                               rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, j);
-                               if (rc)
-                                       break;
-                       }
-                       if (rc) {
+                       if (!vnic) {
                                PMD_DRV_LOG(ERR,
-                                 "HWRM vnic %d ctx %d alloc failure rc: %x\n",
-                                 i, j, rc);
+                                           "Num pools more than FW profile\n");
+                               rc = -EINVAL;
                                goto err_out;
                        }
-                       vnic->num_lb_ctxts = nr_ctxs;
-               }
-
-               /*
-                * Firmware sets pf pair in default vnic cfg. If the VLAN strip
-                * setting is not available at this time, it will not be
-                * configured correctly in the CFA.
-                */
-               if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
-                       vnic->vlan_strip = true;
-               else
-                       vnic->vlan_strip = false;
-
-               rc = bnxt_hwrm_vnic_cfg(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR, "HWRM vnic %d cfg failure rc: %x\n",
-                               i, rc);
-                       goto err_out;
-               }
-
-               rc = bnxt_set_hwrm_vnic_filters(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR,
-                               "HWRM vnic %d filter failure rc: %x\n",
-                               i, rc);
-                       goto err_out;
+                       vnic->cos_queue_id = bp->rx_cos_queue[i].id;
+                       bp->rx_cosq_cnt++;
                }
+       }
 
-               for (j = 0; j < bp->rx_nr_rings; j++) {
-                       rxq = bp->eth_dev->data->rx_queues[j];
-
-                       PMD_DRV_LOG(DEBUG,
-                                   "rxq[%d]->vnic=%p vnic->fw_grp_ids=%p\n",
-                                   j, rxq->vnic, rxq->vnic->fw_grp_ids);
-
-                       if (BNXT_HAS_RING_GRPS(bp) && rxq->rx_deferred_start)
-                               rxq->vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
-               }
+skip_cosq_cfg:
+       rc = bnxt_mq_rx_configure(bp);
+       if (rc) {
+               PMD_DRV_LOG(ERR, "MQ mode configure failure rc: %x\n", rc);
+               goto err_out;
+       }
 
-               rc = bnxt_vnic_rss_configure(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR,
-                                   "HWRM vnic set RSS failure rc: %x\n", rc);
+       /* VNIC configuration */
+       for (i = 0; i < bp->nr_vnics; i++) {
+               rc = bnxt_setup_one_vnic(bp, i);
+               if (rc)
                        goto err_out;
-               }
-
-               bnxt_hwrm_vnic_plcmode_cfg(bp, vnic);
-
-               if (bp->eth_dev->data->dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_TCP_LRO)
-                       bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 1);
-               else
-                       bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 0);
        }
+
        rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, &bp->vnic_info[0], 0, NULL);
        if (rc) {
                PMD_DRV_LOG(ERR,
@@ -433,8 +445,11 @@ static int bnxt_init_chip(struct bnxt *bp)
 
        /* enable uio/vfio intr/eventfd mapping */
        rc = rte_intr_enable(intr_handle);
+#ifndef RTE_EXEC_ENV_FREEBSD
+       /* In FreeBSD OS, nic_uio driver does not support interrupts */
        if (rc)
                goto err_free;
+#endif
 
        rc = bnxt_get_hwrm_link_config(bp, &new);
        if (rc) {
@@ -452,6 +467,10 @@ static int bnxt_init_chip(struct bnxt *bp)
        }
        bnxt_print_link_info(bp->eth_dev);
 
+       bp->mark_table = rte_zmalloc("bnxt_mark_table", BNXT_MARK_TABLE_SZ, 0);
+       if (!bp->mark_table)
+               PMD_DRV_LOG(ERR, "Allocation of mark table failed\n");
+
        return 0;
 
 err_free:
@@ -474,22 +493,6 @@ static int bnxt_shutdown_nic(struct bnxt *bp)
        return 0;
 }
 
-static int bnxt_init_nic(struct bnxt *bp)
-{
-       int rc;
-
-       if (BNXT_HAS_RING_GRPS(bp)) {
-               rc = bnxt_init_ring_grps(bp);
-               if (rc)
-                       return rc;
-       }
-
-       bnxt_init_vnics(bp);
-       bnxt_init_filters(bp);
-
-       return 0;
-}
-
 /*
  * Device configuration and status function
  */
@@ -497,9 +500,15 @@ static int bnxt_init_nic(struct bnxt *bp)
 static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
                                struct rte_eth_dev_info *dev_info)
 {
+       struct rte_pci_device *pdev = RTE_DEV_TO_PCI(eth_dev->device);
        struct bnxt *bp = eth_dev->data->dev_private;
        uint16_t max_vnics, i, j, vpool, vrxq;
        unsigned int max_rx_rings;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        /* MAC Specifics */
        dev_info->max_mac_addrs = bp->max_l2_ctx;
@@ -507,8 +516,9 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
 
        /* PF/VF specifics */
        if (BNXT_PF(bp))
-               dev_info->max_vfs = bp->pdev->max_vfs;
-       max_rx_rings = RTE_MIN(bp->max_rx_rings, bp->max_stat_ctx);
+               dev_info->max_vfs = pdev->max_vfs;
+
+       max_rx_rings = BNXT_MAX_RINGS(bp);
        /* For the sake of symmetry, max_rx_queues = max_tx_queues */
        dev_info->max_rx_queues = max_rx_rings;
        dev_info->max_tx_queues = max_rx_rings;
@@ -516,10 +526,13 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
        dev_info->hash_key_size = 40;
        max_vnics = bp->max_vnics;
 
+       /* MTU specifics */
+       dev_info->min_mtu = RTE_ETHER_MIN_MTU;
+       dev_info->max_mtu = BNXT_MAX_MTU;
+
        /* Fast path specifics */
        dev_info->min_rx_bufsize = 1;
-       dev_info->max_rx_pktlen = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +
-               RTE_ETHER_CRC_LEN + VLAN_TAG_SIZE * 2;
+       dev_info->max_rx_pktlen = BNXT_MAX_PKT_LEN;
 
        dev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT;
        if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
@@ -604,6 +617,10 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
        bp->tx_nr_rings = eth_dev->data->nb_tx_queues;
        bp->rx_nr_rings = eth_dev->data->nb_rx_queues;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        if (BNXT_VF(bp) && (bp->flags & BNXT_FLAG_NEW_RM)) {
                rc = bnxt_hwrm_check_vf_rings(bp);
                if (rc) {
@@ -611,11 +628,36 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
                        return -ENOSPC;
                }
 
+               /* If a resource has already been allocated - in this case
+                * it is the async completion ring, free it. Reallocate it after
+                * resource reservation. This will ensure the resource counts
+                * are calculated correctly.
+                */
+
+               pthread_mutex_lock(&bp->def_cp_lock);
+
+               if (!BNXT_HAS_NQ(bp) && bp->async_cp_ring) {
+                       bnxt_disable_int(bp);
+                       bnxt_free_cp_ring(bp, bp->async_cp_ring);
+               }
+
                rc = bnxt_hwrm_func_reserve_vf_resc(bp, false);
                if (rc) {
                        PMD_DRV_LOG(ERR, "HWRM resource alloc fail:%x\n", rc);
+                       pthread_mutex_unlock(&bp->def_cp_lock);
                        return -ENOSPC;
                }
+
+               if (!BNXT_HAS_NQ(bp) && bp->async_cp_ring) {
+                       rc = bnxt_alloc_async_cp_ring(bp);
+                       if (rc) {
+                               pthread_mutex_unlock(&bp->def_cp_lock);
+                               return rc;
+                       }
+                       bnxt_enable_int(bp);
+               }
+
+               pthread_mutex_unlock(&bp->def_cp_lock);
        } else {
                /* legacy driver needs to get updated values */
                rc = bnxt_hwrm_func_qcaps(bp);
@@ -645,6 +687,10 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
        bp->rx_cp_nr_rings = bp->rx_nr_rings;
        bp->tx_cp_nr_rings = bp->tx_nr_rings;
 
+       if (eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
+               rx_offloads |= DEV_RX_OFFLOAD_RSS_HASH;
+       eth_dev->data->dev_conf.rxmode.offloads = rx_offloads;
+
        if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
                eth_dev->data->mtu =
                        eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
@@ -692,6 +738,9 @@ static int bnxt_scattered_rx(struct rte_eth_dev *eth_dev)
        uint16_t buf_size;
        int i;
 
+       if (eth_dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER)
+               return 1;
+
        for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
                struct bnxt_rx_queue *rxq = eth_dev->data->rx_queues[i];
 
@@ -704,9 +753,12 @@ static int bnxt_scattered_rx(struct rte_eth_dev *eth_dev)
 }
 
 static eth_rx_burst_t
-bnxt_receive_function(__rte_unused struct rte_eth_dev *eth_dev)
+bnxt_receive_function(struct rte_eth_dev *eth_dev)
 {
+       struct bnxt *bp = eth_dev->data->dev_private;
+
 #ifdef RTE_ARCH_X86
+#ifndef RTE_LIBRTE_IEEE1588
        /*
         * Vector mode receive can be enabled only if scatter rx is not
         * in use and rx offloads are limited to VLAN stripping and
@@ -721,9 +773,11 @@ bnxt_receive_function(__rte_unused struct rte_eth_dev *eth_dev)
                DEV_RX_OFFLOAD_UDP_CKSUM |
                DEV_RX_OFFLOAD_TCP_CKSUM |
                DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_RSS_HASH |
                DEV_RX_OFFLOAD_VLAN_FILTER))) {
                PMD_DRV_LOG(INFO, "Using vector mode receive for port %d\n",
                            eth_dev->data->port_id);
+               bp->flags |= BNXT_FLAG_RX_VECTOR_PKT_MODE;
                return bnxt_recv_pkts_vec;
        }
        PMD_DRV_LOG(INFO, "Vector mode receive disabled for port %d\n",
@@ -734,6 +788,8 @@ bnxt_receive_function(__rte_unused struct rte_eth_dev *eth_dev)
                    eth_dev->data->scattered_rx,
                    eth_dev->data->dev_conf.rxmode.offloads);
 #endif
+#endif
+       bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
        return bnxt_recv_pkts;
 }
 
@@ -741,6 +797,7 @@ static eth_tx_burst_t
 bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
 {
 #ifdef RTE_ARCH_X86
+#ifndef RTE_LIBRTE_IEEE1588
        /*
         * Vector mode transmit can be enabled only if not using scatter rx
         * or tx offloads.
@@ -758,10 +815,30 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
                    eth_dev->data->port_id,
                    eth_dev->data->scattered_rx,
                    eth_dev->data->dev_conf.txmode.offloads);
+#endif
 #endif
        return bnxt_xmit_pkts;
 }
 
+static int bnxt_handle_if_change_status(struct bnxt *bp)
+{
+       int rc;
+
+       /* Since fw has undergone a reset and lost all contexts,
+        * set fatal flag to not issue hwrm during cleanup
+        */
+       bp->flags |= BNXT_FLAG_FATAL_ERROR;
+       bnxt_uninit_resources(bp, true);
+
+       /* clear fatal flag so that re-init happens */
+       bp->flags &= ~BNXT_FLAG_FATAL_ERROR;
+       rc = bnxt_init_resources(bp, true);
+
+       bp->flags &= ~BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE;
+
+       return rc;
+}
+
 static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
@@ -769,19 +846,35 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
        int vlan_mask = 0;
        int rc;
 
+       if (!eth_dev->data->nb_tx_queues || !eth_dev->data->nb_rx_queues) {
+               PMD_DRV_LOG(ERR, "Queues are not configured yet!\n");
+               return -EINVAL;
+       }
+
        if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) {
                PMD_DRV_LOG(ERR,
                        "RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
                        bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
        }
 
+       rc = bnxt_hwrm_if_change(bp, 1);
+       if (!rc) {
+               if (bp->flags & BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE) {
+                       rc = bnxt_handle_if_change_status(bp);
+                       if (rc)
+                               return rc;
+               }
+       }
+       bnxt_enable_int(bp);
+
        rc = bnxt_init_chip(bp);
        if (rc)
                goto error;
 
        eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev);
 
-       bnxt_link_update_op(eth_dev, 1);
+       bnxt_link_update(eth_dev, 1, ETH_LINK_UP);
+       bp->dev_stopped = 0;
 
        if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
                vlan_mask |= ETH_VLAN_FILTER_MASK;
@@ -793,15 +886,20 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
        eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
        eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
-       bnxt_enable_int(bp);
+
        bp->flags |= BNXT_FLAG_INIT_DONE;
-       bp->dev_stopped = 0;
+       eth_dev->data->dev_started = 1;
+       pthread_mutex_lock(&bp->def_cp_lock);
+       bnxt_schedule_fw_health_check(bp);
+       pthread_mutex_unlock(&bp->def_cp_lock);
        return 0;
 
 error:
+       bnxt_hwrm_if_change(bp, 0);
        bnxt_shutdown_nic(bp);
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
+       bp->dev_stopped = 1;
        return rc;
 }
 
@@ -816,7 +914,7 @@ static int bnxt_dev_set_link_up_op(struct rte_eth_dev *eth_dev)
                eth_dev->data->dev_link.link_status = 1;
 
        bnxt_print_link_info(eth_dev);
-       return 0;
+       return rc;
 }
 
 static int bnxt_dev_set_link_down_op(struct rte_eth_dev *eth_dev)
@@ -837,17 +935,30 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
+       eth_dev->data->dev_started = 0;
+       /* Prevent crashes when queues are still in use */
+       eth_dev->rx_pkt_burst = &bnxt_dummy_recv_pkts;
+       eth_dev->tx_pkt_burst = &bnxt_dummy_xmit_pkts;
+
        bnxt_disable_int(bp);
 
        /* disable uio/vfio intr/eventfd mapping */
        rte_intr_disable(intr_handle);
 
+       bnxt_cancel_fw_health_check(bp);
+
        bp->flags &= ~BNXT_FLAG_INIT_DONE;
        if (bp->eth_dev->data->dev_started) {
                /* TBD: STOP HW queues DMA */
                eth_dev->data->dev_link.link_status = 0;
        }
-       bnxt_set_hwrm_link_config(bp, false);
+       bnxt_dev_set_link_down_op(eth_dev);
+
+       /* Wait for link to be reset and the async notification to process.
+        * During reset recovery, there is no need to wait
+        */
+       if (!is_bnxt_in_error(bp))
+               bnxt_link_update(eth_dev, 1, ETH_LINK_DOWN);
 
        /* Clean queue intr-vector mapping */
        rte_intr_efd_disable(intr_handle);
@@ -859,8 +970,17 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        bnxt_hwrm_port_clr_stats(bp);
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
+       /* Process any remaining notifications in default completion queue */
+       bnxt_int_handler(eth_dev);
        bnxt_shutdown_nic(bp);
+       bnxt_hwrm_if_change(bp, 0);
+
+       rte_free(bp->mark_table);
+       bp->mark_table = NULL;
+
+       bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
        bp->dev_stopped = 1;
+       bp->rx_cosq_cnt = 0;
 }
 
 static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
@@ -870,16 +990,22 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
        if (bp->dev_stopped == 0)
                bnxt_dev_stop_op(eth_dev);
 
-       if (eth_dev->data->mac_addrs != NULL) {
-               rte_free(eth_dev->data->mac_addrs);
-               eth_dev->data->mac_addrs = NULL;
-       }
-       if (bp->grp_info != NULL) {
-               rte_free(bp->grp_info);
-               bp->grp_info = NULL;
-       }
+       bnxt_uninit_resources(bp, false);
 
-       bnxt_dev_uninit(eth_dev);
+       eth_dev->dev_ops = NULL;
+       eth_dev->rx_pkt_burst = NULL;
+       eth_dev->tx_pkt_burst = NULL;
+
+       rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
+       bp->tx_mem_zone = NULL;
+       rte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone);
+       bp->rx_mem_zone = NULL;
+
+       rte_free(bp->pf.vf_info);
+       bp->pf.vf_info = NULL;
+
+       rte_free(bp->grp_info);
+       bp->grp_info = NULL;
 }
 
 static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
@@ -891,6 +1017,9 @@ static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
        struct bnxt_filter_info *filter, *temp_filter;
        uint32_t i;
 
+       if (is_bnxt_in_error(bp))
+               return;
+
        /*
         * Loop through all VNICs from the specified filter flow pools to
         * remove the corresponding MAC addr filter
@@ -907,94 +1036,121 @@ static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
                                STAILQ_REMOVE(&vnic->filter, filter,
                                                bnxt_filter_info, next);
                                bnxt_hwrm_clear_l2_filter(bp, filter);
-                               filter->mac_index = INVALID_MAC_INDEX;
-                               memset(&filter->l2_addr, 0, RTE_ETHER_ADDR_LEN);
-                               STAILQ_INSERT_TAIL(&bp->free_filter_list,
-                                                  filter, next);
+                               bnxt_free_filter(bp, filter);
                        }
                        filter = temp_filter;
                }
        }
 }
 
-static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
-                               struct rte_ether_addr *mac_addr,
-                               uint32_t index, uint32_t pool)
+static int bnxt_add_mac_filter(struct bnxt *bp, struct bnxt_vnic_info *vnic,
+                              struct rte_ether_addr *mac_addr, uint32_t index,
+                              uint32_t pool)
 {
-       struct bnxt *bp = eth_dev->data->dev_private;
-       struct bnxt_vnic_info *vnic = &bp->vnic_info[pool];
        struct bnxt_filter_info *filter;
        int rc = 0;
 
-       if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) {
-               PMD_DRV_LOG(ERR, "Cannot add MAC address to a VF interface\n");
-               return -ENOTSUP;
-       }
-
-       if (!vnic) {
-               PMD_DRV_LOG(ERR, "VNIC not found for pool %d!\n", pool);
-               return -EINVAL;
-       }
        /* Attach requested MAC address to the new l2_filter */
        STAILQ_FOREACH(filter, &vnic->filter, next) {
                if (filter->mac_index == index) {
-                       PMD_DRV_LOG(ERR,
-                               "MAC addr already existed for pool %d\n", pool);
+                       PMD_DRV_LOG(DEBUG,
+                                   "MAC addr already existed for pool %d\n",
+                                   pool);
                        return 0;
                }
        }
+
        filter = bnxt_alloc_filter(bp);
        if (!filter) {
                PMD_DRV_LOG(ERR, "L2 filter alloc failed\n");
                return -ENODEV;
        }
 
-       filter->mac_index = index;
-       memcpy(filter->l2_addr, mac_addr, RTE_ETHER_ADDR_LEN);
+       /* bnxt_alloc_filter copies default MAC to filter->l2_addr. So,
+        * if the MAC that's been programmed now is a different one, then,
+        * copy that addr to filter->l2_addr
+        */
+       if (mac_addr)
+               memcpy(filter->l2_addr, mac_addr, RTE_ETHER_ADDR_LEN);
+       filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST;
 
        rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
        if (!rc) {
-               STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+               filter->mac_index = index;
+               if (filter->mac_index == 0)
+                       STAILQ_INSERT_HEAD(&vnic->filter, filter, next);
+               else
+                       STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
        } else {
-               filter->mac_index = INVALID_MAC_INDEX;
-               memset(&filter->l2_addr, 0, RTE_ETHER_ADDR_LEN);
                bnxt_free_filter(bp, filter);
        }
 
        return rc;
 }
 
-int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete)
+static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
+                               struct rte_ether_addr *mac_addr,
+                               uint32_t index, uint32_t pool)
 {
-       int rc = 0;
        struct bnxt *bp = eth_dev->data->dev_private;
-       struct rte_eth_link new;
-       unsigned int cnt = BNXT_LINK_WAIT_CNT;
-
-       memset(&new, 0, sizeof(new));
-       do {
-               /* Retrieve link info from hardware */
-               rc = bnxt_get_hwrm_link_config(bp, &new);
-               if (rc) {
-                       new.link_speed = ETH_LINK_SPEED_100M;
-                       new.link_duplex = ETH_LINK_FULL_DUPLEX;
-                       PMD_DRV_LOG(ERR,
-                               "Failed to retrieve link rc = 0x%x!\n", rc);
-                       goto out;
-               }
+       struct bnxt_vnic_info *vnic = &bp->vnic_info[pool];
+       int rc = 0;
 
-               if (!wait_to_complete || new.link_status)
-                       break;
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
-               rte_delay_ms(BNXT_LINK_WAIT_INTERVAL);
+       if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) {
+               PMD_DRV_LOG(ERR, "Cannot add MAC address to a VF interface\n");
+               return -ENOTSUP;
+       }
+
+       if (!vnic) {
+               PMD_DRV_LOG(ERR, "VNIC not found for pool %d!\n", pool);
+               return -EINVAL;
+       }
+
+       rc = bnxt_add_mac_filter(bp, vnic, mac_addr, index, pool);
+
+       return rc;
+}
+
+int bnxt_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete,
+                    bool exp_link_status)
+{
+       int rc = 0;
+       struct bnxt *bp = eth_dev->data->dev_private;
+       struct rte_eth_link new;
+       int cnt = exp_link_status ? BNXT_LINK_UP_WAIT_CNT :
+                 BNXT_LINK_DOWN_WAIT_CNT;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       memset(&new, 0, sizeof(new));
+       do {
+               /* Retrieve link info from hardware */
+               rc = bnxt_get_hwrm_link_config(bp, &new);
+               if (rc) {
+                       new.link_speed = ETH_LINK_SPEED_100M;
+                       new.link_duplex = ETH_LINK_FULL_DUPLEX;
+                       PMD_DRV_LOG(ERR,
+                               "Failed to retrieve link rc = 0x%x!\n", rc);
+                       goto out;
+               }
+
+               if (!wait_to_complete || new.link_status == exp_link_status)
+                       break;
+
+               rte_delay_ms(BNXT_LINK_WAIT_INTERVAL);
        } while (cnt--);
 
 out:
        /* Timed out or success */
        if (new.link_status != eth_dev->data->dev_link.link_status ||
        new.link_speed != eth_dev->data->dev_link.link_speed) {
-               memcpy(&eth_dev->data->dev_link, &new,
-                       sizeof(struct rte_eth_link));
+               rte_eth_linkstatus_set(eth_dev, &new);
 
                _rte_eth_dev_callback_process(eth_dev,
                                              RTE_ETH_EVENT_INTR_LSC,
@@ -1006,6 +1162,12 @@ out:
        return rc;
 }
 
+static int bnxt_link_update_op(struct rte_eth_dev *eth_dev,
+                              int wait_to_complete)
+{
+       return bnxt_link_update(eth_dev, wait_to_complete, ETH_LINK_UP);
+}
+
 static int bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
@@ -1013,10 +1175,18 @@ static int bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev)
        uint32_t old_flags;
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
-       vnic = &bp->vnic_info[0];
+       vnic = BNXT_GET_DEFAULT_VNIC(bp);
 
        old_flags = vnic->flags;
        vnic->flags |= BNXT_VNIC_INFO_PROMISC;
@@ -1034,10 +1204,18 @@ static int bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev)
        uint32_t old_flags;
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
-       vnic = &bp->vnic_info[0];
+       vnic = BNXT_GET_DEFAULT_VNIC(bp);
 
        old_flags = vnic->flags;
        vnic->flags &= ~BNXT_VNIC_INFO_PROMISC;
@@ -1055,10 +1233,18 @@ static int bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev)
        uint32_t old_flags;
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
-       vnic = &bp->vnic_info[0];
+       vnic = BNXT_GET_DEFAULT_VNIC(bp);
 
        old_flags = vnic->flags;
        vnic->flags |= BNXT_VNIC_INFO_ALLMULTI;
@@ -1076,10 +1262,18 @@ static int bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev)
        uint32_t old_flags;
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
-       vnic = &bp->vnic_info[0];
+       vnic = BNXT_GET_DEFAULT_VNIC(bp);
 
        old_flags = vnic->flags;
        vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI;
@@ -1127,10 +1321,14 @@ static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
 {
        struct bnxt *bp = eth_dev->data->dev_private;
        struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
-       struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+       struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
        uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp);
        uint16_t idx, sft;
-       int i;
+       int i, rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        if (!vnic->rss_table)
                return -EINVAL;
@@ -1169,9 +1367,6 @@ static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
                        vnic->rss_table[i] =
                            vnic->fw_grp_ids[reta_conf[idx].reta[sft]];
                }
-
-               vnic->rss_table[i] =
-                   vnic->fw_grp_ids[reta_conf[idx].reta[sft]];
        }
 
        bnxt_hwrm_vnic_rss_cfg(bp, vnic);
@@ -1183,9 +1378,14 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
                              uint16_t reta_size)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
-       struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+       struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
        uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp);
        uint16_t idx, sft, i;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        /* Retrieve from the default VNIC */
        if (!vnic)
@@ -1230,8 +1430,11 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
        struct bnxt *bp = eth_dev->data->dev_private;
        struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
        struct bnxt_vnic_info *vnic;
-       uint16_t hash_type = 0;
-       unsigned int i;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        /*
         * If RSS enablement were different than dev_configure,
@@ -1248,35 +1451,26 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
        bp->flags |= BNXT_FLAG_UPDATE_HASH;
        memcpy(&bp->rss_conf, rss_conf, sizeof(*rss_conf));
 
-       if (rss_conf->rss_hf & ETH_RSS_IPV4)
-               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4;
-       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_TCP)
-               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4;
-       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_UDP)
-               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4;
-       if (rss_conf->rss_hf & ETH_RSS_IPV6)
-               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6;
-       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_TCP)
-               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6;
-       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_UDP)
-               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;
-
-       /* Update the RSS VNIC(s) */
-       for (i = 0; i < bp->nr_vnics; i++) {
-               vnic = &bp->vnic_info[i];
-               vnic->hash_type = hash_type;
+       /* Update the default RSS VNIC(s) */
+       vnic = BNXT_GET_DEFAULT_VNIC(bp);
+       vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_conf->rss_hf);
 
-               /*
-                * Use the supplied key if the key length is
-                * acceptable and the rss_key is not NULL
-                */
-               if (rss_conf->rss_key &&
-                   rss_conf->rss_key_len <= HW_HASH_KEY_SIZE)
-                       memcpy(vnic->rss_hash_key, rss_conf->rss_key,
-                              rss_conf->rss_key_len);
+       /*
+        * If hashkey is not specified, use the previously configured
+        * hashkey
+        */
+       if (!rss_conf->rss_key)
+               goto rss_config;
 
-               bnxt_hwrm_vnic_rss_cfg(bp, vnic);
+       if (rss_conf->rss_key_len != HW_HASH_KEY_SIZE) {
+               PMD_DRV_LOG(ERR,
+                           "Invalid hashkey length, should be 16 bytes\n");
+               return -EINVAL;
        }
+       memcpy(vnic->rss_hash_key, rss_conf->rss_key, rss_conf->rss_key_len);
+
+rss_config:
+       bnxt_hwrm_vnic_rss_cfg(bp, vnic);
        return 0;
 }
 
@@ -1284,10 +1478,14 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev,
                                     struct rte_eth_rss_conf *rss_conf)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
-       struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
-       int len;
+       struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
+       int len, rc;
        uint32_t hash_types;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        /* RSS configuration is the same for all VNICs */
        if (vnic && vnic->rss_hash_key) {
                if (rss_conf->rss_key) {
@@ -1345,6 +1543,10 @@ static int bnxt_flow_ctrl_get_op(struct rte_eth_dev *dev,
        struct rte_eth_link link_info;
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        rc = bnxt_get_hwrm_link_config(bp, &link_info);
        if (rc)
                return rc;
@@ -1374,6 +1576,11 @@ static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev,
                               struct rte_eth_fc_conf *fc_conf)
 {
        struct bnxt *bp = dev->data->dev_private;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        if (!BNXT_SINGLE_PF(bp) || BNXT_VF(bp)) {
                PMD_DRV_LOG(ERR, "Flow Control Settings cannot be modified\n");
@@ -1433,6 +1640,10 @@ bnxt_udp_tunnel_port_add_op(struct rte_eth_dev *eth_dev,
        uint16_t tunnel_type = 0;
        int rc = 0;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        switch (udp_tunnel->prot_type) {
        case RTE_TUNNEL_TYPE_VXLAN:
                if (bp->vxlan_port_cnt) {
@@ -1482,6 +1693,10 @@ bnxt_udp_tunnel_port_del_op(struct rte_eth_dev *eth_dev,
        uint16_t port = 0;
        int rc = 0;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        switch (udp_tunnel->prot_type) {
        case RTE_TUNNEL_TYPE_VXLAN:
                if (!bp->vxlan_port_cnt) {
@@ -1541,32 +1756,22 @@ static int bnxt_del_vlan_filter(struct bnxt *bp, uint16_t vlan_id)
        int rc = 0;
        uint32_t chk = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN;
 
-       /* if VLAN exists && VLAN matches vlan_id
-        *      remove the MAC+VLAN filter
-        *      add a new MAC only filter
-        * else
-        *      VLAN filter doesn't exist, just skip and continue
-        */
        vnic = BNXT_GET_DEFAULT_VNIC(bp);
        filter = STAILQ_FIRST(&vnic->filter);
        while (filter) {
                /* Search for this matching MAC+VLAN filter */
-               if (filter->enables & chk && filter->l2_ivlan == vlan_id &&
-                   !memcmp(filter->l2_addr,
-                           bp->mac_addr,
-                           RTE_ETHER_ADDR_LEN)) {
+               if (bnxt_vlan_filter_exists(bp, filter, chk, vlan_id)) {
                        /* Delete the filter */
                        rc = bnxt_hwrm_clear_l2_filter(bp, filter);
                        if (rc)
                                return rc;
                        STAILQ_REMOVE(&vnic->filter, filter,
                                      bnxt_filter_info, next);
-                       STAILQ_INSERT_TAIL(&bp->free_filter_list, filter, next);
-
+                       bnxt_free_filter(bp, filter);
                        PMD_DRV_LOG(INFO,
-                                   "Del Vlan filter for %d\n",
+                                   "Deleted vlan filter for %d\n",
                                    vlan_id);
-                       return rc;
+                       return 0;
                }
                filter = STAILQ_NEXT(filter, next);
        }
@@ -1594,8 +1799,7 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id)
        filter = STAILQ_FIRST(&vnic->filter);
        /* Check if the VLAN has already been added */
        while (filter) {
-               if (filter->enables & chk && filter->l2_ivlan == vlan_id &&
-                   !memcmp(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN))
+               if (bnxt_vlan_filter_exists(bp, filter, chk, vlan_id))
                        return -EEXIST;
 
                filter = STAILQ_NEXT(filter, next);
@@ -1611,21 +1815,33 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id)
                return -ENOMEM;
        }
        /* MAC + VLAN ID filter */
+       /* If l2_ivlan == 0 and l2_ivlan_mask != 0, only
+        * untagged packets are received
+        *
+        * If l2_ivlan != 0 and l2_ivlan_mask != 0, untagged
+        * packets and only the programmed vlan's packets are received
+        */
        filter->l2_ivlan = vlan_id;
        filter->l2_ivlan_mask = 0x0FFF;
        filter->enables |= en;
+       filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST;
+
        rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
        if (rc) {
                /* Free the newly allocated filter as we were
                 * not able to create the filter in hardware.
                 */
-               filter->fw_l2_filter_id = UINT64_MAX;
-               STAILQ_INSERT_TAIL(&bp->free_filter_list, filter, next);
+               bnxt_free_filter(bp, filter);
                return rc;
        }
 
+       filter->mac_index = 0;
        /* Add this new filter to the list */
-       STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+       if (vlan_id == 0)
+               STAILQ_INSERT_HEAD(&vnic->filter, filter, next);
+       else
+               STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+
        PMD_DRV_LOG(INFO,
                    "Added Vlan filter for %d\n", vlan_id);
        return rc;
@@ -1635,6 +1851,11 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev,
                uint16_t vlan_id, int on)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        /* These operations apply to ALL existing MAC/VLAN filters */
        if (on)
@@ -1643,81 +1864,254 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev,
                return bnxt_del_vlan_filter(bp, vlan_id);
 }
 
+static int bnxt_del_dflt_mac_filter(struct bnxt *bp,
+                                   struct bnxt_vnic_info *vnic)
+{
+       struct bnxt_filter_info *filter;
+       int rc;
+
+       filter = STAILQ_FIRST(&vnic->filter);
+       while (filter) {
+               if (filter->mac_index == 0 &&
+                   !memcmp(filter->l2_addr, bp->mac_addr,
+                           RTE_ETHER_ADDR_LEN)) {
+                       rc = bnxt_hwrm_clear_l2_filter(bp, filter);
+                       if (!rc) {
+                               STAILQ_REMOVE(&vnic->filter, filter,
+                                             bnxt_filter_info, next);
+                               bnxt_free_filter(bp, filter);
+                       }
+                       return rc;
+               }
+               filter = STAILQ_NEXT(filter, next);
+       }
+       return 0;
+}
+
+static int
+bnxt_config_vlan_hw_filter(struct bnxt *bp, uint64_t rx_offloads)
+{
+       struct bnxt_vnic_info *vnic;
+       unsigned int i;
+       int rc;
+
+       vnic = BNXT_GET_DEFAULT_VNIC(bp);
+       if (!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {
+               /* Remove any VLAN filters programmed */
+               for (i = 0; i < RTE_ETHER_MAX_VLAN_ID; i++)
+                       bnxt_del_vlan_filter(bp, i);
+
+               rc = bnxt_add_mac_filter(bp, vnic, NULL, 0, 0);
+               if (rc)
+                       return rc;
+       } else {
+               /* Default filter will allow packets that match the
+                * dest mac. So, it has to be deleted, otherwise, we
+                * will endup receiving vlan packets for which the
+                * filter is not programmed, when hw-vlan-filter
+                * configuration is ON
+                */
+               bnxt_del_dflt_mac_filter(bp, vnic);
+               /* This filter will allow only untagged packets */
+               bnxt_add_vlan_filter(bp, 0);
+       }
+       PMD_DRV_LOG(DEBUG, "VLAN Filtering: %d\n",
+                   !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER));
+
+       return 0;
+}
+
+static int bnxt_free_one_vnic(struct bnxt *bp, uint16_t vnic_id)
+{
+       struct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];
+       unsigned int i;
+       int rc;
+
+       /* Destroy vnic filters and vnic */
+       if (bp->eth_dev->data->dev_conf.rxmode.offloads &
+           DEV_RX_OFFLOAD_VLAN_FILTER) {
+               for (i = 0; i < RTE_ETHER_MAX_VLAN_ID; i++)
+                       bnxt_del_vlan_filter(bp, i);
+       }
+       bnxt_del_dflt_mac_filter(bp, vnic);
+
+       rc = bnxt_hwrm_vnic_free(bp, vnic);
+       if (rc)
+               return rc;
+
+       rte_free(vnic->fw_grp_ids);
+       vnic->fw_grp_ids = NULL;
+
+       return 0;
+}
+
+static int
+bnxt_config_vlan_hw_stripping(struct bnxt *bp, uint64_t rx_offloads)
+{
+       struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
+       int rc;
+
+       /* Destroy, recreate and reconfigure the default vnic */
+       rc = bnxt_free_one_vnic(bp, 0);
+       if (rc)
+               return rc;
+
+       /* default vnic 0 */
+       rc = bnxt_setup_one_vnic(bp, 0);
+       if (rc)
+               return rc;
+
+       if (bp->eth_dev->data->dev_conf.rxmode.offloads &
+           DEV_RX_OFFLOAD_VLAN_FILTER) {
+               rc = bnxt_add_vlan_filter(bp, 0);
+               bnxt_restore_vlan_filters(bp);
+       } else {
+               rc = bnxt_add_mac_filter(bp, vnic, NULL, 0, 0);
+       }
+
+       rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       if (rc)
+               return rc;
+
+       PMD_DRV_LOG(DEBUG, "VLAN Strip Offload: %d\n",
+                   !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));
+
+       return rc;
+}
+
 static int
 bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)
 {
-       struct bnxt *bp = dev->data->dev_private;
        uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
-       unsigned int i;
+       struct bnxt *bp = dev->data->dev_private;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
 
        if (mask & ETH_VLAN_FILTER_MASK) {
-               if (!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {
-                       /* Remove any VLAN filters programmed */
-                       for (i = 0; i < 4095; i++)
-                               bnxt_del_vlan_filter(bp, i);
-               }
-               PMD_DRV_LOG(DEBUG, "VLAN Filtering: %d\n",
-                       !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER));
+               /* Enable or disable VLAN filtering */
+               rc = bnxt_config_vlan_hw_filter(bp, rx_offloads);
+               if (rc)
+                       return rc;
        }
 
        if (mask & ETH_VLAN_STRIP_MASK) {
                /* Enable or disable VLAN stripping */
-               for (i = 0; i < bp->nr_vnics; i++) {
-                       struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-                       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
-                               vnic->vlan_strip = true;
-                       else
-                               vnic->vlan_strip = false;
-                       bnxt_hwrm_vnic_cfg(bp, vnic);
-               }
-               PMD_DRV_LOG(DEBUG, "VLAN Strip Offload: %d\n",
-                       !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));
+               rc = bnxt_config_vlan_hw_stripping(bp, rx_offloads);
+               if (rc)
+                       return rc;
+       }
+
+       if (mask & ETH_VLAN_EXTEND_MASK) {
+               if (rx_offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)
+                       PMD_DRV_LOG(DEBUG, "Extend VLAN supported\n");
+               else
+                       PMD_DRV_LOG(INFO, "Extend VLAN unsupported\n");
+       }
+
+       return 0;
+}
+
+static int
+bnxt_vlan_tpid_set_op(struct rte_eth_dev *dev, enum rte_vlan_type vlan_type,
+                     uint16_t tpid)
+{
+       struct bnxt *bp = dev->data->dev_private;
+       int qinq = dev->data->dev_conf.rxmode.offloads &
+                  DEV_RX_OFFLOAD_VLAN_EXTEND;
+
+       if (vlan_type != ETH_VLAN_TYPE_INNER &&
+           vlan_type != ETH_VLAN_TYPE_OUTER) {
+               PMD_DRV_LOG(ERR,
+                           "Unsupported vlan type.");
+               return -EINVAL;
+       }
+       if (!qinq) {
+               PMD_DRV_LOG(ERR,
+                           "QinQ not enabled. Needs to be ON as we can "
+                           "accelerate only outer vlan\n");
+               return -EINVAL;
        }
 
-       if (mask & ETH_VLAN_EXTEND_MASK)
-               PMD_DRV_LOG(ERR, "Extend VLAN Not supported\n");
+       if (vlan_type == ETH_VLAN_TYPE_OUTER) {
+               switch (tpid) {
+               case RTE_ETHER_TYPE_QINQ:
+                       bp->outer_tpid_bd =
+                               TX_BD_LONG_CFA_META_VLAN_TPID_TPID88A8;
+                               break;
+               case RTE_ETHER_TYPE_VLAN:
+                       bp->outer_tpid_bd =
+                               TX_BD_LONG_CFA_META_VLAN_TPID_TPID8100;
+                               break;
+               case 0x9100:
+                       bp->outer_tpid_bd =
+                               TX_BD_LONG_CFA_META_VLAN_TPID_TPID9100;
+                               break;
+               case 0x9200:
+                       bp->outer_tpid_bd =
+                               TX_BD_LONG_CFA_META_VLAN_TPID_TPID9200;
+                               break;
+               case 0x9300:
+                       bp->outer_tpid_bd =
+                                TX_BD_LONG_CFA_META_VLAN_TPID_TPID9300;
+                               break;
+               default:
+                       PMD_DRV_LOG(ERR, "Invalid TPID: %x\n", tpid);
+                       return -EINVAL;
+               }
+               bp->outer_tpid_bd |= tpid;
+               PMD_DRV_LOG(INFO, "outer_tpid_bd = %x\n", bp->outer_tpid_bd);
+       } else if (vlan_type == ETH_VLAN_TYPE_INNER) {
+               PMD_DRV_LOG(ERR,
+                           "Can accelerate only outer vlan in QinQ\n");
+               return -EINVAL;
+       }
 
        return 0;
 }
 
 static int
 bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
-                       struct rte_ether_addr *addr)
+                            struct rte_ether_addr *addr)
 {
        struct bnxt *bp = dev->data->dev_private;
        /* Default Filter is tied to VNIC 0 */
-       struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
-       struct bnxt_filter_info *filter;
+       struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp))
                return -EPERM;
 
        if (rte_is_zero_ether_addr(addr))
                return -EINVAL;
 
-       STAILQ_FOREACH(filter, &vnic->filter, next) {
-               /* Default Filter is at Index 0 */
-               if (filter->mac_index != 0)
-                       continue;
-
-               memcpy(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN);
-               memset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN);
-               filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX;
-               filter->enables |=
-                       HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |
-                       HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;
+       /* Check if the requested MAC is already added */
+       if (memcmp(addr, bp->mac_addr, RTE_ETHER_ADDR_LEN) == 0)
+               return 0;
 
-               rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
-               if (rc)
-                       return rc;
+       /* Destroy filter and re-create it */
+       bnxt_del_dflt_mac_filter(bp, vnic);
 
-               memcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN);
-               PMD_DRV_LOG(DEBUG, "Set MAC addr\n");
-               return 0;
+       memcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN);
+       if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_VLAN_FILTER) {
+               /* This filter will allow only untagged packets */
+               rc = bnxt_add_vlan_filter(bp, 0);
+       } else {
+               rc = bnxt_add_mac_filter(bp, vnic, addr, 0, 0);
        }
 
-       return 0;
+       PMD_DRV_LOG(DEBUG, "Set MAC addr\n");
+       return rc;
 }
 
 static int
@@ -1729,8 +2123,13 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev,
        char *mc_addr_list = (char *)mc_addr_set;
        struct bnxt_vnic_info *vnic;
        uint32_t off = 0, i = 0;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
-       vnic = &bp->vnic_info[0];
+       vnic = BNXT_GET_DEFAULT_VNIC(bp);
 
        if (nb_mc_addr > BNXT_MAX_MC_ADDRS) {
                vnic->flags |= BNXT_VNIC_INFO_ALLMULTI;
@@ -1746,6 +2145,10 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev,
        }
 
        vnic->mc_addr_cnt = i;
+       if (vnic->mc_addr_cnt)
+               vnic->flags |= BNXT_VNIC_INFO_MCAST;
+       else
+               vnic->flags &= ~BNXT_VNIC_INFO_MCAST;
 
 allmulti:
        return bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
@@ -1774,8 +2177,12 @@ static void
 bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
        struct rte_eth_rxq_info *qinfo)
 {
+       struct bnxt *bp = dev->data->dev_private;
        struct bnxt_rx_queue *rxq;
 
+       if (is_bnxt_in_error(bp))
+               return;
+
        rxq = dev->data->rx_queues[queue_id];
 
        qinfo->mp = rxq->mb_pool;
@@ -1784,15 +2191,19 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 
        qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
        qinfo->conf.rx_drop_en = 0;
-       qinfo->conf.rx_deferred_start = 0;
+       qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
 }
 
 static void
 bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
        struct rte_eth_txq_info *qinfo)
 {
+       struct bnxt *bp = dev->data->dev_private;
        struct bnxt_tx_queue *txq;
 
+       if (is_bnxt_in_error(bp))
+               return;
+
        txq = dev->data->tx_queues[queue_id];
 
        qinfo->nb_desc = txq->nb_tx_desc;
@@ -1806,28 +2217,23 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
        qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
 }
 
-static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
+int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
-       struct rte_eth_dev_info dev_info;
        uint32_t new_pkt_size;
        uint32_t rc = 0;
        uint32_t i;
 
-       new_pkt_size = new_mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN +
-                      VLAN_TAG_SIZE * BNXT_NUM_VLANS;
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
-       rc = bnxt_dev_info_get_op(eth_dev, &dev_info);
-       if (rc != 0) {
-               PMD_DRV_LOG(ERR, "Error during getting ethernet device info\n");
+       /* Exit if receive queues are not configured yet */
+       if (!eth_dev->data->nb_rx_queues)
                return rc;
-       }
 
-       if (new_mtu < RTE_ETHER_MIN_MTU || new_mtu > BNXT_MAX_MTU) {
-               PMD_DRV_LOG(ERR, "MTU requested must be within (%d, %d)\n",
-                       RTE_ETHER_MIN_MTU, BNXT_MAX_MTU);
-               return -EINVAL;
-       }
+       new_pkt_size = new_mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN +
+                      VLAN_TAG_SIZE * BNXT_NUM_VLANS;
 
 #ifdef RTE_ARCH_X86
        /*
@@ -1856,17 +2262,15 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
                bp->flags &= ~BNXT_FLAG_JUMBO;
        }
 
-       eth_dev->data->dev_conf.rxmode.max_rx_pkt_len = new_pkt_size;
-
-       eth_dev->data->mtu = new_mtu;
-       PMD_DRV_LOG(INFO, "New MTU is %d\n", eth_dev->data->mtu);
+       /* Is there a change in mtu setting? */
+       if (eth_dev->data->dev_conf.rxmode.max_rx_pkt_len == new_pkt_size)
+               return rc;
 
        for (i = 0; i < bp->nr_vnics; i++) {
                struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
                uint16_t size = 0;
 
-               vnic->mru = bp->eth_dev->data->mtu + RTE_ETHER_HDR_LEN +
-                                       RTE_ETHER_CRC_LEN + VLAN_TAG_SIZE * 2;
+               vnic->mru = BNXT_VNIC_MRU(new_mtu);
                rc = bnxt_hwrm_vnic_cfg(bp, vnic);
                if (rc)
                        break;
@@ -1881,6 +2285,11 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
                }
        }
 
+       if (!rc)
+               eth_dev->data->dev_conf.rxmode.max_rx_pkt_len = new_pkt_size;
+
+       PMD_DRV_LOG(INFO, "New MTU is %d\n", new_mtu);
+
        return rc;
 }
 
@@ -1891,6 +2300,10 @@ bnxt_vlan_pvid_set_op(struct rte_eth_dev *dev, uint16_t pvid, int on)
        uint16_t vlan = bp->vlan;
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        if (!BNXT_SINGLE_PF(bp) || BNXT_VF(bp)) {
                PMD_DRV_LOG(ERR,
                        "PVID cannot be modified for this function\n");
@@ -1908,6 +2321,11 @@ static int
 bnxt_dev_led_on_op(struct rte_eth_dev *dev)
 {
        struct bnxt *bp = dev->data->dev_private;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        return bnxt_hwrm_port_led_cfg(bp, true);
 }
@@ -1916,6 +2334,11 @@ static int
 bnxt_dev_led_off_op(struct rte_eth_dev *dev)
 {
        struct bnxt *bp = dev->data->dev_private;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        return bnxt_hwrm_port_led_cfg(bp, false);
 }
@@ -1923,43 +2346,32 @@ bnxt_dev_led_off_op(struct rte_eth_dev *dev)
 static uint32_t
 bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
+       struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
        uint32_t desc = 0, raw_cons = 0, cons;
        struct bnxt_cp_ring_info *cpr;
        struct bnxt_rx_queue *rxq;
        struct rx_pkt_cmpl *rxcmp;
-       uint16_t cmp_type;
-       uint8_t cmp = 1;
-       bool valid;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        rxq = dev->data->rx_queues[rx_queue_id];
        cpr = rxq->cp_ring;
-       valid = cpr->valid;
+       raw_cons = cpr->cp_raw_cons;
 
-       while (raw_cons < rxq->nb_rx_desc) {
+       while (1) {
                cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
+               rte_prefetch0(&cpr->cp_desc_ring[cons]);
                rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons];
 
-               if (!CMPL_VALID(rxcmp, valid))
-                       goto nothing_to_do;
-               valid = FLIP_VALID(cons, cpr->cp_ring_struct->ring_mask, valid);
-               cmp_type = CMP_TYPE(rxcmp);
-               if (cmp_type == RX_TPA_END_CMPL_TYPE_RX_TPA_END) {
-                       cmp = (rte_le_to_cpu_32(
-                                       ((struct rx_tpa_end_cmpl *)
-                                        (rxcmp))->agg_bufs_v1) &
-                              RX_TPA_END_CMPL_AGG_BUFS_MASK) >>
-                               RX_TPA_END_CMPL_AGG_BUFS_SFT;
-                       desc++;
-               } else if (cmp_type == 0x11) {
-                       desc++;
-                       cmp = (rxcmp->agg_bufs_v1 &
-                                  RX_PKT_CMPL_AGG_BUFS_MASK) >>
-                               RX_PKT_CMPL_AGG_BUFS_SFT;
+               if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct)) {
+                       break;
                } else {
-                       cmp = 1;
+                       raw_cons++;
+                       desc++;
                }
-nothing_to_do:
-               raw_cons += cmp ? cmp : 2;
        }
 
        return desc;
@@ -1974,10 +2386,15 @@ bnxt_rx_descriptor_status_op(void *rx_queue, uint16_t offset)
        struct bnxt_sw_rx_bd *rx_buf;
        struct rx_pkt_cmpl *rxcmp;
        uint32_t cons, cp_cons;
+       int rc;
 
        if (!rxq)
                return -EINVAL;
 
+       rc = is_bnxt_in_error(rxq->bp);
+       if (rc)
+               return rc;
+
        cpr = rxq->cp_ring;
        rxr = rxq->rx_ring;
 
@@ -2012,10 +2429,15 @@ bnxt_tx_descriptor_status_op(void *tx_queue, uint16_t offset)
        struct bnxt_sw_tx_bd *tx_buf;
        struct tx_pkt_cmpl *txcmp;
        uint32_t cons, cp_cons;
+       int rc;
 
        if (!txq)
                return -EINVAL;
 
+       rc = is_bnxt_in_error(txq->bp);
+       if (rc)
+               return rc;
+
        cpr = txq->cp_ring;
        txr = txq->tx_ring;
 
@@ -2064,7 +2486,7 @@ bnxt_match_and_validate_ether_filter(struct bnxt *bp,
                goto exit;
        }
 
-       vnic0 = &bp->vnic_info[0];
+       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
        vnic = &bp->vnic_info[efilter->queue];
        if (vnic == NULL) {
                PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
@@ -2123,7 +2545,7 @@ bnxt_ethertype_filter(struct rte_eth_dev *dev,
                return -EINVAL;
        }
 
-       vnic0 = &bp->vnic_info[0];
+       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
        vnic = &bp->vnic_info[efilter->queue];
 
        switch (filter_op) {
@@ -2272,9 +2694,6 @@ parse_ntuple_filter(struct bnxt *bp,
                return -EINVAL;
        }
 
-       //TODO Priority
-       //nfilter->priority = (uint8_t)filter->priority;
-
        bfilter->enables = en;
        return 0;
 }
@@ -2341,7 +2760,7 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
                goto free_filter;
 
        vnic = &bp->vnic_info[nfilter->queue];
-       vnic0 = &bp->vnic_info[0];
+       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
        filter1 = STAILQ_FIRST(&vnic0->filter);
        if (filter1 == NULL) {
                ret = -EINVAL;
@@ -2394,14 +2813,11 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
 
                STAILQ_REMOVE(&vnic->filter, mfilter, bnxt_filter_info, next);
                bnxt_free_filter(bp, mfilter);
-               mfilter->fw_l2_filter_id = -1;
                bnxt_free_filter(bp, bfilter);
-               bfilter->fw_l2_filter_id = -1;
        }
 
        return 0;
 free_filter:
-       bfilter->fw_l2_filter_id = -1;
        bnxt_free_filter(bp, bfilter);
        return ret;
 }
@@ -2634,14 +3050,13 @@ bnxt_parse_fdir_filter(struct bnxt *bp,
                return -EINVAL;
        }
 
-       vnic0 = &bp->vnic_info[0];
+       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
        vnic = &bp->vnic_info[fdir->action.rx_queue];
        if (vnic == NULL) {
                PMD_DRV_LOG(ERR, "Invalid queue %d\n", fdir->action.rx_queue);
                return -EINVAL;
        }
 
-
        if (fdir_mode == RTE_FDIR_MODE_PERFECT_MAC_VLAN) {
                rte_memcpy(filter->dst_macaddr,
                        fdir->input.flow.mac_vlan_flow.mac_addr.addr_bytes, 6);
@@ -2800,7 +3215,6 @@ bnxt_fdir_filter(struct rte_eth_dev *dev,
                        STAILQ_REMOVE(&vnic->filter, match,
                                      bnxt_filter_info, next);
                        bnxt_free_filter(bp, match);
-                       filter->fw_l2_filter_id = -1;
                        bnxt_free_filter(bp, filter);
                }
                break;
@@ -2833,18 +3247,21 @@ bnxt_fdir_filter(struct rte_eth_dev *dev,
        return ret;
 
 free_filter:
-       filter->fw_l2_filter_id = -1;
        bnxt_free_filter(bp, filter);
        return ret;
 }
 
 static int
-bnxt_filter_ctrl_op(struct rte_eth_dev *dev __rte_unused,
+bnxt_filter_ctrl_op(struct rte_eth_dev *dev,
                    enum rte_filter_type filter_type,
                    enum rte_filter_op filter_op, void *arg)
 {
        int ret = 0;
 
+       ret = is_bnxt_in_error(dev->data->dev_private);
+       if (ret)
+               return ret;
+
        switch (filter_type) {
        case RTE_ETH_FILTER_TUNNEL:
                PMD_DRV_LOG(ERR,
@@ -3031,18 +3448,24 @@ bnxt_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts)
 static int
 bnxt_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts)
 {
-       uint64_t ns, systime_cycles;
        struct bnxt *bp = dev->data->dev_private;
        struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
+       uint64_t ns, systime_cycles = 0;
+       int rc = 0;
 
        if (!ptp)
                return 0;
 
-       systime_cycles = bnxt_cc_read(bp);
+       if (BNXT_CHIP_THOR(bp))
+               rc = bnxt_hwrm_port_ts_query(bp, BNXT_PTP_FLAGS_CURRENT_TIME,
+                                            &systime_cycles);
+       else
+               systime_cycles = bnxt_cc_read(bp);
+
        ns = rte_timecounter_update(&ptp->tc, systime_cycles);
        *ts = rte_ns_to_timespec(ns);
 
-       return 0;
+       return rc;
 }
 static int
 bnxt_timesync_enable(struct rte_eth_dev *dev)
@@ -3050,6 +3473,7 @@ bnxt_timesync_enable(struct rte_eth_dev *dev)
        struct bnxt *bp = dev->data->dev_private;
        struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
        uint32_t shift = 0;
+       int rc;
 
        if (!ptp)
                return 0;
@@ -3058,8 +3482,9 @@ bnxt_timesync_enable(struct rte_eth_dev *dev)
        ptp->tx_tstamp_en = 1;
        ptp->rxctl = BNXT_PTP_MSG_EVENTS;
 
-       if (!bnxt_hwrm_ptp_cfg(bp))
-               bnxt_map_ptp_regs(bp);
+       rc = bnxt_hwrm_ptp_cfg(bp);
+       if (rc)
+               return rc;
 
        memset(&ptp->tc, 0, sizeof(struct rte_timecounter));
        memset(&ptp->rx_tstamp_tc, 0, sizeof(struct rte_timecounter));
@@ -3077,6 +3502,9 @@ bnxt_timesync_enable(struct rte_eth_dev *dev)
        ptp->tx_tstamp_tc.cc_shift = shift;
        ptp->tx_tstamp_tc.nsec_mask = (1ULL << shift) - 1;
 
+       if (!BNXT_CHIP_THOR(bp))
+               bnxt_map_ptp_regs(bp);
+
        return 0;
 }
 
@@ -3095,7 +3523,8 @@ bnxt_timesync_disable(struct rte_eth_dev *dev)
 
        bnxt_hwrm_ptp_cfg(bp);
 
-       bnxt_unmap_ptp_regs(bp);
+       if (!BNXT_CHIP_THOR(bp))
+               bnxt_unmap_ptp_regs(bp);
 
        return 0;
 }
@@ -3113,7 +3542,11 @@ bnxt_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
        if (!ptp)
                return 0;
 
-       bnxt_get_rx_ts(bp, &rx_tstamp_cycles);
+       if (BNXT_CHIP_THOR(bp))
+               rx_tstamp_cycles = ptp->rx_timestamp;
+       else
+               bnxt_get_rx_ts(bp, &rx_tstamp_cycles);
+
        ns = rte_timecounter_update(&ptp->rx_tstamp_tc, rx_tstamp_cycles);
        *timestamp = rte_ns_to_timespec(ns);
        return  0;
@@ -3127,15 +3560,21 @@ bnxt_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
        struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
        uint64_t tx_tstamp_cycles = 0;
        uint64_t ns;
+       int rc = 0;
 
        if (!ptp)
                return 0;
 
-       bnxt_get_tx_ts(bp, &tx_tstamp_cycles);
+       if (BNXT_CHIP_THOR(bp))
+               rc = bnxt_hwrm_port_ts_query(bp, BNXT_PTP_FLAGS_PATH_TX,
+                                            &tx_tstamp_cycles);
+       else
+               rc = bnxt_get_tx_ts(bp, &tx_tstamp_cycles);
+
        ns = rte_timecounter_update(&ptp->tx_tstamp_tc, tx_tstamp_cycles);
        *timestamp = rte_ns_to_timespec(ns);
 
-       return 0;
+       return rc;
 }
 
 static int
@@ -3160,9 +3599,13 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev)
        uint32_t dir_entries;
        uint32_t entry_length;
 
-       PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x\n",
-               bp->pdev->addr.domain, bp->pdev->addr.bus,
-               bp->pdev->addr.devid, bp->pdev->addr.function);
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       PMD_DRV_LOG(INFO, PCI_PRI_FMT "\n",
+                   bp->pdev->addr.domain, bp->pdev->addr.bus,
+                   bp->pdev->addr.devid, bp->pdev->addr.function);
 
        rc = bnxt_hwrm_nvm_get_dir_info(bp, &dir_entries, &entry_length);
        if (rc != 0)
@@ -3178,11 +3621,16 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev,
        struct bnxt *bp = dev->data->dev_private;
        uint32_t index;
        uint32_t offset;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
-       PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d "
-               "len = %d\n", bp->pdev->addr.domain,
-               bp->pdev->addr.bus, bp->pdev->addr.devid,
-               bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length);
+       PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n",
+                   bp->pdev->addr.domain, bp->pdev->addr.bus,
+                   bp->pdev->addr.devid, bp->pdev->addr.function,
+                   in_eeprom->offset, in_eeprom->length);
 
        if (in_eeprom->offset == 0) /* special offset value to get directory */
                return bnxt_get_nvram_directory(bp, in_eeprom->length,
@@ -3249,11 +3697,16 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev,
        struct bnxt *bp = dev->data->dev_private;
        uint8_t index, dir_op;
        uint16_t type, ext, ordinal, attr;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
-       PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d "
-               "len = %d\n", bp->pdev->addr.domain,
-               bp->pdev->addr.bus, bp->pdev->addr.devid,
-               bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length);
+       PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n",
+                   bp->pdev->addr.domain, bp->pdev->addr.bus,
+                   bp->pdev->addr.devid, bp->pdev->addr.function,
+                   in_eeprom->offset, in_eeprom->length);
 
        if (!BNXT_PF(bp)) {
                PMD_DRV_LOG(ERR, "NVM write not supported from a VF\n");
@@ -3325,6 +3778,7 @@ static const struct eth_dev_ops bnxt_dev_ops = {
        .udp_tunnel_port_del  = bnxt_udp_tunnel_port_del_op,
        .vlan_filter_set = bnxt_vlan_filter_set_op,
        .vlan_offload_set = bnxt_vlan_offload_set_op,
+       .vlan_tpid_set = bnxt_vlan_tpid_set_op,
        .vlan_pvid_set = bnxt_vlan_pvid_set_op,
        .mtu_set = bnxt_mtu_set_op,
        .mac_addr_set = bnxt_set_default_mac_addr_op,
@@ -3360,212 +3814,600 @@ static const struct eth_dev_ops bnxt_dev_ops = {
        .timesync_read_tx_timestamp = bnxt_timesync_read_tx_timestamp,
 };
 
-static bool bnxt_vf_pciid(uint16_t id)
-{
-       if (id == BROADCOM_DEV_ID_57304_VF ||
-           id == BROADCOM_DEV_ID_57406_VF ||
-           id == BROADCOM_DEV_ID_5731X_VF ||
-           id == BROADCOM_DEV_ID_5741X_VF ||
-           id == BROADCOM_DEV_ID_57414_VF ||
-           id == BROADCOM_DEV_ID_STRATUS_NIC_VF1 ||
-           id == BROADCOM_DEV_ID_STRATUS_NIC_VF2 ||
-           id == BROADCOM_DEV_ID_58802_VF ||
-           id == BROADCOM_DEV_ID_57500_VF1 ||
-           id == BROADCOM_DEV_ID_57500_VF2)
-               return true;
-       return false;
-}
-
-bool bnxt_stratus_device(struct bnxt *bp)
-{
-       uint16_t id = bp->pdev->id.device_id;
-
-       if (id == BROADCOM_DEV_ID_STRATUS_NIC ||
-           id == BROADCOM_DEV_ID_STRATUS_NIC_VF1 ||
-           id == BROADCOM_DEV_ID_STRATUS_NIC_VF2)
-               return true;
-       return false;
-}
-
-static int bnxt_init_board(struct rte_eth_dev *eth_dev)
+static uint32_t bnxt_map_reset_regs(struct bnxt *bp, uint32_t reg)
 {
-       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-       struct bnxt *bp = eth_dev->data->dev_private;
+       uint32_t offset;
 
-       /* enable device (incl. PCI PM wakeup), and bus-mastering */
-       bp->bar0 = (void *)pci_dev->mem_resource[0].addr;
-       bp->doorbell_base = (void *)pci_dev->mem_resource[2].addr;
-       if (!bp->bar0 || !bp->doorbell_base) {
-               PMD_DRV_LOG(ERR, "Unable to access Hardware\n");
-               return -ENODEV;
-       }
+       /* Only pre-map the reset GRC registers using window 3 */
+       rte_write32(reg & 0xfffff000, (uint8_t *)bp->bar0 +
+                   BNXT_GRCPF_REG_WINDOW_BASE_OUT + 8);
 
-       bp->eth_dev = eth_dev;
-       bp->pdev = pci_dev;
+       offset = BNXT_GRCP_WINDOW_3_BASE + (reg & 0xffc);
 
-       return 0;
+       return offset;
 }
 
-static int bnxt_alloc_ctx_mem_blk(__rte_unused struct bnxt *bp,
-                                 struct bnxt_ctx_pg_info *ctx_pg,
-                                 uint32_t mem_size,
-                                 const char *suffix,
-                                 uint16_t idx)
+int bnxt_map_fw_health_status_regs(struct bnxt *bp)
 {
-       struct bnxt_ring_mem_info *rmem = &ctx_pg->ring_mem;
-       const struct rte_memzone *mz = NULL;
-       char mz_name[RTE_MEMZONE_NAMESIZE];
-       rte_iova_t mz_phys_addr;
-       uint64_t valid_bits = 0;
-       uint32_t sz;
+       struct bnxt_error_recovery_info *info = bp->recovery_info;
+       uint32_t reg_base = 0xffffffff;
        int i;
 
-       if (!mem_size)
-               return 0;
+       /* Only pre-map the monitoring GRC registers using window 2 */
+       for (i = 0; i < BNXT_FW_STATUS_REG_CNT; i++) {
+               uint32_t reg = info->status_regs[i];
 
-       rmem->nr_pages = RTE_ALIGN_MUL_CEIL(mem_size, BNXT_PAGE_SIZE) /
-                        BNXT_PAGE_SIZE;
-       rmem->page_size = BNXT_PAGE_SIZE;
-       rmem->pg_arr = ctx_pg->ctx_pg_arr;
-       rmem->dma_arr = ctx_pg->ctx_dma_arr;
-       rmem->flags = BNXT_RMEM_VALID_PTE_FLAG;
+               if (BNXT_FW_STATUS_REG_TYPE(reg) != BNXT_FW_STATUS_REG_TYPE_GRC)
+                       continue;
 
-       valid_bits = PTU_PTE_VALID;
+               if (reg_base == 0xffffffff)
+                       reg_base = reg & 0xfffff000;
+               if ((reg & 0xfffff000) != reg_base)
+                       return -ERANGE;
 
-       if (rmem->nr_pages > 1) {
-               snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
-                        "bnxt_ctx_pg_tbl%s_%x_%d",
-                        suffix, idx, bp->eth_dev->data->port_id);
-               mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
-               mz = rte_memzone_lookup(mz_name);
-               if (!mz) {
-                       mz = rte_memzone_reserve_aligned(mz_name,
-                                               rmem->nr_pages * 8,
-                                               SOCKET_ID_ANY,
-                                               RTE_MEMZONE_2MB |
-                                               RTE_MEMZONE_SIZE_HINT_ONLY |
-                                               RTE_MEMZONE_IOVA_CONTIG,
-                                               BNXT_PAGE_SIZE);
-                       if (mz == NULL)
-                               return -ENOMEM;
-               }
+               /* Use mask 0xffc as the Lower 2 bits indicates
+                * address space location
+                */
+               info->mapped_status_regs[i] = BNXT_GRCP_WINDOW_2_BASE +
+                                               (reg & 0xffc);
+       }
 
-               memset(mz->addr, 0, mz->len);
-               mz_phys_addr = mz->iova;
-               if ((unsigned long)mz->addr == mz_phys_addr) {
-                       PMD_DRV_LOG(WARNING,
-                               "Memzone physical address same as virtual.\n");
-                       PMD_DRV_LOG(WARNING,
-                                   "Using rte_mem_virt2iova()\n");
-                       mz_phys_addr = rte_mem_virt2iova(mz->addr);
-                       if (mz_phys_addr == RTE_BAD_IOVA) {
-                               PMD_DRV_LOG(ERR,
-                                       "unable to map addr to phys memory\n");
-                               return -ENOMEM;
-                       }
-               }
-               rte_mem_lock_page(((char *)mz->addr));
+       if (reg_base == 0xffffffff)
+               return 0;
 
-               rmem->pg_tbl = mz->addr;
-               rmem->pg_tbl_map = mz_phys_addr;
-               rmem->pg_tbl_mz = mz;
-       }
+       rte_write32(reg_base, (uint8_t *)bp->bar0 +
+                   BNXT_GRCPF_REG_WINDOW_BASE_OUT + 4);
 
-       snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_%s_%x_%d",
-                suffix, idx, bp->eth_dev->data->port_id);
-       mz = rte_memzone_lookup(mz_name);
-       if (!mz) {
-               mz = rte_memzone_reserve_aligned(mz_name,
-                                                mem_size,
-                                                SOCKET_ID_ANY,
-                                                RTE_MEMZONE_1GB |
-                                                RTE_MEMZONE_SIZE_HINT_ONLY |
-                                                RTE_MEMZONE_IOVA_CONTIG,
-                                                BNXT_PAGE_SIZE);
-               if (mz == NULL)
-                       return -ENOMEM;
-       }
+       return 0;
+}
 
-       memset(mz->addr, 0, mz->len);
-       mz_phys_addr = mz->iova;
-       if ((unsigned long)mz->addr == mz_phys_addr) {
-               PMD_DRV_LOG(WARNING,
-                           "Memzone physical address same as virtual.\n");
-               PMD_DRV_LOG(WARNING,
-                           "Using rte_mem_virt2iova()\n");
-               for (sz = 0; sz < mem_size; sz += BNXT_PAGE_SIZE)
-                       rte_mem_lock_page(((char *)mz->addr) + sz);
-               mz_phys_addr = rte_mem_virt2iova(mz->addr);
-               if (mz_phys_addr == RTE_BAD_IOVA) {
-                       PMD_DRV_LOG(ERR,
-                                   "unable to map addr to phys memory\n");
-                       return -ENOMEM;
-               }
+static void bnxt_write_fw_reset_reg(struct bnxt *bp, uint32_t index)
+{
+       struct bnxt_error_recovery_info *info = bp->recovery_info;
+       uint32_t delay = info->delay_after_reset[index];
+       uint32_t val = info->reset_reg_val[index];
+       uint32_t reg = info->reset_reg[index];
+       uint32_t type, offset;
+
+       type = BNXT_FW_STATUS_REG_TYPE(reg);
+       offset = BNXT_FW_STATUS_REG_OFF(reg);
+
+       switch (type) {
+       case BNXT_FW_STATUS_REG_TYPE_CFG:
+               rte_pci_write_config(bp->pdev, &val, sizeof(val), offset);
+               break;
+       case BNXT_FW_STATUS_REG_TYPE_GRC:
+               offset = bnxt_map_reset_regs(bp, offset);
+               rte_write32(val, (uint8_t *)bp->bar0 + offset);
+               break;
+       case BNXT_FW_STATUS_REG_TYPE_BAR0:
+               rte_write32(val, (uint8_t *)bp->bar0 + offset);
+               break;
        }
+       /* wait on a specific interval of time until core reset is complete */
+       if (delay)
+               rte_delay_ms(delay);
+}
 
-       for (sz = 0, i = 0; sz < mem_size; sz += BNXT_PAGE_SIZE, i++) {
-               rte_mem_lock_page(((char *)mz->addr) + sz);
-               rmem->pg_arr[i] = ((char *)mz->addr) + sz;
-               rmem->dma_arr[i] = mz_phys_addr + sz;
+static void bnxt_dev_cleanup(struct bnxt *bp)
+{
+       bnxt_set_hwrm_link_config(bp, false);
+       bp->link_info.link_up = 0;
+       if (bp->dev_stopped == 0)
+               bnxt_dev_stop_op(bp->eth_dev);
 
-               if (rmem->nr_pages > 1) {
-                       if (i == rmem->nr_pages - 2 &&
-                           (rmem->flags & BNXT_RMEM_RING_PTE_FLAG))
-                               valid_bits |= PTU_PTE_NEXT_TO_LAST;
-                       else if (i == rmem->nr_pages - 1 &&
-                                (rmem->flags & BNXT_RMEM_RING_PTE_FLAG))
-                               valid_bits |= PTU_PTE_LAST;
+       bnxt_uninit_resources(bp, true);
+}
 
-                       rmem->pg_tbl[i] = rte_cpu_to_le_64(rmem->dma_arr[i] |
-                                                          valid_bits);
+static int bnxt_restore_vlan_filters(struct bnxt *bp)
+{
+       struct rte_eth_dev *dev = bp->eth_dev;
+       struct rte_vlan_filter_conf *vfc;
+       int vidx, vbit, rc;
+       uint16_t vlan_id;
+
+       for (vlan_id = 1; vlan_id <= RTE_ETHER_MAX_VLAN_ID; vlan_id++) {
+               vfc = &dev->data->vlan_filter_conf;
+               vidx = vlan_id / 64;
+               vbit = vlan_id % 64;
+
+               /* Each bit corresponds to a VLAN id */
+               if (vfc->ids[vidx] & (UINT64_C(1) << vbit)) {
+                       rc = bnxt_add_vlan_filter(bp, vlan_id);
+                       if (rc)
+                               return rc;
                }
        }
 
-       rmem->mz = mz;
-       if (rmem->vmem_size)
-               rmem->vmem = (void **)mz->addr;
-       rmem->dma_arr[0] = mz_phys_addr;
        return 0;
 }
 
-static void bnxt_free_ctx_mem(struct bnxt *bp)
+static int bnxt_restore_mac_filters(struct bnxt *bp)
 {
-       int i;
+       struct rte_eth_dev *dev = bp->eth_dev;
+       struct rte_eth_dev_info dev_info;
+       struct rte_ether_addr *addr;
+       uint64_t pool_mask;
+       uint32_t pool = 0;
+       uint16_t i;
+       int rc;
 
-       if (!bp->ctx || !(bp->ctx->flags & BNXT_CTX_FLAG_INITED))
-               return;
+       if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp))
+               return 0;
 
-       bp->ctx->flags &= ~BNXT_CTX_FLAG_INITED;
-       rte_memzone_free(bp->ctx->qp_mem.ring_mem.mz);
-       rte_memzone_free(bp->ctx->srq_mem.ring_mem.mz);
-       rte_memzone_free(bp->ctx->cq_mem.ring_mem.mz);
-       rte_memzone_free(bp->ctx->vnic_mem.ring_mem.mz);
-       rte_memzone_free(bp->ctx->stat_mem.ring_mem.mz);
-       rte_memzone_free(bp->ctx->qp_mem.ring_mem.pg_tbl_mz);
-       rte_memzone_free(bp->ctx->srq_mem.ring_mem.pg_tbl_mz);
-       rte_memzone_free(bp->ctx->cq_mem.ring_mem.pg_tbl_mz);
-       rte_memzone_free(bp->ctx->vnic_mem.ring_mem.pg_tbl_mz);
-       rte_memzone_free(bp->ctx->stat_mem.ring_mem.pg_tbl_mz);
+       rc = bnxt_dev_info_get_op(dev, &dev_info);
+       if (rc)
+               return rc;
 
-       for (i = 0; i < BNXT_MAX_Q; i++) {
-               if (bp->ctx->tqm_mem[i])
-                       rte_memzone_free(bp->ctx->tqm_mem[i]->ring_mem.mz);
+       /* replay MAC address configuration */
+       for (i = 1; i < dev_info.max_mac_addrs; i++) {
+               addr = &dev->data->mac_addrs[i];
+
+               /* skip zero address */
+               if (rte_is_zero_ether_addr(addr))
+                       continue;
+
+               pool = 0;
+               pool_mask = dev->data->mac_pool_sel[i];
+
+               do {
+                       if (pool_mask & 1ULL) {
+                               rc = bnxt_mac_addr_add_op(dev, addr, i, pool);
+                               if (rc)
+                                       return rc;
+                       }
+                       pool_mask >>= 1;
+                       pool++;
+               } while (pool_mask);
        }
 
-       rte_free(bp->ctx);
-       bp->ctx = NULL;
+       return 0;
 }
 
-#define bnxt_roundup(x, y)   ((((x) + ((y) - 1)) / (y)) * (y))
+static int bnxt_restore_filters(struct bnxt *bp)
+{
+       struct rte_eth_dev *dev = bp->eth_dev;
+       int ret = 0;
 
-#define min_t(type, x, y) ({                    \
-       type __min1 = (x);                      \
-       type __min2 = (y);                      \
-       __min1 < __min2 ? __min1 : __min2; })
+       if (dev->data->all_multicast)
+               ret = bnxt_allmulticast_enable_op(dev);
+       if (dev->data->promiscuous)
+               ret = bnxt_promiscuous_enable_op(dev);
 
-#define max_t(type, x, y) ({                    \
-       type __max1 = (x);                      \
-       type __max2 = (y);                      \
+       ret = bnxt_restore_mac_filters(bp);
+       if (ret)
+               return ret;
+
+       ret = bnxt_restore_vlan_filters(bp);
+       /* TODO restore other filters as well */
+       return ret;
+}
+
+static void bnxt_dev_recover(void *arg)
+{
+       struct bnxt *bp = arg;
+       int timeout = bp->fw_reset_max_msecs;
+       int rc = 0;
+
+       /* Clear Error flag so that device re-init should happen */
+       bp->flags &= ~BNXT_FLAG_FATAL_ERROR;
+
+       do {
+               rc = bnxt_hwrm_ver_get(bp);
+               if (rc == 0)
+                       break;
+               rte_delay_ms(BNXT_FW_READY_WAIT_INTERVAL);
+               timeout -= BNXT_FW_READY_WAIT_INTERVAL;
+       } while (rc && timeout);
+
+       if (rc) {
+               PMD_DRV_LOG(ERR, "FW is not Ready after reset\n");
+               goto err;
+       }
+
+       rc = bnxt_init_resources(bp, true);
+       if (rc) {
+               PMD_DRV_LOG(ERR,
+                           "Failed to initialize resources after reset\n");
+               goto err;
+       }
+       /* clear reset flag as the device is initialized now */
+       bp->flags &= ~BNXT_FLAG_FW_RESET;
+
+       rc = bnxt_dev_start_op(bp->eth_dev);
+       if (rc) {
+               PMD_DRV_LOG(ERR, "Failed to start port after reset\n");
+               goto err;
+       }
+
+       rc = bnxt_restore_filters(bp);
+       if (rc)
+               goto err;
+
+       PMD_DRV_LOG(INFO, "Recovered from FW reset\n");
+       return;
+err:
+       bp->flags |= BNXT_FLAG_FATAL_ERROR;
+       bnxt_uninit_resources(bp, false);
+       PMD_DRV_LOG(ERR, "Failed to recover from FW reset\n");
+}
+
+void bnxt_dev_reset_and_resume(void *arg)
+{
+       struct bnxt *bp = arg;
+       int rc;
+
+       bnxt_dev_cleanup(bp);
+
+       bnxt_wait_for_device_shutdown(bp);
+
+       rc = rte_eal_alarm_set(US_PER_MS * bp->fw_reset_min_msecs,
+                              bnxt_dev_recover, (void *)bp);
+       if (rc)
+               PMD_DRV_LOG(ERR, "Error setting recovery alarm");
+}
+
+uint32_t bnxt_read_fw_status_reg(struct bnxt *bp, uint32_t index)
+{
+       struct bnxt_error_recovery_info *info = bp->recovery_info;
+       uint32_t reg = info->status_regs[index];
+       uint32_t type, offset, val = 0;
+
+       type = BNXT_FW_STATUS_REG_TYPE(reg);
+       offset = BNXT_FW_STATUS_REG_OFF(reg);
+
+       switch (type) {
+       case BNXT_FW_STATUS_REG_TYPE_CFG:
+               rte_pci_read_config(bp->pdev, &val, sizeof(val), offset);
+               break;
+       case BNXT_FW_STATUS_REG_TYPE_GRC:
+               offset = info->mapped_status_regs[index];
+               /* FALLTHROUGH */
+       case BNXT_FW_STATUS_REG_TYPE_BAR0:
+               val = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
+                                      offset));
+               break;
+       }
+
+       return val;
+}
+
+static int bnxt_fw_reset_all(struct bnxt *bp)
+{
+       struct bnxt_error_recovery_info *info = bp->recovery_info;
+       uint32_t i;
+       int rc = 0;
+
+       if (info->flags & BNXT_FLAG_ERROR_RECOVERY_HOST) {
+               /* Reset through master function driver */
+               for (i = 0; i < info->reg_array_cnt; i++)
+                       bnxt_write_fw_reset_reg(bp, i);
+               /* Wait for time specified by FW after triggering reset */
+               rte_delay_ms(info->master_func_wait_period_after_reset);
+       } else if (info->flags & BNXT_FLAG_ERROR_RECOVERY_CO_CPU) {
+               /* Reset with the help of Kong processor */
+               rc = bnxt_hwrm_fw_reset(bp);
+               if (rc)
+                       PMD_DRV_LOG(ERR, "Failed to reset FW\n");
+       }
+
+       return rc;
+}
+
+static void bnxt_fw_reset_cb(void *arg)
+{
+       struct bnxt *bp = arg;
+       struct bnxt_error_recovery_info *info = bp->recovery_info;
+       int rc = 0;
+
+       /* Only Master function can do FW reset */
+       if (bnxt_is_master_func(bp) &&
+           bnxt_is_recovery_enabled(bp)) {
+               rc = bnxt_fw_reset_all(bp);
+               if (rc) {
+                       PMD_DRV_LOG(ERR, "Adapter recovery failed\n");
+                       return;
+               }
+       }
+
+       /* if recovery method is ERROR_RECOVERY_CO_CPU, KONG will send
+        * EXCEPTION_FATAL_ASYNC event to all the functions
+        * (including MASTER FUNC). After receiving this Async, all the active
+        * drivers should treat this case as FW initiated recovery
+        */
+       if (info->flags & BNXT_FLAG_ERROR_RECOVERY_HOST) {
+               bp->fw_reset_min_msecs = BNXT_MIN_FW_READY_TIMEOUT;
+               bp->fw_reset_max_msecs = BNXT_MAX_FW_RESET_TIMEOUT;
+
+               /* To recover from error */
+               rte_eal_alarm_set(US_PER_MS, bnxt_dev_reset_and_resume,
+                                 (void *)bp);
+       }
+}
+
+/* Driver should poll FW heartbeat, reset_counter with the frequency
+ * advertised by FW in HWRM_ERROR_RECOVERY_QCFG.
+ * When the driver detects heartbeat stop or change in reset_counter,
+ * it has to trigger a reset to recover from the error condition.
+ * A “master PF” is the function who will have the privilege to
+ * initiate the chimp reset. The master PF will be elected by the
+ * firmware and will be notified through async message.
+ */
+static void bnxt_check_fw_health(void *arg)
+{
+       struct bnxt *bp = arg;
+       struct bnxt_error_recovery_info *info = bp->recovery_info;
+       uint32_t val = 0, wait_msec;
+
+       if (!info || !bnxt_is_recovery_enabled(bp) ||
+           is_bnxt_in_error(bp))
+               return;
+
+       val = bnxt_read_fw_status_reg(bp, BNXT_FW_HEARTBEAT_CNT_REG);
+       if (val == info->last_heart_beat)
+               goto reset;
+
+       info->last_heart_beat = val;
+
+       val = bnxt_read_fw_status_reg(bp, BNXT_FW_RECOVERY_CNT_REG);
+       if (val != info->last_reset_counter)
+               goto reset;
+
+       info->last_reset_counter = val;
+
+       rte_eal_alarm_set(US_PER_MS * info->driver_polling_freq,
+                         bnxt_check_fw_health, (void *)bp);
+
+       return;
+reset:
+       /* Stop DMA to/from device */
+       bp->flags |= BNXT_FLAG_FATAL_ERROR;
+       bp->flags |= BNXT_FLAG_FW_RESET;
+
+       PMD_DRV_LOG(ERR, "Detected FW dead condition\n");
+
+       if (bnxt_is_master_func(bp))
+               wait_msec = info->master_func_wait_period;
+       else
+               wait_msec = info->normal_func_wait_period;
+
+       rte_eal_alarm_set(US_PER_MS * wait_msec,
+                         bnxt_fw_reset_cb, (void *)bp);
+}
+
+void bnxt_schedule_fw_health_check(struct bnxt *bp)
+{
+       uint32_t polling_freq;
+
+       if (!bnxt_is_recovery_enabled(bp))
+               return;
+
+       if (bp->flags & BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED)
+               return;
+
+       polling_freq = bp->recovery_info->driver_polling_freq;
+
+       rte_eal_alarm_set(US_PER_MS * polling_freq,
+                         bnxt_check_fw_health, (void *)bp);
+       bp->flags |= BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED;
+}
+
+static void bnxt_cancel_fw_health_check(struct bnxt *bp)
+{
+       if (!bnxt_is_recovery_enabled(bp))
+               return;
+
+       rte_eal_alarm_cancel(bnxt_check_fw_health, (void *)bp);
+       bp->flags &= ~BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED;
+}
+
+static bool bnxt_vf_pciid(uint16_t device_id)
+{
+       switch (device_id) {
+       case BROADCOM_DEV_ID_57304_VF:
+       case BROADCOM_DEV_ID_57406_VF:
+       case BROADCOM_DEV_ID_5731X_VF:
+       case BROADCOM_DEV_ID_5741X_VF:
+       case BROADCOM_DEV_ID_57414_VF:
+       case BROADCOM_DEV_ID_STRATUS_NIC_VF1:
+       case BROADCOM_DEV_ID_STRATUS_NIC_VF2:
+       case BROADCOM_DEV_ID_58802_VF:
+       case BROADCOM_DEV_ID_57500_VF1:
+       case BROADCOM_DEV_ID_57500_VF2:
+               /* FALLTHROUGH */
+               return true;
+       default:
+               return false;
+       }
+}
+
+static bool bnxt_thor_device(uint16_t device_id)
+{
+       switch (device_id) {
+       case BROADCOM_DEV_ID_57508:
+       case BROADCOM_DEV_ID_57504:
+       case BROADCOM_DEV_ID_57502:
+       case BROADCOM_DEV_ID_57508_MF1:
+       case BROADCOM_DEV_ID_57504_MF1:
+       case BROADCOM_DEV_ID_57502_MF1:
+       case BROADCOM_DEV_ID_57508_MF2:
+       case BROADCOM_DEV_ID_57504_MF2:
+       case BROADCOM_DEV_ID_57502_MF2:
+       case BROADCOM_DEV_ID_57500_VF1:
+       case BROADCOM_DEV_ID_57500_VF2:
+               /* FALLTHROUGH */
+               return true;
+       default:
+               return false;
+       }
+}
+
+bool bnxt_stratus_device(struct bnxt *bp)
+{
+       uint16_t device_id = bp->pdev->id.device_id;
+
+       switch (device_id) {
+       case BROADCOM_DEV_ID_STRATUS_NIC:
+       case BROADCOM_DEV_ID_STRATUS_NIC_VF1:
+       case BROADCOM_DEV_ID_STRATUS_NIC_VF2:
+               /* FALLTHROUGH */
+               return true;
+       default:
+               return false;
+       }
+}
+
+static int bnxt_init_board(struct rte_eth_dev *eth_dev)
+{
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+       struct bnxt *bp = eth_dev->data->dev_private;
+
+       /* enable device (incl. PCI PM wakeup), and bus-mastering */
+       bp->bar0 = (void *)pci_dev->mem_resource[0].addr;
+       bp->doorbell_base = (void *)pci_dev->mem_resource[2].addr;
+       if (!bp->bar0 || !bp->doorbell_base) {
+               PMD_DRV_LOG(ERR, "Unable to access Hardware\n");
+               return -ENODEV;
+       }
+
+       bp->eth_dev = eth_dev;
+       bp->pdev = pci_dev;
+
+       return 0;
+}
+
+static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
+                                 struct bnxt_ctx_pg_info *ctx_pg,
+                                 uint32_t mem_size,
+                                 const char *suffix,
+                                 uint16_t idx)
+{
+       struct bnxt_ring_mem_info *rmem = &ctx_pg->ring_mem;
+       const struct rte_memzone *mz = NULL;
+       char mz_name[RTE_MEMZONE_NAMESIZE];
+       rte_iova_t mz_phys_addr;
+       uint64_t valid_bits = 0;
+       uint32_t sz;
+       int i;
+
+       if (!mem_size)
+               return 0;
+
+       rmem->nr_pages = RTE_ALIGN_MUL_CEIL(mem_size, BNXT_PAGE_SIZE) /
+                        BNXT_PAGE_SIZE;
+       rmem->page_size = BNXT_PAGE_SIZE;
+       rmem->pg_arr = ctx_pg->ctx_pg_arr;
+       rmem->dma_arr = ctx_pg->ctx_dma_arr;
+       rmem->flags = BNXT_RMEM_VALID_PTE_FLAG;
+
+       valid_bits = PTU_PTE_VALID;
+
+       if (rmem->nr_pages > 1) {
+               snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
+                        "bnxt_ctx_pg_tbl%s_%x_%d",
+                        suffix, idx, bp->eth_dev->data->port_id);
+               mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
+               mz = rte_memzone_lookup(mz_name);
+               if (!mz) {
+                       mz = rte_memzone_reserve_aligned(mz_name,
+                                               rmem->nr_pages * 8,
+                                               SOCKET_ID_ANY,
+                                               RTE_MEMZONE_2MB |
+                                               RTE_MEMZONE_SIZE_HINT_ONLY |
+                                               RTE_MEMZONE_IOVA_CONTIG,
+                                               BNXT_PAGE_SIZE);
+                       if (mz == NULL)
+                               return -ENOMEM;
+               }
+
+               memset(mz->addr, 0, mz->len);
+               mz_phys_addr = mz->iova;
+
+               rmem->pg_tbl = mz->addr;
+               rmem->pg_tbl_map = mz_phys_addr;
+               rmem->pg_tbl_mz = mz;
+       }
+
+       snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_%s_%x_%d",
+                suffix, idx, bp->eth_dev->data->port_id);
+       mz = rte_memzone_lookup(mz_name);
+       if (!mz) {
+               mz = rte_memzone_reserve_aligned(mz_name,
+                                                mem_size,
+                                                SOCKET_ID_ANY,
+                                                RTE_MEMZONE_1GB |
+                                                RTE_MEMZONE_SIZE_HINT_ONLY |
+                                                RTE_MEMZONE_IOVA_CONTIG,
+                                                BNXT_PAGE_SIZE);
+               if (mz == NULL)
+                       return -ENOMEM;
+       }
+
+       memset(mz->addr, 0, mz->len);
+       mz_phys_addr = mz->iova;
+
+       for (sz = 0, i = 0; sz < mem_size; sz += BNXT_PAGE_SIZE, i++) {
+               rmem->pg_arr[i] = ((char *)mz->addr) + sz;
+               rmem->dma_arr[i] = mz_phys_addr + sz;
+
+               if (rmem->nr_pages > 1) {
+                       if (i == rmem->nr_pages - 2 &&
+                           (rmem->flags & BNXT_RMEM_RING_PTE_FLAG))
+                               valid_bits |= PTU_PTE_NEXT_TO_LAST;
+                       else if (i == rmem->nr_pages - 1 &&
+                                (rmem->flags & BNXT_RMEM_RING_PTE_FLAG))
+                               valid_bits |= PTU_PTE_LAST;
+
+                       rmem->pg_tbl[i] = rte_cpu_to_le_64(rmem->dma_arr[i] |
+                                                          valid_bits);
+               }
+       }
+
+       rmem->mz = mz;
+       if (rmem->vmem_size)
+               rmem->vmem = (void **)mz->addr;
+       rmem->dma_arr[0] = mz_phys_addr;
+       return 0;
+}
+
+static void bnxt_free_ctx_mem(struct bnxt *bp)
+{
+       int i;
+
+       if (!bp->ctx || !(bp->ctx->flags & BNXT_CTX_FLAG_INITED))
+               return;
+
+       bp->ctx->flags &= ~BNXT_CTX_FLAG_INITED;
+       rte_memzone_free(bp->ctx->qp_mem.ring_mem.mz);
+       rte_memzone_free(bp->ctx->srq_mem.ring_mem.mz);
+       rte_memzone_free(bp->ctx->cq_mem.ring_mem.mz);
+       rte_memzone_free(bp->ctx->vnic_mem.ring_mem.mz);
+       rte_memzone_free(bp->ctx->stat_mem.ring_mem.mz);
+       rte_memzone_free(bp->ctx->qp_mem.ring_mem.pg_tbl_mz);
+       rte_memzone_free(bp->ctx->srq_mem.ring_mem.pg_tbl_mz);
+       rte_memzone_free(bp->ctx->cq_mem.ring_mem.pg_tbl_mz);
+       rte_memzone_free(bp->ctx->vnic_mem.ring_mem.pg_tbl_mz);
+       rte_memzone_free(bp->ctx->stat_mem.ring_mem.pg_tbl_mz);
+
+       for (i = 0; i < BNXT_MAX_Q; i++) {
+               if (bp->ctx->tqm_mem[i])
+                       rte_memzone_free(bp->ctx->tqm_mem[i]->ring_mem.mz);
+       }
+
+       rte_free(bp->ctx);
+       bp->ctx = NULL;
+}
+
+#define bnxt_roundup(x, y)   ((((x) + ((y) - 1)) / (y)) * (y))
+
+#define min_t(type, x, y) ({                    \
+       type __min1 = (x);                      \
+       type __min2 = (y);                      \
+       __min1 < __min2 ? __min1 : __min2; })
+
+#define max_t(type, x, y) ({                    \
+       type __max1 = (x);                      \
+       type __max2 = (y);                      \
        __max1 > __max2 ? __max1 : __max2; })
 
 #define clamp_t(type, _x, min, max)     min_t(type, max_t(type, _x, min), max)
@@ -3622,7 +4464,9 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp)
        if (rc)
                return rc;
 
-       entries = ctx->qp_max_l2_entries;
+       entries = ctx->qp_max_l2_entries +
+                 ctx->vnic_max_vnic_entries +
+                 ctx->tqm_min_entries_per_ring;
        entries = bnxt_roundup(entries, ctx->tqm_entries_multiple);
        entries = clamp_t(uint32_t, entries, ctx->tqm_min_entries_per_ring,
                          ctx->tqm_max_entries_per_ring);
@@ -3679,18 +4523,6 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
        }
        memset(mz->addr, 0, mz->len);
        mz_phys_addr = mz->iova;
-       if ((unsigned long)mz->addr == mz_phys_addr) {
-               PMD_DRV_LOG(WARNING,
-                           "Memzone physical address same as virtual.\n");
-               PMD_DRV_LOG(WARNING,
-                           "Using rte_mem_virt2iova()\n");
-               mz_phys_addr = rte_mem_virt2iova(mz->addr);
-               if (mz_phys_addr == RTE_BAD_IOVA) {
-                       PMD_DRV_LOG(ERR,
-                                   "Can't map address to physical memory\n");
-                       return -ENOMEM;
-               }
-       }
 
        bp->rx_mem_zone = (const void *)mz;
        bp->hw_rx_port_stats = mz->addr;
@@ -3717,115 +4549,272 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
        }
        memset(mz->addr, 0, mz->len);
        mz_phys_addr = mz->iova;
-       if ((unsigned long)mz->addr == mz_phys_addr) {
-               PMD_DRV_LOG(WARNING,
-                           "Memzone physical address same as virtual\n");
+
+       bp->tx_mem_zone = (const void *)mz;
+       bp->hw_tx_port_stats = mz->addr;
+       bp->hw_tx_port_stats_map = mz_phys_addr;
+       bp->flags |= BNXT_FLAG_PORT_STATS;
+
+       /* Display extended statistics if FW supports it */
+       if (bp->hwrm_spec_code < HWRM_SPEC_CODE_1_8_4 ||
+           bp->hwrm_spec_code == HWRM_SPEC_CODE_1_9_0 ||
+           !(bp->flags & BNXT_FLAG_EXT_STATS_SUPPORTED))
+               return 0;
+
+       bp->hw_rx_port_stats_ext = (void *)
+               ((uint8_t *)bp->hw_rx_port_stats +
+                sizeof(struct rx_port_stats));
+       bp->hw_rx_port_stats_ext_map = bp->hw_rx_port_stats_map +
+               sizeof(struct rx_port_stats);
+       bp->flags |= BNXT_FLAG_EXT_RX_PORT_STATS;
+
+       if (bp->hwrm_spec_code < HWRM_SPEC_CODE_1_9_2 ||
+           bp->flags & BNXT_FLAG_EXT_STATS_SUPPORTED) {
+               bp->hw_tx_port_stats_ext = (void *)
+                       ((uint8_t *)bp->hw_tx_port_stats +
+                        sizeof(struct tx_port_stats));
+               bp->hw_tx_port_stats_ext_map =
+                       bp->hw_tx_port_stats_map +
+                       sizeof(struct tx_port_stats);
+               bp->flags |= BNXT_FLAG_EXT_TX_PORT_STATS;
+       }
+
+       return 0;
+}
+
+static int bnxt_setup_mac_addr(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = eth_dev->data->dev_private;
+       int rc = 0;
+
+       eth_dev->data->mac_addrs = rte_zmalloc("bnxt_mac_addr_tbl",
+                                              RTE_ETHER_ADDR_LEN *
+                                              bp->max_l2_ctx,
+                                              0);
+       if (eth_dev->data->mac_addrs == NULL) {
+               PMD_DRV_LOG(ERR, "Failed to alloc MAC addr tbl\n");
+               return -ENOMEM;
+       }
+
+       if (bnxt_check_zero_bytes(bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN)) {
+               if (BNXT_PF(bp))
+                       return -EINVAL;
+
+               /* Generate a random MAC address, if none was assigned by PF */
+               PMD_DRV_LOG(INFO, "VF MAC address not assigned by Host PF\n");
+               bnxt_eth_hw_addr_random(bp->mac_addr);
+               PMD_DRV_LOG(INFO,
+                           "Assign random MAC:%02X:%02X:%02X:%02X:%02X:%02X\n",
+                           bp->mac_addr[0], bp->mac_addr[1], bp->mac_addr[2],
+                           bp->mac_addr[3], bp->mac_addr[4], bp->mac_addr[5]);
+
+               rc = bnxt_hwrm_set_mac(bp);
+               if (!rc)
+                       memcpy(&bp->eth_dev->data->mac_addrs[0], bp->mac_addr,
+                              RTE_ETHER_ADDR_LEN);
+               return rc;
+       }
+
+       /* Copy the permanent MAC from the FUNC_QCAPS response */
+       memcpy(bp->mac_addr, bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN);
+       memcpy(&eth_dev->data->mac_addrs[0], bp->mac_addr, RTE_ETHER_ADDR_LEN);
+
+       return rc;
+}
+
+static int bnxt_restore_dflt_mac(struct bnxt *bp)
+{
+       int rc = 0;
+
+       /* MAC is already configured in FW */
+       if (!bnxt_check_zero_bytes(bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN))
+               return 0;
+
+       /* Restore the old MAC configured */
+       rc = bnxt_hwrm_set_mac(bp);
+       if (rc)
+               PMD_DRV_LOG(ERR, "Failed to restore MAC address\n");
+
+       return rc;
+}
+
+static void bnxt_config_vf_req_fwd(struct bnxt *bp)
+{
+       if (!BNXT_PF(bp))
+               return;
+
+#define ALLOW_FUNC(x)  \
+       { \
+               uint32_t arg = (x); \
+               bp->pf.vf_req_fwd[((arg) >> 5)] &= \
+               ~rte_cpu_to_le_32(1 << ((arg) & 0x1f)); \
+       }
+
+       /* Forward all requests if firmware is new enough */
+       if (((bp->fw_ver >= ((20 << 24) | (6 << 16) | (100 << 8))) &&
+            (bp->fw_ver < ((20 << 24) | (7 << 16)))) ||
+           ((bp->fw_ver >= ((20 << 24) | (8 << 16))))) {
+               memset(bp->pf.vf_req_fwd, 0xff, sizeof(bp->pf.vf_req_fwd));
+       } else {
                PMD_DRV_LOG(WARNING,
-                           "Using rte_mem_virt2iova()\n");
-               mz_phys_addr = rte_mem_virt2iova(mz->addr);
-               if (mz_phys_addr == RTE_BAD_IOVA) {
-                       PMD_DRV_LOG(ERR,
-                                   "Can't map address to physical memory\n");
-                       return -ENOMEM;
-               }
+                           "Firmware too old for VF mailbox functionality\n");
+               memset(bp->pf.vf_req_fwd, 0, sizeof(bp->pf.vf_req_fwd));
        }
 
-       bp->tx_mem_zone = (const void *)mz;
-       bp->hw_tx_port_stats = mz->addr;
-       bp->hw_tx_port_stats_map = mz_phys_addr;
-       bp->flags |= BNXT_FLAG_PORT_STATS;
+       /*
+        * The following are used for driver cleanup. If we disallow these,
+        * VF drivers can't clean up cleanly.
+        */
+       ALLOW_FUNC(HWRM_FUNC_DRV_UNRGTR);
+       ALLOW_FUNC(HWRM_VNIC_FREE);
+       ALLOW_FUNC(HWRM_RING_FREE);
+       ALLOW_FUNC(HWRM_RING_GRP_FREE);
+       ALLOW_FUNC(HWRM_VNIC_RSS_COS_LB_CTX_FREE);
+       ALLOW_FUNC(HWRM_CFA_L2_FILTER_FREE);
+       ALLOW_FUNC(HWRM_STAT_CTX_FREE);
+       ALLOW_FUNC(HWRM_PORT_PHY_QCFG);
+       ALLOW_FUNC(HWRM_VNIC_TPA_CFG);
+}
+
+static int bnxt_init_fw(struct bnxt *bp)
+{
+       uint16_t mtu;
+       int rc = 0;
+
+       bp->fw_cap = 0;
+
+       rc = bnxt_hwrm_ver_get(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_hwrm_func_reset(bp);
+       if (rc)
+               return -EIO;
+
+       rc = bnxt_hwrm_vnic_qcaps(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_hwrm_queue_qportcfg(bp);
+       if (rc)
+               return rc;
+
+       /* Get the MAX capabilities for this function.
+        * This function also allocates context memory for TQM rings and
+        * informs the firmware about this allocated backing store memory.
+        */
+       rc = bnxt_hwrm_func_qcaps(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_hwrm_func_qcfg(bp, &mtu);
+       if (rc)
+               return rc;
 
-       /* Display extended statistics if FW supports it */
-       if (bp->hwrm_spec_code < HWRM_SPEC_CODE_1_8_4 ||
-           bp->hwrm_spec_code == HWRM_SPEC_CODE_1_9_0 ||
-           !(bp->flags & BNXT_FLAG_EXT_STATS_SUPPORTED))
-               return 0;
+       rc = bnxt_hwrm_cfa_adv_flow_mgmt_qcaps(bp);
+       if (rc)
+               return rc;
 
-       bp->hw_rx_port_stats_ext = (void *)
-               ((uint8_t *)bp->hw_rx_port_stats +
-                sizeof(struct rx_port_stats));
-       bp->hw_rx_port_stats_ext_map = bp->hw_rx_port_stats_map +
-               sizeof(struct rx_port_stats);
-       bp->flags |= BNXT_FLAG_EXT_RX_PORT_STATS;
+       /* Get the adapter error recovery support info */
+       rc = bnxt_hwrm_error_recovery_qcfg(bp);
+       if (rc)
+               bp->fw_cap &= ~BNXT_FW_CAP_ERROR_RECOVERY;
 
-       if (bp->hwrm_spec_code < HWRM_SPEC_CODE_1_9_2 ||
-           bp->flags & BNXT_FLAG_EXT_STATS_SUPPORTED) {
-               bp->hw_tx_port_stats_ext = (void *)
-                       ((uint8_t *)bp->hw_tx_port_stats +
-                        sizeof(struct tx_port_stats));
-               bp->hw_tx_port_stats_ext_map =
-                       bp->hw_tx_port_stats_map +
-                       sizeof(struct tx_port_stats);
-               bp->flags |= BNXT_FLAG_EXT_TX_PORT_STATS;
-       }
+       bnxt_hwrm_port_led_qcaps(bp);
 
        return 0;
 }
 
-static int bnxt_setup_mac_addr(struct rte_eth_dev *eth_dev)
+static int
+bnxt_init_locks(struct bnxt *bp)
 {
-       struct bnxt *bp = eth_dev->data->dev_private;
-       int rc = 0;
+       int err;
 
-       eth_dev->data->mac_addrs = rte_zmalloc("bnxt_mac_addr_tbl",
-                                              RTE_ETHER_ADDR_LEN *
-                                              bp->max_l2_ctx,
-                                              0);
-       if (eth_dev->data->mac_addrs == NULL) {
-               PMD_DRV_LOG(ERR, "Failed to alloc MAC addr tbl\n");
-               return -ENOMEM;
+       err = pthread_mutex_init(&bp->flow_lock, NULL);
+       if (err) {
+               PMD_DRV_LOG(ERR, "Unable to initialize flow_lock\n");
+               return err;
        }
 
-       if (bnxt_check_zero_bytes(bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN)) {
-               if (BNXT_PF(bp))
-                       return -EINVAL;
+       err = pthread_mutex_init(&bp->def_cp_lock, NULL);
+       if (err)
+               PMD_DRV_LOG(ERR, "Unable to initialize def_cp_lock\n");
+       return err;
+}
 
-               /* Generate a random MAC address, if none was assigned by PF */
-               PMD_DRV_LOG(INFO, "VF MAC address not assigned by Host PF\n");
-               bnxt_eth_hw_addr_random(bp->mac_addr);
-               PMD_DRV_LOG(INFO,
-                           "Assign random MAC:%02X:%02X:%02X:%02X:%02X:%02X\n",
-                           bp->mac_addr[0], bp->mac_addr[1], bp->mac_addr[2],
-                           bp->mac_addr[3], bp->mac_addr[4], bp->mac_addr[5]);
+static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
+{
+       int rc;
 
-               rc = bnxt_hwrm_set_mac(bp);
-               if (!rc)
-                       memcpy(&bp->eth_dev->data->mac_addrs[0], bp->mac_addr,
-                              RTE_ETHER_ADDR_LEN);
+       rc = bnxt_init_fw(bp);
+       if (rc)
                return rc;
+
+       if (!reconfig_dev) {
+               rc = bnxt_setup_mac_addr(bp->eth_dev);
+               if (rc)
+                       return rc;
+       } else {
+               rc = bnxt_restore_dflt_mac(bp);
+               if (rc)
+                       return rc;
        }
 
-       /* Copy the permanent MAC from the FUNC_QCAPS response */
-       memcpy(bp->mac_addr, bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN);
-       memcpy(&eth_dev->data->mac_addrs[0], bp->mac_addr, RTE_ETHER_ADDR_LEN);
+       bnxt_config_vf_req_fwd(bp);
 
-       return rc;
-}
+       rc = bnxt_hwrm_func_driver_register(bp);
+       if (rc) {
+               PMD_DRV_LOG(ERR, "Failed to register driver");
+               return -EBUSY;
+       }
 
-#define ALLOW_FUNC(x)  \
-       { \
-               uint32_t arg = (x); \
-               bp->pf.vf_req_fwd[((arg) >> 5)] &= \
-               ~rte_cpu_to_le_32(1 << ((arg) & 0x1f)); \
+       if (BNXT_PF(bp)) {
+               if (bp->pdev->max_vfs) {
+                       rc = bnxt_hwrm_allocate_vfs(bp, bp->pdev->max_vfs);
+                       if (rc) {
+                               PMD_DRV_LOG(ERR, "Failed to allocate VFs\n");
+                               return rc;
+                       }
+               } else {
+                       rc = bnxt_hwrm_allocate_pf_only(bp);
+                       if (rc) {
+                               PMD_DRV_LOG(ERR,
+                                           "Failed to allocate PF resources");
+                               return rc;
+                       }
+               }
        }
+
+       rc = bnxt_alloc_mem(bp, reconfig_dev);
+       if (rc)
+               return rc;
+
+       rc = bnxt_setup_int(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_request_int(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_init_locks(bp);
+       if (rc)
+               return rc;
+
+       return 0;
+}
+
 static int
 bnxt_dev_init(struct rte_eth_dev *eth_dev)
 {
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
        static int version_printed;
        struct bnxt *bp;
-       uint16_t mtu;
        int rc;
 
        if (version_printed++ == 0)
                PMD_DRV_LOG(INFO, "%s\n", bnxt_version);
 
-       rte_eth_copy_pci_info(eth_dev, pci_dev);
-
-       bp = eth_dev->data->dev_private;
-
-       bp->dev_stopped = 1;
-
        eth_dev->dev_ops = &bnxt_dev_ops;
        eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
        eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
@@ -3837,14 +4826,17 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
+       rte_eth_copy_pci_info(eth_dev, pci_dev);
+
+       bp = eth_dev->data->dev_private;
+
+       bp->dev_stopped = 1;
+       bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
+
        if (bnxt_vf_pciid(pci_dev->id.device_id))
                bp->flags |= BNXT_FLAG_VF;
 
-       if (pci_dev->id.device_id == BROADCOM_DEV_ID_57508 ||
-           pci_dev->id.device_id == BROADCOM_DEV_ID_57504 ||
-           pci_dev->id.device_id == BROADCOM_DEV_ID_57502 ||
-           pci_dev->id.device_id == BROADCOM_DEV_ID_57500_VF1 ||
-           pci_dev->id.device_id == BROADCOM_DEV_ID_57500_VF2)
+       if (bnxt_thor_device(pci_dev->id.device_id))
                bp->flags |= BNXT_FLAG_THOR_CHIP;
 
        if (pci_dev->id.device_id == BROADCOM_DEV_ID_58802 ||
@@ -3856,212 +4848,86 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
        rc = bnxt_init_board(eth_dev);
        if (rc) {
                PMD_DRV_LOG(ERR,
-                       "Board initialization failed rc: %x\n", rc);
-               goto error;
+                           "Failed to initialize board rc: %x\n", rc);
+               return rc;
        }
 
        rc = bnxt_alloc_hwrm_resources(bp);
        if (rc) {
                PMD_DRV_LOG(ERR,
-                       "hwrm resource allocation failure rc: %x\n", rc);
+                           "Failed to allocate hwrm resource rc: %x\n", rc);
                goto error_free;
        }
-       rc = bnxt_hwrm_ver_get(bp);
+       rc = bnxt_init_resources(bp, false);
        if (rc)
                goto error_free;
 
-       rc = bnxt_hwrm_func_reset(bp);
-       if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm chip reset failure rc: %x\n", rc);
-               rc = -EIO;
-               goto error_free;
-       }
-
-       rc = bnxt_hwrm_queue_qportcfg(bp);
-       if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm queue qportcfg failed\n");
-               goto error_free;
-       }
-       /* Get the MAX capabilities for this function */
-       rc = bnxt_hwrm_func_qcaps(bp);
-       if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm query capability failure rc: %x\n", rc);
-               goto error_free;
-       }
-
        rc = bnxt_alloc_stats_mem(bp);
        if (rc)
                goto error_free;
 
-       if (bp->max_tx_rings == 0) {
-               PMD_DRV_LOG(ERR, "No TX rings available!\n");
-               rc = -EBUSY;
-               goto error_free;
-       }
-
-       rc = bnxt_setup_mac_addr(eth_dev);
-       if (rc)
-               goto error_free;
-
-       /* THOR does not support ring groups.
-        * But we will use the array to save RSS context IDs.
-        */
-       if (BNXT_CHIP_THOR(bp)) {
-               bp->max_ring_grps = BNXT_MAX_RSS_CTXTS_THOR;
-       } else if (bp->max_ring_grps < bp->rx_cp_nr_rings) {
-               /* 1 ring is for default completion ring */
-               PMD_DRV_LOG(ERR, "Insufficient resource: Ring Group\n");
-               rc = -ENOSPC;
-               goto error_free;
-       }
-
-       if (BNXT_HAS_RING_GRPS(bp)) {
-               bp->grp_info = rte_zmalloc("bnxt_grp_info",
-                                       sizeof(*bp->grp_info) *
-                                               bp->max_ring_grps, 0);
-               if (!bp->grp_info) {
-                       PMD_DRV_LOG(ERR,
-                               "Failed to alloc %zu bytes for grp info tbl.\n",
-                               sizeof(*bp->grp_info) * bp->max_ring_grps);
-                       rc = -ENOMEM;
-                       goto error_free;
-               }
-       }
-
-       /* Forward all requests if firmware is new enough */
-       if (((bp->fw_ver >= ((20 << 24) | (6 << 16) | (100 << 8))) &&
-           (bp->fw_ver < ((20 << 24) | (7 << 16)))) ||
-           ((bp->fw_ver >= ((20 << 24) | (8 << 16))))) {
-               memset(bp->pf.vf_req_fwd, 0xff, sizeof(bp->pf.vf_req_fwd));
-       } else {
-               PMD_DRV_LOG(WARNING,
-                       "Firmware too old for VF mailbox functionality\n");
-               memset(bp->pf.vf_req_fwd, 0, sizeof(bp->pf.vf_req_fwd));
-       }
-
-       /*
-        * The following are used for driver cleanup.  If we disallow these,
-        * VF drivers can't clean up cleanly.
+       /* Pass the information to the rte_eth_dev_close() that it should also
+        * release the private port resources.
         */
-       ALLOW_FUNC(HWRM_FUNC_DRV_UNRGTR);
-       ALLOW_FUNC(HWRM_VNIC_FREE);
-       ALLOW_FUNC(HWRM_RING_FREE);
-       ALLOW_FUNC(HWRM_RING_GRP_FREE);
-       ALLOW_FUNC(HWRM_VNIC_RSS_COS_LB_CTX_FREE);
-       ALLOW_FUNC(HWRM_CFA_L2_FILTER_FREE);
-       ALLOW_FUNC(HWRM_STAT_CTX_FREE);
-       ALLOW_FUNC(HWRM_PORT_PHY_QCFG);
-       ALLOW_FUNC(HWRM_VNIC_TPA_CFG);
-       rc = bnxt_hwrm_func_driver_register(bp);
-       if (rc) {
-               PMD_DRV_LOG(ERR,
-                       "Failed to register driver");
-               rc = -EBUSY;
-               goto error_free;
-       }
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
 
        PMD_DRV_LOG(INFO,
-               DRV_MODULE_NAME " found at mem %" PRIx64 ", node addr %pM\n",
-               pci_dev->mem_resource[0].phys_addr,
-               pci_dev->mem_resource[0].addr);
-
-       rc = bnxt_hwrm_func_qcfg(bp, &mtu);
-       if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm func qcfg failed\n");
-               goto error_free;
-       }
-
-       if (mtu >= RTE_ETHER_MIN_MTU && mtu <= BNXT_MAX_MTU &&
-           mtu != eth_dev->data->mtu)
-               eth_dev->data->mtu = mtu;
-
-       if (BNXT_PF(bp)) {
-               //if (bp->pf.active_vfs) {
-                       // TODO: Deallocate VF resources?
-               //}
-               if (bp->pdev->max_vfs) {
-                       rc = bnxt_hwrm_allocate_vfs(bp, bp->pdev->max_vfs);
-                       if (rc) {
-                               PMD_DRV_LOG(ERR, "Failed to allocate VFs\n");
-                               goto error_free;
-                       }
-               } else {
-                       rc = bnxt_hwrm_allocate_pf_only(bp);
-                       if (rc) {
-                               PMD_DRV_LOG(ERR,
-                                       "Failed to allocate PF resources\n");
-                               goto error_free;
-                       }
-               }
-       }
-
-       bnxt_hwrm_port_led_qcaps(bp);
-
-       rc = bnxt_setup_int(bp);
-       if (rc)
-               goto error_free;
-
-       rc = bnxt_alloc_mem(bp);
-       if (rc)
-               goto error_free;
-
-       bnxt_init_nic(bp);
-
-       rc = bnxt_request_int(bp);
-       if (rc)
-               goto error_free;
+                   DRV_MODULE_NAME "found at mem %" PRIX64 ", node addr %pM\n",
+                   pci_dev->mem_resource[0].phys_addr,
+                   pci_dev->mem_resource[0].addr);
 
        return 0;
 
 error_free:
        bnxt_dev_uninit(eth_dev);
-error:
        return rc;
 }
 
+static void
+bnxt_uninit_locks(struct bnxt *bp)
+{
+       pthread_mutex_destroy(&bp->flow_lock);
+       pthread_mutex_destroy(&bp->def_cp_lock);
+}
+
 static int
-bnxt_dev_uninit(struct rte_eth_dev *eth_dev)
+bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
 {
-       struct bnxt *bp = eth_dev->data->dev_private;
        int rc;
 
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return -EPERM;
-
-       PMD_DRV_LOG(DEBUG, "Calling Device uninit\n");
-       bnxt_disable_int(bp);
        bnxt_free_int(bp);
-       bnxt_free_mem(bp);
-
+       bnxt_free_mem(bp, reconfig_dev);
        bnxt_hwrm_func_buf_unrgtr(bp);
-
-       if (bp->grp_info != NULL) {
-               rte_free(bp->grp_info);
-               bp->grp_info = NULL;
-       }
        rc = bnxt_hwrm_func_driver_unregister(bp, 0);
-       bnxt_free_hwrm_resources(bp);
+       bp->flags &= ~BNXT_FLAG_REGISTERED;
+       bnxt_free_ctx_mem(bp);
+       if (!reconfig_dev) {
+               bnxt_free_hwrm_resources(bp);
 
-       if (bp->tx_mem_zone) {
-               rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
-               bp->tx_mem_zone = NULL;
+               if (bp->recovery_info != NULL) {
+                       rte_free(bp->recovery_info);
+                       bp->recovery_info = NULL;
+               }
        }
 
-       if (bp->rx_mem_zone) {
-               rte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone);
-               bp->rx_mem_zone = NULL;
-       }
+       bnxt_uninit_locks(bp);
+       rte_free(bp->ptp_cfg);
+       bp->ptp_cfg = NULL;
+       return rc;
+}
 
-       if (bp->dev_stopped == 0)
+static int
+bnxt_dev_uninit(struct rte_eth_dev *eth_dev)
+{
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return -EPERM;
+
+       PMD_DRV_LOG(DEBUG, "Calling Device uninit\n");
+
+       if (eth_dev->state != RTE_ETH_DEV_UNUSED)
                bnxt_dev_close_op(eth_dev);
-       if (bp->pf.vf_info)
-               rte_free(bp->pf.vf_info);
-       bnxt_free_ctx_mem(bp);
-       eth_dev->dev_ops = NULL;
-       eth_dev->rx_pkt_burst = NULL;
-       eth_dev->tx_pkt_burst = NULL;
 
-       return rc;
+       return 0;
 }
 
 static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,