net/bnxt: support periodic FW health monitoring
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index ccec968..d28f1bd 100644 (file)
@@ -11,6 +11,7 @@
 #include <rte_ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
+#include <rte_alarm.h>
 
 #include "bnxt.h"
 #include "bnxt_cpr.h"
@@ -166,6 +167,19 @@ 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);
+
+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;
+}
 
 /***********************/
 
@@ -191,21 +205,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);
 }
 
-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;
+
        rc = bnxt_alloc_vnic_mem(bp);
        if (rc)
                goto alloc_mem_err;
@@ -218,10 +247,14 @@ static int bnxt_alloc_mem(struct bnxt *bp)
        if (rc)
                goto alloc_mem_err;
 
+       rc = bnxt_alloc_async_cp_ring(bp);
+       if (rc)
+               goto alloc_mem_err;
+
        return 0;
 
 alloc_mem_err:
-       bnxt_free_mem(bp);
+       bnxt_free_mem(bp, reconfig);
        return rc;
 }
 
@@ -239,9 +272,6 @@ static int bnxt_init_chip(struct bnxt *bp)
        unsigned int i, j;
        int rc;
 
-       /* disable uio/vfio intr/eventfd mapping */
-       rte_intr_disable(intr_handle);
-
        if (bp->eth_dev->data->mtu > RTE_ETHER_MTU) {
                bp->eth_dev->data->dev_conf.rxmode.offloads |=
                        DEV_RX_OFFLOAD_JUMBO_FRAME;
@@ -488,12 +518,17 @@ static int bnxt_init_nic(struct bnxt *bp)
  * Device configuration and status function
  */
 
-static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
-                                 struct rte_eth_dev_info *dev_info)
+static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
+                               struct rte_eth_dev_info *dev_info)
 {
        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;
@@ -582,6 +617,8 @@ found:
 
        dev_info->vmdq_pool_base = 0;
        dev_info->vmdq_queue_base = 0;
+
+       return 0;
 }
 
 /* Configure the device based on the configuration provided */
@@ -596,6 +633,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) {
@@ -620,8 +661,8 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
        /* Inherit new configurations */
        if (eth_dev->data->nb_rx_queues > bp->max_rx_rings ||
            eth_dev->data->nb_tx_queues > bp->max_tx_rings ||
-           eth_dev->data->nb_rx_queues + eth_dev->data->nb_tx_queues >
-           bp->max_cp_rings ||
+           eth_dev->data->nb_rx_queues + eth_dev->data->nb_tx_queues
+               + BNXT_NUM_ASYNC_CPR(bp) > bp->max_cp_rings ||
            eth_dev->data->nb_rx_queues + eth_dev->data->nb_tx_queues >
            bp->max_stat_ctx)
                goto resource_error;
@@ -754,6 +795,25 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
        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;
@@ -767,6 +827,15 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
                        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;
+               }
+       }
+
        rc = bnxt_init_chip(bp);
        if (rc)
                goto error;
@@ -785,12 +854,16 @@ 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;
+       eth_dev->data->dev_started = 1;
        bp->dev_stopped = 0;
+       bnxt_schedule_fw_health_check(bp);
        return 0;
 
 error:
+       bnxt_hwrm_if_change(bp, 0);
        bnxt_shutdown_nic(bp);
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
@@ -829,11 +902,18 @@ 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 */
@@ -852,6 +932,7 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
        bnxt_shutdown_nic(bp);
+       bnxt_hwrm_if_change(bp, 0);
        bp->dev_stopped = 1;
 }
 
@@ -883,6 +964,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
@@ -918,6 +1002,10 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
        struct bnxt_filter_info *filter;
        int rc = 0;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) {
                PMD_DRV_LOG(ERR, "Cannot add MAC address to a VF interface\n");
                return -ENOTSUP;
@@ -963,6 +1051,10 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete)
        struct rte_eth_link new;
        unsigned int cnt = BNXT_LINK_WAIT_CNT;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        memset(&new, 0, sizeof(new));
        do {
                /* Retrieve link info from hardware */
@@ -998,60 +1090,104 @@ out:
        return rc;
 }
 
-static void bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev)
+static int bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
        struct bnxt_vnic_info *vnic;
+       uint32_t old_flags;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        if (bp->vnic_info == NULL)
-               return;
+               return 0;
 
        vnic = &bp->vnic_info[0];
 
+       old_flags = vnic->flags;
        vnic->flags |= BNXT_VNIC_INFO_PROMISC;
-       bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       if (rc != 0)
+               vnic->flags = old_flags;
+
+       return rc;
 }
 
-static void bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev)
+static int bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
        struct bnxt_vnic_info *vnic;
+       uint32_t old_flags;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        if (bp->vnic_info == NULL)
-               return;
+               return 0;
 
        vnic = &bp->vnic_info[0];
 
+       old_flags = vnic->flags;
        vnic->flags &= ~BNXT_VNIC_INFO_PROMISC;
-       bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       if (rc != 0)
+               vnic->flags = old_flags;
+
+       return rc;
 }
 
-static void bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev)
+static int bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
        struct bnxt_vnic_info *vnic;
+       uint32_t old_flags;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        if (bp->vnic_info == NULL)
-               return;
+               return 0;
 
        vnic = &bp->vnic_info[0];
 
+       old_flags = vnic->flags;
        vnic->flags |= BNXT_VNIC_INFO_ALLMULTI;
-       bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       if (rc != 0)
+               vnic->flags = old_flags;
+
+       return rc;
 }
 
-static void bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev)
+static int bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
        struct bnxt_vnic_info *vnic;
+       uint32_t old_flags;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        if (bp->vnic_info == NULL)
-               return;
+               return 0;
 
        vnic = &bp->vnic_info[0];
 
+       old_flags = vnic->flags;
        vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI;
-       bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       if (rc != 0)
+               vnic->flags = old_flags;
+
+       return rc;
 }
 
 /* Return bnxt_rx_queue pointer corresponding to a given rxq. */
@@ -1094,7 +1230,11 @@ static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
        struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
        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;
@@ -1150,6 +1290,11 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
        struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
        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)
@@ -1196,6 +1341,11 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
        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,
@@ -1249,9 +1399,13 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev,
 {
        struct bnxt *bp = eth_dev->data->dev_private;
        struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
-       int len;
+       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) {
@@ -1309,6 +1463,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;
@@ -1338,6 +1496,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");
@@ -1397,6 +1560,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) {
@@ -1446,6 +1613,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) {
@@ -1599,6 +1770,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)
@@ -1613,6 +1789,11 @@ 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;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        if (mask & ETH_VLAN_FILTER_MASK) {
                if (!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {
@@ -1654,6 +1835,10 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
        struct bnxt_filter_info *filter;
        int rc;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp))
                return -EPERM;
 
@@ -1693,6 +1878,11 @@ 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];
 
@@ -1778,10 +1968,18 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
        uint32_t rc = 0;
        uint32_t i;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        new_pkt_size = new_mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN +
                       VLAN_TAG_SIZE * BNXT_NUM_VLANS;
 
-       bnxt_dev_info_get_op(eth_dev, &dev_info);
+       rc = bnxt_dev_info_get_op(eth_dev, &dev_info);
+       if (rc != 0) {
+               PMD_DRV_LOG(ERR, "Error during getting ethernet device info\n");
+               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",
@@ -1851,6 +2049,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");
@@ -1868,6 +2070,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);
 }
@@ -1876,6 +2083,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);
 }
@@ -1883,6 +2095,7 @@ 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;
@@ -1890,6 +2103,11 @@ bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        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;
@@ -1934,10 +2152,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;
 
@@ -1972,10 +2195,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;
 
@@ -2805,6 +3033,10 @@ bnxt_filter_ctrl_op(struct rte_eth_dev *dev __rte_unused,
 {
        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,
@@ -3120,6 +3352,10 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev)
        uint32_t dir_entries;
        uint32_t entry_length;
 
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
        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);
@@ -3138,6 +3374,11 @@ 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,
@@ -3209,6 +3450,11 @@ 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,
@@ -3320,90 +3566,304 @@ 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)
+int bnxt_map_fw_health_status_regs(struct bnxt *bp)
 {
-       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;
-}
+       struct bnxt_error_recovery_info *info = bp->recovery_info;
+       uint32_t reg_base = 0xffffffff;
+       int i;
 
-bool bnxt_stratus_device(struct bnxt *bp)
-{
-       uint16_t id = bp->pdev->id.device_id;
+       /* 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];
 
-       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;
-}
+               if (BNXT_FW_STATUS_REG_TYPE(reg) != BNXT_FW_STATUS_REG_TYPE_GRC)
+                       continue;
 
-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;
+               if (reg_base == 0xffffffff)
+                       reg_base = reg & 0xfffff000;
+               if ((reg & 0xfffff000) != reg_base)
+                       return -ERANGE;
 
-       /* 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;
+               /* Use mask 0xffc as the Lower 2 bits indicates
+                * address space location
+                */
+               info->mapped_status_regs[i] = BNXT_GRCP_WINDOW_2_BASE +
+                                               (reg & 0xffc);
        }
 
-       bp->eth_dev = eth_dev;
-       bp->pdev = pci_dev;
+       if (reg_base == 0xffffffff)
+               return 0;
+
+       rte_write32(reg_base, (uint8_t *)bp->bar0 +
+                   BNXT_GRCPF_REG_WINDOW_BASE_OUT + 4);
 
        return 0;
 }
 
-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)
+static void bnxt_dev_cleanup(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;
-       int i;
+       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 (!mem_size)
-               return 0;
+       bnxt_uninit_resources(bp, true);
+}
 
-       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;
+static int bnxt_restore_filters(struct bnxt *bp)
+{
+       struct rte_eth_dev *dev = bp->eth_dev;
+       int ret = 0;
 
-       valid_bits = PTU_PTE_VALID;
+       if (dev->data->all_multicast)
+               ret = bnxt_allmulticast_enable_op(dev);
+       if (dev->data->promiscuous)
+               ret = bnxt_promiscuous_enable_op(dev);
 
-       if (rmem->nr_pages > 1) {
-               snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_pg_tbl%s_%x",
-                        suffix, idx);
-               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,
+       /* 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);
+
+       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;
+}
+
+/* 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;
+
+       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");
+}
+
+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 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)
+{
+       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(__rte_unused 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;
@@ -3430,7 +3890,8 @@ static int bnxt_alloc_ctx_mem_blk(__rte_unused struct bnxt *bp,
                rmem->pg_tbl_mz = mz;
        }
 
-       snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_%s_%x", suffix, idx);
+       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,
@@ -3760,19 +4221,166 @@ static int bnxt_setup_mac_addr(struct rte_eth_dev *eth_dev)
        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,
+                           "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.
+        */
+       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;
+
+       rc = bnxt_hwrm_ver_get(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_hwrm_func_reset(bp);
+       if (rc)
+               return -EIO;
+
+       rc = bnxt_hwrm_queue_qportcfg(bp);
+       if (rc)
+               return rc;
+
+       /* Get the MAX capabilities for this function */
+       rc = bnxt_hwrm_func_qcaps(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_hwrm_func_qcfg(bp, &mtu);
+       if (rc)
+               return rc;
+
+       /* Get the adapter error recovery support info */
+       rc = bnxt_hwrm_error_recovery_qcfg(bp);
+       if (rc)
+               bp->flags &= ~BNXT_FLAG_FW_CAP_ERROR_RECOVERY;
+
+       if (mtu >= RTE_ETHER_MIN_MTU && mtu <= BNXT_MAX_MTU &&
+           mtu != bp->eth_dev->data->mtu)
+               bp->eth_dev->data->mtu = mtu;
+
+       bnxt_hwrm_port_led_qcaps(bp);
+
+       return 0;
+}
+
+static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
+{
+       int rc;
+
+       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;
+       }
+
+       bnxt_config_vf_req_fwd(bp);
+
+       rc = bnxt_hwrm_func_driver_register(bp);
+       if (rc) {
+               PMD_DRV_LOG(ERR, "Failed to register driver");
+               return -EBUSY;
+       }
+
+       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;
+
+       bnxt_init_nic(bp);
+
+       rc = bnxt_request_int(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)
@@ -3805,169 +4413,66 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
            pci_dev->id.device_id == BROADCOM_DEV_ID_57500_VF2)
                bp->flags |= BNXT_FLAG_THOR_CHIP;
 
+       if (pci_dev->id.device_id == BROADCOM_DEV_ID_58802 ||
+           pci_dev->id.device_id == BROADCOM_DEV_ID_58804 ||
+           pci_dev->id.device_id == BROADCOM_DEV_ID_58808 ||
+           pci_dev->id.device_id == BROADCOM_DEV_ID_58802_VF)
+               bp->flags |= BNXT_FLAG_STINGRAY;
+
        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));
-       }
+       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);
 
-       /*
-        * 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);
-       rc = bnxt_hwrm_func_driver_register(bp);
-       if (rc) {
-               PMD_DRV_LOG(ERR,
-                       "Failed to register driver");
-               rc = -EBUSY;
-               goto error_free;
-       }
+       return 0;
 
-       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);
+error_free:
+       bnxt_dev_uninit(eth_dev);
+       return rc;
+}
 
-       rc = bnxt_hwrm_func_qcfg(bp, &mtu);
-       if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm func qcfg failed\n");
-               goto error_free;
-       }
+static int
+bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
+{
+       int rc;
 
-       if (mtu >= RTE_ETHER_MIN_MTU && mtu <= BNXT_MAX_MTU &&
-           mtu != eth_dev->data->mtu)
-               eth_dev->data->mtu = mtu;
+       bnxt_disable_int(bp);
+       bnxt_free_int(bp);
+       bnxt_free_mem(bp, reconfig_dev);
+       bnxt_hwrm_func_buf_unrgtr(bp);
+       rc = bnxt_hwrm_func_driver_unregister(bp, 0);
+       bp->flags &= ~BNXT_FLAG_REGISTERED;
+       bnxt_free_ctx_mem(bp);
+       if (!reconfig_dev) {
+               bnxt_free_hwrm_resources(bp);
 
-       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;
-                       }
+               if (bp->recovery_info != NULL) {
+                       rte_free(bp->recovery_info);
+                       bp->recovery_info = NULL;
                }
        }
 
-       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;
-
-       return 0;
-
-error_free:
-       bnxt_dev_uninit(eth_dev);
-error:
        return rc;
 }
 
@@ -3981,18 +4486,13 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev)
                return -EPERM;
 
        PMD_DRV_LOG(DEBUG, "Calling Device uninit\n");
-       bnxt_disable_int(bp);
-       bnxt_free_int(bp);
-       bnxt_free_mem(bp);
 
-       bnxt_hwrm_func_buf_unrgtr(bp);
+       rc = bnxt_uninit_resources(bp, false);
 
        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);
 
        if (bp->tx_mem_zone) {
                rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
@@ -4008,7 +4508,6 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev)
                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;