X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fbnxt_ethdev.c;h=81c8f8d79dc7a805d554445c9f2b9e7b01f7245d;hb=a2999c7bfe395708a6a68ebb6f3199af7d25cffe;hp=7f9329e8b3313e8e208424f6b5bb404118ca3303;hpb=15276ba987bd1dc4db9e92d5f7bd448eb416912f;p=dpdk.git

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 7f9329e8b3..81c8f8d79d 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -13,6 +13,7 @@
 #include <rte_cycles.h>
 #include <rte_alarm.h>
 #include <rte_kvargs.h>
+#include <rte_vect.h>
 
 #include "bnxt.h"
 #include "bnxt_filter.h"
@@ -30,6 +31,7 @@
 #include "bnxt_nvm_defs.h"
 #include "bnxt_tf_common.h"
 #include "ulp_flow_db.h"
+#include "rte_pmd_bnxt.h"
 
 #define DRV_MODULE_NAME		"bnxt"
 static const char bnxt_version[] =
@@ -99,12 +101,24 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
 #define BNXT_DEVARG_FLOW_XSTAT	"flow-xstat"
 #define BNXT_DEVARG_MAX_NUM_KFLOWS  "max-num-kflows"
 #define BNXT_DEVARG_REPRESENTOR	"representor"
+#define BNXT_DEVARG_REP_BASED_PF  "rep-based-pf"
+#define BNXT_DEVARG_REP_IS_PF  "rep-is-pf"
+#define BNXT_DEVARG_REP_Q_R2F  "rep-q-r2f"
+#define BNXT_DEVARG_REP_Q_F2R  "rep-q-f2r"
+#define BNXT_DEVARG_REP_FC_R2F  "rep-fc-r2f"
+#define BNXT_DEVARG_REP_FC_F2R  "rep-fc-f2r"
 
 static const char *const bnxt_dev_args[] = {
 	BNXT_DEVARG_REPRESENTOR,
 	BNXT_DEVARG_TRUFLOW,
 	BNXT_DEVARG_FLOW_XSTAT,
 	BNXT_DEVARG_MAX_NUM_KFLOWS,
+	BNXT_DEVARG_REP_BASED_PF,
+	BNXT_DEVARG_REP_IS_PF,
+	BNXT_DEVARG_REP_Q_R2F,
+	BNXT_DEVARG_REP_Q_F2R,
+	BNXT_DEVARG_REP_FC_R2F,
+	BNXT_DEVARG_REP_FC_F2R,
 	NULL
 };
 
@@ -120,6 +134,38 @@ static const char *const bnxt_dev_args[] = {
  */
 #define	BNXT_DEVARG_FLOW_XSTAT_INVALID(flow_xstat)	((flow_xstat) > 1)
 
+/*
+ * rep_is_pf == false to indicate VF representor
+ * rep_is_pf == true to indicate PF representor
+ */
+#define	BNXT_DEVARG_REP_IS_PF_INVALID(rep_is_pf)	((rep_is_pf) > 1)
+
+/*
+ * rep_based_pf == Physical index of the PF
+ */
+#define	BNXT_DEVARG_REP_BASED_PF_INVALID(rep_based_pf)	((rep_based_pf) > 15)
+/*
+ * rep_q_r2f == Logical COS Queue index for the rep to endpoint direction
+ */
+#define	BNXT_DEVARG_REP_Q_R2F_INVALID(rep_q_r2f)	((rep_q_r2f) > 3)
+
+/*
+ * rep_q_f2r == Logical COS Queue index for the endpoint to rep direction
+ */
+#define	BNXT_DEVARG_REP_Q_F2R_INVALID(rep_q_f2r)	((rep_q_f2r) > 3)
+
+/*
+ * rep_fc_r2f == Flow control for the representor to endpoint direction
+ */
+#define BNXT_DEVARG_REP_FC_R2F_INVALID(rep_fc_r2f)	((rep_fc_r2f) > 1)
+
+/*
+ * rep_fc_f2r == Flow control for the endpoint to representor direction
+ */
+#define BNXT_DEVARG_REP_FC_F2R_INVALID(rep_fc_f2r)	((rep_fc_f2r) > 1)
+
+int bnxt_cfa_code_dynfield_offset = -1;
+
 /*
  * max_num_kflows must be >= 32
  * and must be a power-of-2 supported value
@@ -802,6 +848,10 @@ uint32_t bnxt_get_speed_capabilities(struct bnxt *bp)
 	uint32_t link_speed = bp->link_info->support_speeds;
 	uint32_t speed_capa = 0;
 
+	/* If PAM4 is configured, use PAM4 supported speed */
+	if (link_speed == 0 && bp->link_info->support_pam4_speeds > 0)
+		link_speed = bp->link_info->support_pam4_speeds;
+
 	if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_100MB)
 		speed_capa |= ETH_LINK_SPEED_100M;
 	if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100MBHD)
@@ -822,7 +872,11 @@ uint32_t bnxt_get_speed_capabilities(struct bnxt *bp)
 		speed_capa |= ETH_LINK_SPEED_50G;
 	if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100GB)
 		speed_capa |= ETH_LINK_SPEED_100G;
-	if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_200GB)
+	if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_PAM4_SPEEDS_50G)
+		speed_capa |= ETH_LINK_SPEED_50G;
+	if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_PAM4_SPEEDS_100G)
+		speed_capa |= ETH_LINK_SPEED_100G;
+	if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_PAM4_SPEEDS_200G)
 		speed_capa |= ETH_LINK_SPEED_200G;
 
 	if (bp->link_info->auto_mode ==
@@ -874,7 +928,9 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
 	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->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+	dev_info->tx_offload_capa = BNXT_DEV_TX_OFFLOAD_SUPPORT |
+				    dev_info->tx_queue_offload_capa;
 	dev_info->flow_type_rss_offloads = BNXT_ETH_RSS_SUPPORT;
 
 	dev_info->speed_capa = bnxt_get_speed_capabilities(bp);
@@ -887,8 +943,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
 			.wthresh = 0,
 		},
 		.rx_free_thresh = 32,
-		/* If no descriptors available, pkts are dropped by default */
-		.rx_drop_en = 1,
+		.rx_drop_en = BNXT_DEFAULT_RX_DROP_EN,
 	};
 
 	dev_info->default_txconf = (struct rte_eth_txconf) {
@@ -908,6 +963,14 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
 	dev_info->tx_desc_lim.nb_min = BNXT_MIN_RING_DESC;
 	dev_info->tx_desc_lim.nb_max = BNXT_MAX_TX_RING_DESC;
 
+	if (BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp)) {
+		dev_info->switch_info.name = eth_dev->device->name;
+		dev_info->switch_info.domain_id = bp->switch_domain_id;
+		dev_info->switch_info.port_id =
+				BNXT_PF(bp) ? BNXT_SWITCH_PORT_ID_PF :
+				    BNXT_SWITCH_PORT_ID_TRUSTED_VF;
+	}
+
 	/* *INDENT-ON* */
 
 	/*
@@ -1114,7 +1177,8 @@ bnxt_receive_function(struct rte_eth_dev *eth_dev)
 		DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
 		DEV_RX_OFFLOAD_RSS_HASH |
 		DEV_RX_OFFLOAD_VLAN_FILTER)) &&
-	    !BNXT_TRUFLOW_EN(bp)) {
+	    !BNXT_TRUFLOW_EN(bp) && BNXT_NUM_ASYNC_CPR(bp) &&
+	    rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
 		PMD_DRV_LOG(INFO, "Using vector mode receive for port %d\n",
 			    eth_dev->data->port_id);
 		bp->flags |= BNXT_FLAG_RX_VECTOR_PKT_MODE;
@@ -1138,6 +1202,7 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
 {
 #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;
 
 	/*
@@ -1145,8 +1210,9 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
 	 * or tx offloads.
 	 */
 	if (!eth_dev->data->scattered_rx &&
-	    !eth_dev->data->dev_conf.txmode.offloads &&
-	    !BNXT_TRUFLOW_EN(bp)) {
+	    !(offloads & ~DEV_TX_OFFLOAD_MBUF_FAST_FREE) &&
+	    !BNXT_TRUFLOW_EN(bp) &&
+	    rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
 		PMD_DRV_LOG(INFO, "Using vector mode transmit for port %d\n",
 			    eth_dev->data->port_id);
 		return bnxt_xmit_pkts_vec;
@@ -1157,7 +1223,7 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
 		    "Port %d scatter: %d tx offload: %" PRIX64 "\n",
 		    eth_dev->data->port_id,
 		    eth_dev->data->scattered_rx,
-		    eth_dev->data->dev_conf.txmode.offloads);
+		    offloads);
 #endif
 #endif
 	return bnxt_xmit_pkts;
@@ -1196,7 +1262,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
 	if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) {
 		PMD_DRV_LOG(ERR,
-			"RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
+			"RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
 			bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
 	}
 
@@ -1226,7 +1292,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 	eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev);
 	eth_dev->data->dev_started = 1;
 
-	bnxt_link_update(eth_dev, 1, ETH_LINK_UP);
+	bnxt_link_update_op(eth_dev, 1);
 
 	if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
 		vlan_mask |= ETH_VLAN_FILTER_MASK;
@@ -1236,14 +1302,15 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 	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);
 
-	pthread_mutex_lock(&bp->def_cp_lock);
 	bnxt_schedule_fw_health_check(bp);
-	pthread_mutex_unlock(&bp->def_cp_lock);
-
-	bnxt_ulp_init(bp);
 
 	return 0;
 
@@ -1283,18 +1350,28 @@ static int bnxt_dev_set_link_down_op(struct rte_eth_dev *eth_dev)
 
 static void bnxt_free_switch_domain(struct bnxt *bp)
 {
-	if (bp->switch_domain_id)
-		rte_eth_switch_domain_free(bp->switch_domain_id);
+	int rc = 0;
+
+	if (bp->switch_domain_id) {
+		rc = rte_eth_switch_domain_free(bp->switch_domain_id);
+		if (rc)
+			PMD_DRV_LOG(ERR, "free switch domain:%d fail: %d\n",
+				    bp->switch_domain_id, rc);
+	}
 }
 
 /* Unload the driver, release resources */
-static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
+static int bnxt_dev_stop_op(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);
 	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+	struct rte_eth_link link;
+	int ret;
 
 	eth_dev->data->dev_started = 0;
+	eth_dev->data->scattered_rx = 0;
+
 	/* Prevent crashes when queues are still in use */
 	eth_dev->rx_pkt_burst = &bnxt_dummy_recv_pkts;
 	eth_dev->tx_pkt_burst = &bnxt_dummy_xmit_pkts;
@@ -1304,19 +1381,26 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 	/* disable uio/vfio intr/eventfd mapping */
 	rte_intr_disable(intr_handle);
 
-	bnxt_ulp_destroy_df_rules(bp, false);
-	bnxt_ulp_deinit(bp);
+	/* Stop the child representors for this device */
+	ret = bnxt_rep_stop_all(bp);
+	if (ret != 0)
+		return ret;
+
+	/* delete the bnxt ULP port details */
+	bnxt_ulp_port_deinit(bp);
 
 	bnxt_cancel_fw_health_check(bp);
 
-	bnxt_dev_set_link_down_op(eth_dev);
-
-	/* Wait for link to be reset and the async notification to process.
-	 * During reset recovery, there is no need to wait and
-	 * VF/NPAR functions do not have privilege to change PHY config.
-	 */
-	if (!is_bnxt_in_error(bp) && BNXT_SINGLE_PF(bp))
-		bnxt_link_update(eth_dev, 1, ETH_LINK_DOWN);
+	/* Do not bring link down during reset recovery */
+	if (!is_bnxt_in_error(bp)) {
+		bnxt_dev_set_link_down_op(eth_dev);
+		/* Wait for link to be reset */
+		if (BNXT_SINGLE_PF(bp))
+			rte_delay_ms(500);
+		/* clear the recorded link status */
+		memset(&link, 0, sizeof(link));
+		rte_eth_linkstatus_set(eth_dev, &link);
+	}
 
 	/* Clean queue intr-vector mapping */
 	rte_intr_efd_disable(intr_handle);
@@ -1341,11 +1425,17 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 	/* All filters are deleted on a port stop. */
 	if (BNXT_FLOW_XSTATS_EN(bp))
 		bp->flow_stat->flow_count = 0;
+
+	return 0;
 }
 
-static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+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;
 
 	/* cancel the recovery handler before remove dev */
 	rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
@@ -1353,7 +1443,7 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 	bnxt_cancel_fc_thread(bp);
 
 	if (eth_dev->data->dev_started)
-		bnxt_dev_stop_op(eth_dev);
+		ret = bnxt_dev_stop_op(eth_dev);
 
 	bnxt_free_switch_domain(bp);
 
@@ -1365,10 +1455,6 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 	bnxt_free_pf_info(bp);
 	bnxt_free_parent_info(bp);
 
-	eth_dev->dev_ops = NULL;
-	eth_dev->rx_pkt_burst = NULL;
-	eth_dev->tx_pkt_burst = NULL;
-
 	rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
 	bp->tx_mem_zone = NULL;
 	rte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone);
@@ -1378,6 +1464,8 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 
 	rte_free(bp->grp_info);
 	bp->grp_info = NULL;
+
+	return ret;
 }
 
 static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev,
@@ -1472,7 +1560,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
 	if (rc)
 		return rc;
 
-	if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) {
+	if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp)) {
 		PMD_DRV_LOG(ERR, "Cannot add MAC address to a VF interface\n");
 		return -ENOTSUP;
 	}
@@ -1491,14 +1579,13 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
 	return rc;
 }
 
-int bnxt_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete,
-		     bool exp_link_status)
+int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete)
 {
 	int rc = 0;
 	struct bnxt *bp = eth_dev->data->dev_private;
 	struct rte_eth_link new;
-	int cnt = exp_link_status ? BNXT_LINK_UP_WAIT_CNT :
-		  BNXT_LINK_DOWN_WAIT_CNT;
+	int cnt = wait_to_complete ? BNXT_MAX_LINK_WAIT_CNT :
+			BNXT_MIN_LINK_WAIT_CNT;
 
 	rc = is_bnxt_in_error(bp);
 	if (rc)
@@ -1516,12 +1603,18 @@ int bnxt_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete,
 			goto out;
 		}
 
-		if (!wait_to_complete || new.link_status == exp_link_status)
+		if (!wait_to_complete || new.link_status)
 			break;
 
 		rte_delay_ms(BNXT_LINK_WAIT_INTERVAL);
 	} while (cnt--);
 
+	/* Only single function PF can bring phy down.
+	 * When port is stopped, report link down for VF/MH/NPAR functions.
+	 */
+	if (!BNXT_SINGLE_PF(bp) && !eth_dev->data->dev_started)
+		memset(&new, 0, sizeof(new));
+
 out:
 	/* Timed out or success */
 	if (new.link_status != eth_dev->data->dev_link.link_status ||
@@ -1538,12 +1631,6 @@ out:
 	return rc;
 }
 
-int bnxt_link_update_op(struct rte_eth_dev *eth_dev,
-			int wait_to_complete)
-{
-	return bnxt_link_update(eth_dev, wait_to_complete, ETH_LINK_UP);
-}
-
 static int bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev)
 {
 	struct bnxt *bp = eth_dev->data->dev_private;
@@ -1599,8 +1686,6 @@ static int bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev)
 	if (rc != 0)
 		vnic->flags = old_flags;
 
-	bnxt_ulp_create_df_rules(bp);
-
 	return rc;
 }
 
@@ -1834,6 +1919,9 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
 	/* Update the default RSS VNIC(s) */
 	vnic = BNXT_GET_DEFAULT_VNIC(bp);
 	vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_conf->rss_hf);
+	vnic->hash_mode =
+		bnxt_rte_to_hwrm_hash_level(bp, rss_conf->rss_hf,
+					    ETH_RSS_LEVEL(rss_conf->rss_hf));
 
 	/*
 	 * If hashkey is not specified, use the previously configured
@@ -1904,6 +1992,10 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev,
 			hash_types &=
 				~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;
 		}
+
+		rss_conf->rss_hf |=
+			bnxt_hwrm_to_rte_rss_level(bp, vnic->hash_mode);
+
 		if (hash_types) {
 			PMD_DRV_LOG(ERR,
 				"Unknown RSS config from firmware (%08x), RSS disabled",
@@ -2118,14 +2210,6 @@ bnxt_udp_tunnel_port_del_op(struct rte_eth_dev *eth_dev,
 	}
 
 	rc = bnxt_hwrm_tunnel_dst_port_free(bp, port, tunnel_type);
-	if (!rc) {
-		if (tunnel_type ==
-		    HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_VXLAN)
-			bp->vxlan_port = 0;
-		if (tunnel_type ==
-		    HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_GENEVE)
-			bp->geneve_port = 0;
-	}
 	return rc;
 }
 
@@ -2588,8 +2672,9 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 	qinfo->nb_desc = rxq->nb_rx_desc;
 
 	qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
-	qinfo->conf.rx_drop_en = 0;
+	qinfo->conf.rx_drop_en = rxq->drop_en;
 	qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
+	qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads;
 }
 
 static void
@@ -2613,6 +2698,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 	qinfo->conf.tx_free_thresh = txq->tx_free_thresh;
 	qinfo->conf.tx_rs_thresh = 0;
 	qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
+	qinfo->conf.offloads = txq->offloads;
 }
 
 static const struct {
@@ -2693,14 +2779,12 @@ int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
 	new_pkt_size = new_mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN +
 		       VLAN_TAG_SIZE * BNXT_NUM_VLANS;
 
-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
 	/*
-	 * If vector-mode tx/rx is active, disallow any MTU change that would
-	 * require scattered receive support.
+	 * Disallow any MTU change that would require scattered receive support
+	 * if it is not already enabled.
 	 */
 	if (eth_dev->data->dev_started &&
-	    (eth_dev->rx_pkt_burst == bnxt_recv_pkts_vec ||
-	     eth_dev->tx_pkt_burst == bnxt_xmit_pkts_vec) &&
+	    !eth_dev->data->scattered_rx &&
 	    (new_pkt_size >
 	     eth_dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
 		PMD_DRV_LOG(ERR,
@@ -2708,7 +2792,6 @@ int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
 		PMD_DRV_LOG(ERR, "Stop port before changing MTU.\n");
 		return -EINVAL;
 	}
-#endif
 
 	if (new_mtu > RTE_ETHER_MTU) {
 		bp->flags |= BNXT_FLAG_JUMBO;
@@ -2841,7 +2924,7 @@ bnxt_rx_descriptor_status_op(void *rx_queue, uint16_t offset)
 	struct bnxt_rx_queue *rxq = (struct bnxt_rx_queue *)rx_queue;
 	struct bnxt_rx_ring_info *rxr;
 	struct bnxt_cp_ring_info *cpr;
-	struct bnxt_sw_rx_bd *rx_buf;
+	struct rte_mbuf *rx_buf;
 	struct rx_pkt_cmpl *rxcmp;
 	uint32_t cons, cp_cons;
 	int rc;
@@ -2870,8 +2953,8 @@ bnxt_rx_descriptor_status_op(void *rx_queue, uint16_t offset)
 		if (CMPL_VALID(rxcmp, !cpr->valid))
 			return RTE_ETH_RX_DESC_DONE;
 	}
-	rx_buf = &rxr->rx_buf_ring[cons];
-	if (rx_buf->mbuf == NULL)
+	rx_buf = rxr->rx_buf_ring[cons];
+	if (rx_buf == NULL || rx_buf == &rxq->fake_mbuf)
 		return RTE_ETH_RX_DESC_UNAVAIL;
 
 
@@ -2920,795 +3003,6 @@ bnxt_tx_descriptor_status_op(void *tx_queue, uint16_t offset)
 	return RTE_ETH_TX_DESC_FULL;
 }
 
-static struct bnxt_filter_info *
-bnxt_match_and_validate_ether_filter(struct bnxt *bp,
-				struct rte_eth_ethertype_filter *efilter,
-				struct bnxt_vnic_info *vnic0,
-				struct bnxt_vnic_info *vnic,
-				int *ret)
-{
-	struct bnxt_filter_info *mfilter = NULL;
-	int match = 0;
-	*ret = 0;
-
-	if (efilter->ether_type == RTE_ETHER_TYPE_IPV4 ||
-		efilter->ether_type == RTE_ETHER_TYPE_IPV6) {
-		PMD_DRV_LOG(ERR, "invalid ether_type(0x%04x) in"
-			" ethertype filter.", efilter->ether_type);
-		*ret = -EINVAL;
-		goto exit;
-	}
-	if (efilter->queue >= bp->rx_nr_rings) {
-		PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
-		*ret = -EINVAL;
-		goto exit;
-	}
-
-	vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-	vnic = &bp->vnic_info[efilter->queue];
-	if (vnic == NULL) {
-		PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
-		*ret = -EINVAL;
-		goto exit;
-	}
-
-	if (efilter->flags & RTE_ETHTYPE_FLAGS_DROP) {
-		STAILQ_FOREACH(mfilter, &vnic0->filter, next) {
-			if ((!memcmp(efilter->mac_addr.addr_bytes,
-				     mfilter->l2_addr, RTE_ETHER_ADDR_LEN) &&
-			     mfilter->flags ==
-			     HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP &&
-			     mfilter->ethertype == efilter->ether_type)) {
-				match = 1;
-				break;
-			}
-		}
-	} else {
-		STAILQ_FOREACH(mfilter, &vnic->filter, next)
-			if ((!memcmp(efilter->mac_addr.addr_bytes,
-				     mfilter->l2_addr, RTE_ETHER_ADDR_LEN) &&
-			     mfilter->ethertype == efilter->ether_type &&
-			     mfilter->flags ==
-			     HWRM_CFA_L2_FILTER_CFG_INPUT_FLAGS_PATH_RX)) {
-				match = 1;
-				break;
-			}
-	}
-
-	if (match)
-		*ret = -EEXIST;
-
-exit:
-	return mfilter;
-}
-
-static int
-bnxt_ethertype_filter(struct rte_eth_dev *dev,
-			enum rte_filter_op filter_op,
-			void *arg)
-{
-	struct bnxt *bp = dev->data->dev_private;
-	struct rte_eth_ethertype_filter *efilter =
-			(struct rte_eth_ethertype_filter *)arg;
-	struct bnxt_filter_info *bfilter, *filter1;
-	struct bnxt_vnic_info *vnic, *vnic0;
-	int ret;
-
-	if (filter_op == RTE_ETH_FILTER_NOP)
-		return 0;
-
-	if (arg == NULL) {
-		PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
-			    filter_op);
-		return -EINVAL;
-	}
-
-	vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-	vnic = &bp->vnic_info[efilter->queue];
-
-	switch (filter_op) {
-	case RTE_ETH_FILTER_ADD:
-		bnxt_match_and_validate_ether_filter(bp, efilter,
-							vnic0, vnic, &ret);
-		if (ret < 0)
-			return ret;
-
-		bfilter = bnxt_get_unused_filter(bp);
-		if (bfilter == NULL) {
-			PMD_DRV_LOG(ERR,
-				"Not enough resources for a new filter.\n");
-			return -ENOMEM;
-		}
-		bfilter->filter_type = HWRM_CFA_NTUPLE_FILTER;
-		memcpy(bfilter->l2_addr, efilter->mac_addr.addr_bytes,
-		       RTE_ETHER_ADDR_LEN);
-		memcpy(bfilter->dst_macaddr, efilter->mac_addr.addr_bytes,
-		       RTE_ETHER_ADDR_LEN);
-		bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_MACADDR;
-		bfilter->ethertype = efilter->ether_type;
-		bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-
-		filter1 = bnxt_get_l2_filter(bp, bfilter, vnic0);
-		if (filter1 == NULL) {
-			ret = -EINVAL;
-			goto cleanup;
-		}
-		bfilter->enables |=
-			HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
-		bfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;
-
-		bfilter->dst_id = vnic->fw_vnic_id;
-
-		if (efilter->flags & RTE_ETHTYPE_FLAGS_DROP) {
-			bfilter->flags =
-				HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP;
-		}
-
-		ret = bnxt_hwrm_set_ntuple_filter(bp, bfilter->dst_id, bfilter);
-		if (ret)
-			goto cleanup;
-		STAILQ_INSERT_TAIL(&vnic->filter, bfilter, next);
-		break;
-	case RTE_ETH_FILTER_DELETE:
-		filter1 = bnxt_match_and_validate_ether_filter(bp, efilter,
-							vnic0, vnic, &ret);
-		if (ret == -EEXIST) {
-			ret = bnxt_hwrm_clear_ntuple_filter(bp, filter1);
-
-			STAILQ_REMOVE(&vnic->filter, filter1, bnxt_filter_info,
-				      next);
-			bnxt_free_filter(bp, filter1);
-		} else if (ret == 0) {
-			PMD_DRV_LOG(ERR, "No matching filter found\n");
-		}
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
-		ret = -EINVAL;
-		goto error;
-	}
-	return ret;
-cleanup:
-	bnxt_free_filter(bp, bfilter);
-error:
-	return ret;
-}
-
-static inline int
-parse_ntuple_filter(struct bnxt *bp,
-		    struct rte_eth_ntuple_filter *nfilter,
-		    struct bnxt_filter_info *bfilter)
-{
-	uint32_t en = 0;
-
-	if (nfilter->queue >= bp->rx_nr_rings) {
-		PMD_DRV_LOG(ERR, "Invalid queue %d\n", nfilter->queue);
-		return -EINVAL;
-	}
-
-	switch (nfilter->dst_port_mask) {
-	case UINT16_MAX:
-		bfilter->dst_port_mask = -1;
-		bfilter->dst_port = nfilter->dst_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT |
-			NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "invalid dst_port mask.");
-		return -EINVAL;
-	}
-
-	bfilter->ip_addr_type = NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-	en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-
-	switch (nfilter->proto_mask) {
-	case UINT8_MAX:
-		if (nfilter->proto == 17) /* IPPROTO_UDP */
-			bfilter->ip_protocol = 17;
-		else if (nfilter->proto == 6) /* IPPROTO_TCP */
-			bfilter->ip_protocol = 6;
-		else
-			return -EINVAL;
-		en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "invalid protocol mask.");
-		return -EINVAL;
-	}
-
-	switch (nfilter->dst_ip_mask) {
-	case UINT32_MAX:
-		bfilter->dst_ipaddr_mask[0] = -1;
-		bfilter->dst_ipaddr[0] = nfilter->dst_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR |
-			NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "invalid dst_ip mask.");
-		return -EINVAL;
-	}
-
-	switch (nfilter->src_ip_mask) {
-	case UINT32_MAX:
-		bfilter->src_ipaddr_mask[0] = -1;
-		bfilter->src_ipaddr[0] = nfilter->src_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR |
-			NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "invalid src_ip mask.");
-		return -EINVAL;
-	}
-
-	switch (nfilter->src_port_mask) {
-	case UINT16_MAX:
-		bfilter->src_port_mask = -1;
-		bfilter->src_port = nfilter->src_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT |
-			NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "invalid src_port mask.");
-		return -EINVAL;
-	}
-
-	bfilter->enables = en;
-	return 0;
-}
-
-static struct bnxt_filter_info*
-bnxt_match_ntuple_filter(struct bnxt *bp,
-			 struct bnxt_filter_info *bfilter,
-			 struct bnxt_vnic_info **mvnic)
-{
-	struct bnxt_filter_info *mfilter = NULL;
-	int i;
-
-	for (i = bp->nr_vnics - 1; i >= 0; i--) {
-		struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-		STAILQ_FOREACH(mfilter, &vnic->filter, next) {
-			if (bfilter->src_ipaddr[0] == mfilter->src_ipaddr[0] &&
-			    bfilter->src_ipaddr_mask[0] ==
-			    mfilter->src_ipaddr_mask[0] &&
-			    bfilter->src_port == mfilter->src_port &&
-			    bfilter->src_port_mask == mfilter->src_port_mask &&
-			    bfilter->dst_ipaddr[0] == mfilter->dst_ipaddr[0] &&
-			    bfilter->dst_ipaddr_mask[0] ==
-			    mfilter->dst_ipaddr_mask[0] &&
-			    bfilter->dst_port == mfilter->dst_port &&
-			    bfilter->dst_port_mask == mfilter->dst_port_mask &&
-			    bfilter->flags == mfilter->flags &&
-			    bfilter->enables == mfilter->enables) {
-				if (mvnic)
-					*mvnic = vnic;
-				return mfilter;
-			}
-		}
-	}
-	return NULL;
-}
-
-static int
-bnxt_cfg_ntuple_filter(struct bnxt *bp,
-		       struct rte_eth_ntuple_filter *nfilter,
-		       enum rte_filter_op filter_op)
-{
-	struct bnxt_filter_info *bfilter, *mfilter, *filter1;
-	struct bnxt_vnic_info *vnic, *vnic0, *mvnic;
-	int ret;
-
-	if (nfilter->flags != RTE_5TUPLE_FLAGS) {
-		PMD_DRV_LOG(ERR, "only 5tuple is supported.");
-		return -EINVAL;
-	}
-
-	if (nfilter->flags & RTE_NTUPLE_FLAGS_TCP_FLAG) {
-		PMD_DRV_LOG(ERR, "Ntuple filter: TCP flags not supported\n");
-		return -EINVAL;
-	}
-
-	bfilter = bnxt_get_unused_filter(bp);
-	if (bfilter == NULL) {
-		PMD_DRV_LOG(ERR,
-			"Not enough resources for a new filter.\n");
-		return -ENOMEM;
-	}
-	ret = parse_ntuple_filter(bp, nfilter, bfilter);
-	if (ret < 0)
-		goto free_filter;
-
-	vnic = &bp->vnic_info[nfilter->queue];
-	vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-	filter1 = STAILQ_FIRST(&vnic0->filter);
-	if (filter1 == NULL) {
-		ret = -EINVAL;
-		goto free_filter;
-	}
-
-	bfilter->dst_id = vnic->fw_vnic_id;
-	bfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;
-	bfilter->enables |=
-		HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
-	bfilter->ethertype = 0x800;
-	bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-
-	mfilter = bnxt_match_ntuple_filter(bp, bfilter, &mvnic);
-
-	if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
-	    bfilter->dst_id == mfilter->dst_id) {
-		PMD_DRV_LOG(ERR, "filter exists.\n");
-		ret = -EEXIST;
-		goto free_filter;
-	} else if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
-		   bfilter->dst_id != mfilter->dst_id) {
-		mfilter->dst_id = vnic->fw_vnic_id;
-		ret = bnxt_hwrm_set_ntuple_filter(bp, mfilter->dst_id, mfilter);
-		STAILQ_REMOVE(&mvnic->filter, mfilter, bnxt_filter_info, next);
-		STAILQ_INSERT_TAIL(&vnic->filter, mfilter, next);
-		PMD_DRV_LOG(ERR, "filter with matching pattern exists.\n");
-		PMD_DRV_LOG(ERR, " Updated it to the new destination queue\n");
-		goto free_filter;
-	}
-	if (mfilter == NULL && filter_op == RTE_ETH_FILTER_DELETE) {
-		PMD_DRV_LOG(ERR, "filter doesn't exist.");
-		ret = -ENOENT;
-		goto free_filter;
-	}
-
-	if (filter_op == RTE_ETH_FILTER_ADD) {
-		bfilter->filter_type = HWRM_CFA_NTUPLE_FILTER;
-		ret = bnxt_hwrm_set_ntuple_filter(bp, bfilter->dst_id, bfilter);
-		if (ret)
-			goto free_filter;
-		STAILQ_INSERT_TAIL(&vnic->filter, bfilter, next);
-	} else {
-		if (mfilter == NULL) {
-			/* This should not happen. But for Coverity! */
-			ret = -ENOENT;
-			goto free_filter;
-		}
-		ret = bnxt_hwrm_clear_ntuple_filter(bp, mfilter);
-
-		STAILQ_REMOVE(&vnic->filter, mfilter, bnxt_filter_info, next);
-		bnxt_free_filter(bp, mfilter);
-		bnxt_free_filter(bp, bfilter);
-	}
-
-	return 0;
-free_filter:
-	bnxt_free_filter(bp, bfilter);
-	return ret;
-}
-
-static int
-bnxt_ntuple_filter(struct rte_eth_dev *dev,
-			enum rte_filter_op filter_op,
-			void *arg)
-{
-	struct bnxt *bp = dev->data->dev_private;
-	int ret;
-
-	if (filter_op == RTE_ETH_FILTER_NOP)
-		return 0;
-
-	if (arg == NULL) {
-		PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
-			    filter_op);
-		return -EINVAL;
-	}
-
-	switch (filter_op) {
-	case RTE_ETH_FILTER_ADD:
-		ret = bnxt_cfg_ntuple_filter(bp,
-			(struct rte_eth_ntuple_filter *)arg,
-			filter_op);
-		break;
-	case RTE_ETH_FILTER_DELETE:
-		ret = bnxt_cfg_ntuple_filter(bp,
-			(struct rte_eth_ntuple_filter *)arg,
-			filter_op);
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
-		ret = -EINVAL;
-		break;
-	}
-	return ret;
-}
-
-static int
-bnxt_parse_fdir_filter(struct bnxt *bp,
-		       struct rte_eth_fdir_filter *fdir,
-		       struct bnxt_filter_info *filter)
-{
-	enum rte_fdir_mode fdir_mode =
-		bp->eth_dev->data->dev_conf.fdir_conf.mode;
-	struct bnxt_vnic_info *vnic0, *vnic;
-	struct bnxt_filter_info *filter1;
-	uint32_t en = 0;
-	int i;
-
-	if (fdir_mode == RTE_FDIR_MODE_PERFECT_TUNNEL)
-		return -EINVAL;
-
-	filter->l2_ovlan = fdir->input.flow_ext.vlan_tci;
-	en |= EM_FLOW_ALLOC_INPUT_EN_OVLAN_VID;
-
-	switch (fdir->input.flow_type) {
-	case RTE_ETH_FLOW_IPV4:
-	case RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:
-		/* FALLTHROUGH */
-		filter->src_ipaddr[0] = fdir->input.flow.ip4_flow.src_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-		filter->dst_ipaddr[0] = fdir->input.flow.ip4_flow.dst_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-		filter->ip_protocol = fdir->input.flow.ip4_flow.proto;
-		en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-		filter->ip_addr_type =
-			NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-		filter->src_ipaddr_mask[0] = 0xffffffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-		filter->dst_ipaddr_mask[0] = 0xffffffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-		filter->ethertype = 0x800;
-		filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-		break;
-	case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
-		filter->src_port = fdir->input.flow.tcp4_flow.src_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-		filter->dst_port = fdir->input.flow.tcp4_flow.dst_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-		filter->dst_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-		filter->src_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-		filter->src_ipaddr[0] = fdir->input.flow.tcp4_flow.ip.src_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-		filter->dst_ipaddr[0] = fdir->input.flow.tcp4_flow.ip.dst_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-		filter->ip_protocol = 6;
-		en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-		filter->ip_addr_type =
-			NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-		filter->src_ipaddr_mask[0] = 0xffffffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-		filter->dst_ipaddr_mask[0] = 0xffffffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-		filter->ethertype = 0x800;
-		filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-		break;
-	case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
-		filter->src_port = fdir->input.flow.udp4_flow.src_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-		filter->dst_port = fdir->input.flow.udp4_flow.dst_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-		filter->dst_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-		filter->src_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-		filter->src_ipaddr[0] = fdir->input.flow.udp4_flow.ip.src_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-		filter->dst_ipaddr[0] = fdir->input.flow.udp4_flow.ip.dst_ip;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-		filter->ip_protocol = 17;
-		en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-		filter->ip_addr_type =
-			NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-		filter->src_ipaddr_mask[0] = 0xffffffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-		filter->dst_ipaddr_mask[0] = 0xffffffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-		filter->ethertype = 0x800;
-		filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-		break;
-	case RTE_ETH_FLOW_IPV6:
-	case RTE_ETH_FLOW_NONFRAG_IPV6_OTHER:
-		/* FALLTHROUGH */
-		filter->ip_addr_type =
-			NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV6;
-		filter->ip_protocol = fdir->input.flow.ipv6_flow.proto;
-		en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-		rte_memcpy(filter->src_ipaddr,
-			   fdir->input.flow.ipv6_flow.src_ip, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-		rte_memcpy(filter->dst_ipaddr,
-			   fdir->input.flow.ipv6_flow.dst_ip, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-		memset(filter->dst_ipaddr_mask, 0xff, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-		memset(filter->src_ipaddr_mask, 0xff, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-		filter->ethertype = 0x86dd;
-		filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-		break;
-	case RTE_ETH_FLOW_NONFRAG_IPV6_TCP:
-		filter->src_port = fdir->input.flow.tcp6_flow.src_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-		filter->dst_port = fdir->input.flow.tcp6_flow.dst_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-		filter->dst_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-		filter->src_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-		filter->ip_addr_type =
-			NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV6;
-		filter->ip_protocol = fdir->input.flow.tcp6_flow.ip.proto;
-		en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-		rte_memcpy(filter->src_ipaddr,
-			   fdir->input.flow.tcp6_flow.ip.src_ip, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-		rte_memcpy(filter->dst_ipaddr,
-			   fdir->input.flow.tcp6_flow.ip.dst_ip, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-		memset(filter->dst_ipaddr_mask, 0xff, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-		memset(filter->src_ipaddr_mask, 0xff, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-		filter->ethertype = 0x86dd;
-		filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-		break;
-	case RTE_ETH_FLOW_NONFRAG_IPV6_UDP:
-		filter->src_port = fdir->input.flow.udp6_flow.src_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-		filter->dst_port = fdir->input.flow.udp6_flow.dst_port;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-		filter->dst_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-		filter->src_port_mask = 0xffff;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-		filter->ip_addr_type =
-			NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV6;
-		filter->ip_protocol = fdir->input.flow.udp6_flow.ip.proto;
-		en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-		rte_memcpy(filter->src_ipaddr,
-			   fdir->input.flow.udp6_flow.ip.src_ip, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-		rte_memcpy(filter->dst_ipaddr,
-			   fdir->input.flow.udp6_flow.ip.dst_ip, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-		memset(filter->dst_ipaddr_mask, 0xff, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-		memset(filter->src_ipaddr_mask, 0xff, 16);
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-		filter->ethertype = 0x86dd;
-		filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-		break;
-	case RTE_ETH_FLOW_L2_PAYLOAD:
-		filter->ethertype = fdir->input.flow.l2_flow.ether_type;
-		en |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-		break;
-	case RTE_ETH_FLOW_VXLAN:
-		if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
-			return -EINVAL;
-		filter->vni = fdir->input.flow.tunnel_flow.tunnel_id;
-		filter->tunnel_type =
-			CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN;
-		en |= HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_TUNNEL_TYPE;
-		break;
-	case RTE_ETH_FLOW_NVGRE:
-		if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
-			return -EINVAL;
-		filter->vni = fdir->input.flow.tunnel_flow.tunnel_id;
-		filter->tunnel_type =
-			CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE;
-		en |= HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_TUNNEL_TYPE;
-		break;
-	case RTE_ETH_FLOW_UNKNOWN:
-	case RTE_ETH_FLOW_RAW:
-	case RTE_ETH_FLOW_FRAG_IPV4:
-	case RTE_ETH_FLOW_NONFRAG_IPV4_SCTP:
-	case RTE_ETH_FLOW_FRAG_IPV6:
-	case RTE_ETH_FLOW_NONFRAG_IPV6_SCTP:
-	case RTE_ETH_FLOW_IPV6_EX:
-	case RTE_ETH_FLOW_IPV6_TCP_EX:
-	case RTE_ETH_FLOW_IPV6_UDP_EX:
-	case RTE_ETH_FLOW_GENEVE:
-		/* FALLTHROUGH */
-	default:
-		return -EINVAL;
-	}
-
-	vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-	vnic = &bp->vnic_info[fdir->action.rx_queue];
-	if (vnic == NULL) {
-		PMD_DRV_LOG(ERR, "Invalid queue %d\n", fdir->action.rx_queue);
-		return -EINVAL;
-	}
-
-	if (fdir_mode == RTE_FDIR_MODE_PERFECT_MAC_VLAN) {
-		rte_memcpy(filter->dst_macaddr,
-			fdir->input.flow.mac_vlan_flow.mac_addr.addr_bytes, 6);
-			en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_MACADDR;
-	}
-
-	if (fdir->action.behavior == RTE_ETH_FDIR_REJECT) {
-		filter->flags = HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP;
-		filter1 = STAILQ_FIRST(&vnic0->filter);
-		//filter1 = bnxt_get_l2_filter(bp, filter, vnic0);
-	} else {
-		filter->dst_id = vnic->fw_vnic_id;
-		for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
-			if (filter->dst_macaddr[i] == 0x00)
-				filter1 = STAILQ_FIRST(&vnic0->filter);
-			else
-				filter1 = bnxt_get_l2_filter(bp, filter, vnic);
-	}
-
-	if (filter1 == NULL)
-		return -EINVAL;
-
-	en |= HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
-	filter->fw_l2_filter_id = filter1->fw_l2_filter_id;
-
-	filter->enables = en;
-
-	return 0;
-}
-
-static struct bnxt_filter_info *
-bnxt_match_fdir(struct bnxt *bp, struct bnxt_filter_info *nf,
-		struct bnxt_vnic_info **mvnic)
-{
-	struct bnxt_filter_info *mf = NULL;
-	int i;
-
-	for (i = bp->nr_vnics - 1; i >= 0; i--) {
-		struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-
-		STAILQ_FOREACH(mf, &vnic->filter, next) {
-			if (mf->filter_type == nf->filter_type &&
-			    mf->flags == nf->flags &&
-			    mf->src_port == nf->src_port &&
-			    mf->src_port_mask == nf->src_port_mask &&
-			    mf->dst_port == nf->dst_port &&
-			    mf->dst_port_mask == nf->dst_port_mask &&
-			    mf->ip_protocol == nf->ip_protocol &&
-			    mf->ip_addr_type == nf->ip_addr_type &&
-			    mf->ethertype == nf->ethertype &&
-			    mf->vni == nf->vni &&
-			    mf->tunnel_type == nf->tunnel_type &&
-			    mf->l2_ovlan == nf->l2_ovlan &&
-			    mf->l2_ovlan_mask == nf->l2_ovlan_mask &&
-			    mf->l2_ivlan == nf->l2_ivlan &&
-			    mf->l2_ivlan_mask == nf->l2_ivlan_mask &&
-			    !memcmp(mf->l2_addr, nf->l2_addr,
-				    RTE_ETHER_ADDR_LEN) &&
-			    !memcmp(mf->l2_addr_mask, nf->l2_addr_mask,
-				    RTE_ETHER_ADDR_LEN) &&
-			    !memcmp(mf->src_macaddr, nf->src_macaddr,
-				    RTE_ETHER_ADDR_LEN) &&
-			    !memcmp(mf->dst_macaddr, nf->dst_macaddr,
-				    RTE_ETHER_ADDR_LEN) &&
-			    !memcmp(mf->src_ipaddr, nf->src_ipaddr,
-				    sizeof(nf->src_ipaddr)) &&
-			    !memcmp(mf->src_ipaddr_mask, nf->src_ipaddr_mask,
-				    sizeof(nf->src_ipaddr_mask)) &&
-			    !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))) {
-				if (mvnic)
-					*mvnic = vnic;
-				return mf;
-			}
-		}
-	}
-	return NULL;
-}
-
-static int
-bnxt_fdir_filter(struct rte_eth_dev *dev,
-		 enum rte_filter_op filter_op,
-		 void *arg)
-{
-	struct bnxt *bp = 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, *mvnic;
-	int ret = 0, i;
-
-	if (filter_op == RTE_ETH_FILTER_NOP)
-		return 0;
-
-	if (arg == NULL && filter_op != RTE_ETH_FILTER_FLUSH)
-		return -EINVAL;
-
-	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,
-				"Not enough resources for a new flow.\n");
-			return -ENOMEM;
-		}
-
-		ret = bnxt_parse_fdir_filter(bp, fdir, filter);
-		if (ret != 0)
-			goto free_filter;
-		filter->filter_type = HWRM_CFA_NTUPLE_FILTER;
-
-		if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
-			vnic = &bp->vnic_info[0];
-		else
-			vnic = &bp->vnic_info[fdir->action.rx_queue];
-
-		match = bnxt_match_fdir(bp, filter, &mvnic);
-		if (match != NULL && filter_op == RTE_ETH_FILTER_ADD) {
-			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");
-			ret = -ENOENT;
-			goto free_filter;
-		}
-
-		if (filter_op == RTE_ETH_FILTER_ADD) {
-			ret = bnxt_hwrm_set_ntuple_filter(bp,
-							  filter->dst_id,
-							  filter);
-			if (ret)
-				goto free_filter;
-			STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
-		} else {
-			ret = bnxt_hwrm_clear_ntuple_filter(bp, match);
-			STAILQ_REMOVE(&vnic->filter, match,
-				      bnxt_filter_info, next);
-			bnxt_free_filter(bp, match);
-			bnxt_free_filter(bp, filter);
-		}
-		break;
-	case RTE_ETH_FILTER_FLUSH:
-		for (i = bp->nr_vnics - 1; i >= 0; i--) {
-			struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-
-			STAILQ_FOREACH(filter, &vnic->filter, next) {
-				if (filter->filter_type ==
-				    HWRM_CFA_NTUPLE_FILTER) {
-					ret =
-					bnxt_hwrm_clear_ntuple_filter(bp,
-								      filter);
-					STAILQ_REMOVE(&vnic->filter, filter,
-						      bnxt_filter_info, next);
-				}
-			}
-		}
-		return ret;
-	case RTE_ETH_FILTER_UPDATE:
-	case RTE_ETH_FILTER_STATS:
-	case RTE_ETH_FILTER_INFO:
-		PMD_DRV_LOG(ERR, "operation %u not implemented", filter_op);
-		break;
-	default:
-		PMD_DRV_LOG(ERR, "unknown operation %u", filter_op);
-		ret = -EINVAL;
-		break;
-	}
-	return ret;
-
-free_filter:
-	bnxt_free_filter(bp, filter);
-	return ret;
-}
-
 int
 bnxt_filter_ctrl_op(struct rte_eth_dev *dev,
 		    enum rte_filter_type filter_type,
@@ -3717,9 +3011,20 @@ bnxt_filter_ctrl_op(struct rte_eth_dev *dev,
 	struct bnxt *bp = dev->data->dev_private;
 	int ret = 0;
 
+	if (!bp)
+		return -EIO;
+
 	if (BNXT_ETH_DEV_IS_REPRESENTOR(dev)) {
-		struct bnxt_vf_representor *vfr = dev->data->dev_private;
+		struct bnxt_representor *vfr = dev->data->dev_private;
 		bp = vfr->parent_dev->data->dev_private;
+		/* parent is deleted while children are still valid */
+		if (!bp) {
+			PMD_DRV_LOG(DEBUG, "BNXT Port:%d VFR Error %d:%d\n",
+				    dev->data->port_id,
+				    filter_type,
+				    filter_op);
+			return -EIO;
+		}
 	}
 
 	ret = is_bnxt_in_error(bp);
@@ -3727,22 +3032,15 @@ bnxt_filter_ctrl_op(struct rte_eth_dev *dev,
 		return ret;
 
 	switch (filter_type) {
-	case RTE_ETH_FILTER_TUNNEL:
-		PMD_DRV_LOG(ERR,
-			"filter type: %d: To be implemented\n", filter_type);
-		break;
-	case RTE_ETH_FILTER_FDIR:
-		ret = bnxt_fdir_filter(dev, filter_op, arg);
-		break;
-	case RTE_ETH_FILTER_NTUPLE:
-		ret = bnxt_ntuple_filter(dev, filter_op, arg);
-		break;
-	case RTE_ETH_FILTER_ETHERTYPE:
-		ret = bnxt_ethertype_filter(dev, filter_op, arg);
-		break;
 	case RTE_ETH_FILTER_GENERIC:
 		if (filter_op != RTE_ETH_FILTER_GET)
 			return -EINVAL;
+
+		/* PMD supports thread-safe flow operations.  rte_flow API
+		 * functions can avoid mutex for multi-thread safety.
+		 */
+		dev->data->dev_flags |= RTE_ETH_DEV_FLOW_OPS_THREAD_SAFE;
+
 		if (BNXT_TRUFLOW_EN(bp))
 			*(const void **)arg = &bnxt_ulp_rte_flow_ops;
 		else
@@ -4260,8 +3558,6 @@ static const struct eth_dev_ops bnxt_dev_ops = {
 	.tx_burst_mode_get = bnxt_tx_burst_mode_get,
 	.dev_led_on = bnxt_dev_led_on_op,
 	.dev_led_off = bnxt_dev_led_off_op,
-	.xstats_get_by_id = bnxt_dev_xstats_get_by_id_op,
-	.xstats_get_names_by_id = bnxt_dev_xstats_get_names_by_id_op,
 	.rx_queue_start = bnxt_rx_queue_start,
 	.rx_queue_stop = bnxt_rx_queue_stop,
 	.tx_queue_start = bnxt_tx_queue_start,
@@ -4357,7 +3653,7 @@ static void bnxt_write_fw_reset_reg(struct bnxt *bp, uint32_t index)
 
 static void bnxt_dev_cleanup(struct bnxt *bp)
 {
-	bnxt_set_hwrm_link_config(bp, false);
+	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);
@@ -4653,17 +3949,22 @@ void bnxt_schedule_fw_health_check(struct bnxt *bp)
 {
 	uint32_t polling_freq;
 
+	pthread_mutex_lock(&bp->health_check_lock);
+
 	if (!bnxt_is_recovery_enabled(bp))
-		return;
+		goto done;
 
 	if (bp->flags & BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED)
-		return;
+		goto done;
 
 	polling_freq = bp->recovery_info->driver_polling_freq;
 
 	rte_eal_alarm_set(US_PER_MS * polling_freq,
 			  bnxt_check_fw_health, (void *)bp);
 	bp->flags |= BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED;
+
+done:
+	pthread_mutex_unlock(&bp->health_check_lock);
 }
 
 static void bnxt_cancel_fw_health_check(struct bnxt *bp)
@@ -5119,37 +4420,14 @@ static void bnxt_config_vf_req_fwd(struct bnxt *bp)
 	if (!BNXT_PF(bp))
 		return;
 
-#define ALLOW_FUNC(x)	\
-	{ \
-		uint32_t arg = (x); \
-		bp->pf->vf_req_fwd[((arg) >> 5)] &= \
-		~rte_cpu_to_le_32(1 << ((arg) & 0x1f)); \
-	}
-
-	/* Forward all requests if firmware is new enough */
-	if (((bp->fw_ver >= ((20 << 24) | (6 << 16) | (100 << 8))) &&
-	     (bp->fw_ver < ((20 << 24) | (7 << 16)))) ||
-	    ((bp->fw_ver >= ((20 << 24) | (8 << 16))))) {
-		memset(bp->pf->vf_req_fwd, 0xff, sizeof(bp->pf->vf_req_fwd));
-	} else {
-		PMD_DRV_LOG(WARNING,
-			    "Firmware too old for VF mailbox functionality\n");
-		memset(bp->pf->vf_req_fwd, 0, sizeof(bp->pf->vf_req_fwd));
-	}
+	memset(bp->pf->vf_req_fwd, 0, sizeof(bp->pf->vf_req_fwd));
 
-	/*
-	 * The following are used for driver cleanup. If we disallow these,
-	 * VF drivers can't clean up cleanly.
-	 */
-	ALLOW_FUNC(HWRM_FUNC_DRV_UNRGTR);
-	ALLOW_FUNC(HWRM_VNIC_FREE);
-	ALLOW_FUNC(HWRM_RING_FREE);
-	ALLOW_FUNC(HWRM_RING_GRP_FREE);
-	ALLOW_FUNC(HWRM_VNIC_RSS_COS_LB_CTX_FREE);
-	ALLOW_FUNC(HWRM_CFA_L2_FILTER_FREE);
-	ALLOW_FUNC(HWRM_STAT_CTX_FREE);
-	ALLOW_FUNC(HWRM_PORT_PHY_QCFG);
-	ALLOW_FUNC(HWRM_VNIC_TPA_CFG);
+	if (!(bp->fw_cap & BNXT_FW_CAP_LINK_ADMIN))
+		BNXT_HWRM_CMD_TO_FORWARD(HWRM_PORT_PHY_QCFG);
+	BNXT_HWRM_CMD_TO_FORWARD(HWRM_FUNC_CFG);
+	BNXT_HWRM_CMD_TO_FORWARD(HWRM_FUNC_VF_CFG);
+	BNXT_HWRM_CMD_TO_FORWARD(HWRM_CFA_L2_FILTER_ALLOC);
+	BNXT_HWRM_CMD_TO_FORWARD(HWRM_OEM_CMD);
 }
 
 uint16_t
@@ -5161,7 +4439,7 @@ bnxt_get_svif(uint16_t port_id, bool func_svif,
 
 	eth_dev = &rte_eth_devices[port_id];
 	if (BNXT_ETH_DEV_IS_REPRESENTOR(eth_dev)) {
-		struct bnxt_vf_representor *vfr = eth_dev->data->dev_private;
+		struct bnxt_representor *vfr = eth_dev->data->dev_private;
 		if (!vfr)
 			return 0;
 
@@ -5185,7 +4463,7 @@ bnxt_get_vnic_id(uint16_t port, enum bnxt_ulp_intf_type type)
 
 	eth_dev = &rte_eth_devices[port];
 	if (BNXT_ETH_DEV_IS_REPRESENTOR(eth_dev)) {
-		struct bnxt_vf_representor *vfr = eth_dev->data->dev_private;
+		struct bnxt_representor *vfr = eth_dev->data->dev_private;
 		if (!vfr)
 			return 0;
 
@@ -5210,7 +4488,7 @@ bnxt_get_fw_func_id(uint16_t port, enum bnxt_ulp_intf_type type)
 
 	eth_dev = &rte_eth_devices[port];
 	if (BNXT_ETH_DEV_IS_REPRESENTOR(eth_dev)) {
-		struct bnxt_vf_representor *vfr = eth_dev->data->dev_private;
+		struct bnxt_representor *vfr = eth_dev->data->dev_private;
 		if (!vfr)
 			return 0;
 
@@ -5249,7 +4527,7 @@ bnxt_get_interface_type(uint16_t port)
 uint16_t
 bnxt_get_phy_port_id(uint16_t port_id)
 {
-	struct bnxt_vf_representor *vfr;
+	struct bnxt_representor *vfr;
 	struct rte_eth_dev *eth_dev;
 	struct bnxt *bp;
 
@@ -5275,7 +4553,7 @@ bnxt_get_parif(uint16_t port_id, enum bnxt_ulp_intf_type type)
 
 	eth_dev = &rte_eth_devices[port_id];
 	if (BNXT_ETH_DEV_IS_REPRESENTOR(eth_dev)) {
-		struct bnxt_vf_representor *vfr = eth_dev->data->dev_private;
+		struct bnxt_representor *vfr = eth_dev->data->dev_private;
 		if (!vfr)
 			return 0;
 
@@ -5451,6 +4729,10 @@ bnxt_init_locks(struct bnxt *bp)
 	err = pthread_mutex_init(&bp->def_cp_lock, NULL);
 	if (err)
 		PMD_DRV_LOG(ERR, "Unable to initialize def_cp_lock\n");
+
+	err = pthread_mutex_init(&bp->health_check_lock, NULL);
+	if (err)
+		PMD_DRV_LOG(ERR, "Unable to initialize health_check_lock\n");
 	return err;
 }
 
@@ -5550,9 +4832,13 @@ bnxt_parse_devarg_truflow(__rte_unused const char *key,
 		return -EINVAL;
 	}
 
-	bp->flags |= BNXT_FLAG_TRUFLOW_EN;
-	if (BNXT_TRUFLOW_EN(bp))
+	if (truflow) {
+		bp->flags |= BNXT_FLAG_TRUFLOW_EN;
 		PMD_DRV_LOG(INFO, "Host-based truflow feature enabled.\n");
+	} else {
+		bp->flags &= ~BNXT_FLAG_TRUFLOW_EN;
+		PMD_DRV_LOG(INFO, "Host-based truflow feature disabled.\n");
+	}
 
 	return 0;
 }
@@ -5628,6 +4914,229 @@ bnxt_parse_devarg_max_num_kflows(__rte_unused const char *key,
 	return 0;
 }
 
+static int
+bnxt_parse_devarg_rep_is_pf(__rte_unused const char *key,
+			    const char *value, void *opaque_arg)
+{
+	struct bnxt_representor *vfr_bp = opaque_arg;
+	unsigned long rep_is_pf;
+	char *end = NULL;
+
+	if (!value || !opaque_arg) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_is_pf devargs.\n");
+		return -EINVAL;
+	}
+
+	rep_is_pf = strtoul(value, &end, 10);
+	if (end == NULL || *end != '\0' ||
+	    (rep_is_pf == ULONG_MAX && errno == ERANGE)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_is_pf devargs.\n");
+		return -EINVAL;
+	}
+
+	if (BNXT_DEVARG_REP_IS_PF_INVALID(rep_is_pf)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid value passed to rep_is_pf devargs.\n");
+		return -EINVAL;
+	}
+
+	vfr_bp->flags |= rep_is_pf;
+	if (BNXT_REP_PF(vfr_bp))
+		PMD_DRV_LOG(INFO, "PF representor\n");
+	else
+		PMD_DRV_LOG(INFO, "VF representor\n");
+
+	return 0;
+}
+
+static int
+bnxt_parse_devarg_rep_based_pf(__rte_unused const char *key,
+			       const char *value, void *opaque_arg)
+{
+	struct bnxt_representor *vfr_bp = opaque_arg;
+	unsigned long rep_based_pf;
+	char *end = NULL;
+
+	if (!value || !opaque_arg) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_based_pf "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	rep_based_pf = strtoul(value, &end, 10);
+	if (end == NULL || *end != '\0' ||
+	    (rep_based_pf == ULONG_MAX && errno == ERANGE)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_based_pf "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	if (BNXT_DEVARG_REP_BASED_PF_INVALID(rep_based_pf)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid value passed to rep_based_pf devargs.\n");
+		return -EINVAL;
+	}
+
+	vfr_bp->rep_based_pf = rep_based_pf;
+	vfr_bp->flags |= BNXT_REP_BASED_PF_VALID;
+
+	PMD_DRV_LOG(INFO, "rep-based-pf = %d\n", vfr_bp->rep_based_pf);
+
+	return 0;
+}
+
+static int
+bnxt_parse_devarg_rep_q_r2f(__rte_unused const char *key,
+			    const char *value, void *opaque_arg)
+{
+	struct bnxt_representor *vfr_bp = opaque_arg;
+	unsigned long rep_q_r2f;
+	char *end = NULL;
+
+	if (!value || !opaque_arg) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_q_r2f "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	rep_q_r2f = strtoul(value, &end, 10);
+	if (end == NULL || *end != '\0' ||
+	    (rep_q_r2f == ULONG_MAX && errno == ERANGE)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_q_r2f "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	if (BNXT_DEVARG_REP_Q_R2F_INVALID(rep_q_r2f)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid value passed to rep_q_r2f devargs.\n");
+		return -EINVAL;
+	}
+
+	vfr_bp->rep_q_r2f = rep_q_r2f;
+	vfr_bp->flags |= BNXT_REP_Q_R2F_VALID;
+	PMD_DRV_LOG(INFO, "rep-q-r2f = %d\n", vfr_bp->rep_q_r2f);
+
+	return 0;
+}
+
+static int
+bnxt_parse_devarg_rep_q_f2r(__rte_unused const char *key,
+			    const char *value, void *opaque_arg)
+{
+	struct bnxt_representor *vfr_bp = opaque_arg;
+	unsigned long rep_q_f2r;
+	char *end = NULL;
+
+	if (!value || !opaque_arg) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_q_f2r "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	rep_q_f2r = strtoul(value, &end, 10);
+	if (end == NULL || *end != '\0' ||
+	    (rep_q_f2r == ULONG_MAX && errno == ERANGE)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_q_f2r "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	if (BNXT_DEVARG_REP_Q_F2R_INVALID(rep_q_f2r)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid value passed to rep_q_f2r devargs.\n");
+		return -EINVAL;
+	}
+
+	vfr_bp->rep_q_f2r = rep_q_f2r;
+	vfr_bp->flags |= BNXT_REP_Q_F2R_VALID;
+	PMD_DRV_LOG(INFO, "rep-q-f2r = %d\n", vfr_bp->rep_q_f2r);
+
+	return 0;
+}
+
+static int
+bnxt_parse_devarg_rep_fc_r2f(__rte_unused const char *key,
+			     const char *value, void *opaque_arg)
+{
+	struct bnxt_representor *vfr_bp = opaque_arg;
+	unsigned long rep_fc_r2f;
+	char *end = NULL;
+
+	if (!value || !opaque_arg) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_fc_r2f "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	rep_fc_r2f = strtoul(value, &end, 10);
+	if (end == NULL || *end != '\0' ||
+	    (rep_fc_r2f == ULONG_MAX && errno == ERANGE)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_fc_r2f "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	if (BNXT_DEVARG_REP_FC_R2F_INVALID(rep_fc_r2f)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid value passed to rep_fc_r2f devargs.\n");
+		return -EINVAL;
+	}
+
+	vfr_bp->flags |= BNXT_REP_FC_R2F_VALID;
+	vfr_bp->rep_fc_r2f = rep_fc_r2f;
+	PMD_DRV_LOG(INFO, "rep-fc-r2f = %lu\n", rep_fc_r2f);
+
+	return 0;
+}
+
+static int
+bnxt_parse_devarg_rep_fc_f2r(__rte_unused const char *key,
+			     const char *value, void *opaque_arg)
+{
+	struct bnxt_representor *vfr_bp = opaque_arg;
+	unsigned long rep_fc_f2r;
+	char *end = NULL;
+
+	if (!value || !opaque_arg) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_fc_f2r "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	rep_fc_f2r = strtoul(value, &end, 10);
+	if (end == NULL || *end != '\0' ||
+	    (rep_fc_f2r == ULONG_MAX && errno == ERANGE)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid parameter passed to rep_fc_f2r "
+			    "devargs.\n");
+		return -EINVAL;
+	}
+
+	if (BNXT_DEVARG_REP_FC_F2R_INVALID(rep_fc_f2r)) {
+		PMD_DRV_LOG(ERR,
+			    "Invalid value passed to rep_fc_f2r devargs.\n");
+		return -EINVAL;
+	}
+
+	vfr_bp->flags |= BNXT_REP_FC_F2R_VALID;
+	vfr_bp->rep_fc_f2r = rep_fc_f2r;
+	PMD_DRV_LOG(INFO, "rep-fc-f2r = %lu\n", rep_fc_f2r);
+
+	return 0;
+}
+
 static void
 bnxt_parse_dev_args(struct bnxt *bp, struct rte_devargs *devargs)
 {
@@ -5642,21 +5151,21 @@ bnxt_parse_dev_args(struct bnxt *bp, struct rte_devargs *devargs)
 
 	/*
 	 * Handler for "truflow" devarg.
-	 * Invoked as for ex: "-w 0000:00:0d.0,host-based-truflow=1"
+	 * Invoked as for ex: "-a 0000:00:0d.0,host-based-truflow=1"
 	 */
 	rte_kvargs_process(kvlist, BNXT_DEVARG_TRUFLOW,
 			   bnxt_parse_devarg_truflow, bp);
 
 	/*
 	 * Handler for "flow_xstat" devarg.
-	 * Invoked as for ex: "-w 0000:00:0d.0,flow_xstat=1"
+	 * Invoked as for ex: "-a 0000:00:0d.0,flow_xstat=1"
 	 */
 	rte_kvargs_process(kvlist, BNXT_DEVARG_FLOW_XSTAT,
 			   bnxt_parse_devarg_flow_xstat, bp);
 
 	/*
 	 * Handler for "max_num_kflows" devarg.
-	 * Invoked as for ex: "-w 000:00:0d.0,max_num_kflows=32"
+	 * Invoked as for ex: "-a 000:00:0d.0,max_num_kflows=32"
 	 */
 	rte_kvargs_process(kvlist, BNXT_DEVARG_MAX_NUM_KFLOWS,
 			   bnxt_parse_devarg_max_num_kflows, bp);
@@ -5708,6 +5217,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
 		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;
 
@@ -5728,6 +5238,22 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
 	    pci_dev->id.device_id == BROADCOM_DEV_ID_58802_VF)
 		bp->flags |= BNXT_FLAG_STINGRAY;
 
+	if (BNXT_TRUFLOW_EN(bp)) {
+		/* extra mbuf field is required to store CFA code from mark */
+		static const struct rte_mbuf_dynfield bnxt_cfa_code_dynfield_desc = {
+			.name = RTE_PMD_BNXT_CFA_CODE_DYNFIELD_NAME,
+			.size = sizeof(bnxt_cfa_code_dynfield_t),
+			.align = __alignof__(bnxt_cfa_code_dynfield_t),
+		};
+		bnxt_cfa_code_dynfield_offset =
+			rte_mbuf_dynfield_register(&bnxt_cfa_code_dynfield_desc);
+		if (bnxt_cfa_code_dynfield_offset < 0) {
+			PMD_DRV_LOG(ERR,
+			    "Failed to register mbuf field for TruFlow mark\n");
+			return -rte_errno;
+		}
+	}
+
 	rc = bnxt_init_board(eth_dev);
 	if (rc) {
 		PMD_DRV_LOG(ERR,
@@ -5771,11 +5297,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
 
 	bnxt_alloc_switch_domain(bp);
 
-	/* Pass the information to the rte_eth_dev_close() that it should also
-	 * release the private port resources.
-	 */
-	eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
-
 	PMD_DRV_LOG(INFO,
 		    DRV_MODULE_NAME "found at mem %" PRIX64 ", node addr %pM\n",
 		    pci_dev->mem_resource[0].phys_addr,
@@ -5862,6 +5383,7 @@ 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);
@@ -5875,7 +5397,10 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
 
 	bnxt_free_int(bp);
 	bnxt_free_mem(bp, reconfig_dev);
+
 	bnxt_hwrm_func_buf_unrgtr(bp);
+	rte_free(bp->pf->vf_req_buf);
+
 	rc = bnxt_hwrm_func_driver_unregister(bp, 0);
 	bp->flags &= ~BNXT_FLAG_REGISTERED;
 	bnxt_free_ctx_mem(bp);
@@ -5921,8 +5446,12 @@ static int bnxt_pci_remove_dev_with_reps(struct rte_eth_dev *eth_dev)
 		vf_rep_eth_dev = bp->rep_info[i].vfr_eth_dev;
 		if (!vf_rep_eth_dev)
 			continue;
-		rte_eth_dev_destroy(vf_rep_eth_dev, bnxt_vf_representor_uninit);
+		PMD_DRV_LOG(DEBUG, "BNXT Port:%d VFR pci remove\n",
+			    vf_rep_eth_dev->data->port_id);
+		rte_eth_dev_destroy(vf_rep_eth_dev, bnxt_representor_uninit);
 	}
+	PMD_DRV_LOG(DEBUG, "BNXT Port:%d pci remove\n",
+		    eth_dev->data->port_id);
 	ret = rte_eth_dev_destroy(eth_dev, bnxt_dev_uninit);
 
 	return ret;
@@ -5980,23 +5509,25 @@ static int bnxt_init_rep_info(struct bnxt *bp)
 }
 
 static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
-			       struct rte_eth_devargs eth_da,
-			       struct rte_eth_dev *backing_eth_dev)
+			       struct rte_eth_devargs *eth_da,
+			       struct rte_eth_dev *backing_eth_dev,
+			       const char *dev_args)
 {
 	struct rte_eth_dev *vf_rep_eth_dev;
 	char name[RTE_ETH_NAME_MAX_LEN];
 	struct bnxt *backing_bp;
 	uint16_t num_rep;
 	int i, ret = 0;
+	struct rte_kvargs *kvlist = NULL;
 
-	num_rep = eth_da.nb_representor_ports;
+	num_rep = eth_da->nb_representor_ports;
 	if (num_rep > BNXT_MAX_VF_REPS) {
 		PMD_DRV_LOG(ERR, "nb_representor_ports = %d > %d MAX VF REPS\n",
 			    num_rep, BNXT_MAX_VF_REPS);
 		return -EINVAL;
 	}
 
-	if (num_rep > RTE_MAX_ETHPORTS) {
+	if (num_rep >= RTE_MAX_ETHPORTS) {
 		PMD_DRV_LOG(ERR,
 			    "nb_representor_ports = %d > %d MAX ETHPORTS\n",
 			    num_rep, RTE_MAX_ETHPORTS);
@@ -6018,8 +5549,8 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 		return 0;
 
 	for (i = 0; i < num_rep; i++) {
-		struct bnxt_vf_representor representor = {
-			.vf_id = eth_da.representor_ports[i],
+		struct bnxt_representor representor = {
+			.vf_id = eth_da->representor_ports[i],
 			.switch_domain_id = backing_bp->switch_domain_id,
 			.parent_dev = backing_eth_dev
 		};
@@ -6032,33 +5563,124 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 
 		/* representor port net_bdf_port */
 		snprintf(name, sizeof(name), "net_%s_representor_%d",
-			 pci_dev->device.name, eth_da.representor_ports[i]);
+			 pci_dev->device.name, eth_da->representor_ports[i]);
+
+		kvlist = rte_kvargs_parse(dev_args, bnxt_dev_args);
+		if (kvlist) {
+			/*
+			 * Handler for "rep_is_pf" devarg.
+			 * Invoked as for ex: "-a 000:00:0d.0,
+			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
+			 */
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_IS_PF,
+						 bnxt_parse_devarg_rep_is_pf,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
+			/*
+			 * Handler for "rep_based_pf" devarg.
+			 * Invoked as for ex: "-a 000:00:0d.0,
+			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
+			 */
+			ret = rte_kvargs_process(kvlist,
+						 BNXT_DEVARG_REP_BASED_PF,
+						 bnxt_parse_devarg_rep_based_pf,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
+			/*
+			 * Handler for "rep_based_pf" devarg.
+			 * Invoked as for ex: "-a 000:00:0d.0,
+			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
+			 */
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_R2F,
+						 bnxt_parse_devarg_rep_q_r2f,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
+			/*
+			 * Handler for "rep_based_pf" devarg.
+			 * Invoked as for ex: "-a 000:00:0d.0,
+			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
+			 */
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_F2R,
+						 bnxt_parse_devarg_rep_q_f2r,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
+			/*
+			 * Handler for "rep_based_pf" devarg.
+			 * Invoked as for ex: "-a 000:00:0d.0,
+			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
+			 */
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_R2F,
+						 bnxt_parse_devarg_rep_fc_r2f,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
+			/*
+			 * Handler for "rep_based_pf" devarg.
+			 * Invoked as for ex: "-a 000:00:0d.0,
+			 * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
+			 */
+			ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_F2R,
+						 bnxt_parse_devarg_rep_fc_f2r,
+						 (void *)&representor);
+			if (ret) {
+				ret = -EINVAL;
+				goto err;
+			}
+		}
 
 		ret = rte_eth_dev_create(&pci_dev->device, name,
-					 sizeof(struct bnxt_vf_representor),
+					 sizeof(struct bnxt_representor),
 					 NULL, NULL,
-					 bnxt_vf_representor_init,
+					 bnxt_representor_init,
 					 &representor);
-
-		if (!ret) {
-			vf_rep_eth_dev = rte_eth_dev_allocated(name);
-			if (!vf_rep_eth_dev) {
-				PMD_DRV_LOG(ERR, "Failed to find the eth_dev"
-					    " for VF-Rep: %s.", name);
-				bnxt_pci_remove_dev_with_reps(backing_eth_dev);
-				ret = -ENODEV;
-				return ret;
-			}
-			backing_bp->rep_info[representor.vf_id].vfr_eth_dev =
-				vf_rep_eth_dev;
-			backing_bp->num_reps++;
-		} else {
+		if (ret) {
 			PMD_DRV_LOG(ERR, "failed to create bnxt vf "
 				    "representor %s.", name);
-			bnxt_pci_remove_dev_with_reps(backing_eth_dev);
+			goto err;
+		}
+
+		vf_rep_eth_dev = rte_eth_dev_allocated(name);
+		if (!vf_rep_eth_dev) {
+			PMD_DRV_LOG(ERR, "Failed to find the eth_dev"
+				    " for VF-Rep: %s.", name);
+			ret = -ENODEV;
+			goto err;
 		}
+
+		PMD_DRV_LOG(DEBUG, "BNXT Port:%d VFR pci probe\n",
+			    backing_eth_dev->data->port_id);
+		backing_bp->rep_info[representor.vf_id].vfr_eth_dev =
+							 vf_rep_eth_dev;
+		backing_bp->num_reps++;
+
 	}
 
+	rte_kvargs_free(kvlist);
+	return 0;
+
+err:
+	/* If num_rep > 1, then rollback already created
+	 * ports, since we'll be failing the probe anyway
+	 */
+	if (num_rep > 1)
+		bnxt_pci_remove_dev_with_reps(backing_eth_dev);
+	rte_errno = -ret;
+	rte_kvargs_free(kvlist);
+
 	return ret;
 }
 
@@ -6097,9 +5719,15 @@ static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 
 		backing_eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
 	}
+	PMD_DRV_LOG(DEBUG, "BNXT Port:%d pci probe\n",
+		    backing_eth_dev->data->port_id);
+
+	if (!num_rep)
+		return ret;
 
 	/* probe representor ports now */
-	ret = bnxt_rep_port_probe(pci_dev, eth_da, backing_eth_dev);
+	ret = bnxt_rep_port_probe(pci_dev, &eth_da, backing_eth_dev,
+				  pci_dev->device.devargs->args);
 
 	return ret;
 }
@@ -6116,10 +5744,11 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
 			   * +ve value will at least help in proper cleanup
 			   */
 
+	PMD_DRV_LOG(DEBUG, "BNXT Port:%d pci remove\n", eth_dev->data->port_id);
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
 		if (eth_dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR)
 			return rte_eth_dev_destroy(eth_dev,
-						   bnxt_vf_representor_uninit);
+						   bnxt_representor_uninit);
 		else
 			return rte_eth_dev_destroy(eth_dev,
 						   bnxt_dev_uninit);