drivers: advertise kmod dependencies in pmdinfo
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index d3a624f..a24e153 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_NS2 0x16cd
+#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_5741X_VF 0x16dc
+#define BROADCOM_DEV_ID_5731X_VF 0x16e1
+#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
+
 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) },
+       { .vendor_id = 0, /* sentinel */ },
 };
 
-static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
-{
-       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
-
-       rte_free(eth_dev->data->mac_addrs);
-       bnxt_free_hwrm_resources(bp);
-}
+#define BNXT_ETH_RSS_SUPPORT ( \
+       ETH_RSS_IPV4 |          \
+       ETH_RSS_NONFRAG_IPV4_TCP |      \
+       ETH_RSS_NONFRAG_IPV4_UDP |      \
+       ETH_RSS_IPV6 |          \
+       ETH_RSS_NONFRAG_IPV6_TCP |      \
+       ETH_RSS_NONFRAG_IPV6_UDP)
 
 /***********************/
 
@@ -124,6 +160,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);
@@ -210,6 +247,21 @@ 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;
+               }
+       }
+
        return 0;
 
 err_out:
@@ -301,6 +353,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 +393,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 +407,42 @@ 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 inline int
+rte_bnxt_atomic_write_link_status(struct rte_eth_dev *eth_dev,
+                               struct rte_eth_link *link)
+{
+       struct rte_eth_link *dst = &eth_dev->data->dev_link;
+       struct rte_eth_link *src = link;
+
+       if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
+                                       *(uint64_t *)src) == 0)
+               return 1;
+
+       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 +450,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,24 +458,55 @@ 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, 0);
        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);
        return rc;
 }
 
+static int bnxt_dev_set_link_up_op(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+
+       eth_dev->data->dev_link.link_status = 1;
+       bnxt_set_hwrm_link_config(bp, true);
+       return 0;
+}
+
+static int bnxt_dev_set_link_down_op(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+
+       eth_dev->data->dev_link.link_status = 0;
+       bnxt_set_hwrm_link_config(bp, false);
+       return 0;
+}
+
 /* Unload the driver, release resources */
 static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 {
@@ -397,11 +516,108 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
                /* 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_shutdown_nic(bp);
+       bp->dev_stopped = 1;
+}
+
+static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+
+       if (bp->dev_stopped == 0)
+               bnxt_dev_stop_op(eth_dev);
+
+       bnxt_free_tx_mbufs(bp);
+       bnxt_free_rx_mbufs(bp);
+       bnxt_free_mem(bp);
+       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;
+       }
+}
+
+static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
+                                   uint32_t index)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       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;
+
+       /*
+        * 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 & (1ULL << i)))
+                       continue;
+
+               STAILQ_FOREACH(vnic, &bp->ff_pool[i], next) {
+                       filter = STAILQ_FIRST(&vnic->filter);
+                       while (filter) {
+                               temp_filter = STAILQ_NEXT(filter, next);
+                               if (filter->mac_index == index) {
+                                       STAILQ_REMOVE(&vnic->filter, filter,
+                                                     bnxt_filter_info, next);
+                                       bnxt_hwrm_clear_filter(bp, filter);
+                                       filter->mac_index = INVALID_MAC_INDEX;
+                                       memset(&filter->l2_addr, 0,
+                                              ETHER_ADDR_LEN);
+                                       STAILQ_INSERT_TAIL(
+                                                       &bp->free_filter_list,
+                                                       filter, next);
+                               }
+                               filter = temp_filter;
+                       }
+               }
+       }
+}
+
+static void bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
+                                struct ether_addr *mac_addr,
+                                uint32_t index, uint32_t pool)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       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;
+       }
+       /* Attach requested MAC address to the new l2_filter */
+       STAILQ_FOREACH(filter, &vnic->filter, next) {
+               if (filter->mac_index == index) {
+                       RTE_LOG(ERR, PMD,
+                               "MAC addr already existed for pool %d\n", pool);
+                       return;
+               }
+       }
+       filter = bnxt_alloc_filter(bp);
+       if (!filter) {
+               RTE_LOG(ERR, PMD, "L2 filter alloc failed\n");
+               return;
+       }
+       STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+       filter->mac_index = index;
+       memcpy(filter->l2_addr, mac_addr, ETHER_ADDR_LEN);
+       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;
@@ -419,21 +635,20 @@ 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) {
+               rte_bnxt_atomic_write_link_status(eth_dev, &new);
+               bnxt_print_link_info(eth_dev);
        }
-       eth_dev->data->dev_link.link_status = new.link_status;
-out:
+
        return rc;
 }
 
@@ -493,6 +708,262 @@ static void bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev)
        bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic);
 }
 
+static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev,
+                           struct rte_eth_rss_reta_entry64 *reta_conf,
+                           uint16_t reta_size)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+       struct bnxt_vnic_info *vnic;
+       int i;
+
+       if (!(dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG))
+               return -EINVAL;
+
+       if (reta_size != HW_HASH_INDEX_SIZE) {
+               RTE_LOG(ERR, PMD, "The configured hash table lookup size "
+                       "(%d) must equal the size supported by the hardware "
+                       "(%d)\n", reta_size, HW_HASH_INDEX_SIZE);
+               return -EINVAL;
+       }
+       /* Update the RSS VNIC(s) */
+       for (i = 0; i < MAX_FF_POOLS; i++) {
+               STAILQ_FOREACH(vnic, &bp->ff_pool[i], next) {
+                       memcpy(vnic->rss_table, reta_conf, reta_size);
+
+                       bnxt_hwrm_vnic_rss_cfg(bp, vnic);
+               }
+       }
+       return 0;
+}
+
+static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
+                             struct rte_eth_rss_reta_entry64 *reta_conf,
+                             uint16_t reta_size)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+
+       /* Retrieve from the default VNIC */
+       if (!vnic)
+               return -EINVAL;
+       if (!vnic->rss_table)
+               return -EINVAL;
+
+       if (reta_size != HW_HASH_INDEX_SIZE) {
+               RTE_LOG(ERR, PMD, "The configured hash table lookup size "
+                       "(%d) must equal the size supported by the hardware "
+                       "(%d)\n", reta_size, HW_HASH_INDEX_SIZE);
+               return -EINVAL;
+       }
+       /* 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;
+}
+
+static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
+                                  struct rte_eth_rss_conf *rss_conf)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+       struct bnxt_vnic_info *vnic;
+       uint16_t hash_type = 0;
+       int i;
+
+       /*
+        * If RSS enablement were different than dev_configure,
+        * then return -EINVAL
+        */
+       if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
+               if (!rss_conf->rss_hf)
+                       return -EINVAL;
+       } else {
+               if (rss_conf->rss_hf & BNXT_ETH_RSS_SUPPORT)
+                       return -EINVAL;
+       }
+       if (rss_conf->rss_hf & ETH_RSS_IPV4)
+               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4;
+       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_TCP)
+               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4;
+       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_UDP)
+               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4;
+       if (rss_conf->rss_hf & ETH_RSS_IPV6)
+               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6;
+       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_TCP)
+               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6;
+       if (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_UDP)
+               hash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;
+
+       /* Update the RSS VNIC(s) */
+       for (i = 0; i < MAX_FF_POOLS; i++) {
+               STAILQ_FOREACH(vnic, &bp->ff_pool[i], next) {
+                       vnic->hash_type = hash_type;
+
+                       /*
+                        * Use the supplied key if the key length is
+                        * acceptable and the rss_key is not NULL
+                        */
+                       if (rss_conf->rss_key &&
+                           rss_conf->rss_key_len <= HW_HASH_KEY_SIZE)
+                               memcpy(vnic->rss_hash_key, rss_conf->rss_key,
+                                      rss_conf->rss_key_len);
+
+                       bnxt_hwrm_vnic_rss_cfg(bp, vnic);
+               }
+       }
+       return 0;
+}
+
+static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev,
+                                    struct rte_eth_rss_conf *rss_conf)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+       int len;
+       uint32_t hash_types;
+
+       /* RSS configuration is the same for all VNICs */
+       if (vnic && vnic->rss_hash_key) {
+               if (rss_conf->rss_key) {
+                       len = rss_conf->rss_key_len <= HW_HASH_KEY_SIZE ?
+                             rss_conf->rss_key_len : HW_HASH_KEY_SIZE;
+                       memcpy(rss_conf->rss_key, vnic->rss_hash_key, len);
+               }
+
+               hash_types = vnic->hash_type;
+               rss_conf->rss_hf = 0;
+               if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4) {
+                       rss_conf->rss_hf |= ETH_RSS_IPV4;
+                       hash_types &= ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4;
+               }
+               if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4) {
+                       rss_conf->rss_hf |= ETH_RSS_NONFRAG_IPV4_TCP;
+                       hash_types &=
+                               ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4;
+               }
+               if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4) {
+                       rss_conf->rss_hf |= ETH_RSS_NONFRAG_IPV4_UDP;
+                       hash_types &=
+                               ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4;
+               }
+               if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6) {
+                       rss_conf->rss_hf |= ETH_RSS_IPV6;
+                       hash_types &= ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6;
+               }
+               if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6) {
+                       rss_conf->rss_hf |= ETH_RSS_NONFRAG_IPV6_TCP;
+                       hash_types &=
+                               ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6;
+               }
+               if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6) {
+                       rss_conf->rss_hf |= ETH_RSS_NONFRAG_IPV6_UDP;
+                       hash_types &=
+                               ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;
+               }
+               if (hash_types) {
+                       RTE_LOG(ERR, PMD,
+                               "Unknwon RSS config from firmware (%08x), RSS disabled",
+                               vnic->hash_type);
+                       return -ENOTSUP;
+               }
+       } else {
+               rss_conf->rss_hf = 0;
+       }
+       return 0;
+}
+
+static int bnxt_flow_ctrl_get_op(struct rte_eth_dev *dev,
+                              struct rte_eth_fc_conf *fc_conf __rte_unused)
+{
+       struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
+       struct rte_eth_link link_info;
+       int rc;
+
+       rc = bnxt_get_hwrm_link_config(bp, &link_info);
+       if (rc)
+               return rc;
+
+       memset(fc_conf, 0, sizeof(*fc_conf));
+       if (bp->link_info.auto_pause)
+               fc_conf->autoneg = 1;
+       switch (bp->link_info.pause) {
+       case 0:
+               fc_conf->mode = RTE_FC_NONE;
+               break;
+       case HWRM_PORT_PHY_QCFG_OUTPUT_PAUSE_TX:
+               fc_conf->mode = RTE_FC_TX_PAUSE;
+               break;
+       case HWRM_PORT_PHY_QCFG_OUTPUT_PAUSE_RX:
+               fc_conf->mode = RTE_FC_RX_PAUSE;
+               break;
+       case (HWRM_PORT_PHY_QCFG_OUTPUT_PAUSE_TX |
+                       HWRM_PORT_PHY_QCFG_OUTPUT_PAUSE_RX):
+               fc_conf->mode = RTE_FC_FULL;
+               break;
+       }
+       return 0;
+}
+
+static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev,
+                              struct rte_eth_fc_conf *fc_conf)
+{
+       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;
+               bp->link_info.force_pause = 0;
+               break;
+       case RTE_FC_RX_PAUSE:
+               if (fc_conf->autoneg) {
+                       bp->link_info.auto_pause =
+                                       HWRM_PORT_PHY_CFG_INPUT_AUTO_PAUSE_RX;
+                       bp->link_info.force_pause = 0;
+               } else {
+                       bp->link_info.auto_pause = 0;
+                       bp->link_info.force_pause =
+                                       HWRM_PORT_PHY_CFG_INPUT_FORCE_PAUSE_RX;
+               }
+               break;
+       case RTE_FC_TX_PAUSE:
+               if (fc_conf->autoneg) {
+                       bp->link_info.auto_pause =
+                                       HWRM_PORT_PHY_CFG_INPUT_AUTO_PAUSE_TX;
+                       bp->link_info.force_pause = 0;
+               } else {
+                       bp->link_info.auto_pause = 0;
+                       bp->link_info.force_pause =
+                                       HWRM_PORT_PHY_CFG_INPUT_FORCE_PAUSE_TX;
+               }
+               break;
+       case RTE_FC_FULL:
+               if (fc_conf->autoneg) {
+                       bp->link_info.auto_pause =
+                                       HWRM_PORT_PHY_CFG_INPUT_AUTO_PAUSE_TX |
+                                       HWRM_PORT_PHY_CFG_INPUT_AUTO_PAUSE_RX;
+                       bp->link_info.force_pause = 0;
+               } else {
+                       bp->link_info.auto_pause = 0;
+                       bp->link_info.force_pause =
+                                       HWRM_PORT_PHY_CFG_INPUT_FORCE_PAUSE_TX |
+                                       HWRM_PORT_PHY_CFG_INPUT_FORCE_PAUSE_RX;
+               }
+               break;
+       }
+       return bnxt_set_hwrm_link_config(bp, true);
+}
+
 /*
  * Initialization
  */
@@ -503,23 +974,35 @@ static struct eth_dev_ops bnxt_dev_ops = {
        .dev_configure = bnxt_dev_configure_op,
        .dev_start = bnxt_dev_start_op,
        .dev_stop = bnxt_dev_stop_op,
+       .dev_set_link_up = bnxt_dev_set_link_up_op,
+       .dev_set_link_down = bnxt_dev_set_link_down_op,
        .stats_get = bnxt_stats_get_op,
        .stats_reset = bnxt_stats_reset_op,
        .rx_queue_setup = bnxt_rx_queue_setup_op,
        .rx_queue_release = bnxt_rx_queue_release_op,
        .tx_queue_setup = bnxt_tx_queue_setup_op,
        .tx_queue_release = bnxt_tx_queue_release_op,
+       .reta_update = bnxt_reta_update_op,
+       .reta_query = bnxt_reta_query_op,
+       .rss_hash_update = bnxt_rss_hash_update_op,
+       .rss_hash_conf_get = bnxt_rss_hash_conf_get_op,
        .link_update = bnxt_link_update_op,
        .promiscuous_enable = bnxt_promiscuous_enable_op,
        .promiscuous_disable = bnxt_promiscuous_disable_op,
        .allmulticast_enable = bnxt_allmulticast_enable_op,
        .allmulticast_disable = bnxt_allmulticast_disable_op,
+       .mac_addr_add = bnxt_mac_addr_add_op,
+       .mac_addr_remove = bnxt_mac_addr_remove_op,
+       .flow_ctrl_get = bnxt_flow_ctrl_get_op,
+       .flow_ctrl_set = bnxt_flow_ctrl_set_op,
 };
 
 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;
 }
@@ -567,14 +1050,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;
 
@@ -602,6 +1077,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) {
@@ -647,6 +1124,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:
@@ -660,37 +1139,38 @@ 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);
+RTE_PMD_REGISTER_KMOD_DEP(net_bnxt, "* igb_uio | uio_pci_generic | vfio");