net/bnxt: add device ID for Stratus VF
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index 76fff71..7632c32 100644 (file)
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) Broadcom Limited.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Broadcom Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2014-2018 Broadcom
+ * All rights reserved.
  */
 
 #include <inttypes.h>
@@ -62,7 +34,8 @@ int bnxt_logtype_driver;
 
 #define PCI_VENDOR_ID_BROADCOM 0x14E4
 
-#define BROADCOM_DEV_ID_STRATUS_NIC_VF 0x1609
+#define BROADCOM_DEV_ID_STRATUS_NIC_VF1 0x1606
+#define BROADCOM_DEV_ID_STRATUS_NIC_VF2 0x1609
 #define BROADCOM_DEV_ID_STRATUS_NIC 0x1614
 #define BROADCOM_DEV_ID_57414_VF 0x16c1
 #define BROADCOM_DEV_ID_57301 0x16c8
@@ -97,10 +70,15 @@ int bnxt_logtype_driver;
 #define BROADCOM_DEV_ID_57407_MF 0x16ea
 #define BROADCOM_DEV_ID_57414_MF 0x16ec
 #define BROADCOM_DEV_ID_57416_MF 0x16ee
+#define BROADCOM_DEV_ID_58802 0xd802
+#define BROADCOM_DEV_ID_58804 0xd804
+#define BROADCOM_DEV_ID_58808 0x16f0
 
 static const struct rte_pci_id bnxt_pci_id_map[] = {
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM,
-                        BROADCOM_DEV_ID_STRATUS_NIC_VF) },
+                        BROADCOM_DEV_ID_STRATUS_NIC_VF1) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM,
+                        BROADCOM_DEV_ID_STRATUS_NIC_VF2) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_STRATUS_NIC) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414_VF) },
        { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57301) },
@@ -135,6 +113,9 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
        { 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) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58802) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58804) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58808) },
        { .vendor_id = 0, /* sentinel */ },
 };
 
@@ -146,6 +127,28 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
        ETH_RSS_NONFRAG_IPV6_TCP |      \
        ETH_RSS_NONFRAG_IPV6_UDP)
 
+#define BNXT_DEV_TX_OFFLOAD_SUPPORT (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 | \
+                                    DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | \
+                                    DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \
+                                    DEV_TX_OFFLOAD_GRE_TNL_TSO | \
+                                    DEV_TX_OFFLOAD_IPIP_TNL_TSO | \
+                                    DEV_TX_OFFLOAD_GENEVE_TNL_TSO | \
+                                    DEV_TX_OFFLOAD_MULTI_SEGS)
+
+#define BNXT_DEV_RX_OFFLOAD_SUPPORT (DEV_RX_OFFLOAD_VLAN_FILTER | \
+                                    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_RX_OFFLOAD_JUMBO_FRAME | \
+                                    DEV_RX_OFFLOAD_CRC_STRIP | \
+                                    DEV_RX_OFFLOAD_TCP_LRO)
+
 static int bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask);
 static void bnxt_print_link_info(struct rte_eth_dev *eth_dev);
 
@@ -202,7 +205,7 @@ alloc_mem_err:
 
 static int bnxt_init_chip(struct bnxt *bp)
 {
-       unsigned int i, rss_idx, fw_idx;
+       unsigned int i;
        struct rte_eth_link new;
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
@@ -215,10 +218,12 @@ static int bnxt_init_chip(struct bnxt *bp)
        rte_intr_disable(intr_handle);
 
        if (bp->eth_dev->data->mtu > ETHER_MTU) {
-               bp->eth_dev->data->dev_conf.rxmode.jumbo_frame = 1;
+               bp->eth_dev->data->dev_conf.rxmode.offloads |=
+                       DEV_RX_OFFLOAD_JUMBO_FRAME;
                bp->flags |= BNXT_FLAG_JUMBO;
        } else {
-               bp->eth_dev->data->dev_conf.rxmode.jumbo_frame = 0;
+               bp->eth_dev->data->dev_conf.rxmode.offloads &=
+                       ~DEV_RX_OFFLOAD_JUMBO_FRAME;
                bp->flags &= ~BNXT_FLAG_JUMBO;
        }
 
@@ -279,32 +284,18 @@ static int bnxt_init_chip(struct bnxt *bp)
                                i, rc);
                        goto err_out;
                }
-               if (vnic->rss_table && vnic->hash_type) {
-                       /*
-                        * Fill the RSS hash & redirection table with
-                        * ring group ids for all VNICs
-                        */
-                       for (rss_idx = 0, fw_idx = 0;
-                            rss_idx < HW_HASH_INDEX_SIZE;
-                            rss_idx++, fw_idx++) {
-                               if (vnic->fw_grp_ids[fw_idx] ==
-                                   INVALID_HW_RING_ID)
-                                       fw_idx = 0;
-                               vnic->rss_table[rss_idx] =
-                                               vnic->fw_grp_ids[fw_idx];
-                       }
-                       rc = bnxt_hwrm_vnic_rss_cfg(bp, vnic);
-                       if (rc) {
-                               PMD_DRV_LOG(ERR,
-                                       "HWRM vnic %d set RSS failure rc: %x\n",
-                                       i, rc);
-                               goto err_out;
-                       }
+
+               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.enable_lro)
+               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);
@@ -422,8 +413,6 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
        uint16_t max_vnics, i, j, vpool, vrxq;
        unsigned int max_rx_rings;
 
-       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-
        /* MAC Specifics */
        dev_info->max_mac_addrs = bp->max_l2_ctx;
        dev_info->max_hash_mac_addrs = 0;
@@ -445,21 +434,12 @@ 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 = 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 |
-                                       DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
-                                       DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
-                                       DEV_TX_OFFLOAD_GRE_TNL_TSO |
-                                       DEV_TX_OFFLOAD_IPIP_TNL_TSO |
-                                       DEV_TX_OFFLOAD_GENEVE_TNL_TSO;
+
+       dev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT;
+       if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
+               dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_TIMESTAMP;
+       dev_info->tx_offload_capa = BNXT_DEV_TX_OFFLOAD_SUPPORT;
+       dev_info->flow_type_rss_offloads = BNXT_ETH_RSS_SUPPORT;
 
        /* *INDENT-OFF* */
        dev_info->default_rxconf = (struct rte_eth_rxconf) {
@@ -469,7 +449,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) {
@@ -480,8 +461,6 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
                },
                .tx_free_thresh = 32,
                .tx_rs_thresh = 32,
-               .txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS |
-                            ETH_TXQ_FLAGS_NOOFFLOADS,
        };
        eth_dev->data->dev_conf.intr_conf.lsc = 1;
 
@@ -525,6 +504,24 @@ found:
 static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       uint64_t tx_offloads = eth_dev->data->dev_conf.txmode.offloads;
+       uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;
+
+       if (tx_offloads != (tx_offloads & BNXT_DEV_TX_OFFLOAD_SUPPORT)) {
+               PMD_DRV_LOG
+                       (ERR,
+                        "Tx offloads requested 0x%" PRIx64 " supported 0x%x\n",
+                        tx_offloads, BNXT_DEV_TX_OFFLOAD_SUPPORT);
+               return -ENOTSUP;
+       }
+
+       if (rx_offloads != (rx_offloads & BNXT_DEV_RX_OFFLOAD_SUPPORT)) {
+               PMD_DRV_LOG
+                       (ERR,
+                        "Rx offloads requested 0x%" PRIx64 " supported 0x%x\n",
+                           rx_offloads, BNXT_DEV_RX_OFFLOAD_SUPPORT);
+               return -ENOTSUP;
+       }
 
        bp->rx_queues = (void *)eth_dev->data->rx_queues;
        bp->tx_queues = (void *)eth_dev->data->tx_queues;
@@ -555,7 +552,7 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
        bp->rx_cp_nr_rings = bp->rx_nr_rings;
        bp->tx_cp_nr_rings = bp->tx_nr_rings;
 
-       if (eth_dev->data->dev_conf.rxmode.jumbo_frame)
+       if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
                eth_dev->data->mtu =
                                eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
                                ETHER_HDR_LEN - ETHER_CRC_LEN - VLAN_TAG_SIZE;
@@ -586,6 +583,7 @@ static int bnxt_dev_lsc_intr_setup(struct rte_eth_dev *eth_dev)
 static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;
        int vlan_mask = 0;
        int rc;
 
@@ -602,9 +600,9 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
        bnxt_link_update_op(eth_dev, 1);
 
-       if (eth_dev->data->dev_conf.rxmode.hw_vlan_filter)
+       if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
                vlan_mask |= ETH_VLAN_FILTER_MASK;
-       if (eth_dev->data->dev_conf.rxmode.hw_vlan_strip)
+       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)
@@ -742,7 +740,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
                if (filter->mac_index == index) {
                        PMD_DRV_LOG(ERR,
                                "MAC addr already existed for pool %d\n", pool);
-                       return -EINVAL;
+                       return 0;
                }
        }
        filter = bnxt_alloc_filter(bp);
@@ -1381,30 +1379,31 @@ static int
 bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)
 {
        struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
+       uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
        unsigned int i;
 
        if (mask & ETH_VLAN_FILTER_MASK) {
-               if (!dev->data->dev_conf.rxmode.hw_vlan_filter) {
+               if (!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {
                        /* Remove any VLAN filters programmed */
                        for (i = 0; i < 4095; i++)
                                bnxt_del_vlan_filter(bp, i);
                }
                PMD_DRV_LOG(DEBUG, "VLAN Filtering: %d\n",
-                       dev->data->dev_conf.rxmode.hw_vlan_filter);
+                       !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER));
        }
 
        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 (dev->data->dev_conf.rxmode.hw_vlan_strip)
+                       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",
-                       dev->data->dev_conf.rxmode.hw_vlan_strip);
+                       !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));
        }
 
        if (mask & ETH_VLAN_EXTEND_MASK)
@@ -1413,7 +1412,7 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)
        return 0;
 }
 
-static void
+static int
 bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)
 {
        struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
@@ -1423,7 +1422,7 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)
        int rc;
 
        if (BNXT_VF(bp))
-               return;
+               return -EPERM;
 
        memcpy(bp->mac_addr, addr, sizeof(bp->mac_addr));
 
@@ -1433,7 +1432,7 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)
                        continue;
                rc = bnxt_hwrm_clear_l2_filter(bp, filter);
                if (rc)
-                       break;
+                       return rc;
                memcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN);
                memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN);
                filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX;
@@ -1442,10 +1441,12 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)
                        HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;
                rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
                if (rc)
-                       break;
+                       return rc;
                filter->mac_index = 0;
                PMD_DRV_LOG(DEBUG, "Set MAC addr\n");
        }
+
+       return 0;
 }
 
 static int
@@ -1555,9 +1556,11 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
 
        if (new_mtu > ETHER_MTU) {
                bp->flags |= BNXT_FLAG_JUMBO;
-               eth_dev->data->dev_conf.rxmode.jumbo_frame = 1;
+               bp->eth_dev->data->dev_conf.rxmode.offloads |=
+                       DEV_RX_OFFLOAD_JUMBO_FRAME;
        } else {
-               eth_dev->data->dev_conf.rxmode.jumbo_frame = 0;
+               bp->eth_dev->data->dev_conf.rxmode.offloads &=
+                       ~DEV_RX_OFFLOAD_JUMBO_FRAME;
                bp->flags &= ~BNXT_FLAG_JUMBO;
        }
 
@@ -2373,7 +2376,8 @@ bnxt_parse_fdir_filter(struct bnxt *bp,
 }
 
 static struct bnxt_filter_info *
-bnxt_match_fdir(struct bnxt *bp, struct bnxt_filter_info *nf)
+bnxt_match_fdir(struct bnxt *bp, struct bnxt_filter_info *nf,
+               struct bnxt_vnic_info **mvnic)
 {
        struct bnxt_filter_info *mf = NULL;
        int i;
@@ -2411,8 +2415,11 @@ bnxt_match_fdir(struct bnxt *bp, struct bnxt_filter_info *nf)
                            !memcmp(mf->dst_ipaddr, nf->dst_ipaddr,
                                    sizeof(nf->dst_ipaddr)) &&
                            !memcmp(mf->dst_ipaddr_mask, nf->dst_ipaddr_mask,
-                                   sizeof(nf->dst_ipaddr_mask)))
+                                   sizeof(nf->dst_ipaddr_mask))) {
+                               if (mvnic)
+                                       *mvnic = vnic;
                                return mf;
+                       }
                }
        }
        return NULL;
@@ -2426,7 +2433,7 @@ bnxt_fdir_filter(struct rte_eth_dev *dev,
        struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
        struct rte_eth_fdir_filter *fdir  = (struct rte_eth_fdir_filter *)arg;
        struct bnxt_filter_info *filter, *match;
-       struct bnxt_vnic_info *vnic;
+       struct bnxt_vnic_info *vnic, *mvnic;
        int ret = 0, i;
 
        if (filter_op == RTE_ETH_FILTER_NOP)
@@ -2438,7 +2445,6 @@ bnxt_fdir_filter(struct rte_eth_dev *dev,
        switch (filter_op) {
        case RTE_ETH_FILTER_ADD:
        case RTE_ETH_FILTER_DELETE:
-               /* FALLTHROUGH */
                filter = bnxt_get_unused_filter(bp);
                if (filter == NULL) {
                        PMD_DRV_LOG(ERR,
@@ -2451,11 +2457,31 @@ bnxt_fdir_filter(struct rte_eth_dev *dev,
                        goto free_filter;
                filter->filter_type = HWRM_CFA_NTUPLE_FILTER;
 
-               match = bnxt_match_fdir(bp, filter);
+               if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
+                       vnic = STAILQ_FIRST(&bp->ff_pool[0]);
+               else
+                       vnic = STAILQ_FIRST(&bp->ff_pool[fdir->action.rx_queue]);
+
+               match = bnxt_match_fdir(bp, filter, &mvnic);
                if (match != NULL && filter_op == RTE_ETH_FILTER_ADD) {
-                       PMD_DRV_LOG(ERR, "Flow already exists.\n");
-                       ret = -EEXIST;
-                       goto free_filter;
+                       if (match->dst_id == vnic->fw_vnic_id) {
+                               PMD_DRV_LOG(ERR, "Flow already exists.\n");
+                               ret = -EEXIST;
+                               goto free_filter;
+                       } else {
+                               match->dst_id = vnic->fw_vnic_id;
+                               ret = bnxt_hwrm_set_ntuple_filter(bp,
+                                                                 match->dst_id,
+                                                                 match);
+                               STAILQ_REMOVE(&mvnic->filter, match,
+                                             bnxt_filter_info, next);
+                               STAILQ_INSERT_TAIL(&vnic->filter, match, next);
+                               PMD_DRV_LOG(ERR,
+                                       "Filter with matching pattern exist\n");
+                               PMD_DRV_LOG(ERR,
+                                       "Updated it to new destination q\n");
+                               goto free_filter;
+                       }
                }
                if (match == NULL && filter_op == RTE_ETH_FILTER_DELETE) {
                        PMD_DRV_LOG(ERR, "Flow does not exist.\n");
@@ -2463,12 +2489,6 @@ bnxt_fdir_filter(struct rte_eth_dev *dev,
                        goto free_filter;
                }
 
-               if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
-                       vnic = STAILQ_FIRST(&bp->ff_pool[0]);
-               else
-                       vnic =
-                       STAILQ_FIRST(&bp->ff_pool[fdir->action.rx_queue]);
-
                if (filter_op == RTE_ETH_FILTER_ADD) {
                        ret = bnxt_hwrm_set_ntuple_filter(bp,
                                                          filter->dst_id,
@@ -2504,7 +2524,6 @@ bnxt_fdir_filter(struct rte_eth_dev *dev,
        case RTE_ETH_FILTER_UPDATE:
        case RTE_ETH_FILTER_STATS:
        case RTE_ETH_FILTER_INFO:
-               /* FALLTHROUGH */
                PMD_DRV_LOG(ERR, "operation %u not implemented", filter_op);
                break;
        default:
@@ -3022,6 +3041,10 @@ static const struct eth_dev_ops bnxt_dev_ops = {
        .rx_queue_count = bnxt_rx_queue_count_op,
        .rx_descriptor_status = bnxt_rx_descriptor_status_op,
        .tx_descriptor_status = bnxt_tx_descriptor_status_op,
+       .rx_queue_start = bnxt_rx_queue_start,
+       .rx_queue_stop = bnxt_rx_queue_stop,
+       .tx_queue_start = bnxt_tx_queue_start,
+       .tx_queue_stop = bnxt_tx_queue_stop,
        .filter_ctrl = bnxt_filter_ctrl_op,
        .dev_supported_ptypes_get = bnxt_dev_supported_ptypes_get_op,
        .get_eeprom_length    = bnxt_get_eeprom_length_op,
@@ -3043,7 +3066,8 @@ static bool bnxt_vf_pciid(uint16_t id)
            id == BROADCOM_DEV_ID_5731X_VF ||
            id == BROADCOM_DEV_ID_5741X_VF ||
            id == BROADCOM_DEV_ID_57414_VF ||
-           id == BROADCOM_DEV_ID_STRATUS_NIC_VF)
+           id == BROADCOM_DEV_ID_STRATUS_NIC_VF1 ||
+           id == BROADCOM_DEV_ID_STRATUS_NIC_VF2)
                return true;
        return false;
 }
@@ -3109,7 +3133,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
 
        bp = eth_dev->data->dev_private;
 
-       rte_atomic64_init(&bp->rx_mbuf_alloc_fail);
        bp->dev_stopped = 1;
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -3142,9 +3165,10 @@ skip_init:
                                sizeof(struct rx_port_stats) + 512);
                if (!mz) {
                        mz = rte_memzone_reserve(mz_name, total_alloc_len,
-                                                SOCKET_ID_ANY,
-                                                RTE_MEMZONE_2MB |
-                                                RTE_MEMZONE_SIZE_HINT_ONLY);
+                                       SOCKET_ID_ANY,
+                                       RTE_MEMZONE_2MB |
+                                       RTE_MEMZONE_SIZE_HINT_ONLY |
+                                       RTE_MEMZONE_IOVA_CONTIG);
                        if (mz == NULL)
                                return -ENOMEM;
                }
@@ -3176,10 +3200,12 @@ skip_init:
                total_alloc_len = RTE_CACHE_LINE_ROUNDUP(
                                sizeof(struct tx_port_stats) + 512);
                if (!mz) {
-                       mz = rte_memzone_reserve(mz_name, total_alloc_len,
-                                                SOCKET_ID_ANY,
-                                                RTE_MEMZONE_2MB |
-                                                RTE_MEMZONE_SIZE_HINT_ONLY);
+                       mz = rte_memzone_reserve(mz_name,
+                                       total_alloc_len,
+                                       SOCKET_ID_ANY,
+                                       RTE_MEMZONE_2MB |
+                                       RTE_MEMZONE_SIZE_HINT_ONLY |
+                                       RTE_MEMZONE_IOVA_CONTIG);
                        if (mz == NULL)
                                return -ENOMEM;
                }
@@ -3449,7 +3475,7 @@ bnxt_init_log(void)
 {
        bnxt_logtype_driver = rte_log_register("pmd.bnxt.driver");
        if (bnxt_logtype_driver >= 0)
-               rte_log_set_level(bnxt_logtype_driver, RTE_LOG_NOTICE);
+               rte_log_set_level(bnxt_logtype_driver, RTE_LOG_INFO);
 }
 
 RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd);