New upstream version 16.11.8
[deb_dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index 406e38a..44bf6ba 100644 (file)
@@ -43,6 +43,7 @@
 #include "bnxt_cpr.h"
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
+#include "bnxt_irq.h"
 #include "bnxt_ring.h"
 #include "bnxt_rxq.h"
 #include "bnxt_rxr.h"
 static const char bnxt_version[] =
        "Broadcom Cumulus driver " DRV_MODULE_NAME "\n";
 
+#define PCI_VENDOR_ID_BROADCOM 0x14E4
+
+#define BROADCOM_DEV_ID_57301 0x16c8
+#define BROADCOM_DEV_ID_57302 0x16c9
+#define BROADCOM_DEV_ID_57304_PF 0x16ca
+#define BROADCOM_DEV_ID_57304_VF 0x16cb
+#define BROADCOM_DEV_ID_57417_MF 0x16cc
+#define BROADCOM_DEV_ID_NS2 0x16cd
+#define BROADCOM_DEV_ID_57311 0x16ce
+#define BROADCOM_DEV_ID_57312 0x16cf
+#define BROADCOM_DEV_ID_57402 0x16d0
+#define BROADCOM_DEV_ID_57404 0x16d1
+#define BROADCOM_DEV_ID_57406_PF 0x16d2
+#define BROADCOM_DEV_ID_57406_VF 0x16d3
+#define BROADCOM_DEV_ID_57402_MF 0x16d4
+#define BROADCOM_DEV_ID_57407_RJ45 0x16d5
+#define BROADCOM_DEV_ID_57412 0x16d6
+#define BROADCOM_DEV_ID_57414 0x16d7
+#define BROADCOM_DEV_ID_57416_RJ45 0x16d8
+#define BROADCOM_DEV_ID_57417_RJ45 0x16d9
+#define BROADCOM_DEV_ID_5741X_VF 0x16dc
+#define BROADCOM_DEV_ID_57412_MF 0x16de
+#define BROADCOM_DEV_ID_57314 0x16df
+#define BROADCOM_DEV_ID_57317_RJ45 0x16e0
+#define BROADCOM_DEV_ID_5731X_VF 0x16e1
+#define BROADCOM_DEV_ID_57417_SFP 0x16e2
+#define BROADCOM_DEV_ID_57416_SFP 0x16e3
+#define BROADCOM_DEV_ID_57317_SFP 0x16e4
+#define BROADCOM_DEV_ID_57404_MF 0x16e7
+#define BROADCOM_DEV_ID_57406_MF 0x16e8
+#define BROADCOM_DEV_ID_57407_SFP 0x16e9
+#define BROADCOM_DEV_ID_57407_MF 0x16ea
+#define BROADCOM_DEV_ID_57414_MF 0x16ec
+#define BROADCOM_DEV_ID_57416_MF 0x16ee
+
 static struct rte_pci_id bnxt_pci_id_map[] = {
-#define RTE_PCI_DEV_ID_DECL_BNXT(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
-#include "rte_pci_dev_ids.h"
-       {.device_id = 0},
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57301) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57302) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_PF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_VF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_NS2) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57402) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57404) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_PF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_VF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57402_MF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57407_RJ45) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57404_MF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_MF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57407_SFP) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57407_MF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_5741X_VF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_5731X_VF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57314) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57417_MF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57311) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57312) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57412) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57416_RJ45) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57417_RJ45) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57412_MF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57317_RJ45) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57417_SFP) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57416_SFP) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57317_SFP) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414_MF) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57416_MF) },
+       { .vendor_id = 0, /* sentinel */ },
 };
 
 #define BNXT_ETH_RSS_SUPPORT ( \
@@ -70,6 +136,9 @@ static struct rte_pci_id bnxt_pci_id_map[] = {
        ETH_RSS_NONFRAG_IPV6_TCP |      \
        ETH_RSS_NONFRAG_IPV6_UDP)
 
+static void bnxt_print_link_info(struct rte_eth_dev *eth_dev);
+static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);
+
 /***********************/
 
 /*
@@ -124,6 +193,7 @@ alloc_mem_err:
 static int bnxt_init_chip(struct bnxt *bp)
 {
        unsigned int i, rss_idx, fw_idx;
+       struct rte_eth_link new;
        int rc;
 
        rc = bnxt_alloc_all_hwrm_stat_ctxs(bp);
@@ -153,6 +223,17 @@ static int bnxt_init_chip(struct bnxt *bp)
        /* VNIC configuration */
        for (i = 0; i < bp->nr_vnics; i++) {
                struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
+               uint32_t size = sizeof(*vnic->fw_grp_ids) * bp->max_ring_grps;
+
+               vnic->fw_grp_ids = rte_zmalloc("vnic_fw_grp_ids", size, 0);
+               if (!vnic->fw_grp_ids) {
+                       RTE_LOG(ERR, PMD,
+                                   "Failed to alloc %d bytes for group ids\n",
+                                   size);
+                       rc = -ENOMEM;
+                       goto err_out;
+               }
+               memset(vnic->fw_grp_ids, -1, size);
 
                rc = bnxt_hwrm_vnic_alloc(bp, vnic);
                if (rc) {
@@ -210,6 +291,22 @@ static int bnxt_init_chip(struct bnxt *bp)
                goto err_out;
        }
 
+       rc = bnxt_get_hwrm_link_config(bp, &new);
+       if (rc) {
+               RTE_LOG(ERR, PMD, "HWRM Get link config failure rc: %x\n", rc);
+               goto err_out;
+       }
+
+       if (!bp->link_info.link_up) {
+               rc = bnxt_set_hwrm_link_config(bp, true);
+               if (rc) {
+                       RTE_LOG(ERR, PMD,
+                               "HWRM link config failure rc: %x\n", rc);
+                       goto err_out;
+               }
+       }
+       bnxt_print_link_info(bp->eth_dev);
+
        return 0;
 
 err_out:
@@ -230,7 +327,9 @@ static int bnxt_init_nic(struct bnxt *bp)
 {
        int rc;
 
-       bnxt_init_ring_grps(bp);
+       rc = bnxt_init_ring_grps(bp);
+       if (rc)
+               return rc;
        bnxt_init_vnics(bp);
        bnxt_init_filters(bp);
 
@@ -260,12 +359,12 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
                dev_info->max_rx_queues = bp->pf.max_rx_rings;
                dev_info->max_tx_queues = bp->pf.max_tx_rings;
                dev_info->max_vfs = bp->pf.active_vfs;
-               dev_info->reta_size = bp->pf.max_rsscos_ctx;
+               dev_info->reta_size = HW_HASH_INDEX_SIZE;
                max_vnics = bp->pf.max_vnics;
        } else {
                dev_info->max_rx_queues = bp->vf.max_rx_rings;
                dev_info->max_tx_queues = bp->vf.max_tx_rings;
-               dev_info->reta_size = bp->vf.max_rsscos_ctx;
+               dev_info->reta_size = HW_HASH_INDEX_SIZE;
                max_vnics = bp->vf.max_vnics;
        }
 
@@ -273,8 +372,13 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
        dev_info->min_rx_bufsize = 1;
        dev_info->max_rx_pktlen = BNXT_MAX_MTU + ETHER_HDR_LEN + ETHER_CRC_LEN
                                  + VLAN_TAG_SIZE;
-       dev_info->rx_offload_capa = 0;
-       dev_info->tx_offload_capa = DEV_TX_OFFLOAD_IPV4_CKSUM |
+       dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP |
+                                       DEV_RX_OFFLOAD_IPV4_CKSUM |
+                                       DEV_RX_OFFLOAD_UDP_CKSUM |
+                                       DEV_RX_OFFLOAD_TCP_CKSUM |
+                                       DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
+       dev_info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT |
+                                       DEV_TX_OFFLOAD_IPV4_CKSUM |
                                        DEV_TX_OFFLOAD_TCP_CKSUM |
                                        DEV_TX_OFFLOAD_UDP_CKSUM |
                                        DEV_TX_OFFLOAD_TCP_TSO;
@@ -287,7 +391,8 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
                        .wthresh = 0,
                },
                .rx_free_thresh = 32,
-               .rx_drop_en = 0,
+               /* If no descriptors available, pkts are dropped by default */
+               .rx_drop_en = 1,
        };
 
        dev_info->default_txconf = (struct rte_eth_txconf) {
@@ -301,6 +406,8 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
                .txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS |
                             ETH_TXQ_FLAGS_NOOFFLOADS,
        };
+       eth_dev->data->dev_conf.intr_conf.lsc = 1;
+
        /* *INDENT-ON* */
 
        /*
@@ -339,7 +446,6 @@ found:
 static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
-       int rc;
 
        bp->rx_queues = (void *)eth_dev->data->rx_queues;
        bp->tx_queues = (void *)eth_dev->data->tx_queues;
@@ -354,8 +460,28 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
                eth_dev->data->mtu =
                                eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
                                ETHER_HDR_LEN - ETHER_CRC_LEN - VLAN_TAG_SIZE;
-       rc = bnxt_set_hwrm_link_config(bp, true);
-       return rc;
+       return 0;
+}
+
+static void bnxt_print_link_info(struct rte_eth_dev *eth_dev)
+{
+       struct rte_eth_link *link = &eth_dev->data->dev_link;
+
+       if (link->link_status)
+               RTE_LOG(INFO, PMD, "Port %d Link Up - speed %u Mbps - %s\n",
+                       (uint8_t)(eth_dev->data->port_id),
+                       (uint32_t)link->link_speed,
+                       (link->link_duplex == ETH_LINK_FULL_DUPLEX) ?
+                       ("full-duplex") : ("half-duplex\n"));
+       else
+               RTE_LOG(INFO, PMD, "Port %d Link Down\n",
+                       (uint8_t)(eth_dev->data->port_id));
+}
+
+static int bnxt_dev_lsc_intr_setup(struct rte_eth_dev *eth_dev)
+{
+       bnxt_print_link_info(eth_dev);
+       return 0;
 }
 
 static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
@@ -363,6 +489,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
        int rc;
 
+       bp->dev_stopped = 0;
        rc = bnxt_hwrm_func_reset(bp);
        if (rc) {
                RTE_LOG(ERR, PMD, "hwrm chip reset failure rc: %x\n", rc);
@@ -370,18 +497,31 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
                goto error;
        }
 
+       rc = bnxt_setup_int(bp);
+       if (rc)
+               goto error;
+
        rc = bnxt_alloc_mem(bp);
        if (rc)
                goto error;
 
+       rc = bnxt_request_int(bp);
+       if (rc)
+               goto error;
+
        rc = bnxt_init_nic(bp);
        if (rc)
                goto error;
 
+       bnxt_enable_int(bp);
+
+       bnxt_link_update_op(eth_dev, 1);
        return 0;
 
 error:
        bnxt_shutdown_nic(bp);
+       bnxt_disable_int(bp);
+       bnxt_free_int(bp);
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
        bnxt_free_mem(bp);
@@ -391,9 +531,14 @@ error:
 static int bnxt_dev_set_link_up_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       int rc = 0;
 
-       eth_dev->data->dev_link.link_status = 1;
-       bnxt_set_hwrm_link_config(bp, true);
+       if (!bp->link_info.link_up)
+               rc = bnxt_set_hwrm_link_config(bp, true);
+       if (!rc)
+               eth_dev->data->dev_link.link_status = 1;
+
+       bnxt_print_link_info(eth_dev);
        return 0;
 }
 
@@ -403,29 +548,47 @@ static int bnxt_dev_set_link_down_op(struct rte_eth_dev *eth_dev)
 
        eth_dev->data->dev_link.link_status = 0;
        bnxt_set_hwrm_link_config(bp, false);
+       bp->link_info.link_up = 0;
+
        return 0;
 }
 
-static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+/* Unload the driver, release resources */
+static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
 
+       if (bp->eth_dev->data->dev_started) {
+               /* TBD: STOP HW queues DMA */
+               eth_dev->data->dev_link.link_status = 0;
+       }
+       bnxt_set_hwrm_link_config(bp, false);
+       bnxt_disable_int(bp);
+       bnxt_free_int(bp);
        bnxt_free_tx_mbufs(bp);
        bnxt_free_rx_mbufs(bp);
-       bnxt_free_mem(bp);
-       rte_free(eth_dev->data->mac_addrs);
+       bnxt_shutdown_nic(bp);
+       bp->dev_stopped = 1;
 }
 
-/* Unload the driver, release resources */
-static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
+static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
 
-       if (bp->eth_dev->data->dev_started) {
-               /* TBD: STOP HW queues DMA */
-               eth_dev->data->dev_link.link_status = 0;
+       if (bp->dev_stopped == 0)
+               bnxt_dev_stop_op(eth_dev);
+
+       bnxt_free_mem(bp);
+       if (eth_dev->data->mac_addrs != NULL) {
+               rte_free(eth_dev->data->mac_addrs);
+               eth_dev->data->mac_addrs = NULL;
        }
-       bnxt_shutdown_nic(bp);
+       if (bp->grp_info != NULL) {
+               rte_free(bp->grp_info);
+               bp->grp_info = NULL;
+       }
+
+       bnxt_dev_uninit(eth_dev);
 }
 
 static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
@@ -435,14 +598,15 @@ static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
        uint64_t pool_mask = eth_dev->data->mac_pool_sel[index];
        struct bnxt_vnic_info *vnic;
        struct bnxt_filter_info *filter, *temp_filter;
-       int i;
+       uint32_t pool = RTE_MIN(MAX_FF_POOLS, ETH_64_POOLS);
+       uint32_t i;
 
        /*
         * Loop through all VNICs from the specified filter flow pools to
         * remove the corresponding MAC addr filter
         */
-       for (i = 0; i < MAX_FF_POOLS; i++) {
-               if (!(pool_mask & (1 << i)))
+       for (i = 0; i < pool; i++) {
+               if (!(pool_mask & (1ULL << i)))
                        continue;
 
                STAILQ_FOREACH(vnic, &bp->ff_pool[i], next) {
@@ -474,6 +638,11 @@ static void bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
        struct bnxt_vnic_info *vnic = STAILQ_FIRST(&bp->ff_pool[pool]);
        struct bnxt_filter_info *filter;
 
+       if (BNXT_VF(bp)) {
+               RTE_LOG(ERR, PMD, "Cannot add MAC address to a VF interface\n");
+               return;
+       }
+
        if (!vnic) {
                RTE_LOG(ERR, PMD, "VNIC not found for pool %d!\n", pool);
                return;
@@ -497,8 +666,7 @@ static void bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
        bnxt_hwrm_set_filter(bp, vnic, filter);
 }
 
-static int bnxt_link_update_op(struct rte_eth_dev *eth_dev,
-                              int wait_to_complete)
+int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete)
 {
        int rc = 0;
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
@@ -516,21 +684,21 @@ static int bnxt_link_update_op(struct rte_eth_dev *eth_dev,
                                "Failed to retrieve link rc = 0x%x!", rc);
                        goto out;
                }
-               if (!wait_to_complete)
-                       break;
-
                rte_delay_ms(BNXT_LINK_WAIT_INTERVAL);
 
+               if (!wait_to_complete)
+                       break;
        } while (!new.link_status && cnt--);
 
+out:
        /* Timed out or success */
-       if (new.link_status) {
-               /* Update only if success */
-               eth_dev->data->dev_link.link_duplex = new.link_duplex;
-               eth_dev->data->dev_link.link_speed = new.link_speed;
+       if (new.link_status != eth_dev->data->dev_link.link_status ||
+       new.link_speed != eth_dev->data->dev_link.link_speed) {
+               memcpy(&eth_dev->data->dev_link, &new,
+                       sizeof(struct rte_eth_link));
+               bnxt_print_link_info(eth_dev);
        }
-       eth_dev->data->dev_link.link_status = new.link_status;
-out:
+
        return rc;
 }
 
@@ -641,6 +809,11 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
        /* EW - need to revisit here copying from u64 to u16 */
        memcpy(reta_conf, vnic->rss_table, reta_size);
 
+       if (rte_intr_allow_others(&eth_dev->pci_dev->intr_handle)) {
+               if (eth_dev->data->dev_conf.intr_conf.lsc != 0)
+                       bnxt_dev_lsc_intr_setup(eth_dev);
+       }
+
        return 0;
 }
 
@@ -792,6 +965,11 @@ static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev,
 {
        struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
 
+       if (BNXT_NPAR_PF(bp) || BNXT_VF(bp)) {
+               RTE_LOG(ERR, PMD, "Flow Control Settings cannot be modified\n");
+               return -ENOTSUP;
+       }
+
        switch (fc_conf->mode) {
        case RTE_FC_NONE:
                bp->link_info.auto_pause = 0;
@@ -872,7 +1050,9 @@ static struct eth_dev_ops bnxt_dev_ops = {
 static bool bnxt_vf_pciid(uint16_t id)
 {
        if (id == BROADCOM_DEV_ID_57304_VF ||
-           id == BROADCOM_DEV_ID_57406_VF)
+           id == BROADCOM_DEV_ID_57406_VF ||
+           id == BROADCOM_DEV_ID_5731X_VF ||
+           id == BROADCOM_DEV_ID_5741X_VF)
                return true;
        return false;
 }
@@ -920,14 +1100,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
        if (version_printed++ == 0)
                RTE_LOG(INFO, PMD, "%s", bnxt_version);
 
-       if (eth_dev->pci_dev->addr.function >= 2 &&
-                       eth_dev->pci_dev->addr.function < 4) {
-               RTE_LOG(ERR, PMD, "Function not enabled %x:\n",
-                       eth_dev->pci_dev->addr.function);
-               rc = -ENOMEM;
-               goto error;
-       }
-
        rte_eth_copy_pci_info(eth_dev, eth_dev->pci_dev);
        bp = eth_dev->data->dev_private;
 
@@ -955,6 +1127,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
                goto error_free;
        bnxt_hwrm_queue_qportcfg(bp);
 
+       bnxt_hwrm_func_qcfg(bp);
+
        /* Get the MAX capabilities for this function */
        rc = bnxt_hwrm_func_qcaps(bp);
        if (rc) {
@@ -1000,6 +1174,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
                eth_dev->pci_dev->mem_resource[0].phys_addr,
                eth_dev->pci_dev->mem_resource[0].addr);
 
+       bp->dev_stopped = 0;
+
        return 0;
 
 error_free:
@@ -1013,37 +1189,37 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev) {
        struct bnxt *bp = eth_dev->data->dev_private;
        int rc;
 
-       if (eth_dev->data->mac_addrs)
+       if (eth_dev->data->mac_addrs != NULL) {
                rte_free(eth_dev->data->mac_addrs);
-       if (bp->grp_info)
+               eth_dev->data->mac_addrs = NULL;
+       }
+       if (bp->grp_info != NULL) {
                rte_free(bp->grp_info);
+               bp->grp_info = NULL;
+       }
        rc = bnxt_hwrm_func_driver_unregister(bp, 0);
        bnxt_free_hwrm_resources(bp);
+       if (bp->dev_stopped == 0)
+               bnxt_dev_close_op(eth_dev);
+       eth_dev->dev_ops = NULL;
+       eth_dev->rx_pkt_burst = NULL;
+       eth_dev->tx_pkt_burst = NULL;
+
        return rc;
 }
 
 static struct eth_driver bnxt_rte_pmd = {
        .pci_drv = {
-                   .name = "rte_" DRV_MODULE_NAME "_pmd",
                    .id_table = bnxt_pci_id_map,
-                   .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+                   .drv_flags = RTE_PCI_DRV_NEED_MAPPING |
+                           RTE_PCI_DRV_DETACHABLE | RTE_PCI_DRV_INTR_LSC,
+                   .probe = rte_eth_dev_pci_probe,
+                   .remove = rte_eth_dev_pci_remove
                    },
        .eth_dev_init = bnxt_dev_init,
        .eth_dev_uninit = bnxt_dev_uninit,
        .dev_private_size = sizeof(struct bnxt),
 };
 
-static int bnxt_rte_pmd_init(const char *name, const char *params __rte_unused)
-{
-       RTE_LOG(INFO, PMD, "bnxt_rte_pmd_init() called for %s\n", name);
-       rte_eth_driver_register(&bnxt_rte_pmd);
-       return 0;
-}
-
-static struct rte_driver bnxt_pmd_drv = {
-       .name = "eth_bnxt",
-       .type = PMD_PDEV,
-       .init = bnxt_rte_pmd_init,
-};
-
-PMD_REGISTER_DRIVER(bnxt_pmd_drv);
+RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map);