net/hns3: encapsulate DFX stats in datapath
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index 02ab87b..4b76cd5 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2018 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -7,8 +7,8 @@
 #include <stdbool.h>
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_alarm.h>
@@ -679,7 +679,7 @@ static int bnxt_update_phy_setting(struct bnxt *bp)
        return rc;
 }
 
-static int bnxt_init_chip(struct bnxt *bp)
+static int bnxt_start_nic(struct bnxt *bp)
 {
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
@@ -748,11 +748,17 @@ skip_cosq_cfg:
                goto err_out;
        }
 
+       /* default vnic 0 */
+       rc = bnxt_setup_one_vnic(bp, 0);
+       if (rc)
+               goto err_out;
        /* VNIC configuration */
-       for (i = 0; i < bp->nr_vnics; i++) {
-               rc = bnxt_setup_one_vnic(bp, i);
-               if (rc)
-                       goto err_out;
+       if (BNXT_RFS_NEEDS_VNIC(bp)) {
+               for (i = 1; i < bp->nr_vnics; i++) {
+                       rc = bnxt_setup_one_vnic(bp, i);
+                       if (rc)
+                               goto err_out;
+               }
        }
 
        rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, &bp->vnic_info[0], 0, NULL);
@@ -1153,6 +1159,12 @@ bnxt_receive_function(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
 
+       /* Disable vector mode RX for Stingray2 for now */
+       if (BNXT_CHIP_SR2(bp)) {
+               bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
+               return bnxt_recv_pkts;
+       }
+
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
 #ifndef RTE_LIBRTE_IEEE1588
        /*
@@ -1193,12 +1205,17 @@ bnxt_receive_function(struct rte_eth_dev *eth_dev)
 }
 
 static eth_tx_burst_t
-bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
+bnxt_transmit_function(struct rte_eth_dev *eth_dev)
 {
+       struct bnxt *bp = eth_dev->data->dev_private;
+
+       /* Disable vector mode TX for Stingray2 for now */
+       if (BNXT_CHIP_SR2(bp))
+               return bnxt_xmit_pkts;
+
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
 #ifndef RTE_LIBRTE_IEEE1588
        uint64_t offloads = eth_dev->data->dev_conf.txmode.offloads;
-       struct bnxt *bp = eth_dev->data->dev_private;
 
        /*
         * Vector mode transmit can be enabled only if not using scatter rx
@@ -1243,80 +1260,6 @@ static int bnxt_handle_if_change_status(struct bnxt *bp)
        return rc;
 }
 
-static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
-{
-       struct bnxt *bp = eth_dev->data->dev_private;
-       uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;
-       int vlan_mask = 0;
-       int rc, retry_cnt = BNXT_IF_CHANGE_RETRY_COUNT;
-
-       if (!eth_dev->data->nb_tx_queues || !eth_dev->data->nb_rx_queues) {
-               PMD_DRV_LOG(ERR, "Queues are not configured yet!\n");
-               return -EINVAL;
-       }
-
-       if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS)
-               PMD_DRV_LOG(ERR,
-                           "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
-                           bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
-
-       do {
-               rc = bnxt_hwrm_if_change(bp, true);
-               if (rc == 0 || rc != -EAGAIN)
-                       break;
-
-               rte_delay_ms(BNXT_IF_CHANGE_RETRY_INTERVAL);
-       } while (retry_cnt--);
-
-       if (rc)
-               return rc;
-
-       if (bp->flags & BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE) {
-               rc = bnxt_handle_if_change_status(bp);
-               if (rc)
-                       return rc;
-       }
-
-       bnxt_enable_int(bp);
-
-       rc = bnxt_init_chip(bp);
-       if (rc)
-               goto error;
-
-       eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev);
-       eth_dev->data->dev_started = 1;
-
-       bnxt_link_update_op(eth_dev, 1);
-
-       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
-               vlan_mask |= ETH_VLAN_FILTER_MASK;
-       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
-               vlan_mask |= ETH_VLAN_STRIP_MASK;
-       rc = bnxt_vlan_offload_set_op(eth_dev, vlan_mask);
-       if (rc)
-               goto error;
-
-       /* Initialize bnxt ULP port details */
-       rc = bnxt_ulp_port_init(bp);
-       if (rc)
-               goto error;
-
-       eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
-       eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
-
-       bnxt_schedule_fw_health_check(bp);
-
-       return 0;
-
-error:
-       bnxt_shutdown_nic(bp);
-       bnxt_free_tx_mbufs(bp);
-       bnxt_free_rx_mbufs(bp);
-       bnxt_hwrm_if_change(bp, false);
-       eth_dev->data->dev_started = 0;
-       return rc;
-}
-
 static int bnxt_dev_set_link_up_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
@@ -1354,8 +1297,7 @@ static void bnxt_free_switch_domain(struct bnxt *bp)
        }
 }
 
-/* Unload the driver, release resources */
-static int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
+static int bnxt_dev_stop(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);
@@ -1423,31 +1365,115 @@ static int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
-static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+/* Unload the driver, release resources */
+static int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
-       int ret = 0;
 
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return 0;
+       pthread_mutex_lock(&bp->err_recovery_lock);
+       if (bp->flags & BNXT_FLAG_FW_RESET) {
+               PMD_DRV_LOG(ERR,
+                           "Adapter recovering from error..Please retry\n");
+               pthread_mutex_unlock(&bp->err_recovery_lock);
+               return -EAGAIN;
+       }
+       pthread_mutex_unlock(&bp->err_recovery_lock);
 
-       /* cancel the recovery handler before remove dev */
-       rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
-       rte_eal_alarm_cancel(bnxt_dev_recover, (void *)bp);
-       bnxt_cancel_fc_thread(bp);
+       return bnxt_dev_stop(eth_dev);
+}
 
-       if (eth_dev->data->dev_started)
-               ret = bnxt_dev_stop_op(eth_dev);
+static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = eth_dev->data->dev_private;
+       uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;
+       int vlan_mask = 0;
+       int rc, retry_cnt = BNXT_IF_CHANGE_RETRY_COUNT;
 
-       bnxt_free_switch_domain(bp);
+       if (!eth_dev->data->nb_tx_queues || !eth_dev->data->nb_rx_queues) {
+               PMD_DRV_LOG(ERR, "Queues are not configured yet!\n");
+               return -EINVAL;
+       }
 
-       bnxt_uninit_resources(bp, false);
+       if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS)
+               PMD_DRV_LOG(ERR,
+                           "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
+                           bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
+
+       do {
+               rc = bnxt_hwrm_if_change(bp, true);
+               if (rc == 0 || rc != -EAGAIN)
+                       break;
+
+               rte_delay_ms(BNXT_IF_CHANGE_RETRY_INTERVAL);
+       } while (retry_cnt--);
+
+       if (rc)
+               return rc;
+
+       if (bp->flags & BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE) {
+               rc = bnxt_handle_if_change_status(bp);
+               if (rc)
+                       return rc;
+       }
+
+       bnxt_enable_int(bp);
+
+       rc = bnxt_start_nic(bp);
+       if (rc)
+               goto error;
+
+       eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev);
+       eth_dev->data->dev_started = 1;
+
+       bnxt_link_update_op(eth_dev, 1);
+
+       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
+               vlan_mask |= ETH_VLAN_FILTER_MASK;
+       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
+               vlan_mask |= ETH_VLAN_STRIP_MASK;
+       rc = bnxt_vlan_offload_set_op(eth_dev, vlan_mask);
+       if (rc)
+               goto error;
+
+       /* Initialize bnxt ULP port details */
+       rc = bnxt_ulp_port_init(bp);
+       if (rc)
+               goto error;
+
+       eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
+       eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
+
+       bnxt_schedule_fw_health_check(bp);
+
+       return 0;
+
+error:
+       bnxt_dev_stop(eth_dev);
+       return rc;
+}
+
+static void
+bnxt_uninit_locks(struct bnxt *bp)
+{
+       pthread_mutex_destroy(&bp->flow_lock);
+       pthread_mutex_destroy(&bp->def_cp_lock);
+       pthread_mutex_destroy(&bp->health_check_lock);
+       pthread_mutex_destroy(&bp->err_recovery_lock);
+       if (bp->rep_info) {
+               pthread_mutex_destroy(&bp->rep_info->vfr_lock);
+               pthread_mutex_destroy(&bp->rep_info->vfr_start_lock);
+       }
+}
 
+static void bnxt_drv_uninit(struct bnxt *bp)
+{
+       bnxt_free_switch_domain(bp);
        bnxt_free_leds_info(bp);
        bnxt_free_cos_queues(bp);
        bnxt_free_link_info(bp);
        bnxt_free_pf_info(bp);
        bnxt_free_parent_info(bp);
+       bnxt_uninit_locks(bp);
 
        rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
        bp->tx_mem_zone = NULL;
@@ -1458,6 +1484,36 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 
        rte_free(bp->grp_info);
        bp->grp_info = NULL;
+}
+
+static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = eth_dev->data->dev_private;
+       int ret = 0;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       pthread_mutex_lock(&bp->err_recovery_lock);
+       if (bp->flags & BNXT_FLAG_FW_RESET) {
+               PMD_DRV_LOG(ERR,
+                           "Adapter recovering from error...Please retry\n");
+               pthread_mutex_unlock(&bp->err_recovery_lock);
+               return -EAGAIN;
+       }
+       pthread_mutex_unlock(&bp->err_recovery_lock);
+
+       /* cancel the recovery handler before remove dev */
+       rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
+       rte_eal_alarm_cancel(bnxt_dev_recover, (void *)bp);
+       bnxt_cancel_fc_thread(bp);
+
+       if (eth_dev->data->dev_started)
+               ret = bnxt_dev_stop(eth_dev);
+
+       bnxt_uninit_resources(bp, false);
+
+       bnxt_drv_uninit(bp);
 
        return ret;
 }
@@ -3650,7 +3706,7 @@ static void bnxt_dev_cleanup(struct bnxt *bp)
        bp->eth_dev->data->dev_link.link_status = 0;
        bp->link_info->link_up = 0;
        if (bp->eth_dev->data->dev_started)
-               bnxt_dev_stop_op(bp->eth_dev);
+               bnxt_dev_stop(bp->eth_dev);
 
        bnxt_uninit_resources(bp, true);
 }
@@ -3751,6 +3807,7 @@ static void bnxt_dev_recover(void *arg)
        int timeout = bp->fw_reset_max_msecs;
        int rc = 0;
 
+       pthread_mutex_lock(&bp->err_recovery_lock);
        /* Clear Error flag so that device re-init should happen */
        bp->flags &= ~BNXT_FLAG_FATAL_ERROR;
 
@@ -3787,12 +3844,15 @@ static void bnxt_dev_recover(void *arg)
                goto err_start;
 
        PMD_DRV_LOG(INFO, "Recovered from FW reset\n");
+       pthread_mutex_unlock(&bp->err_recovery_lock);
+
        return;
 err_start:
-       bnxt_dev_stop_op(bp->eth_dev);
+       bnxt_dev_stop(bp->eth_dev);
 err:
        bp->flags |= BNXT_FLAG_FATAL_ERROR;
        bnxt_uninit_resources(bp, false);
+       pthread_mutex_unlock(&bp->err_recovery_lock);
        PMD_DRV_LOG(ERR, "Failed to recover from FW reset\n");
 }
 
@@ -4032,7 +4092,7 @@ bool bnxt_stratus_device(struct bnxt *bp)
        }
 }
 
-static int bnxt_init_board(struct rte_eth_dev *eth_dev)
+static int bnxt_map_pci_bars(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;
@@ -4206,39 +4266,49 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp)
 
        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;
+       if (ctx->qp_entry_size) {
+               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;
+       if (ctx->srq_entry_size) {
+               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;
+       if (ctx->cq_entry_size) {
+               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;
+       if (ctx->vnic_entry_size) {
+               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;
+       if (ctx->stat_entry_size) {
+               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;
+       }
 
        min = ctx->tqm_min_entries_per_ring;
 
@@ -4254,10 +4324,12 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp)
        for (i = 0, ena = 0; i < ctx->tqm_fp_rings_count + 1; i++) {
                ctx_pg = ctx->tqm_mem[i];
                ctx_pg->entries = i ? entries : entries_sp;
-               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;
+               if (ctx->tqm_entry_size) {
+                       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;
        }
 
@@ -4657,7 +4729,11 @@ static int bnxt_map_hcomm_fw_status_reg(struct bnxt *bp)
        return 0;
 }
 
-static int bnxt_init_fw(struct bnxt *bp)
+/* This function gets the FW version along with the
+ * capabilities(MAX and current) of the function, vnic,
+ * error recovery, phy and other chip related info
+ */
+static int bnxt_get_config(struct bnxt *bp)
 {
        uint16_t mtu;
        int rc = 0;
@@ -4698,6 +4774,10 @@ static int bnxt_init_fw(struct bnxt *bp)
        if (rc)
                return rc;
 
+       rc = bnxt_hwrm_cfa_adv_flow_mgmt_qcaps(bp);
+       if (rc)
+               return rc;
+
        bnxt_hwrm_port_mac_qcfg(bp);
 
        bnxt_hwrm_parent_pf_qcfg(bp);
@@ -4733,8 +4813,15 @@ bnxt_init_locks(struct bnxt *bp)
        }
 
        err = pthread_mutex_init(&bp->health_check_lock, NULL);
-       if (err)
+       if (err) {
                PMD_DRV_LOG(ERR, "Unable to initialize health_check_lock\n");
+               return err;
+       }
+
+       err = pthread_mutex_init(&bp->err_recovery_lock, NULL);
+       if (err)
+               PMD_DRV_LOG(ERR, "Unable to initialize err_recovery_lock\n");
+
        return err;
 }
 
@@ -4742,7 +4829,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
 {
        int rc = 0;
 
-       rc = bnxt_init_fw(bp);
+       rc = bnxt_get_config(bp);
        if (rc)
                return rc;
 
@@ -4799,10 +4886,6 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
                return rc;
        }
 
-       rc = bnxt_init_locks(bp);
-       if (rc)
-               return rc;
-
        return 0;
 }
 
@@ -5193,38 +5276,14 @@ static int bnxt_alloc_switch_domain(struct bnxt *bp)
        return rc;
 }
 
-static int
-bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
+/* Allocate and initialize various fields in bnxt struct that
+ * need to be allocated/destroyed only once in the lifetime of the driver
+ */
+static int bnxt_drv_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;
-       int rc;
-
-       if (version_printed++ == 0)
-               PMD_DRV_LOG(INFO, "%s\n", bnxt_version);
-
-       eth_dev->dev_ops = &bnxt_dev_ops;
-       eth_dev->rx_queue_count = bnxt_rx_queue_count_op;
-       eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op;
-       eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op;
-       eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
-       eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
-
-       /*
-        * For secondary processes, we don't initialise any further
-        * as primary has already done this work.
-        */
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return 0;
-
-       rte_eth_copy_pci_info(eth_dev, pci_dev);
-       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
-
-       bp = eth_dev->data->dev_private;
-
-       /* Parse dev arguments passed on when starting the DPDK application. */
-       bnxt_parse_dev_args(bp, pci_dev->device.devargs);
+       struct bnxt *bp = eth_dev->data->dev_private;
+       int rc = 0;
 
        bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
 
@@ -5256,7 +5315,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
                }
        }
 
-       rc = bnxt_init_board(eth_dev);
+       rc = bnxt_map_pci_bars(eth_dev);
        if (rc) {
                PMD_DRV_LOG(ERR,
                            "Failed to initialize board rc: %x\n", rc);
@@ -5265,27 +5324,75 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
 
        rc = bnxt_alloc_pf_info(bp);
        if (rc)
-               goto error_free;
+               return rc;
 
        rc = bnxt_alloc_link_info(bp);
        if (rc)
-               goto error_free;
+               return rc;
 
        rc = bnxt_alloc_parent_info(bp);
        if (rc)
-               goto error_free;
+               return rc;
 
        rc = bnxt_alloc_hwrm_resources(bp);
        if (rc) {
                PMD_DRV_LOG(ERR,
                            "Failed to allocate hwrm resource rc: %x\n", rc);
-               goto error_free;
+               return rc;
        }
        rc = bnxt_alloc_leds_info(bp);
        if (rc)
-               goto error_free;
+               return rc;
 
        rc = bnxt_alloc_cos_queues(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_init_locks(bp);
+       if (rc)
+               return rc;
+
+       rc = bnxt_alloc_switch_domain(bp);
+       if (rc)
+               return rc;
+
+       return rc;
+}
+
+static int
+bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
+{
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+       static int version_printed;
+       struct bnxt *bp;
+       int rc;
+
+       if (version_printed++ == 0)
+               PMD_DRV_LOG(INFO, "%s\n", bnxt_version);
+
+       eth_dev->dev_ops = &bnxt_dev_ops;
+       eth_dev->rx_queue_count = bnxt_rx_queue_count_op;
+       eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op;
+       eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op;
+       eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
+       eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
+
+       /*
+        * For secondary processes, we don't initialise any further
+        * as primary has already done this work.
+        */
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       rte_eth_copy_pci_info(eth_dev, pci_dev);
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
+       bp = eth_dev->data->dev_private;
+
+       /* Parse dev arguments passed on when starting the DPDK application. */
+       bnxt_parse_dev_args(bp, pci_dev->device.devargs);
+
+       rc = bnxt_drv_init(eth_dev);
        if (rc)
                goto error_free;
 
@@ -5297,8 +5404,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
        if (rc)
                goto error_free;
 
-       bnxt_alloc_switch_domain(bp);
-
        PMD_DRV_LOG(INFO,
                    DRV_MODULE_NAME "found at mem %" PRIX64 ", node addr %pM\n",
                    pci_dev->mem_resource[0].phys_addr,
@@ -5380,18 +5485,6 @@ bnxt_free_error_recovery_info(struct bnxt *bp)
        bp->fw_cap &= ~BNXT_FW_CAP_ERROR_RECOVERY;
 }
 
-static void
-bnxt_uninit_locks(struct bnxt *bp)
-{
-       pthread_mutex_destroy(&bp->flow_lock);
-       pthread_mutex_destroy(&bp->def_cp_lock);
-       pthread_mutex_destroy(&bp->health_check_lock);
-       if (bp->rep_info) {
-               pthread_mutex_destroy(&bp->rep_info->vfr_lock);
-               pthread_mutex_destroy(&bp->rep_info->vfr_start_lock);
-       }
-}
-
 static int
 bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
 {
@@ -5413,7 +5506,6 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
 
        bnxt_uninit_ctx_mem(bp);
 
-       bnxt_uninit_locks(bp);
        bnxt_free_flow_stats_info(bp);
        bnxt_free_rep_info(bp);
        rte_free(bp->ptp_cfg);