net/bnxt: fix adding MAC address
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index 61ae799..15048de 100644 (file)
@@ -71,6 +71,10 @@ int bnxt_logtype_driver;
 #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_VF 0x1807
 #define BROADCOM_DEV_ID_58802 0xd802
 #define BROADCOM_DEV_ID_58804 0xd804
 #define BROADCOM_DEV_ID_58808 0x16f0
@@ -119,6 +123,10 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58804) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58808) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58802_VF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57508) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57504) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57502) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57500_VF) },
        { .vendor_id = 0, /* sentinel */ },
 };
 
@@ -163,6 +171,24 @@ 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)
+{
+       if (!BNXT_CHIP_THOR(bp))
+               return 1;
+
+       return RTE_ALIGN_MUL_CEIL(bp->rx_nr_rings,
+                                 BNXT_RSS_ENTRIES_PER_CTX_THOR) /
+                                   BNXT_RSS_ENTRIES_PER_CTX_THOR;
+}
+
+static uint16_t  bnxt_rss_hash_tbl_size(const struct bnxt *bp)
+{
+       if (!BNXT_CHIP_THOR(bp))
+               return HW_HASH_INDEX_SIZE;
+
+       return bnxt_rss_ctxts(bp) * BNXT_RSS_ENTRIES_PER_CTX_THOR;
+}
+
 static void bnxt_free_mem(struct bnxt *bp)
 {
        bnxt_free_filter_mem(bp);
@@ -224,6 +250,12 @@ static int bnxt_init_chip(struct bnxt *bp)
                bp->flags &= ~BNXT_FLAG_JUMBO;
        }
 
+       /* 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;
+
        rc = bnxt_alloc_all_hwrm_stat_ctxs(bp);
        if (rc) {
                PMD_DRV_LOG(ERR, "HWRM stat ctx alloc failure rc: %x\n", rc);
@@ -276,13 +308,21 @@ static int bnxt_init_chip(struct bnxt *bp)
 
                /* Alloc RSS context only if RSS mode is enabled */
                if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {
-                       rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic);
+                       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 alloc failure rc: %x\n",
-                                       i, rc);
+                                 "HWRM vnic %d ctx %d alloc failure rc: %x\n",
+                                 i, j, rc);
                                goto err_out;
                        }
+                       vnic->num_lb_ctxts = nr_ctxs;
                }
 
                /*
@@ -317,7 +357,7 @@ static int bnxt_init_chip(struct bnxt *bp)
                                    "rxq[%d]->vnic=%p vnic->fw_grp_ids=%p\n",
                                    j, rxq->vnic, rxq->vnic->fw_grp_ids);
 
-                       if (rxq->rx_deferred_start)
+                       if (BNXT_HAS_RING_GRPS(bp) && rxq->rx_deferred_start)
                                rxq->vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
                }
 
@@ -354,8 +394,9 @@ static int bnxt_init_chip(struct bnxt *bp)
                                        bp->rx_cp_nr_rings);
                        return -ENOTSUP;
                }
-               if (rte_intr_efd_enable(intr_handle, intr_vector))
-                       return -1;
+               rc = rte_intr_efd_enable(intr_handle, intr_vector);
+               if (rc)
+                       return rc;
        }
 
        if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {
@@ -366,28 +407,30 @@ static int bnxt_init_chip(struct bnxt *bp)
                if (intr_handle->intr_vec == NULL) {
                        PMD_DRV_LOG(ERR, "Failed to allocate %d rx_queues"
                                " intr_vec", bp->eth_dev->data->nb_rx_queues);
-                       return -ENOMEM;
+                       rc = -ENOMEM;
+                       goto err_disable;
                }
                PMD_DRV_LOG(DEBUG, "intr_handle->intr_vec = %p "
                        "intr_handle->nb_efd = %d intr_handle->max_intr = %d\n",
                         intr_handle->intr_vec, intr_handle->nb_efd,
                        intr_handle->max_intr);
-       }
-
-       for (queue_id = 0; queue_id < bp->eth_dev->data->nb_rx_queues;
-            queue_id++) {
-               intr_handle->intr_vec[queue_id] = vec;
-               if (vec < base + intr_handle->nb_efd - 1)
-                       vec++;
+               for (queue_id = 0; queue_id < bp->eth_dev->data->nb_rx_queues;
+                    queue_id++) {
+                       intr_handle->intr_vec[queue_id] = vec;
+                       if (vec < base + intr_handle->nb_efd - 1)
+                               vec++;
+               }
        }
 
        /* enable uio/vfio intr/eventfd mapping */
-       rte_intr_enable(intr_handle);
+       rc = rte_intr_enable(intr_handle);
+       if (rc)
+               goto err_free;
 
        rc = bnxt_get_hwrm_link_config(bp, &new);
        if (rc) {
                PMD_DRV_LOG(ERR, "HWRM Get link config failure rc: %x\n", rc);
-               goto err_out;
+               goto err_free;
        }
 
        if (!bp->link_info.link_up) {
@@ -395,16 +438,18 @@ static int bnxt_init_chip(struct bnxt *bp)
                if (rc) {
                        PMD_DRV_LOG(ERR,
                                "HWRM link config failure rc: %x\n", rc);
-                       goto err_out;
+                       goto err_free;
                }
        }
        bnxt_print_link_info(bp->eth_dev);
 
        return 0;
 
+err_free:
+       rte_free(intr_handle->intr_vec);
+err_disable:
+       rte_intr_efd_disable(intr_handle);
 err_out:
-       bnxt_free_all_hwrm_resources(bp);
-
        /* Some of the error status returned by FW may not be from errno.h */
        if (rc > 0)
                rc = -EIO;
@@ -424,9 +469,11 @@ static int bnxt_init_nic(struct bnxt *bp)
 {
        int rc;
 
-       rc = bnxt_init_ring_grps(bp);
-       if (rc)
-               return 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);
@@ -452,11 +499,11 @@ static void 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_vnics, bp->max_stat_ctx);
+       max_rx_rings = RTE_MIN(bp->max_rx_rings, bp->max_stat_ctx);
        /* 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;
-       dev_info->reta_size = HW_HASH_INDEX_SIZE;
+       dev_info->reta_size = bnxt_rss_hash_tbl_size(bp);
        dev_info->hash_key_size = 40;
        max_vnics = bp->max_vnics;
 
@@ -573,22 +620,16 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
            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 >
-           bp->max_stat_ctx ||
-           (uint32_t)(eth_dev->data->nb_rx_queues) > bp->max_ring_grps ||
-           (!(eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) &&
-            bp->max_vnics < eth_dev->data->nb_rx_queues)) {
-               PMD_DRV_LOG(ERR,
-                       "Insufficient resources to support requested config\n");
-               PMD_DRV_LOG(ERR,
-                       "Num Queues Requested: Tx %d, Rx %d\n",
-                       eth_dev->data->nb_tx_queues,
-                       eth_dev->data->nb_rx_queues);
-               PMD_DRV_LOG(ERR,
-                       "MAX: TxQ %d, RxQ %d, CQ %d Stat %d, Grp %d, Vnic %d\n",
-                       bp->max_tx_rings, bp->max_rx_rings, bp->max_cp_rings,
-                       bp->max_stat_ctx, bp->max_ring_grps, bp->max_vnics);
-               return -ENOSPC;
-       }
+           bp->max_stat_ctx)
+               goto resource_error;
+
+       if (BNXT_HAS_RING_GRPS(bp) &&
+           (uint32_t)(eth_dev->data->nb_rx_queues) > bp->max_ring_grps)
+               goto resource_error;
+
+       if (!(eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) &&
+           bp->max_vnics < eth_dev->data->nb_rx_queues)
+               goto resource_error;
 
        bp->rx_cp_nr_rings = bp->rx_nr_rings;
        bp->tx_cp_nr_rings = bp->tx_nr_rings;
@@ -601,6 +642,19 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
                bnxt_mtu_set_op(eth_dev, eth_dev->data->mtu);
        }
        return 0;
+
+resource_error:
+       PMD_DRV_LOG(ERR,
+                   "Insufficient resources to support requested config\n");
+       PMD_DRV_LOG(ERR,
+                   "Num Queues Requested: Tx %d, Rx %d\n",
+                   eth_dev->data->nb_tx_queues,
+                   eth_dev->data->nb_rx_queues);
+       PMD_DRV_LOG(ERR,
+                   "MAX: TxQ %d, RxQ %d, CQ %d Stat %d, Grp %d, Vnic %d\n",
+                   bp->max_tx_rings, bp->max_rx_rings, bp->max_cp_rings,
+                   bp->max_stat_ctx, bp->max_ring_grps, bp->max_vnics);
+       return -ENOSPC;
 }
 
 static void bnxt_print_link_info(struct rte_eth_dev *eth_dev)
@@ -711,7 +765,6 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
                        "RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
                        bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
        }
-       bp->dev_stopped = 0;
 
        rc = bnxt_init_chip(bp);
        if (rc)
@@ -731,7 +784,9 @@ 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;
        return 0;
 
 error:
@@ -770,6 +825,13 @@ static int bnxt_dev_set_link_down_op(struct rte_eth_dev *eth_dev)
 static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+
+       bnxt_disable_int(bp);
+
+       /* disable uio/vfio intr/eventfd mapping */
+       rte_intr_disable(intr_handle);
 
        bp->flags &= ~BNXT_FLAG_INIT_DONE;
        if (bp->eth_dev->data->dev_started) {
@@ -777,6 +839,14 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
                eth_dev->data->dev_link.link_status = 0;
        }
        bnxt_set_hwrm_link_config(bp, false);
+
+       /* Clean queue intr-vector mapping */
+       rte_intr_efd_disable(intr_handle);
+       if (intr_handle->intr_vec != NULL) {
+               rte_free(intr_handle->intr_vec);
+               intr_handle->intr_vec = NULL;
+       }
+
        bnxt_hwrm_port_clr_stats(bp);
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
@@ -845,6 +915,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
        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");
@@ -868,10 +939,20 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
                PMD_DRV_LOG(ERR, "L2 filter alloc failed\n");
                return -ENODEV;
        }
-       STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+
        filter->mac_index = index;
        memcpy(filter->l2_addr, mac_addr, RTE_ETHER_ADDR_LEN);
-       return bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
+
+       rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
+       if (!rc) {
+               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)
@@ -983,11 +1064,20 @@ static struct bnxt_rx_queue *bnxt_qid_to_rxq(struct bnxt *bp, uint16_t qid)
 /* Return rxq corresponding to a given rss table ring/group ID. */
 static uint16_t bnxt_rss_to_qid(struct bnxt *bp, uint16_t fwr)
 {
+       struct bnxt_rx_queue *rxq;
        unsigned int i;
 
-       for (i = 0; i < bp->rx_nr_rings; i++) {
-               if (bp->grp_info[i].fw_grp_id == fwr)
-                       return i;
+       if (!BNXT_HAS_RING_GRPS(bp)) {
+               for (i = 0; i < bp->rx_nr_rings; i++) {
+                       rxq = bp->eth_dev->data->rx_queues[i];
+                       if (rxq->rx_ring->rx_ring_struct->fw_ring_id == fwr)
+                               return rxq->index;
+               }
+       } else {
+               for (i = 0; i < bp->rx_nr_rings; i++) {
+                       if (bp->grp_info[i].fw_grp_id == fwr)
+                               return i;
+               }
        }
 
        return INVALID_HW_RING_ID;
@@ -1000,7 +1090,7 @@ 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];
-       uint16_t tbl_size = HW_HASH_INDEX_SIZE;
+       uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp);
        uint16_t idx, sft;
        int i;
 
@@ -1032,6 +1122,16 @@ static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
                        return -EINVAL;
                }
 
+               if (BNXT_CHIP_THOR(bp)) {
+                       vnic->rss_table[i * 2] =
+                               rxq->rx_ring->rx_ring_struct->fw_ring_id;
+                       vnic->rss_table[i * 2 + 1] =
+                               rxq->cp_ring->cp_ring_struct->fw_ring_id;
+               } else {
+                       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]];
        }
@@ -1046,7 +1146,7 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
 {
        struct bnxt *bp = eth_dev->data->dev_private;
        struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
-       uint16_t tbl_size = HW_HASH_INDEX_SIZE;
+       uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp);
        uint16_t idx, sft, i;
 
        /* Retrieve from the default VNIC */
@@ -1069,7 +1169,11 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
                if (reta_conf[idx].mask & (1ULL << sft)) {
                        uint16_t qid;
 
-                       qid = bnxt_rss_to_qid(bp, vnic->rss_table[i]);
+                       if (BNXT_CHIP_THOR(bp))
+                               qid = bnxt_rss_to_qid(bp,
+                                                     vnic->rss_table[i * 2]);
+                       else
+                               qid = bnxt_rss_to_qid(bp, vnic->rss_table[i]);
 
                        if (qid == INVALID_HW_RING_ID) {
                                PMD_DRV_LOG(ERR, "Inv. entry in rss table.\n");
@@ -3265,7 +3369,8 @@ static bool bnxt_vf_pciid(uint16_t id)
            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_58802_VF ||
+           id == BROADCOM_DEV_ID_57500_VF)
                return true;
        return false;
 }
@@ -3327,10 +3432,403 @@ init_err_disable:
        return rc;
 }
 
+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",
+                        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,
+                                               BNXT_PAGE_SIZE);
+                       if (mz == NULL)
+                               return -ENOMEM;
+               }
+
+               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));
+
+               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", suffix, idx);
+       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;
+       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;
+               }
+       }
+
+       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;
+
+               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)
+
+int bnxt_alloc_ctx_mem(struct bnxt *bp)
+{
+       struct bnxt_ctx_pg_info *ctx_pg;
+       struct bnxt_ctx_mem_info *ctx;
+       uint32_t mem_size, ena, entries;
+       int i, rc;
+
+       rc = bnxt_hwrm_func_backing_store_qcaps(bp);
+       if (rc) {
+               PMD_DRV_LOG(ERR, "Query context mem capability failed\n");
+               return rc;
+       }
+       ctx = bp->ctx;
+       if (!ctx || (ctx->flags & BNXT_CTX_FLAG_INITED))
+               return 0;
+
+       ctx_pg = &ctx->qp_mem;
+       ctx_pg->entries = ctx->qp_min_qp1_entries + ctx->qp_max_l2_entries;
+       mem_size = ctx->qp_entry_size * ctx_pg->entries;
+       rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "qp_mem", 0);
+       if (rc)
+               return rc;
+
+       ctx_pg = &ctx->srq_mem;
+       ctx_pg->entries = ctx->srq_max_l2_entries;
+       mem_size = ctx->srq_entry_size * ctx_pg->entries;
+       rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "srq_mem", 0);
+       if (rc)
+               return rc;
+
+       ctx_pg = &ctx->cq_mem;
+       ctx_pg->entries = ctx->cq_max_l2_entries;
+       mem_size = ctx->cq_entry_size * ctx_pg->entries;
+       rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "cq_mem", 0);
+       if (rc)
+               return rc;
+
+       ctx_pg = &ctx->vnic_mem;
+       ctx_pg->entries = ctx->vnic_max_vnic_entries +
+               ctx->vnic_max_ring_table_entries;
+       mem_size = ctx->vnic_entry_size * ctx_pg->entries;
+       rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "vnic_mem", 0);
+       if (rc)
+               return rc;
+
+       ctx_pg = &ctx->stat_mem;
+       ctx_pg->entries = ctx->stat_max_entries;
+       mem_size = ctx->stat_entry_size * ctx_pg->entries;
+       rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "stat_mem", 0);
+       if (rc)
+               return rc;
+
+       entries = ctx->qp_max_l2_entries;
+       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);
+       for (i = 0, ena = 0; i < BNXT_MAX_Q; i++) {
+               ctx_pg = ctx->tqm_mem[i];
+               /* use min tqm entries for now. */
+               ctx_pg->entries = entries;
+               mem_size = ctx->tqm_entry_size * ctx_pg->entries;
+               rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "tqm_mem", i);
+               if (rc)
+                       return rc;
+               ena |= HWRM_FUNC_BACKING_STORE_CFG_INPUT_ENABLES_TQM_SP << i;
+       }
+
+       ena |= FUNC_BACKING_STORE_CFG_INPUT_DFLT_ENABLES;
+       rc = bnxt_hwrm_func_backing_store_cfg(bp, ena);
+       if (rc)
+               PMD_DRV_LOG(ERR,
+                           "Failed to configure context mem: rc = %d\n", rc);
+       else
+               ctx->flags |= BNXT_CTX_FLAG_INITED;
+
+       return 0;
+}
+
+static int bnxt_alloc_stats_mem(struct bnxt *bp)
+{
+       struct rte_pci_device *pci_dev = bp->pdev;
+       char mz_name[RTE_MEMZONE_NAMESIZE];
+       const struct rte_memzone *mz = NULL;
+       uint32_t total_alloc_len;
+       rte_iova_t mz_phys_addr;
+
+       if (pci_dev->id.device_id == BROADCOM_DEV_ID_NS2)
+               return 0;
+
+       snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
+                "bnxt_" PCI_PRI_FMT "-%s", pci_dev->addr.domain,
+                pci_dev->addr.bus, pci_dev->addr.devid,
+                pci_dev->addr.function, "rx_port_stats");
+       mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
+       mz = rte_memzone_lookup(mz_name);
+       total_alloc_len =
+               RTE_CACHE_LINE_ROUNDUP(sizeof(struct rx_port_stats) +
+                                      sizeof(struct rx_port_stats_ext) + 512);
+       if (!mz) {
+               mz = rte_memzone_reserve(mz_name, total_alloc_len,
+                                        SOCKET_ID_ANY,
+                                        RTE_MEMZONE_2MB |
+                                        RTE_MEMZONE_SIZE_HINT_ONLY |
+                                        RTE_MEMZONE_IOVA_CONTIG);
+               if (mz == NULL)
+                       return -ENOMEM;
+       }
+       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;
+       bp->hw_rx_port_stats_map = mz_phys_addr;
+
+       snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
+                "bnxt_" PCI_PRI_FMT "-%s", pci_dev->addr.domain,
+                pci_dev->addr.bus, pci_dev->addr.devid,
+                pci_dev->addr.function, "tx_port_stats");
+       mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
+       mz = rte_memzone_lookup(mz_name);
+       total_alloc_len =
+               RTE_CACHE_LINE_ROUNDUP(sizeof(struct tx_port_stats) +
+                                      sizeof(struct tx_port_stats_ext) + 512);
+       if (!mz) {
+               mz = rte_memzone_reserve(mz_name,
+                                        total_alloc_len,
+                                        SOCKET_ID_ANY,
+                                        RTE_MEMZONE_2MB |
+                                        RTE_MEMZONE_SIZE_HINT_ONLY |
+                                        RTE_MEMZONE_IOVA_CONTIG);
+               if (mz == NULL)
+                       return -ENOMEM;
+       }
+       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->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;
+}
 
 #define ALLOW_FUNC(x)  \
        { \
-               typeof(x) arg = (x); \
+               uint32_t arg = (x); \
                bp->pf.vf_req_fwd[((arg) >> 5)] &= \
                ~rte_cpu_to_le_32(1 << ((arg) & 0x1f)); \
        }
@@ -3338,12 +3836,9 @@ static int
 bnxt_dev_init(struct rte_eth_dev *eth_dev)
 {
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-       char mz_name[RTE_MEMZONE_NAMESIZE];
-       const struct rte_memzone *mz = NULL;
        static int version_printed;
-       uint32_t total_alloc_len;
-       rte_iova_t mz_phys_addr;
        struct bnxt *bp;
+       uint16_t mtu;
        int rc;
 
        if (version_printed++ == 0)
@@ -3361,6 +3856,12 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
        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_VF)
+               bp->flags |= BNXT_FLAG_THOR_CHIP;
+
        rc = bnxt_init_board(eth_dev);
        if (rc) {
                PMD_DRV_LOG(ERR,
@@ -3374,107 +3875,6 @@ skip_init:
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
-       if (pci_dev->id.device_id != BROADCOM_DEV_ID_NS2) {
-               snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
-                        "bnxt_%04x:%02x:%02x:%02x-%s", pci_dev->addr.domain,
-                        pci_dev->addr.bus, pci_dev->addr.devid,
-                        pci_dev->addr.function, "rx_port_stats");
-               mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
-               mz = rte_memzone_lookup(mz_name);
-               total_alloc_len = RTE_CACHE_LINE_ROUNDUP(
-                                       sizeof(struct rx_port_stats) +
-                                       sizeof(struct rx_port_stats_ext) +
-                                       512);
-               if (!mz) {
-                       mz = rte_memzone_reserve(mz_name, total_alloc_len,
-                                       SOCKET_ID_ANY,
-                                       RTE_MEMZONE_2MB |
-                                       RTE_MEMZONE_SIZE_HINT_ONLY |
-                                       RTE_MEMZONE_IOVA_CONTIG);
-                       if (mz == NULL)
-                               return -ENOMEM;
-               }
-               memset(mz->addr, 0, mz->len);
-               mz_phys_addr = mz->iova;
-               if ((unsigned long)mz->addr == mz_phys_addr) {
-                       PMD_DRV_LOG(INFO,
-                               "Memzone physical address same as virtual using rte_mem_virt2iova()\n");
-                       mz_phys_addr = rte_mem_virt2iova(mz->addr);
-                       if (mz_phys_addr == 0) {
-                               PMD_DRV_LOG(ERR,
-                               "unable to map address to physical memory\n");
-                               return -ENOMEM;
-                       }
-               }
-
-               bp->rx_mem_zone = (const void *)mz;
-               bp->hw_rx_port_stats = mz->addr;
-               bp->hw_rx_port_stats_map = mz_phys_addr;
-
-               snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
-                        "bnxt_%04x:%02x:%02x:%02x-%s", pci_dev->addr.domain,
-                        pci_dev->addr.bus, pci_dev->addr.devid,
-                        pci_dev->addr.function, "tx_port_stats");
-               mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
-               mz = rte_memzone_lookup(mz_name);
-               total_alloc_len = RTE_CACHE_LINE_ROUNDUP(
-                                       sizeof(struct tx_port_stats) +
-                                       sizeof(struct tx_port_stats_ext) +
-                                       512);
-               if (!mz) {
-                       mz = rte_memzone_reserve(mz_name,
-                                       total_alloc_len,
-                                       SOCKET_ID_ANY,
-                                       RTE_MEMZONE_2MB |
-                                       RTE_MEMZONE_SIZE_HINT_ONLY |
-                                       RTE_MEMZONE_IOVA_CONTIG);
-                       if (mz == NULL)
-                               return -ENOMEM;
-               }
-               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 == 0) {
-                               PMD_DRV_LOG(ERR,
-                               "unable to map address to physical memory\n");
-                               return -ENOMEM;
-                       }
-               }
-
-               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)
-                       goto skip_ext_stats;
-
-               bp->hw_rx_port_stats_ext = (void *)
-                       (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->hw_tx_port_stats_ext = (void *)
-                       (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;
-               }
-       }
-
-skip_ext_stats:
        rc = bnxt_alloc_hwrm_resources(bp);
        if (rc) {
                PMD_DRV_LOG(ERR,
@@ -3484,67 +3884,63 @@ skip_ext_stats:
        rc = bnxt_hwrm_ver_get(bp);
        if (rc)
                goto error_free;
-       rc = bnxt_hwrm_queue_qportcfg(bp);
+
+       rc = bnxt_hwrm_func_reset(bp);
        if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm queue qportcfg failed\n");
+               PMD_DRV_LOG(ERR, "hwrm chip reset failure rc: %x\n", rc);
+               rc = -EIO;
                goto error_free;
        }
 
-       rc = bnxt_hwrm_func_qcfg(bp);
+       rc = bnxt_hwrm_queue_qportcfg(bp);
        if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm func qcfg failed\n");
+               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;
        }
-       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 %u bytes needed to store MAC addr tbl",
-                       RTE_ETHER_ADDR_LEN * bp->max_l2_ctx);
-               rc = -ENOMEM;
-               goto error_free;
-       }
 
-       if (bnxt_check_zero_bytes(bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN)) {
-               PMD_DRV_LOG(ERR,
-                           "Invalid MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
-                           bp->dflt_mac_addr[0], bp->dflt_mac_addr[1],
-                           bp->dflt_mac_addr[2], bp->dflt_mac_addr[3],
-                           bp->dflt_mac_addr[4], bp->dflt_mac_addr[5]);
-               rc = -EINVAL;
+       rc = bnxt_setup_mac_addr(eth_dev);
+       if (rc)
                goto error_free;
-       }
-       /* Copy the permanent MAC from the qcap response address now. */
-       memcpy(bp->mac_addr, bp->dflt_mac_addr, sizeof(bp->mac_addr));
-       memcpy(&eth_dev->data->mac_addrs[0], bp->mac_addr, RTE_ETHER_ADDR_LEN);
 
-       if (bp->max_ring_grps < bp->rx_cp_nr_rings) {
+       /* 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;
        }
 
-       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 to store group info table\n",
-                       sizeof(*bp->grp_info) * bp->max_ring_grps);
-               rc = -ENOMEM;
-               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 */
@@ -3584,13 +3980,16 @@ skip_ext_stats:
                pci_dev->mem_resource[0].phys_addr,
                pci_dev->mem_resource[0].addr);
 
-       rc = bnxt_hwrm_func_reset(bp);
+       rc = bnxt_hwrm_func_qcfg(bp, &mtu);
        if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm chip reset failure rc: %x\n", rc);
-               rc = -EIO;
+               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?
@@ -3625,7 +4024,6 @@ skip_ext_stats:
        if (rc)
                goto error_free_int;
 
-       bnxt_enable_int(bp);
        bnxt_init_nic(bp);
 
        return 0;
@@ -3675,6 +4073,7 @@ 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;
@@ -3700,8 +4099,7 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
 
 static struct rte_pci_driver bnxt_rte_pmd = {
        .id_table = bnxt_pci_id_map,
-       .drv_flags = RTE_PCI_DRV_NEED_MAPPING |
-               RTE_PCI_DRV_INTR_LSC | RTE_PCI_DRV_IOVA_AS_VA,
+       .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
        .probe = bnxt_pci_probe,
        .remove = bnxt_pci_remove,
 };