net/bnxt: allow group ID 0 for RSS action
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index 879ea58..fc3f1a8 100644 (file)
@@ -132,6 +132,7 @@ static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);
 static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev);
 static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
 static void bnxt_cancel_fw_health_check(struct bnxt *bp);
+static int bnxt_restore_vlan_filters(struct bnxt *bp);
 
 int is_bnxt_in_error(struct bnxt *bp)
 {
@@ -228,14 +229,101 @@ alloc_mem_err:
        return rc;
 }
 
-static int bnxt_init_chip(struct bnxt *bp)
+static int bnxt_setup_one_vnic(struct bnxt *bp, uint16_t vnic_id)
 {
+       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+       struct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];
+       uint64_t rx_offloads = dev_conf->rxmode.offloads;
        struct bnxt_rx_queue *rxq;
+       unsigned int j;
+       int rc;
+
+       rc = bnxt_vnic_grp_alloc(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       PMD_DRV_LOG(DEBUG, "vnic[%d] = %p vnic->fw_grp_ids = %p\n",
+                   vnic_id, vnic, vnic->fw_grp_ids);
+
+       rc = bnxt_hwrm_vnic_alloc(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       /* Alloc RSS context only if RSS mode is enabled */
+       if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {
+               int j, nr_ctxs = bnxt_rss_ctxts(bp);
+
+               rc = 0;
+               for (j = 0; j < nr_ctxs; j++) {
+                       rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, j);
+                       if (rc)
+                               break;
+               }
+               if (rc) {
+                       PMD_DRV_LOG(ERR,
+                                   "HWRM vnic %d ctx %d alloc failure rc: %x\n",
+                                   vnic_id, j, rc);
+                       goto err_out;
+               }
+               vnic->num_lb_ctxts = nr_ctxs;
+       }
+
+       /*
+        * Firmware sets pf pair in default vnic cfg. If the VLAN strip
+        * setting is not available at this time, it will not be
+        * configured correctly in the CFA.
+        */
+       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
+               vnic->vlan_strip = true;
+       else
+               vnic->vlan_strip = false;
+
+       rc = bnxt_hwrm_vnic_cfg(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       rc = bnxt_set_hwrm_vnic_filters(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       for (j = 0; j < bp->rx_num_qs_per_vnic; j++) {
+               rxq = bp->eth_dev->data->rx_queues[j];
+
+               PMD_DRV_LOG(DEBUG,
+                           "rxq[%d]->vnic=%p vnic->fw_grp_ids=%p\n",
+                           j, rxq->vnic, rxq->vnic->fw_grp_ids);
+
+               if (BNXT_HAS_RING_GRPS(bp) && rxq->rx_deferred_start)
+                       rxq->vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
+               else
+                       vnic->rx_queue_cnt++;
+       }
+
+       PMD_DRV_LOG(DEBUG, "vnic->rx_queue_cnt = %d\n", vnic->rx_queue_cnt);
+
+       rc = bnxt_vnic_rss_configure(bp, vnic);
+       if (rc)
+               goto err_out;
+
+       bnxt_hwrm_vnic_plcmode_cfg(bp, vnic);
+
+       if (rx_offloads & DEV_RX_OFFLOAD_TCP_LRO)
+               bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 1);
+       else
+               bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 0);
+
+       return 0;
+err_out:
+       PMD_DRV_LOG(ERR, "HWRM vnic %d cfg failure rc: %x\n",
+                   vnic_id, rc);
+       return rc;
+}
+
+static int bnxt_init_chip(struct bnxt *bp)
+{
        struct rte_eth_link new;
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
-       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
-       uint64_t rx_offloads = dev_conf->rxmode.offloads;
        uint32_t intr_vector = 0;
        uint32_t queue_id, base = BNXT_MISC_VEC_ID;
        uint32_t vec = BNXT_MISC_VEC_ID;
@@ -303,93 +391,11 @@ skip_cosq_cfg:
 
        /* VNIC configuration */
        for (i = 0; i < bp->nr_vnics; i++) {
-               struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
-               struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-
-               rc = bnxt_vnic_grp_alloc(bp, vnic);
+               rc = bnxt_setup_one_vnic(bp, i);
                if (rc)
                        goto err_out;
-
-               PMD_DRV_LOG(DEBUG, "vnic[%d] = %p vnic->fw_grp_ids = %p\n",
-                           i, vnic, vnic->fw_grp_ids);
-
-               rc = bnxt_hwrm_vnic_alloc(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR, "HWRM vnic %d alloc failure rc: %x\n",
-                               i, rc);
-                       goto err_out;
-               }
-
-               /* Alloc RSS context only if RSS mode is enabled */
-               if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {
-                       int j, nr_ctxs = bnxt_rss_ctxts(bp);
-
-                       rc = 0;
-                       for (j = 0; j < nr_ctxs; j++) {
-                               rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, j);
-                               if (rc)
-                                       break;
-                       }
-                       if (rc) {
-                               PMD_DRV_LOG(ERR,
-                                 "HWRM vnic %d ctx %d alloc failure rc: %x\n",
-                                 i, j, rc);
-                               goto err_out;
-                       }
-                       vnic->num_lb_ctxts = nr_ctxs;
-               }
-
-               /*
-                * Firmware sets pf pair in default vnic cfg. If the VLAN strip
-                * setting is not available at this time, it will not be
-                * configured correctly in the CFA.
-                */
-               if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
-                       vnic->vlan_strip = true;
-               else
-                       vnic->vlan_strip = false;
-
-               rc = bnxt_hwrm_vnic_cfg(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR, "HWRM vnic %d cfg failure rc: %x\n",
-                               i, rc);
-                       goto err_out;
-               }
-
-               rc = bnxt_set_hwrm_vnic_filters(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR,
-                               "HWRM vnic %d filter failure rc: %x\n",
-                               i, rc);
-                       goto err_out;
-               }
-
-               for (j = 0; j < bp->rx_num_qs_per_vnic; j++) {
-                       rxq = bp->eth_dev->data->rx_queues[j];
-
-                       PMD_DRV_LOG(DEBUG,
-                                   "rxq[%d]->vnic=%p vnic->fw_grp_ids=%p\n",
-                                   j, rxq->vnic, rxq->vnic->fw_grp_ids);
-
-                       if (BNXT_HAS_RING_GRPS(bp) && rxq->rx_deferred_start)
-                               rxq->vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
-               }
-
-               rc = bnxt_vnic_rss_configure(bp, vnic);
-               if (rc) {
-                       PMD_DRV_LOG(ERR,
-                                   "HWRM vnic set RSS failure rc: %x\n", rc);
-                       goto err_out;
-               }
-
-               bnxt_hwrm_vnic_plcmode_cfg(bp, vnic);
-
-               if (bp->eth_dev->data->dev_conf.rxmode.offloads &
-                   DEV_RX_OFFLOAD_TCP_LRO)
-                       bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 1);
-               else
-                       bnxt_hwrm_vnic_tpa_cfg(bp, vnic, 0);
        }
+
        rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, &bp->vnic_info[0], 0, NULL);
        if (rc) {
                PMD_DRV_LOG(ERR,
@@ -868,6 +874,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
        eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev);
 
        bnxt_link_update(eth_dev, 1, ETH_LINK_UP);
+       bp->dev_stopped = 0;
 
        if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
                vlan_mask |= ETH_VLAN_FILTER_MASK;
@@ -882,7 +889,6 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
        bp->flags |= BNXT_FLAG_INIT_DONE;
        eth_dev->data->dev_started = 1;
-       bp->dev_stopped = 0;
        pthread_mutex_lock(&bp->def_cp_lock);
        bnxt_schedule_fw_health_check(bp);
        pthread_mutex_unlock(&bp->def_cp_lock);
@@ -893,6 +899,7 @@ error:
        bnxt_shutdown_nic(bp);
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
+       bp->dev_stopped = 1;
        return rc;
 }
 
@@ -967,7 +974,10 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        bnxt_int_handler(eth_dev);
        bnxt_shutdown_nic(bp);
        bnxt_hwrm_if_change(bp, 0);
-       memset(bp->mark_table, 0, BNXT_MARK_TABLE_SZ);
+
+       rte_free(bp->mark_table);
+       bp->mark_table = NULL;
+
        bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
        bp->dev_stopped = 1;
        bp->rx_cosq_cnt = 0;
@@ -980,19 +990,22 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
        if (bp->dev_stopped == 0)
                bnxt_dev_stop_op(eth_dev);
 
-       if (eth_dev->data->mac_addrs != NULL) {
-               rte_free(eth_dev->data->mac_addrs);
-               eth_dev->data->mac_addrs = NULL;
-       }
-       if (bp->grp_info != NULL) {
-               rte_free(bp->grp_info);
-               bp->grp_info = NULL;
-       }
+       bnxt_uninit_resources(bp, false);
 
-       rte_free(bp->mark_table);
-       bp->mark_table = NULL;
+       eth_dev->dev_ops = NULL;
+       eth_dev->rx_pkt_burst = NULL;
+       eth_dev->tx_pkt_burst = NULL;
 
-       bnxt_dev_uninit(eth_dev);
+       rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
+       bp->tx_mem_zone = NULL;
+       rte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone);
+       bp->rx_mem_zone = NULL;
+
+       rte_free(bp->pf.vf_info);
+       bp->pf.vf_info = NULL;
+
+       rte_free(bp->grp_info);
+       bp->grp_info = NULL;
 }
 
 static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
@@ -1166,6 +1179,10 @@ static int bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev)
        if (rc)
                return rc;
 
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
@@ -1191,6 +1208,10 @@ static int bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev)
        if (rc)
                return rc;
 
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
@@ -1216,6 +1237,10 @@ static int bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev)
        if (rc)
                return rc;
 
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
@@ -1241,6 +1266,10 @@ static int bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev)
        if (rc)
                return rc;
 
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
        if (bp->vnic_info == NULL)
                return 0;
 
@@ -1860,18 +1889,12 @@ static int bnxt_del_dflt_mac_filter(struct bnxt *bp,
 }
 
 static int
-bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)
+bnxt_config_vlan_hw_filter(struct bnxt *bp, uint64_t rx_offloads)
 {
-       struct bnxt *bp = dev->data->dev_private;
-       uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
        struct bnxt_vnic_info *vnic;
        unsigned int i;
        int rc;
 
-       rc = is_bnxt_in_error(bp);
-       if (rc)
-               return rc;
-
        vnic = BNXT_GET_DEFAULT_VNIC(bp);
        if (!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {
                /* Remove any VLAN filters programmed */
@@ -1895,18 +1918,94 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)
        PMD_DRV_LOG(DEBUG, "VLAN Filtering: %d\n",
                    !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER));
 
+       return 0;
+}
+
+static int bnxt_free_one_vnic(struct bnxt *bp, uint16_t vnic_id)
+{
+       struct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];
+       unsigned int i;
+       int rc;
+
+       /* Destroy vnic filters and vnic */
+       if (bp->eth_dev->data->dev_conf.rxmode.offloads &
+           DEV_RX_OFFLOAD_VLAN_FILTER) {
+               for (i = 0; i < RTE_ETHER_MAX_VLAN_ID; i++)
+                       bnxt_del_vlan_filter(bp, i);
+       }
+       bnxt_del_dflt_mac_filter(bp, vnic);
+
+       rc = bnxt_hwrm_vnic_free(bp, vnic);
+       if (rc)
+               return rc;
+
+       rte_free(vnic->fw_grp_ids);
+       vnic->fw_grp_ids = NULL;
+
+       return 0;
+}
+
+static int
+bnxt_config_vlan_hw_stripping(struct bnxt *bp, uint64_t rx_offloads)
+{
+       struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
+       int rc;
+
+       /* Destroy, recreate and reconfigure the default vnic */
+       rc = bnxt_free_one_vnic(bp, 0);
+       if (rc)
+               return rc;
+
+       /* default vnic 0 */
+       rc = bnxt_setup_one_vnic(bp, 0);
+       if (rc)
+               return rc;
+
+       if (bp->eth_dev->data->dev_conf.rxmode.offloads &
+           DEV_RX_OFFLOAD_VLAN_FILTER) {
+               rc = bnxt_add_vlan_filter(bp, 0);
+               bnxt_restore_vlan_filters(bp);
+       } else {
+               rc = bnxt_add_mac_filter(bp, vnic, NULL, 0, 0);
+       }
+
+       rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
+       if (rc)
+               return rc;
+
+       PMD_DRV_LOG(DEBUG, "VLAN Strip Offload: %d\n",
+                   !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));
+
+       return rc;
+}
+
+static int
+bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)
+{
+       uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
+       struct bnxt *bp = dev->data->dev_private;
+       int rc;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       /* Filter settings will get applied when port is started */
+       if (bp->dev_stopped == 1)
+               return 0;
+
+       if (mask & ETH_VLAN_FILTER_MASK) {
+               /* Enable or disable VLAN filtering */
+               rc = bnxt_config_vlan_hw_filter(bp, rx_offloads);
+               if (rc)
+                       return rc;
+       }
+
        if (mask & ETH_VLAN_STRIP_MASK) {
                /* Enable or disable VLAN stripping */
-               for (i = 0; i < bp->nr_vnics; i++) {
-                       struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-                       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
-                               vnic->vlan_strip = true;
-                       else
-                               vnic->vlan_strip = false;
-                       bnxt_hwrm_vnic_cfg(bp, vnic);
-               }
-               PMD_DRV_LOG(DEBUG, "VLAN Strip Offload: %d\n",
-                       !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));
+               rc = bnxt_config_vlan_hw_stripping(bp, rx_offloads);
+               if (rc)
+                       return rc;
        }
 
        if (mask & ETH_VLAN_EXTEND_MASK) {
@@ -1984,7 +2083,6 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
        struct bnxt *bp = dev->data->dev_private;
        /* Default Filter is tied to VNIC 0 */
        struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
-       struct bnxt_filter_info *filter;
        int rc;
 
        rc = is_bnxt_in_error(bp);
@@ -1997,32 +2095,23 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
        if (rte_is_zero_ether_addr(addr))
                return -EINVAL;
 
-       STAILQ_FOREACH(filter, &vnic->filter, next) {
-               /* Default Filter is at Index 0 */
-               if (filter->mac_index != 0)
-                       continue;
+       /* Check if the requested MAC is already added */
+       if (memcmp(addr, bp->mac_addr, RTE_ETHER_ADDR_LEN) == 0)
+               return 0;
 
-               memcpy(filter->l2_addr, addr, RTE_ETHER_ADDR_LEN);
-               memset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN);
-               filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX |
-                       HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST;
-               filter->enables |=
-                       HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |
-                       HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;
+       /* Destroy filter and re-create it */
+       bnxt_del_dflt_mac_filter(bp, vnic);
 
-               rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
-               if (rc) {
-                       memcpy(filter->l2_addr, bp->mac_addr,
-                              RTE_ETHER_ADDR_LEN);
-                       return rc;
-               }
-
-               memcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN);
-               PMD_DRV_LOG(DEBUG, "Set MAC addr\n");
-               return 0;
+       memcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN);
+       if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_VLAN_FILTER) {
+               /* This filter will allow only untagged packets */
+               rc = bnxt_add_vlan_filter(bp, 0);
+       } else {
+               rc = bnxt_add_mac_filter(bp, vnic, addr, 0, 0);
        }
 
-       return 0;
+       PMD_DRV_LOG(DEBUG, "Set MAC addr\n");
+       return rc;
 }
 
 static int
@@ -3514,9 +3603,9 @@ bnxt_get_eeprom_length_op(struct rte_eth_dev *dev)
        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);
+       PMD_DRV_LOG(INFO, PCI_PRI_FMT "\n",
+                   bp->pdev->addr.domain, bp->pdev->addr.bus,
+                   bp->pdev->addr.devid, bp->pdev->addr.function);
 
        rc = bnxt_hwrm_nvm_get_dir_info(bp, &dir_entries, &entry_length);
        if (rc != 0)
@@ -3538,10 +3627,10 @@ bnxt_get_eeprom_op(struct rte_eth_dev *dev,
        if (rc)
                return rc;
 
-       PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d "
-               "len = %d\n", bp->pdev->addr.domain,
-               bp->pdev->addr.bus, bp->pdev->addr.devid,
-               bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length);
+       PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n",
+                   bp->pdev->addr.domain, bp->pdev->addr.bus,
+                   bp->pdev->addr.devid, bp->pdev->addr.function,
+                   in_eeprom->offset, in_eeprom->length);
 
        if (in_eeprom->offset == 0) /* special offset value to get directory */
                return bnxt_get_nvram_directory(bp, in_eeprom->length,
@@ -3614,10 +3703,10 @@ bnxt_set_eeprom_op(struct rte_eth_dev *dev,
        if (rc)
                return rc;
 
-       PMD_DRV_LOG(INFO, "%04x:%02x:%02x:%02x in_eeprom->offset = %d "
-               "len = %d\n", bp->pdev->addr.domain,
-               bp->pdev->addr.bus, bp->pdev->addr.devid,
-               bp->pdev->addr.function, in_eeprom->offset, in_eeprom->length);
+       PMD_DRV_LOG(INFO, PCI_PRI_FMT " in_eeprom->offset = %d len = %d\n",
+                   bp->pdev->addr.domain, bp->pdev->addr.bus,
+                   bp->pdev->addr.devid, bp->pdev->addr.function,
+                   in_eeprom->offset, in_eeprom->length);
 
        if (!BNXT_PF(bp)) {
                PMD_DRV_LOG(ERR, "NVM write not supported from a VF\n");
@@ -4233,18 +4322,6 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
 
                memset(mz->addr, 0, mz->len);
                mz_phys_addr = mz->iova;
-               if ((unsigned long)mz->addr == mz_phys_addr) {
-                       PMD_DRV_LOG(DEBUG,
-                                   "physical address same as virtual\n");
-                       PMD_DRV_LOG(DEBUG, "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;
@@ -4268,22 +4345,8 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
 
        memset(mz->addr, 0, mz->len);
        mz_phys_addr = mz->iova;
-       if ((unsigned long)mz->addr == mz_phys_addr) {
-               PMD_DRV_LOG(DEBUG,
-                           "Memzone physical address same as virtual.\n");
-               PMD_DRV_LOG(DEBUG, "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;
 
@@ -4460,18 +4523,6 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
        }
        memset(mz->addr, 0, mz->len);
        mz_phys_addr = mz->iova;
-       if ((unsigned long)mz->addr == mz_phys_addr) {
-               PMD_DRV_LOG(DEBUG,
-                           "Memzone physical address same as virtual.\n");
-               PMD_DRV_LOG(DEBUG,
-                           "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;
@@ -4498,17 +4549,6 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
        }
        memset(mz->addr, 0, mz->len);
        mz_phys_addr = mz->iova;
-       if ((unsigned long)mz->addr == mz_phys_addr) {
-               PMD_DRV_LOG(DEBUG,
-                           "Memzone physical address same as virtual\n");
-               PMD_DRV_LOG(DEBUG, "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;
@@ -4826,6 +4866,11 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
        if (rc)
                goto error_free;
 
+       /* Pass the information to the rte_eth_dev_close() that it should also
+        * release the private port resources.
+        */
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+
        PMD_DRV_LOG(INFO,
                    DRV_MODULE_NAME "found at mem %" PRIX64 ", node addr %pM\n",
                    pci_dev->mem_resource[0].phys_addr,
@@ -4874,35 +4919,15 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
 static int
 bnxt_dev_uninit(struct rte_eth_dev *eth_dev)
 {
-       struct bnxt *bp = eth_dev->data->dev_private;
-       int rc;
-
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return -EPERM;
 
        PMD_DRV_LOG(DEBUG, "Calling Device uninit\n");
 
-       rc = bnxt_uninit_resources(bp, false);
-
-       if (bp->tx_mem_zone) {
-               rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
-               bp->tx_mem_zone = NULL;
-       }
-
-       if (bp->rx_mem_zone) {
-               rte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone);
-               bp->rx_mem_zone = NULL;
-       }
-
-       if (bp->dev_stopped == 0)
+       if (eth_dev->state != RTE_ETH_DEV_UNUSED)
                bnxt_dev_close_op(eth_dev);
-       if (bp->pf.vf_info)
-               rte_free(bp->pf.vf_info);
-       eth_dev->dev_ops = NULL;
-       eth_dev->rx_pkt_burst = NULL;
-       eth_dev->tx_pkt_burst = NULL;
 
-       return rc;
+       return 0;
 }
 
 static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,