net/bnxt: use shorter SIMD initializers
[dpdk.git] / drivers / net / bnxt / bnxt_hwrm.c
index 2e93a84..361f995 100644 (file)
@@ -52,7 +52,7 @@ static int page_getenum(size_t size)
        if (size <= 1 << 30)
                return 30;
        PMD_DRV_LOG(ERR, "Page size %zu out of range\n", size);
-       return sizeof(void *) * 8 - 1;
+       return sizeof(int) * 8 - 1;
 }
 
 static int page_roundup(size_t size)
@@ -148,7 +148,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
        /* Poll for the valid bit */
        for (i = 0; i < timeout; i++) {
                /* Sanity check on the resp->resp_len */
-               rte_cio_rmb();
+               rte_io_rmb();
                if (resp->resp_len && resp->resp_len <= bp->max_resp_len) {
                        /* Last byte of resp contains the valid key */
                        valid = (uint8_t *)resp + resp->resp_len - 1;
@@ -530,6 +530,9 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp,
 
        HWRM_PREP(&req, HWRM_CFA_L2_FILTER_ALLOC, BNXT_USE_CHIMP_MB);
 
+       /* PMD does not support XDP and RoCE */
+       filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_XDP_DISABLE |
+                       HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_TRAFFIC_L2;
        req.flags = rte_cpu_to_le_32(filter->flags);
 
        enables = filter->enables |
@@ -626,7 +629,7 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
 
        HWRM_PREP(&req, HWRM_PORT_MAC_PTP_QCFG, BNXT_USE_CHIMP_MB);
 
-       req.port_id = rte_cpu_to_le_16(bp->pf.port_id);
+       req.port_id = rte_cpu_to_le_16(bp->pf->port_id);
 
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
@@ -670,6 +673,20 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
        return 0;
 }
 
+void bnxt_hwrm_free_vf_info(struct bnxt *bp)
+{
+       int i;
+
+       for (i = 0; i < bp->pf->max_vfs; i++) {
+               rte_free(bp->pf->vf_info[i].vlan_table);
+               bp->pf->vf_info[i].vlan_table = NULL;
+               rte_free(bp->pf->vf_info[i].vlan_as_table);
+               bp->pf->vf_info[i].vlan_as_table = NULL;
+       }
+       rte_free(bp->pf->vf_info);
+       bp->pf->vf_info = NULL;
+}
+
 static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
 {
        int rc = 0;
@@ -690,47 +707,57 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
        bp->max_ring_grps = rte_le_to_cpu_32(resp->max_hw_ring_grps);
        flags = rte_le_to_cpu_32(resp->flags);
        if (BNXT_PF(bp)) {
-               bp->pf.port_id = resp->port_id;
-               bp->pf.first_vf_id = rte_le_to_cpu_16(resp->first_vf_id);
-               bp->pf.total_vfs = rte_le_to_cpu_16(resp->max_vfs);
+               bp->pf->port_id = resp->port_id;
+               bp->pf->first_vf_id = rte_le_to_cpu_16(resp->first_vf_id);
+               bp->pf->total_vfs = rte_le_to_cpu_16(resp->max_vfs);
                new_max_vfs = bp->pdev->max_vfs;
-               if (new_max_vfs != bp->pf.max_vfs) {
-                       if (bp->pf.vf_info)
-                               rte_free(bp->pf.vf_info);
-                       bp->pf.vf_info = rte_malloc("bnxt_vf_info",
-                           sizeof(bp->pf.vf_info[0]) * new_max_vfs, 0);
-                       bp->pf.max_vfs = new_max_vfs;
+               if (new_max_vfs != bp->pf->max_vfs) {
+                       if (bp->pf->vf_info)
+                               bnxt_hwrm_free_vf_info(bp);
+                       bp->pf->vf_info = rte_zmalloc("bnxt_vf_info",
+                           sizeof(bp->pf->vf_info[0]) * new_max_vfs, 0);
+                       if (bp->pf->vf_info == NULL) {
+                               PMD_DRV_LOG(ERR, "Alloc vf info fail\n");
+                               return -ENOMEM;
+                       }
+                       bp->pf->max_vfs = new_max_vfs;
                        for (i = 0; i < new_max_vfs; i++) {
-                               bp->pf.vf_info[i].fid = bp->pf.first_vf_id + i;
-                               bp->pf.vf_info[i].vlan_table =
+                               bp->pf->vf_info[i].fid =
+                                       bp->pf->first_vf_id + i;
+                               bp->pf->vf_info[i].vlan_table =
                                        rte_zmalloc("VF VLAN table",
                                                    getpagesize(),
                                                    getpagesize());
-                               if (bp->pf.vf_info[i].vlan_table == NULL)
+                               if (bp->pf->vf_info[i].vlan_table == NULL)
                                        PMD_DRV_LOG(ERR,
                                        "Fail to alloc VLAN table for VF %d\n",
                                        i);
                                else
                                        rte_mem_lock_page(
-                                               bp->pf.vf_info[i].vlan_table);
-                               bp->pf.vf_info[i].vlan_as_table =
+                                               bp->pf->vf_info[i].vlan_table);
+                               bp->pf->vf_info[i].vlan_as_table =
                                        rte_zmalloc("VF VLAN AS table",
                                                    getpagesize(),
                                                    getpagesize());
-                               if (bp->pf.vf_info[i].vlan_as_table == NULL)
+                               if (bp->pf->vf_info[i].vlan_as_table == NULL)
                                        PMD_DRV_LOG(ERR,
                                        "Alloc VLAN AS table for VF %d fail\n",
                                        i);
                                else
                                        rte_mem_lock_page(
-                                              bp->pf.vf_info[i].vlan_as_table);
-                               STAILQ_INIT(&bp->pf.vf_info[i].filter);
+                                             bp->pf->vf_info[i].vlan_as_table);
+                               STAILQ_INIT(&bp->pf->vf_info[i].filter);
                        }
                }
        }
 
        bp->fw_fid = rte_le_to_cpu_32(resp->fid);
-       memcpy(bp->dflt_mac_addr, &resp->mac_address, RTE_ETHER_ADDR_LEN);
+       if (!bnxt_check_zero_bytes(resp->mac_address, RTE_ETHER_ADDR_LEN)) {
+               bp->flags |= BNXT_FLAG_DFLT_MAC_SET;
+               memcpy(bp->mac_addr, &resp->mac_address, RTE_ETHER_ADDR_LEN);
+       } else {
+               bp->flags &= ~BNXT_FLAG_DFLT_MAC_SET;
+       }
        bp->max_rsscos_ctx = rte_le_to_cpu_16(resp->max_rsscos_ctx);
        bp->max_cp_rings = rte_le_to_cpu_16(resp->max_cmpl_rings);
        bp->max_tx_rings = rte_le_to_cpu_16(resp->max_tx_rings);
@@ -738,11 +765,11 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
        bp->first_vf_id = rte_le_to_cpu_16(resp->first_vf_id);
        bp->max_rx_em_flows = rte_le_to_cpu_16(resp->max_rx_em_flows);
        bp->max_l2_ctx = rte_le_to_cpu_16(resp->max_l2_ctxs);
-       if (!BNXT_CHIP_THOR(bp))
+       if (!BNXT_CHIP_THOR(bp) && !bp->pdev->max_vfs)
                bp->max_l2_ctx += bp->max_rx_em_flows;
        /* TODO: For now, do not support VMDq/RFS on VFs. */
        if (BNXT_PF(bp)) {
-               if (bp->pf.max_vfs)
+               if (bp->pf->max_vfs)
                        bp->max_vnics = 1;
                else
                        bp->max_vnics = rte_le_to_cpu_16(resp->max_vnics);
@@ -753,7 +780,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
                    bp->max_l2_ctx, bp->max_vnics);
        bp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx);
        if (BNXT_PF(bp)) {
-               bp->pf.total_vnics = rte_le_to_cpu_16(resp->max_vnics);
+               bp->pf->total_vnics = rte_le_to_cpu_16(resp->max_vnics);
                if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_PTP_SUPPORTED) {
                        bp->flags |= BNXT_FLAG_PTP_SUPPORTED;
                        PMD_DRV_LOG(DEBUG, "PTP SUPPORTED\n");
@@ -776,6 +803,9 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
        if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_HOT_RESET_CAPABLE)
                bp->fw_cap |= BNXT_FW_CAP_HOT_RESET;
 
+       if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_LINK_ADMIN_STATUS_SUPPORTED)
+               bp->fw_cap |= BNXT_FW_CAP_LINK_ADMIN;
+
        HWRM_UNLOCK();
 
        return rc;
@@ -791,16 +821,15 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
                if (rc)
                        return rc;
 
+               /* On older FW,
+                * bnxt_hwrm_func_resc_qcaps can fail and cause init failure.
+                * But the error can be ignored. Return success.
+                */
                rc = bnxt_hwrm_func_resc_qcaps(bp);
                if (!rc)
                        bp->flags |= BNXT_FLAG_NEW_RM;
        }
 
-       /* On older FW,
-        * bnxt_hwrm_func_resc_qcaps can fail and cause init failure.
-        * But the error can be ignored. Return success.
-        */
-
        return 0;
 }
 
@@ -808,6 +837,7 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
 int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)
 {
        int rc = 0;
+       uint32_t flags;
        struct hwrm_vnic_qcaps_input req = {.req_type = 0 };
        struct hwrm_vnic_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
 
@@ -819,12 +849,16 @@ int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)
 
        HWRM_CHECK_RESULT();
 
-       if (rte_le_to_cpu_32(resp->flags) &
-           HWRM_VNIC_QCAPS_OUTPUT_FLAGS_COS_ASSIGNMENT_CAP) {
+       flags = rte_le_to_cpu_32(resp->flags);
+
+       if (flags & HWRM_VNIC_QCAPS_OUTPUT_FLAGS_COS_ASSIGNMENT_CAP) {
                bp->vnic_cap_flags |= BNXT_VNIC_CAP_COS_CLASSIFY;
                PMD_DRV_LOG(INFO, "CoS assignment capability enabled\n");
        }
 
+       if (flags & HWRM_VNIC_QCAPS_OUTPUT_FLAGS_OUTERMOST_RSS_CAP)
+               bp->vnic_cap_flags |= BNXT_VNIC_CAP_OUTER_RSS;
+
        bp->max_tpa_v2 = rte_le_to_cpu_16(resp->max_aggs_supported);
 
        HWRM_UNLOCK();
@@ -881,17 +915,9 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)
        if (BNXT_PF(bp)) {
                req.enables |= rte_cpu_to_le_32(
                        HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_VF_REQ_FWD);
-               memcpy(req.vf_req_fwd, bp->pf.vf_req_fwd,
+               memcpy(req.vf_req_fwd, bp->pf->vf_req_fwd,
                       RTE_MIN(sizeof(req.vf_req_fwd),
-                              sizeof(bp->pf.vf_req_fwd)));
-
-               /*
-                * PF can sniff HWRM API issued by VF. This can be set up by
-                * linux driver and inherited by the DPDK PF driver. Clear
-                * this HWRM sniffer list in FW because DPDK PF driver does
-                * not support this.
-                */
-               flags |= HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_FWD_NONE_MODE;
+                              sizeof(bp->pf->vf_req_fwd)));
        }
 
        req.flags = rte_cpu_to_le_32(flags);
@@ -912,6 +938,10 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)
                req.async_event_fwd[1] |=
                        rte_cpu_to_le_32(ASYNC_CMPL_EVENT_ID_DBG_NOTIFICATION);
 
+       if (BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))
+               req.async_event_fwd[1] |=
+               rte_cpu_to_le_32(ASYNC_CMPL_EVENT_ID_DEFAULT_VNIC_CHANGE);
+
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
        HWRM_CHECK_RESULT();
@@ -1016,21 +1046,19 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)
 
        HWRM_CHECK_RESULT_SILENT();
 
-       if (BNXT_VF(bp)) {
-               bp->max_rsscos_ctx = rte_le_to_cpu_16(resp->max_rsscos_ctx);
-               bp->max_cp_rings = rte_le_to_cpu_16(resp->max_cmpl_rings);
-               bp->max_tx_rings = rte_le_to_cpu_16(resp->max_tx_rings);
-               bp->max_rx_rings = rte_le_to_cpu_16(resp->max_rx_rings);
-               bp->max_ring_grps = rte_le_to_cpu_32(resp->max_hw_ring_grps);
-               /* func_resource_qcaps does not return max_rx_em_flows.
-                * So use the value provided by func_qcaps.
-                */
-               bp->max_l2_ctx = rte_le_to_cpu_16(resp->max_l2_ctxs);
-               if (!BNXT_CHIP_THOR(bp))
-                       bp->max_l2_ctx += bp->max_rx_em_flows;
-               bp->max_vnics = rte_le_to_cpu_16(resp->max_vnics);
-               bp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx);
-       }
+       bp->max_rsscos_ctx = rte_le_to_cpu_16(resp->max_rsscos_ctx);
+       bp->max_cp_rings = rte_le_to_cpu_16(resp->max_cmpl_rings);
+       bp->max_tx_rings = rte_le_to_cpu_16(resp->max_tx_rings);
+       bp->max_rx_rings = rte_le_to_cpu_16(resp->max_rx_rings);
+       bp->max_ring_grps = rte_le_to_cpu_32(resp->max_hw_ring_grps);
+       /* func_resource_qcaps does not return max_rx_em_flows.
+        * So use the value provided by func_qcaps.
+        */
+       bp->max_l2_ctx = rte_le_to_cpu_16(resp->max_l2_ctxs);
+       if (!BNXT_CHIP_THOR(bp) && !bp->pdev->max_vfs)
+               bp->max_l2_ctx += bp->max_rx_em_flows;
+       bp->max_vnics = rte_le_to_cpu_16(resp->max_vnics);
+       bp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx);
        bp->max_nq_rings = rte_le_to_cpu_16(resp->max_msix);
        bp->vf_resv_strategy = rte_le_to_cpu_16(resp->vf_reservation_strategy);
        if (bp->vf_resv_strategy >
@@ -1229,16 +1257,24 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf)
                }
 
                req.flags = rte_cpu_to_le_32(conf->phy_flags);
-               req.force_link_speed = rte_cpu_to_le_16(conf->link_speed);
-               enables |= HWRM_PORT_PHY_CFG_INPUT_ENABLES_AUTO_MODE;
                /*
                 * Note, ChiMP FW 20.2.1 and 20.2.2 return an error when we set
                 * any auto mode, even "none".
                 */
                if (!conf->link_speed) {
                        /* No speeds specified. Enable AutoNeg - all speeds */
+                       enables |= HWRM_PORT_PHY_CFG_INPUT_ENABLES_AUTO_MODE;
                        req.auto_mode =
                                HWRM_PORT_PHY_CFG_INPUT_AUTO_MODE_ALL_SPEEDS;
+               } else {
+                       if (bp->link_info->link_signal_mode) {
+                               enables |=
+                               HWRM_PORT_PHY_CFG_IN_EN_FORCE_PAM4_LINK_SPEED;
+                               req.force_pam4_link_speed =
+                                       rte_cpu_to_le_16(conf->link_speed);
+                       }
+                       req.force_link_speed =
+                                       rte_cpu_to_le_16(conf->link_speed);
                }
                /* AutoNeg - Advertise speeds specified. */
                if (conf->auto_link_speed_mask &&
@@ -1247,9 +1283,20 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf)
                                HWRM_PORT_PHY_CFG_INPUT_AUTO_MODE_SPEED_MASK;
                        req.auto_link_speed_mask =
                                conf->auto_link_speed_mask;
-                       enables |=
-                       HWRM_PORT_PHY_CFG_INPUT_ENABLES_AUTO_LINK_SPEED_MASK;
+                       if (conf->auto_pam4_link_speeds) {
+                               enables |=
+                               HWRM_PORT_PHY_CFG_IN_EN_AUTO_PAM4_LINK_SPD_MASK;
+                               req.auto_link_pam4_speed_mask =
+                                       conf->auto_pam4_link_speeds;
+                       } else {
+                               enables |=
+                               HWRM_PORT_PHY_CFG_IN_EN_AUTO_LINK_SPEED_MASK;
+                       }
                }
+               if (conf->auto_link_speed &&
+               !(conf->phy_flags & HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE))
+                       enables |=
+                               HWRM_PORT_PHY_CFG_INPUT_ENABLES_AUTO_LINK_SPEED;
 
                req.auto_duplex = conf->duplex;
                enables |= HWRM_PORT_PHY_CFG_INPUT_ENABLES_AUTO_DUPLEX;
@@ -1309,21 +1356,52 @@ static int bnxt_hwrm_port_phy_qcfg(struct bnxt *bp,
        link_info->phy_ver[0] = resp->phy_maj;
        link_info->phy_ver[1] = resp->phy_min;
        link_info->phy_ver[2] = resp->phy_bld;
-
+       link_info->link_signal_mode =
+               rte_le_to_cpu_16(resp->active_fec_signal_mode);
+       link_info->force_pam4_link_speed =
+                       rte_le_to_cpu_16(resp->force_pam4_link_speed);
+       link_info->support_pam4_speeds =
+                       rte_le_to_cpu_16(resp->support_pam4_speeds);
+       link_info->auto_pam4_link_speeds =
+                       rte_le_to_cpu_16(resp->auto_pam4_link_speed_mask);
        HWRM_UNLOCK();
 
-       PMD_DRV_LOG(DEBUG, "Link Speed %d\n", link_info->link_speed);
-       PMD_DRV_LOG(DEBUG, "Auto Mode %d\n", link_info->auto_mode);
-       PMD_DRV_LOG(DEBUG, "Support Speeds %x\n", link_info->support_speeds);
-       PMD_DRV_LOG(DEBUG, "Auto Link Speed %x\n", link_info->auto_link_speed);
-       PMD_DRV_LOG(DEBUG, "Auto Link Speed Mask %x\n",
-                   link_info->auto_link_speed_mask);
-       PMD_DRV_LOG(DEBUG, "Forced Link Speed %x\n",
-                   link_info->force_link_speed);
-
+       PMD_DRV_LOG(DEBUG, "Link Speed:%d,Auto:%d:%x:%x,Support:%x,Force:%x\n",
+                   link_info->link_speed, link_info->auto_mode,
+                   link_info->auto_link_speed, link_info->auto_link_speed_mask,
+                   link_info->support_speeds, link_info->force_link_speed);
        return rc;
 }
 
+int bnxt_hwrm_port_phy_qcaps(struct bnxt *bp)
+{
+       int rc = 0;
+       struct hwrm_port_phy_qcaps_input req = {0};
+       struct hwrm_port_phy_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
+       struct bnxt_link_info *link_info = bp->link_info;
+
+       if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp))
+               return 0;
+
+       HWRM_PREP(&req, HWRM_PORT_PHY_QCAPS, BNXT_USE_CHIMP_MB);
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+
+       HWRM_CHECK_RESULT();
+
+       bp->port_cnt = resp->port_cnt;
+       if (resp->supported_speeds_auto_mode)
+               link_info->support_auto_speeds =
+                       rte_le_to_cpu_16(resp->supported_speeds_auto_mode);
+       if (resp->supported_pam4_speeds_auto_mode)
+               link_info->support_pam4_auto_speeds =
+                       rte_le_to_cpu_16(resp->supported_pam4_speeds_auto_mode);
+
+       HWRM_UNLOCK();
+
+       return 0;
+}
+
 static bool bnxt_find_lossy_profile(struct bnxt *bp)
 {
        int i = 0;
@@ -2214,8 +2292,8 @@ int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
                                HWRM_VNIC_TPA_CFG_INPUT_FLAGS_GRO |
                                HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_ECN |
                        HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_SAME_GRE_SEQ);
-               req.max_agg_segs = rte_cpu_to_le_16(BNXT_TPA_MAX_AGGS(bp));
-               req.max_aggs = rte_cpu_to_le_16(BNXT_TPA_MAX_SEGS(bp));
+               req.max_aggs = rte_cpu_to_le_16(BNXT_TPA_MAX_AGGS(bp));
+               req.max_agg_segs = rte_cpu_to_le_16(BNXT_TPA_MAX_SEGS(bp));
                req.min_agg_len = rte_cpu_to_le_32(512);
        }
        req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id);
@@ -2234,11 +2312,11 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf, const uint8_t *mac_addr)
        struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr;
        int rc;
 
-       req.flags = rte_cpu_to_le_32(bp->pf.vf_info[vf].func_cfg_flags);
+       req.flags = rte_cpu_to_le_32(bp->pf->vf_info[vf].func_cfg_flags);
        req.enables = rte_cpu_to_le_32(
                        HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_MAC_ADDR);
        memcpy(req.dflt_mac_addr, mac_addr, sizeof(req.dflt_mac_addr));
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
 
        HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
 
@@ -2246,7 +2324,7 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf, const uint8_t *mac_addr)
        HWRM_CHECK_RESULT();
        HWRM_UNLOCK();
 
-       bp->pf.vf_info[vf].random_mac = false;
+       bp->pf->vf_info[vf].random_mac = false;
 
        return rc;
 }
@@ -2585,6 +2663,25 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp)
        return 0;
 }
 
+int
+bnxt_clear_one_vnic_filter(struct bnxt *bp, struct bnxt_filter_info *filter)
+{
+       int rc = 0;
+
+       if (filter->filter_type == HWRM_CFA_EM_FILTER) {
+               rc = bnxt_hwrm_clear_em_filter(bp, filter);
+               if (rc)
+                       return rc;
+       } else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER) {
+               rc = bnxt_hwrm_clear_ntuple_filter(bp, filter);
+               if (rc)
+                       return rc;
+       }
+
+       rc = bnxt_hwrm_clear_l2_filter(bp, filter);
+       return rc;
+}
+
 static int
 bnxt_clear_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
 {
@@ -2592,11 +2689,7 @@ bnxt_clear_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
        int rc = 0;
 
        STAILQ_FOREACH(filter, &vnic->filter, next) {
-               if (filter->filter_type == HWRM_CFA_EM_FILTER)
-                       rc = bnxt_hwrm_clear_em_filter(bp, filter);
-               else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)
-                       rc = bnxt_hwrm_clear_ntuple_filter(bp, filter);
-               rc = bnxt_hwrm_clear_l2_filter(bp, filter);
+               rc = bnxt_clear_one_vnic_filter(bp, filter);
                STAILQ_REMOVE(&vnic->filter, filter, bnxt_filter_info, next);
                bnxt_free_filter(bp, filter);
        }
@@ -2614,11 +2707,7 @@ bnxt_clear_hwrm_vnic_flows(struct bnxt *bp, struct bnxt_vnic_info *vnic)
                flow = STAILQ_FIRST(&vnic->flow_list);
                filter = flow->filter;
                PMD_DRV_LOG(DEBUG, "filter type %d\n", filter->filter_type);
-               if (filter->filter_type == HWRM_CFA_EM_FILTER)
-                       rc = bnxt_hwrm_clear_em_filter(bp, filter);
-               else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)
-                       rc = bnxt_hwrm_clear_ntuple_filter(bp, filter);
-               rc = bnxt_hwrm_clear_l2_filter(bp, filter);
+               rc = bnxt_clear_one_vnic_filter(bp, filter);
 
                STAILQ_REMOVE(&vnic->flow_list, flow, rte_flow, next);
                rte_free(flow);
@@ -2653,11 +2742,10 @@ bnxt_free_tunnel_ports(struct bnxt *bp)
        if (bp->vxlan_port_cnt)
                bnxt_hwrm_tunnel_dst_port_free(bp, bp->vxlan_fw_dst_port_id,
                        HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_VXLAN);
-       bp->vxlan_port = 0;
+
        if (bp->geneve_port_cnt)
                bnxt_hwrm_tunnel_dst_port_free(bp, bp->geneve_fw_dst_port_id,
                        HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_GENEVE);
-       bp->geneve_port = 0;
 }
 
 void bnxt_free_all_hwrm_resources(struct bnxt *bp)
@@ -2714,10 +2802,11 @@ static uint16_t bnxt_parse_eth_link_duplex(uint32_t conf_link_speed)
 
 static uint16_t bnxt_check_eth_link_autoneg(uint32_t conf_link)
 {
-       return (conf_link & ETH_LINK_SPEED_FIXED) ? 0 : 1;
+       return !conf_link;
 }
 
-static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed)
+static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed,
+                                         uint16_t pam4_link)
 {
        uint16_t eth_link_speed = 0;
 
@@ -2756,16 +2845,18 @@ static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed)
                        HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_40GB;
                break;
        case ETH_LINK_SPEED_50G:
-               eth_link_speed =
+               eth_link_speed = pam4_link ?
+                       HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_50GB :
                        HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_50GB;
                break;
        case ETH_LINK_SPEED_100G:
-               eth_link_speed =
+               eth_link_speed = pam4_link ?
+                       HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_100GB :
                        HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_100GB;
                break;
        case ETH_LINK_SPEED_200G:
                eth_link_speed =
-                       HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_200GB;
+                       HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_200GB;
                break;
        default:
                PMD_DRV_LOG(ERR,
@@ -2782,13 +2873,18 @@ static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed)
                ETH_LINK_SPEED_40G | ETH_LINK_SPEED_50G | \
                ETH_LINK_SPEED_100G | ETH_LINK_SPEED_200G)
 
-static int bnxt_valid_link_speed(uint32_t link_speed, uint16_t port_id)
+static int bnxt_validate_link_speed(struct bnxt *bp)
 {
+       uint32_t link_speed = bp->eth_dev->data->dev_conf.link_speeds;
+       uint16_t port_id = bp->eth_dev->data->port_id;
+       uint32_t link_speed_capa;
        uint32_t one_speed;
 
        if (link_speed == ETH_LINK_SPEED_AUTONEG)
                return 0;
 
+       link_speed_capa = bnxt_get_speed_capabilities(bp);
+
        if (link_speed & ETH_LINK_SPEED_FIXED) {
                one_speed = link_speed & ~ETH_LINK_SPEED_FIXED;
 
@@ -2798,14 +2894,14 @@ static int bnxt_valid_link_speed(uint32_t link_speed, uint16_t port_id)
                                link_speed, port_id);
                        return -EINVAL;
                }
-               if ((one_speed & BNXT_SUPPORTED_SPEEDS) != one_speed) {
+               if ((one_speed & link_speed_capa) != one_speed) {
                        PMD_DRV_LOG(ERR,
                                "Unsupported advertised speed (%u) for port %u\n",
                                link_speed, port_id);
                        return -EINVAL;
                }
        } else {
-               if (!(link_speed & BNXT_SUPPORTED_SPEEDS)) {
+               if (!(link_speed & link_speed_capa)) {
                        PMD_DRV_LOG(ERR,
                                "Unsupported advertised speeds (%u) for port %u\n",
                                link_speed, port_id);
@@ -2847,7 +2943,7 @@ bnxt_parse_eth_link_speed_mask(struct bnxt *bp, uint32_t link_speed)
        if (link_speed & ETH_LINK_SPEED_100G)
                ret |= HWRM_PORT_PHY_CFG_INPUT_AUTO_LINK_SPEED_MASK_100GB;
        if (link_speed & ETH_LINK_SPEED_200G)
-               ret |= HWRM_PORT_PHY_CFG_INPUT_AUTO_LINK_SPEED_MASK_200GB;
+               ret |= HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_200GB;
        return ret;
 }
 
@@ -2921,12 +3017,16 @@ int bnxt_get_hwrm_link_config(struct bnxt *bp, struct rte_eth_link *link)
        int rc = 0;
        struct bnxt_link_info *link_info = bp->link_info;
 
+       rc = bnxt_hwrm_port_phy_qcaps(bp);
+       if (rc)
+               PMD_DRV_LOG(ERR, "Get link config failed with rc %d\n", rc);
+
        rc = bnxt_hwrm_port_phy_qcfg(bp, link_info);
        if (rc) {
-               PMD_DRV_LOG(ERR,
-                       "Get link config failed with rc %d\n", rc);
+               PMD_DRV_LOG(ERR, "Get link config failed with rc %d\n", rc);
                goto exit;
        }
+
        if (link_info->link_speed)
                link->link_speed =
                        bnxt_parse_hw_link_speed(link_info->link_speed);
@@ -2951,8 +3051,7 @@ int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up)
        if (!BNXT_SINGLE_PF(bp) || BNXT_VF(bp))
                return 0;
 
-       rc = bnxt_valid_link_speed(dev_conf->link_speeds,
-                       bp->eth_dev->data->port_id);
+       rc = bnxt_validate_link_speed(bp);
        if (rc)
                goto error;
 
@@ -2972,7 +3071,8 @@ int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up)
                autoneg = 0;
        }
 
-       speed = bnxt_parse_eth_link_speed(dev_conf->link_speeds);
+       speed = bnxt_parse_eth_link_speed(dev_conf->link_speeds,
+                                         bp->link_info->link_signal_mode);
        link_req.phy_flags = HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESET_PHY;
        /* Autoneg can be done only when the FW allows.
         * When user configures fixed speed of 40G and later changes to
@@ -3003,6 +3103,15 @@ int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up)
                /* If user wants a particular speed try that first. */
                if (speed)
                        link_req.link_speed = speed;
+               else if (bp->link_info->force_pam4_link_speed)
+                       link_req.link_speed =
+                               bp->link_info->force_pam4_link_speed;
+               else if (bp->link_info->auto_pam4_link_speeds)
+                       link_req.link_speed =
+                               bp->link_info->auto_pam4_link_speeds;
+               else if (bp->link_info->support_pam4_speeds)
+                       link_req.link_speed =
+                               bp->link_info->support_pam4_speeds;
                else if (bp->link_info->force_link_speed)
                        link_req.link_speed = bp->link_info->force_link_speed;
                else
@@ -3084,6 +3193,75 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu)
        return rc;
 }
 
+int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp)
+{
+       struct hwrm_func_qcfg_input req = {0};
+       struct hwrm_func_qcfg_output *resp = bp->hwrm_cmd_resp_addr;
+       int rc;
+
+       if (!BNXT_VF_IS_TRUSTED(bp))
+               return 0;
+
+       if (!bp->parent)
+               return -EINVAL;
+
+       bp->parent->fid = BNXT_PF_FID_INVALID;
+
+       HWRM_PREP(&req, HWRM_FUNC_QCFG, BNXT_USE_CHIMP_MB);
+
+       req.fid = rte_cpu_to_le_16(0xfffe); /* Request parent PF information. */
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+
+       HWRM_CHECK_RESULT();
+
+       memcpy(bp->parent->mac_addr, resp->mac_address, RTE_ETHER_ADDR_LEN);
+       bp->parent->vnic = rte_le_to_cpu_16(resp->dflt_vnic_id);
+       bp->parent->fid = rte_le_to_cpu_16(resp->fid);
+       bp->parent->port_id = rte_le_to_cpu_16(resp->port_id);
+
+       /* FIXME: Temporary workaround - remove when firmware issue is fixed. */
+       if (bp->parent->vnic == 0) {
+               PMD_DRV_LOG(ERR, "Error: parent VNIC unavailable.\n");
+               /* Use hard-coded values appropriate for current Wh+ fw. */
+               if (bp->parent->fid == 2)
+                       bp->parent->vnic = 0x100;
+               else
+                       bp->parent->vnic = 1;
+       }
+
+       HWRM_UNLOCK();
+
+       return 0;
+}
+
+int bnxt_hwrm_get_dflt_vnic_svif(struct bnxt *bp, uint16_t fid,
+                                uint16_t *vnic_id, uint16_t *svif)
+{
+       struct hwrm_func_qcfg_input req = {0};
+       struct hwrm_func_qcfg_output *resp = bp->hwrm_cmd_resp_addr;
+       uint16_t svif_info;
+       int rc = 0;
+
+       HWRM_PREP(&req, HWRM_FUNC_QCFG, BNXT_USE_CHIMP_MB);
+       req.fid = rte_cpu_to_le_16(fid);
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+
+       HWRM_CHECK_RESULT();
+
+       if (vnic_id)
+               *vnic_id = rte_le_to_cpu_16(resp->dflt_vnic_id);
+
+       svif_info = rte_le_to_cpu_16(resp->svif_info);
+       if (svif && (svif_info & HWRM_FUNC_QCFG_OUTPUT_SVIF_INFO_SVIF_VALID))
+               *svif = svif_info & HWRM_FUNC_QCFG_OUTPUT_SVIF_INFO_SVIF_MASK;
+
+       HWRM_UNLOCK();
+
+       return rc;
+}
+
 int bnxt_hwrm_port_mac_qcfg(struct bnxt *bp)
 {
        struct hwrm_port_mac_qcfg_input req = {0};
@@ -3093,14 +3271,14 @@ int bnxt_hwrm_port_mac_qcfg(struct bnxt *bp)
 
        bp->port_svif = BNXT_SVIF_INVALID;
 
-       if (!BNXT_PF(bp))
+       if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp))
                return 0;
 
        HWRM_PREP(&req, HWRM_PORT_MAC_QCFG, BNXT_USE_CHIMP_MB);
 
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
-       HWRM_CHECK_RESULT();
+       HWRM_CHECK_RESULT_SILENT();
 
        port_svif_info = rte_le_to_cpu_16(resp->port_svif_info);
        if (port_svif_info &
@@ -3113,33 +3291,8 @@ int bnxt_hwrm_port_mac_qcfg(struct bnxt *bp)
        return 0;
 }
 
-static void copy_func_cfg_to_qcaps(struct hwrm_func_cfg_input *fcfg,
-                                  struct hwrm_func_qcaps_output *qcaps)
-{
-       qcaps->max_rsscos_ctx = fcfg->num_rsscos_ctxs;
-       memcpy(qcaps->mac_address, fcfg->dflt_mac_addr,
-              sizeof(qcaps->mac_address));
-       qcaps->max_l2_ctxs = fcfg->num_l2_ctxs;
-       qcaps->max_rx_rings = fcfg->num_rx_rings;
-       qcaps->max_tx_rings = fcfg->num_tx_rings;
-       qcaps->max_cmpl_rings = fcfg->num_cmpl_rings;
-       qcaps->max_stat_ctx = fcfg->num_stat_ctxs;
-       qcaps->max_vfs = 0;
-       qcaps->first_vf_id = 0;
-       qcaps->max_vnics = fcfg->num_vnics;
-       qcaps->max_decap_records = 0;
-       qcaps->max_encap_records = 0;
-       qcaps->max_tx_wm_flows = 0;
-       qcaps->max_tx_em_flows = 0;
-       qcaps->max_rx_wm_flows = 0;
-       qcaps->max_rx_em_flows = 0;
-       qcaps->max_flow_id = 0;
-       qcaps->max_mcast_filters = fcfg->num_mcast_filters;
-       qcaps->max_sp_tx_rings = 0;
-       qcaps->max_hw_ring_grps = fcfg->num_hw_ring_grps;
-}
-
-static int bnxt_hwrm_pf_func_cfg(struct bnxt *bp, int tx_rings)
+static int bnxt_hwrm_pf_func_cfg(struct bnxt *bp,
+                                struct bnxt_pf_resource_info *pf_resc)
 {
        struct hwrm_func_cfg_input req = {0};
        struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr;
@@ -3158,21 +3311,22 @@ static int bnxt_hwrm_pf_func_cfg(struct bnxt *bp, int tx_rings)
 
        if (BNXT_HAS_RING_GRPS(bp)) {
                enables |= HWRM_FUNC_CFG_INPUT_ENABLES_NUM_HW_RING_GRPS;
-               req.num_hw_ring_grps = rte_cpu_to_le_16(bp->max_ring_grps);
+               req.num_hw_ring_grps =
+                       rte_cpu_to_le_16(pf_resc->num_hw_ring_grps);
        } else if (BNXT_HAS_NQ(bp)) {
                enables |= HWRM_FUNC_CFG_INPUT_ENABLES_NUM_MSIX;
                req.num_msix = rte_cpu_to_le_16(bp->max_nq_rings);
        }
 
-       req.flags = rte_cpu_to_le_32(bp->pf.func_cfg_flags);
+       req.flags = rte_cpu_to_le_32(bp->pf->func_cfg_flags);
        req.mtu = rte_cpu_to_le_16(BNXT_MAX_MTU);
        req.mru = rte_cpu_to_le_16(BNXT_VNIC_MRU(bp->eth_dev->data->mtu));
-       req.num_rsscos_ctxs = rte_cpu_to_le_16(bp->max_rsscos_ctx);
-       req.num_stat_ctxs = rte_cpu_to_le_16(bp->max_stat_ctx);
-       req.num_cmpl_rings = rte_cpu_to_le_16(bp->max_cp_rings);
-       req.num_tx_rings = rte_cpu_to_le_16(tx_rings);
-       req.num_rx_rings = rte_cpu_to_le_16(bp->max_rx_rings);
-       req.num_l2_ctxs = rte_cpu_to_le_16(bp->max_l2_ctx);
+       req.num_rsscos_ctxs = rte_cpu_to_le_16(pf_resc->num_rsscos_ctxs);
+       req.num_stat_ctxs = rte_cpu_to_le_16(pf_resc->num_stat_ctxs);
+       req.num_cmpl_rings = rte_cpu_to_le_16(pf_resc->num_cp_rings);
+       req.num_tx_rings = rte_cpu_to_le_16(pf_resc->num_tx_rings);
+       req.num_rx_rings = rte_cpu_to_le_16(pf_resc->num_rx_rings);
+       req.num_l2_ctxs = rte_cpu_to_le_16(pf_resc->num_l2_ctxs);
        req.num_vnics = rte_cpu_to_le_16(bp->max_vnics);
        req.fid = rte_cpu_to_le_16(0xffff);
        req.enables = rte_cpu_to_le_32(enables);
@@ -3187,9 +3341,43 @@ static int bnxt_hwrm_pf_func_cfg(struct bnxt *bp, int tx_rings)
        return rc;
 }
 
-static void populate_vf_func_cfg_req(struct bnxt *bp,
-                                    struct hwrm_func_cfg_input *req,
-                                    int num_vfs)
+/* min values are the guaranteed resources and max values are subject
+ * to availability. The strategy for now is to keep both min & max
+ * values the same.
+ */
+static void
+bnxt_fill_vf_func_cfg_req_new(struct bnxt *bp,
+                             struct hwrm_func_vf_resource_cfg_input *req,
+                             int num_vfs)
+{
+       req->max_rsscos_ctx = rte_cpu_to_le_16(bp->max_rsscos_ctx /
+                                              (num_vfs + 1));
+       req->min_rsscos_ctx = req->max_rsscos_ctx;
+       req->max_stat_ctx = rte_cpu_to_le_16(bp->max_stat_ctx / (num_vfs + 1));
+       req->min_stat_ctx = req->max_stat_ctx;
+       req->max_cmpl_rings = rte_cpu_to_le_16(bp->max_cp_rings /
+                                              (num_vfs + 1));
+       req->min_cmpl_rings = req->max_cmpl_rings;
+       req->max_tx_rings = rte_cpu_to_le_16(bp->max_tx_rings / (num_vfs + 1));
+       req->min_tx_rings = req->max_tx_rings;
+       req->max_rx_rings = rte_cpu_to_le_16(bp->max_rx_rings / (num_vfs + 1));
+       req->min_rx_rings = req->max_rx_rings;
+       req->max_l2_ctxs = rte_cpu_to_le_16(bp->max_l2_ctx / (num_vfs + 1));
+       req->min_l2_ctxs = req->max_l2_ctxs;
+       /* TODO: For now, do not support VMDq/RFS on VFs. */
+       req->max_vnics = rte_cpu_to_le_16(1);
+       req->min_vnics = req->max_vnics;
+       req->max_hw_ring_grps = rte_cpu_to_le_16(bp->max_ring_grps /
+                                                (num_vfs + 1));
+       req->min_hw_ring_grps = req->max_hw_ring_grps;
+       req->flags =
+        rte_cpu_to_le_16(HWRM_FUNC_VF_RESOURCE_CFG_INPUT_FLAGS_MIN_GUARANTEED);
+}
+
+static void
+bnxt_fill_vf_func_cfg_req_old(struct bnxt *bp,
+                             struct hwrm_func_cfg_input *req,
+                             int num_vfs)
 {
        req->enables = rte_cpu_to_le_32(HWRM_FUNC_CFG_INPUT_ENABLES_MTU |
                        HWRM_FUNC_CFG_INPUT_ENABLES_MRU |
@@ -3220,60 +3408,29 @@ static void populate_vf_func_cfg_req(struct bnxt *bp,
                                                 (num_vfs + 1));
 }
 
-static void add_random_mac_if_needed(struct bnxt *bp,
-                                    struct hwrm_func_cfg_input *cfg_req,
-                                    int vf)
-{
-       struct rte_ether_addr mac;
-
-       if (bnxt_hwrm_func_qcfg_vf_default_mac(bp, vf, &mac))
-               return;
-
-       if (memcmp(mac.addr_bytes, "\x00\x00\x00\x00\x00", 6) == 0) {
-               cfg_req->enables |=
-               rte_cpu_to_le_32(HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_MAC_ADDR);
-               rte_eth_random_addr(cfg_req->dflt_mac_addr);
-               bp->pf.vf_info[vf].random_mac = true;
-       } else {
-               memcpy(cfg_req->dflt_mac_addr, mac.addr_bytes,
-                       RTE_ETHER_ADDR_LEN);
-       }
-}
-
-static int reserve_resources_from_vf(struct bnxt *bp,
-                                    struct hwrm_func_cfg_input *cfg_req,
+/* Update the port wide resource values based on how many resources
+ * got allocated to the VF.
+ */
+static int bnxt_update_max_resources(struct bnxt *bp,
                                     int vf)
 {
-       struct hwrm_func_qcaps_input req = {0};
-       struct hwrm_func_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_func_qcfg_input req = {0};
+       struct hwrm_func_qcfg_output *resp = bp->hwrm_cmd_resp_addr;
        int rc;
 
        /* Get the actual allocated values now */
-       HWRM_PREP(&req, HWRM_FUNC_QCAPS, BNXT_USE_CHIMP_MB);
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       HWRM_PREP(&req, HWRM_FUNC_QCFG, BNXT_USE_CHIMP_MB);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+       HWRM_CHECK_RESULT();
 
-       if (rc) {
-               PMD_DRV_LOG(ERR, "hwrm_func_qcaps failed rc:%d\n", rc);
-               copy_func_cfg_to_qcaps(cfg_req, resp);
-       } else if (resp->error_code) {
-               rc = rte_le_to_cpu_16(resp->error_code);
-               PMD_DRV_LOG(ERR, "hwrm_func_qcaps error %d\n", rc);
-               copy_func_cfg_to_qcaps(cfg_req, resp);
-       }
-
-       bp->max_rsscos_ctx -= rte_le_to_cpu_16(resp->max_rsscos_ctx);
-       bp->max_stat_ctx -= rte_le_to_cpu_16(resp->max_stat_ctx);
-       bp->max_cp_rings -= rte_le_to_cpu_16(resp->max_cmpl_rings);
-       bp->max_tx_rings -= rte_le_to_cpu_16(resp->max_tx_rings);
-       bp->max_rx_rings -= rte_le_to_cpu_16(resp->max_rx_rings);
-       bp->max_l2_ctx -= rte_le_to_cpu_16(resp->max_l2_ctxs);
-       /*
-        * TODO: While not supporting VMDq with VFs, max_vnics is always
-        * forced to 1 in this case
-        */
-       //bp->max_vnics -= rte_le_to_cpu_16(esp->max_vnics);
-       bp->max_ring_grps -= rte_le_to_cpu_16(resp->max_hw_ring_grps);
+       bp->max_rsscos_ctx -= rte_le_to_cpu_16(resp->alloc_rsscos_ctx);
+       bp->max_stat_ctx -= rte_le_to_cpu_16(resp->alloc_stat_ctx);
+       bp->max_cp_rings -= rte_le_to_cpu_16(resp->alloc_cmpl_rings);
+       bp->max_tx_rings -= rte_le_to_cpu_16(resp->alloc_tx_rings);
+       bp->max_rx_rings -= rte_le_to_cpu_16(resp->alloc_rx_rings);
+       bp->max_l2_ctx -= rte_le_to_cpu_16(resp->alloc_l2_ctx);
+       bp->max_ring_grps -= rte_le_to_cpu_16(resp->alloc_hw_ring_grps);
 
        HWRM_UNLOCK();
 
@@ -3288,7 +3445,7 @@ int bnxt_hwrm_func_qcfg_current_vf_vlan(struct bnxt *bp, int vf)
 
        /* Check for zero MAC address */
        HWRM_PREP(&req, HWRM_FUNC_QCFG, BNXT_USE_CHIMP_MB);
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
        HWRM_CHECK_RESULT();
        rc = rte_le_to_cpu_16(resp->vlan);
@@ -3298,7 +3455,8 @@ int bnxt_hwrm_func_qcfg_current_vf_vlan(struct bnxt *bp, int vf)
        return rc;
 }
 
-static int update_pf_resource_max(struct bnxt *bp)
+static int bnxt_query_pf_resources(struct bnxt *bp,
+                                  struct bnxt_pf_resource_info *pf_resc)
 {
        struct hwrm_func_qcfg_input req = {0};
        struct hwrm_func_qcfg_output *resp = bp->hwrm_cmd_resp_addr;
@@ -3310,17 +3468,56 @@ static int update_pf_resource_max(struct bnxt *bp)
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
        HWRM_CHECK_RESULT();
 
-       /* Only TX ring value reflects actual allocation? TODO */
-       bp->max_tx_rings = rte_le_to_cpu_16(resp->alloc_tx_rings);
-       bp->pf.evb_mode = resp->evb_mode;
+       pf_resc->num_tx_rings = rte_le_to_cpu_16(resp->alloc_tx_rings);
+       pf_resc->num_rsscos_ctxs = rte_le_to_cpu_16(resp->alloc_rsscos_ctx);
+       pf_resc->num_stat_ctxs = rte_le_to_cpu_16(resp->alloc_stat_ctx);
+       pf_resc->num_cp_rings = rte_le_to_cpu_16(resp->alloc_cmpl_rings);
+       pf_resc->num_rx_rings = rte_le_to_cpu_16(resp->alloc_rx_rings);
+       pf_resc->num_l2_ctxs = rte_le_to_cpu_16(resp->alloc_l2_ctx);
+       pf_resc->num_hw_ring_grps = rte_le_to_cpu_32(resp->alloc_hw_ring_grps);
+       bp->pf->evb_mode = resp->evb_mode;
 
        HWRM_UNLOCK();
 
        return rc;
 }
 
+static void
+bnxt_calculate_pf_resources(struct bnxt *bp,
+                           struct bnxt_pf_resource_info *pf_resc,
+                           int num_vfs)
+{
+       if (!num_vfs) {
+               pf_resc->num_rsscos_ctxs = bp->max_rsscos_ctx;
+               pf_resc->num_stat_ctxs = bp->max_stat_ctx;
+               pf_resc->num_cp_rings = bp->max_cp_rings;
+               pf_resc->num_tx_rings = bp->max_tx_rings;
+               pf_resc->num_rx_rings = bp->max_rx_rings;
+               pf_resc->num_l2_ctxs = bp->max_l2_ctx;
+               pf_resc->num_hw_ring_grps = bp->max_ring_grps;
+
+               return;
+       }
+
+       pf_resc->num_rsscos_ctxs = bp->max_rsscos_ctx / (num_vfs + 1) +
+                                  bp->max_rsscos_ctx % (num_vfs + 1);
+       pf_resc->num_stat_ctxs = bp->max_stat_ctx / (num_vfs + 1) +
+                                bp->max_stat_ctx % (num_vfs + 1);
+       pf_resc->num_cp_rings = bp->max_cp_rings / (num_vfs + 1) +
+                               bp->max_cp_rings % (num_vfs + 1);
+       pf_resc->num_tx_rings = bp->max_tx_rings / (num_vfs + 1) +
+                               bp->max_tx_rings % (num_vfs + 1);
+       pf_resc->num_rx_rings = bp->max_rx_rings / (num_vfs + 1) +
+                               bp->max_rx_rings % (num_vfs + 1);
+       pf_resc->num_l2_ctxs = bp->max_l2_ctx / (num_vfs + 1) +
+                              bp->max_l2_ctx % (num_vfs + 1);
+       pf_resc->num_hw_ring_grps = bp->max_ring_grps / (num_vfs + 1) +
+                                   bp->max_ring_grps % (num_vfs + 1);
+}
+
 int bnxt_hwrm_allocate_pf_only(struct bnxt *bp)
 {
+       struct bnxt_pf_resource_info pf_resc = { 0 };
        int rc;
 
        if (!BNXT_PF(bp)) {
@@ -3332,85 +3529,103 @@ int bnxt_hwrm_allocate_pf_only(struct bnxt *bp)
        if (rc)
                return rc;
 
-       bp->pf.func_cfg_flags &=
+       bnxt_calculate_pf_resources(bp, &pf_resc, 0);
+
+       bp->pf->func_cfg_flags &=
                ~(HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_ENABLE |
                  HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_DISABLE);
-       bp->pf.func_cfg_flags |=
+       bp->pf->func_cfg_flags |=
                HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_DISABLE;
-       rc = bnxt_hwrm_pf_func_cfg(bp, bp->max_tx_rings);
+       rc = bnxt_hwrm_pf_func_cfg(bp, &pf_resc);
        rc = __bnxt_hwrm_func_qcaps(bp);
        return rc;
 }
 
-int bnxt_hwrm_allocate_vfs(struct bnxt *bp, int num_vfs)
+static int
+bnxt_configure_vf_req_buf(struct bnxt *bp, int num_vfs)
 {
-       struct hwrm_func_cfg_input req = {0};
-       struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr;
-       int i;
-       size_t sz;
-       int rc = 0;
-       size_t req_buf_sz;
+       size_t req_buf_sz, sz;
+       int i, rc;
 
-       if (!BNXT_PF(bp)) {
-               PMD_DRV_LOG(ERR, "Attempt to allcoate VFs on a VF!\n");
-               return -EINVAL;
+       req_buf_sz = num_vfs * HWRM_MAX_REQ_LEN;
+       bp->pf->vf_req_buf = rte_malloc("bnxt_vf_fwd", req_buf_sz,
+               page_roundup(num_vfs * HWRM_MAX_REQ_LEN));
+       if (bp->pf->vf_req_buf == NULL) {
+               return -ENOMEM;
        }
 
-       rc = bnxt_hwrm_func_qcaps(bp);
+       for (sz = 0; sz < req_buf_sz; sz += getpagesize())
+               rte_mem_lock_page(((char *)bp->pf->vf_req_buf) + sz);
+
+       for (i = 0; i < num_vfs; i++)
+               bp->pf->vf_info[i].req_buf = ((char *)bp->pf->vf_req_buf) +
+                                            (i * HWRM_MAX_REQ_LEN);
 
+       rc = bnxt_hwrm_func_buf_rgtr(bp, num_vfs);
        if (rc)
-               return rc;
+               rte_free(bp->pf->vf_req_buf);
 
-       bp->pf.active_vfs = num_vfs;
+       return rc;
+}
 
-       /*
-        * First, configure the PF to only use one TX ring.  This ensures that
-        * there are enough rings for all VFs.
-        *
-        * If we don't do this, when we call func_alloc() later, we will lock
-        * extra rings to the PF that won't be available during func_cfg() of
-        * the VFs.
-        *
-        * This has been fixed with firmware versions above 20.6.54
-        */
-       bp->pf.func_cfg_flags &=
-               ~(HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_ENABLE |
-                 HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_DISABLE);
-       bp->pf.func_cfg_flags |=
-               HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_ENABLE;
-       rc = bnxt_hwrm_pf_func_cfg(bp, 1);
-       if (rc)
-               return rc;
+static int
+bnxt_process_vf_resc_config_new(struct bnxt *bp, int num_vfs)
+{
+       struct hwrm_func_vf_resource_cfg_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_func_vf_resource_cfg_input req = {0};
+       int i, rc = 0;
 
-       /*
-        * Now, create and register a buffer to hold forwarded VF requests
-        */
-       req_buf_sz = num_vfs * HWRM_MAX_REQ_LEN;
-       bp->pf.vf_req_buf = rte_malloc("bnxt_vf_fwd", req_buf_sz,
-               page_roundup(num_vfs * HWRM_MAX_REQ_LEN));
-       if (bp->pf.vf_req_buf == NULL) {
-               rc = -ENOMEM;
-               goto error_free;
+       bnxt_fill_vf_func_cfg_req_new(bp, &req, num_vfs);
+       bp->pf->active_vfs = 0;
+       for (i = 0; i < num_vfs; i++) {
+               HWRM_PREP(&req, HWRM_FUNC_VF_RESOURCE_CFG, BNXT_USE_CHIMP_MB);
+               req.vf_id = rte_cpu_to_le_16(bp->pf->vf_info[i].fid);
+               rc = bnxt_hwrm_send_message(bp,
+                                           &req,
+                                           sizeof(req),
+                                           BNXT_USE_CHIMP_MB);
+               if (rc || resp->error_code) {
+                       PMD_DRV_LOG(ERR,
+                               "Failed to initialize VF %d\n", i);
+                       PMD_DRV_LOG(ERR,
+                               "Not all VFs available. (%d, %d)\n",
+                               rc, resp->error_code);
+                       HWRM_UNLOCK();
+
+                       /* If the first VF configuration itself fails,
+                        * unregister the vf_fwd_request buffer.
+                        */
+                       if (i == 0)
+                               bnxt_hwrm_func_buf_unrgtr(bp);
+                       break;
+               }
+               HWRM_UNLOCK();
+
+               /* Update the max resource values based on the resource values
+                * allocated to the VF.
+                */
+               bnxt_update_max_resources(bp, i);
+               bp->pf->active_vfs++;
+               bnxt_hwrm_func_clr_stats(bp, bp->pf->vf_info[i].fid);
        }
-       for (sz = 0; sz < req_buf_sz; sz += getpagesize())
-               rte_mem_lock_page(((char *)bp->pf.vf_req_buf) + sz);
-       for (i = 0; i < num_vfs; i++)
-               bp->pf.vf_info[i].req_buf = ((char *)bp->pf.vf_req_buf) +
-                                       (i * HWRM_MAX_REQ_LEN);
 
-       rc = bnxt_hwrm_func_buf_rgtr(bp);
-       if (rc)
-               goto error_free;
+       return 0;
+}
 
-       populate_vf_func_cfg_req(bp, &req, num_vfs);
+static int
+bnxt_process_vf_resc_config_old(struct bnxt *bp, int num_vfs)
+{
+       struct hwrm_func_cfg_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_func_cfg_input req = {0};
+       int i, rc;
 
-       bp->pf.active_vfs = 0;
-       for (i = 0; i < num_vfs; i++) {
-               add_random_mac_if_needed(bp, &req, i);
+       bnxt_fill_vf_func_cfg_req_old(bp, &req, num_vfs);
 
+       bp->pf->active_vfs = 0;
+       for (i = 0; i < num_vfs; i++) {
                HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
-               req.flags = rte_cpu_to_le_32(bp->pf.vf_info[i].func_cfg_flags);
-               req.fid = rte_cpu_to_le_16(bp->pf.vf_info[i].fid);
+               req.flags = rte_cpu_to_le_32(bp->pf->vf_info[i].func_cfg_flags);
+               req.fid = rte_cpu_to_le_16(bp->pf->vf_info[i].fid);
                rc = bnxt_hwrm_send_message(bp,
                                            &req,
                                            sizeof(req),
@@ -3422,40 +3637,107 @@ int bnxt_hwrm_allocate_vfs(struct bnxt *bp, int num_vfs)
 
                if (rc || resp->error_code) {
                        PMD_DRV_LOG(ERR,
-                               "Failed to initizlie VF %d\n", i);
+                               "Failed to initialize VF %d\n", i);
                        PMD_DRV_LOG(ERR,
                                "Not all VFs available. (%d, %d)\n",
                                rc, resp->error_code);
                        HWRM_UNLOCK();
+
+                       /* If the first VF configuration itself fails,
+                        * unregister the vf_fwd_request buffer.
+                        */
+                       if (i == 0)
+                               bnxt_hwrm_func_buf_unrgtr(bp);
                        break;
                }
 
                HWRM_UNLOCK();
 
-               reserve_resources_from_vf(bp, &req, i);
-               bp->pf.active_vfs++;
-               bnxt_hwrm_func_clr_stats(bp, bp->pf.vf_info[i].fid);
+               /* Update the max resource values based on the resource values
+                * allocated to the VF.
+                */
+               bnxt_update_max_resources(bp, i);
+               bp->pf->active_vfs++;
+               bnxt_hwrm_func_clr_stats(bp, bp->pf->vf_info[i].fid);
        }
 
+       return 0;
+}
+
+static void
+bnxt_configure_vf_resources(struct bnxt *bp, int num_vfs)
+{
+       if (bp->flags & BNXT_FLAG_NEW_RM)
+               bnxt_process_vf_resc_config_new(bp, num_vfs);
+       else
+               bnxt_process_vf_resc_config_old(bp, num_vfs);
+}
+
+static void
+bnxt_update_pf_resources(struct bnxt *bp,
+                        struct bnxt_pf_resource_info *pf_resc)
+{
+       bp->max_rsscos_ctx = pf_resc->num_rsscos_ctxs;
+       bp->max_stat_ctx = pf_resc->num_stat_ctxs;
+       bp->max_cp_rings = pf_resc->num_cp_rings;
+       bp->max_tx_rings = pf_resc->num_tx_rings;
+       bp->max_rx_rings = pf_resc->num_rx_rings;
+       bp->max_ring_grps = pf_resc->num_hw_ring_grps;
+}
+
+static int32_t
+bnxt_configure_pf_resources(struct bnxt *bp,
+                           struct bnxt_pf_resource_info *pf_resc)
+{
        /*
-        * Now configure the PF to use "the rest" of the resources
-        * We're using STD_TX_RING_MODE here though which will limit the TX
-        * rings.  This will allow QoS to function properly.  Not setting this
+        * We're using STD_TX_RING_MODE here which will limit the TX
+        * rings. This will allow QoS to function properly. Not setting this
         * will cause PF rings to break bandwidth settings.
         */
-       rc = bnxt_hwrm_pf_func_cfg(bp, bp->max_tx_rings);
+       bp->pf->func_cfg_flags &=
+               ~(HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_ENABLE |
+                 HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_DISABLE);
+       bp->pf->func_cfg_flags |=
+               HWRM_FUNC_CFG_INPUT_FLAGS_STD_TX_RING_MODE_ENABLE;
+       return bnxt_hwrm_pf_func_cfg(bp, pf_resc);
+}
+
+int bnxt_hwrm_allocate_vfs(struct bnxt *bp, int num_vfs)
+{
+       struct bnxt_pf_resource_info pf_resc = { 0 };
+       int rc;
+
+       if (!BNXT_PF(bp)) {
+               PMD_DRV_LOG(ERR, "Attempt to allocate VFs on a VF!\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_hwrm_func_qcaps(bp);
        if (rc)
-               goto error_free;
+               return rc;
+
+       bnxt_calculate_pf_resources(bp, &pf_resc, num_vfs);
 
-       rc = update_pf_resource_max(bp);
+       rc = bnxt_configure_pf_resources(bp, &pf_resc);
        if (rc)
-               goto error_free;
+               return rc;
 
-       return rc;
+       rc = bnxt_query_pf_resources(bp, &pf_resc);
+       if (rc)
+               return rc;
 
-error_free:
-       bnxt_hwrm_func_buf_unrgtr(bp);
-       return rc;
+       /*
+        * Now, create and register a buffer to hold forwarded VF requests
+        */
+       rc = bnxt_configure_vf_req_buf(bp, num_vfs);
+       if (rc)
+               return rc;
+
+       bnxt_configure_vf_resources(bp, num_vfs);
+
+       bnxt_update_pf_resources(bp, &pf_resc);
+
+       return 0;
 }
 
 int bnxt_hwrm_pf_evb_mode(struct bnxt *bp)
@@ -3468,7 +3750,7 @@ int bnxt_hwrm_pf_evb_mode(struct bnxt *bp)
 
        req.fid = rte_cpu_to_le_16(0xffff);
        req.enables = rte_cpu_to_le_32(HWRM_FUNC_CFG_INPUT_ENABLES_EVB_MODE);
-       req.evb_mode = bp->pf.evb_mode;
+       req.evb_mode = bp->pf->evb_mode;
 
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
        HWRM_CHECK_RESULT();
@@ -3486,17 +3768,19 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
 
        HWRM_PREP(&req, HWRM_TUNNEL_DST_PORT_ALLOC, BNXT_USE_CHIMP_MB);
        req.tunnel_type = tunnel_type;
-       req.tunnel_dst_port_val = port;
+       req.tunnel_dst_port_val = rte_cpu_to_be_16(port);
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
        HWRM_CHECK_RESULT();
 
        switch (tunnel_type) {
        case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_VXLAN:
-               bp->vxlan_fw_dst_port_id = resp->tunnel_dst_port_id;
+               bp->vxlan_fw_dst_port_id =
+                       rte_le_to_cpu_16(resp->tunnel_dst_port_id);
                bp->vxlan_port = port;
                break;
        case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_GENEVE:
-               bp->geneve_fw_dst_port_id = resp->tunnel_dst_port_id;
+               bp->geneve_fw_dst_port_id =
+                       rte_le_to_cpu_16(resp->tunnel_dst_port_id);
                bp->geneve_port = port;
                break;
        default:
@@ -3524,6 +3808,18 @@ int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port,
        HWRM_CHECK_RESULT();
        HWRM_UNLOCK();
 
+       if (tunnel_type ==
+           HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_VXLAN) {
+               bp->vxlan_port = 0;
+               bp->vxlan_port_cnt = 0;
+       }
+
+       if (tunnel_type ==
+           HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_GENEVE) {
+               bp->geneve_port = 0;
+               bp->geneve_port_cnt = 0;
+       }
+
        return rc;
 }
 
@@ -3536,7 +3832,7 @@ int bnxt_hwrm_func_cfg_vf_set_flags(struct bnxt *bp, uint16_t vf,
 
        HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
 
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
        req.flags = rte_cpu_to_le_32(flags);
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
@@ -3558,23 +3854,24 @@ int bnxt_set_rx_mask_no_vlan(struct bnxt *bp, struct bnxt_vnic_info *vnic)
        return bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
 }
 
-int bnxt_hwrm_func_buf_rgtr(struct bnxt *bp)
+int bnxt_hwrm_func_buf_rgtr(struct bnxt *bp, int num_vfs)
 {
-       int rc = 0;
-       struct hwrm_func_buf_rgtr_input req = {.req_type = 0 };
        struct hwrm_func_buf_rgtr_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_func_buf_rgtr_input req = {.req_type = 0 };
+       int rc;
 
        HWRM_PREP(&req, HWRM_FUNC_BUF_RGTR, BNXT_USE_CHIMP_MB);
 
        req.req_buf_num_pages = rte_cpu_to_le_16(1);
-       req.req_buf_page_size = rte_cpu_to_le_16(
-                        page_getenum(bp->pf.active_vfs * HWRM_MAX_REQ_LEN));
+       req.req_buf_page_size =
+               rte_cpu_to_le_16(page_getenum(num_vfs * HWRM_MAX_REQ_LEN));
        req.req_buf_len = rte_cpu_to_le_16(HWRM_MAX_REQ_LEN);
        req.req_buf_page_addr0 =
-               rte_cpu_to_le_64(rte_malloc_virt2iova(bp->pf.vf_req_buf));
+               rte_cpu_to_le_64(rte_malloc_virt2iova(bp->pf->vf_req_buf));
        if (req.req_buf_page_addr0 == RTE_BAD_IOVA) {
                PMD_DRV_LOG(ERR,
                        "unable to map buffer address to physical memory\n");
+               HWRM_UNLOCK();
                return -ENOMEM;
        }
 
@@ -3614,7 +3911,7 @@ int bnxt_hwrm_func_cfg_def_cp(struct bnxt *bp)
        HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
 
        req.fid = rte_cpu_to_le_16(0xffff);
-       req.flags = rte_cpu_to_le_32(bp->pf.func_cfg_flags);
+       req.flags = rte_cpu_to_le_32(bp->pf->func_cfg_flags);
        req.enables = rte_cpu_to_le_32(
                        HWRM_FUNC_CFG_INPUT_ENABLES_ASYNC_EVENT_CR);
        req.async_event_cr = rte_cpu_to_le_16(
@@ -3658,12 +3955,12 @@ int bnxt_hwrm_set_default_vlan(struct bnxt *bp, int vf, uint8_t is_vf)
        HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
 
        if (is_vf) {
-               dflt_vlan = bp->pf.vf_info[vf].dflt_vlan;
-               fid = bp->pf.vf_info[vf].fid;
-               func_cfg_flags = bp->pf.vf_info[vf].func_cfg_flags;
+               dflt_vlan = bp->pf->vf_info[vf].dflt_vlan;
+               fid = bp->pf->vf_info[vf].fid;
+               func_cfg_flags = bp->pf->vf_info[vf].func_cfg_flags;
        } else {
                fid = rte_cpu_to_le_16(0xffff);
-               func_cfg_flags = bp->pf.func_cfg_flags;
+               func_cfg_flags = bp->pf->func_cfg_flags;
                dflt_vlan = bp->vlan;
        }
 
@@ -3689,9 +3986,9 @@ int bnxt_hwrm_func_bw_cfg(struct bnxt *bp, uint16_t vf,
 
        HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
 
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
        req.enables |= rte_cpu_to_le_32(enables);
-       req.flags = rte_cpu_to_le_32(bp->pf.vf_info[vf].func_cfg_flags);
+       req.flags = rte_cpu_to_le_32(bp->pf->vf_info[vf].func_cfg_flags);
        req.max_bw = rte_cpu_to_le_32(max_bw);
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
@@ -3709,10 +4006,10 @@ int bnxt_hwrm_set_vf_vlan(struct bnxt *bp, int vf)
 
        HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
 
-       req.flags = rte_cpu_to_le_32(bp->pf.vf_info[vf].func_cfg_flags);
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       req.flags = rte_cpu_to_le_32(bp->pf->vf_info[vf].func_cfg_flags);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
        req.enables |= rte_cpu_to_le_32(HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_VLAN);
-       req.dflt_vlan = rte_cpu_to_le_16(bp->pf.vf_info[vf].dflt_vlan);
+       req.dflt_vlan = rte_cpu_to_le_16(bp->pf->vf_info[vf].dflt_vlan);
 
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
@@ -3766,7 +4063,7 @@ int bnxt_hwrm_func_qcfg_vf_default_mac(struct bnxt *bp, uint16_t vf,
 
        HWRM_PREP(&req, HWRM_FUNC_QCFG, BNXT_USE_CHIMP_MB);
 
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
        HWRM_CHECK_RESULT();
@@ -3823,8 +4120,8 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
                stats->q_ibytes[idx] = rte_le_to_cpu_64(resp->rx_ucast_bytes);
                stats->q_ibytes[idx] += rte_le_to_cpu_64(resp->rx_mcast_bytes);
                stats->q_ibytes[idx] += rte_le_to_cpu_64(resp->rx_bcast_bytes);
-               stats->q_errors[idx] = rte_le_to_cpu_64(resp->rx_err_pkts);
-               stats->q_errors[idx] += rte_le_to_cpu_64(resp->rx_drop_pkts);
+               stats->q_errors[idx] = rte_le_to_cpu_64(resp->rx_discard_pkts);
+               stats->q_errors[idx] += rte_le_to_cpu_64(resp->rx_error_pkts);
        } else {
                stats->q_opackets[idx] = rte_le_to_cpu_64(resp->tx_ucast_pkts);
                stats->q_opackets[idx] += rte_le_to_cpu_64(resp->tx_mcast_pkts);
@@ -3843,7 +4140,7 @@ int bnxt_hwrm_port_qstats(struct bnxt *bp)
 {
        struct hwrm_port_qstats_input req = {0};
        struct hwrm_port_qstats_output *resp = bp->hwrm_cmd_resp_addr;
-       struct bnxt_pf_info *pf = &bp->pf;
+       struct bnxt_pf_info *pf = bp->pf;
        int rc;
 
        HWRM_PREP(&req, HWRM_PORT_QSTATS, BNXT_USE_CHIMP_MB);
@@ -3863,7 +4160,7 @@ int bnxt_hwrm_port_clr_stats(struct bnxt *bp)
 {
        struct hwrm_port_clr_stats_input req = {0};
        struct hwrm_port_clr_stats_output *resp = bp->hwrm_cmd_resp_addr;
-       struct bnxt_pf_info *pf = &bp->pf;
+       struct bnxt_pf_info *pf = bp->pf;
        int rc;
 
        /* Not allowed on NS2 device, NPAR, MultiHost, VF */
@@ -3892,7 +4189,7 @@ int bnxt_hwrm_port_led_qcaps(struct bnxt *bp)
                return 0;
 
        HWRM_PREP(&req, HWRM_PORT_LED_QCAPS, BNXT_USE_CHIMP_MB);
-       req.port_id = bp->pf.port_id;
+       req.port_id = bp->pf->port_id;
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
        HWRM_CHECK_RESULT();
@@ -3939,7 +4236,7 @@ int bnxt_hwrm_port_led_cfg(struct bnxt *bp, bool led_on)
                led_state = HWRM_PORT_LED_CFG_INPUT_LED0_STATE_BLINKALT;
                duration = rte_cpu_to_le_16(500);
        }
-       req.port_id = bp->pf.port_id;
+       req.port_id = bp->pf->port_id;
        req.num_leds = bp->leds->num_leds;
        led_cfg = (struct bnxt_led_cfg *)&req.led0_id;
        for (i = 0; i < bp->leds->num_leds; i++, led_cfg++) {
@@ -4151,8 +4448,8 @@ static int bnxt_hwrm_func_vf_vnic_query(struct bnxt *bp, uint16_t vf,
        /* First query all VNIC ids */
        HWRM_PREP(&req, HWRM_FUNC_VF_VNIC_IDS_QUERY, BNXT_USE_CHIMP_MB);
 
-       req.vf_id = rte_cpu_to_le_16(bp->pf.first_vf_id + vf);
-       req.max_vnic_id_cnt = rte_cpu_to_le_32(bp->pf.total_vnics);
+       req.vf_id = rte_cpu_to_le_16(bp->pf->first_vf_id + vf);
+       req.max_vnic_id_cnt = rte_cpu_to_le_32(bp->pf->total_vnics);
        req.vnic_id_tbl_addr = rte_cpu_to_le_64(rte_malloc_virt2iova(vnic_ids));
 
        if (req.vnic_id_tbl_addr == RTE_BAD_IOVA) {
@@ -4187,7 +4484,7 @@ int bnxt_hwrm_func_vf_vnic_query_and_config(struct bnxt *bp, uint16_t vf,
        size_t sz;
 
        /* First query all VNIC ids */
-       vnic_id_sz = bp->pf.total_vnics * sizeof(*vnic_ids);
+       vnic_id_sz = bp->pf->total_vnics * sizeof(*vnic_ids);
        vnic_ids = rte_malloc("bnxt_hwrm_vf_vnic_ids_query", vnic_id_sz,
                        RTE_CACHE_LINE_SIZE);
        if (vnic_ids == NULL)
@@ -4206,7 +4503,7 @@ int bnxt_hwrm_func_vf_vnic_query_and_config(struct bnxt *bp, uint16_t vf,
        for (i = 0; i < num_vnic_ids; i++) {
                memset(&vnic, 0, sizeof(struct bnxt_vnic_info));
                vnic.fw_vnic_id = rte_le_to_cpu_16(vnic_ids[i]);
-               rc = bnxt_hwrm_vnic_qcfg(bp, &vnic, bp->pf.first_vf_id + vf);
+               rc = bnxt_hwrm_vnic_qcfg(bp, &vnic, bp->pf->first_vf_id + vf);
                if (rc)
                        break;
                if (vnic.mru <= 4)      /* Indicates unallocated */
@@ -4233,7 +4530,7 @@ int bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof(struct bnxt *bp, uint16_t vf,
 
        HWRM_PREP(&req, HWRM_FUNC_CFG, BNXT_USE_CHIMP_MB);
 
-       req.fid = rte_cpu_to_le_16(bp->pf.vf_info[vf].fid);
+       req.fid = rte_cpu_to_le_16(bp->pf->vf_info[vf].fid);
        req.enables |= rte_cpu_to_le_32(
                        HWRM_FUNC_CFG_INPUT_ENABLES_VLAN_ANTISPOOF_MODE);
        req.vlan_antispoof_mode = on ?
@@ -4256,7 +4553,7 @@ int bnxt_hwrm_func_qcfg_vf_dflt_vnic_id(struct bnxt *bp, int vf)
        size_t sz;
        int rc;
 
-       vnic_id_sz = bp->pf.total_vnics * sizeof(*vnic_ids);
+       vnic_id_sz = bp->pf->total_vnics * sizeof(*vnic_ids);
        vnic_ids = rte_malloc("bnxt_hwrm_vf_vnic_ids_query", vnic_id_sz,
                        RTE_CACHE_LINE_SIZE);
        if (vnic_ids == NULL)
@@ -4279,7 +4576,7 @@ int bnxt_hwrm_func_qcfg_vf_dflt_vnic_id(struct bnxt *bp, int vf)
                memset(&vnic, 0, sizeof(struct bnxt_vnic_info));
                vnic.fw_vnic_id = rte_le_to_cpu_16(vnic_ids[i]);
                rc = bnxt_hwrm_vnic_qcfg(bp, &vnic,
-                                       bp->pf.first_vf_id + vf);
+                                       bp->pf->first_vf_id + vf);
                if (rc)
                        goto exit;
                if (vnic.func_default) {
@@ -4885,7 +5182,7 @@ int bnxt_hwrm_ext_port_qstats(struct bnxt *bp)
 {
        struct hwrm_port_qstats_ext_input req = {0};
        struct hwrm_port_qstats_ext_output *resp = bp->hwrm_cmd_resp_addr;
-       struct bnxt_pf_info *pf = &bp->pf;
+       struct bnxt_pf_info *pf = bp->pf;
        int rc;
 
        if (!(bp->flags & BNXT_FLAG_EXT_RX_PORT_STATS ||
@@ -5026,7 +5323,6 @@ int bnxt_hwrm_set_mac(struct bnxt *bp)
 
        HWRM_CHECK_RESULT();
 
-       memcpy(bp->dflt_mac_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN);
        HWRM_UNLOCK();
 
        return rc;
@@ -5204,7 +5500,7 @@ int bnxt_hwrm_port_ts_query(struct bnxt *bp, uint8_t path, uint64_t *timestamp)
        }
 
        req.flags = rte_cpu_to_le_32(flags);
-       req.port_id = rte_cpu_to_le_16(bp->pf.port_id);
+       req.port_id = rte_cpu_to_le_16(bp->pf->port_id);
 
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
@@ -5220,38 +5516,6 @@ int bnxt_hwrm_port_ts_query(struct bnxt *bp, uint8_t path, uint64_t *timestamp)
        return rc;
 }
 
-int bnxt_hwrm_cfa_adv_flow_mgmt_qcaps(struct bnxt *bp)
-{
-       struct hwrm_cfa_adv_flow_mgnt_qcaps_output *resp =
-                                       bp->hwrm_cmd_resp_addr;
-       struct hwrm_cfa_adv_flow_mgnt_qcaps_input req = {0};
-       uint32_t flags = 0;
-       int rc = 0;
-
-       if (!(bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_MGMT))
-               return rc;
-
-       if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
-               PMD_DRV_LOG(DEBUG,
-                           "Not a PF or trusted VF. Command not supported\n");
-               return 0;
-       }
-
-       HWRM_PREP(&req, HWRM_CFA_ADV_FLOW_MGNT_QCAPS, BNXT_USE_KONG(bp));
-       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_KONG(bp));
-
-       HWRM_CHECK_RESULT();
-       flags = rte_le_to_cpu_32(resp->flags);
-       HWRM_UNLOCK();
-
-       if (flags & HWRM_CFA_ADV_FLOW_MGNT_QCAPS_L2_HDR_SRC_FILTER_EN) {
-               bp->flow_flags |= BNXT_FLOW_FLAG_L2_HDR_SRC_FILTER_EN;
-               PMD_DRV_LOG(INFO, "Source L2 header filtering enabled\n");
-       }
-
-       return rc;
-}
-
 int bnxt_hwrm_cfa_counter_qcaps(struct bnxt *bp, uint16_t *max_fc)
 {
        int rc = 0;
@@ -5406,3 +5670,147 @@ int bnxt_hwrm_cfa_counter_qstats(struct bnxt *bp,
 
        return 0;
 }
+
+int bnxt_hwrm_cfa_vfr_alloc(struct bnxt *bp, uint16_t vf_idx)
+{
+       struct hwrm_cfa_vfr_alloc_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_cfa_vfr_alloc_input req = {0};
+       int rc;
+
+       if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
+               PMD_DRV_LOG(DEBUG,
+                           "Not a PF or trusted VF. Command not supported\n");
+               return 0;
+       }
+
+       HWRM_PREP(&req, HWRM_CFA_VFR_ALLOC, BNXT_USE_CHIMP_MB);
+       req.vf_id = rte_cpu_to_le_16(vf_idx);
+       snprintf(req.vfr_name, sizeof(req.vfr_name), "%svfr%d",
+                bp->eth_dev->data->name, vf_idx);
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+       HWRM_CHECK_RESULT();
+
+       HWRM_UNLOCK();
+       PMD_DRV_LOG(DEBUG, "VFR %d allocated\n", vf_idx);
+       return rc;
+}
+
+int bnxt_hwrm_cfa_vfr_free(struct bnxt *bp, uint16_t vf_idx)
+{
+       struct hwrm_cfa_vfr_free_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_cfa_vfr_free_input req = {0};
+       int rc;
+
+       if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
+               PMD_DRV_LOG(DEBUG,
+                           "Not a PF or trusted VF. Command not supported\n");
+               return 0;
+       }
+
+       HWRM_PREP(&req, HWRM_CFA_VFR_FREE, BNXT_USE_CHIMP_MB);
+       req.vf_id = rte_cpu_to_le_16(vf_idx);
+       snprintf(req.vfr_name, sizeof(req.vfr_name), "%svfr%d",
+                bp->eth_dev->data->name, vf_idx);
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+       HWRM_CHECK_RESULT();
+       HWRM_UNLOCK();
+       PMD_DRV_LOG(DEBUG, "VFR %d freed\n", vf_idx);
+       return rc;
+}
+
+int bnxt_hwrm_first_vf_id_query(struct bnxt *bp, uint16_t fid,
+                               uint16_t *first_vf_id)
+{
+       int rc = 0;
+       struct hwrm_func_qcaps_input req = {.req_type = 0 };
+       struct hwrm_func_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
+
+       HWRM_PREP(&req, HWRM_FUNC_QCAPS, BNXT_USE_CHIMP_MB);
+
+       req.fid = rte_cpu_to_le_16(fid);
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+
+       HWRM_CHECK_RESULT();
+
+       if (first_vf_id)
+               *first_vf_id = rte_le_to_cpu_16(resp->first_vf_id);
+
+       HWRM_UNLOCK();
+
+       return rc;
+}
+
+int bnxt_hwrm_cfa_pair_alloc(struct bnxt *bp, struct bnxt_representor *rep_bp)
+{
+       struct hwrm_cfa_pair_alloc_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_cfa_pair_alloc_input req = {0};
+       int rc;
+
+       if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
+               PMD_DRV_LOG(DEBUG,
+                           "Not a PF or trusted VF. Command not supported\n");
+               return 0;
+       }
+
+       HWRM_PREP(&req, HWRM_CFA_PAIR_ALLOC, BNXT_USE_CHIMP_MB);
+       req.pair_mode = HWRM_CFA_PAIR_FREE_INPUT_PAIR_MODE_REP2FN_TRUFLOW;
+       snprintf(req.pair_name, sizeof(req.pair_name), "%svfr%d",
+                bp->eth_dev->data->name, rep_bp->vf_id);
+
+       req.pf_b_id = rte_cpu_to_le_32(rep_bp->rep_based_pf);
+       req.vf_b_id = rte_cpu_to_le_16(rep_bp->vf_id);
+       req.vf_a_id = rte_cpu_to_le_16(bp->fw_fid);
+       req.host_b_id = 1; /* TBD - Confirm if this is OK */
+
+       req.enables |= rep_bp->flags & BNXT_REP_Q_R2F_VALID ?
+                       HWRM_CFA_PAIR_ALLOC_INPUT_ENABLES_Q_AB_VALID : 0;
+       req.enables |= rep_bp->flags & BNXT_REP_Q_F2R_VALID ?
+                       HWRM_CFA_PAIR_ALLOC_INPUT_ENABLES_Q_BA_VALID : 0;
+       req.enables |= rep_bp->flags & BNXT_REP_FC_R2F_VALID ?
+                       HWRM_CFA_PAIR_ALLOC_INPUT_ENABLES_FC_AB_VALID : 0;
+       req.enables |= rep_bp->flags & BNXT_REP_FC_F2R_VALID ?
+                       HWRM_CFA_PAIR_ALLOC_INPUT_ENABLES_FC_BA_VALID : 0;
+
+       req.q_ab = rep_bp->rep_q_r2f;
+       req.q_ba = rep_bp->rep_q_f2r;
+       req.fc_ab = rep_bp->rep_fc_r2f;
+       req.fc_ba = rep_bp->rep_fc_f2r;
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+       HWRM_CHECK_RESULT();
+
+       HWRM_UNLOCK();
+       PMD_DRV_LOG(DEBUG, "%s %d allocated\n",
+                   BNXT_REP_PF(rep_bp) ? "PFR" : "VFR", rep_bp->vf_id);
+       return rc;
+}
+
+int bnxt_hwrm_cfa_pair_free(struct bnxt *bp, struct bnxt_representor *rep_bp)
+{
+       struct hwrm_cfa_pair_free_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_cfa_pair_free_input req = {0};
+       int rc;
+
+       if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
+               PMD_DRV_LOG(DEBUG,
+                           "Not a PF or trusted VF. Command not supported\n");
+               return 0;
+       }
+
+       HWRM_PREP(&req, HWRM_CFA_PAIR_FREE, BNXT_USE_CHIMP_MB);
+       snprintf(req.pair_name, sizeof(req.pair_name), "%svfr%d",
+                bp->eth_dev->data->name, rep_bp->vf_id);
+       req.pf_b_id = rte_cpu_to_le_32(rep_bp->rep_based_pf);
+       req.vf_id = rte_cpu_to_le_16(rep_bp->vf_id);
+       req.pair_mode = HWRM_CFA_PAIR_FREE_INPUT_PAIR_MODE_REP2FN_TRUFLOW;
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+       HWRM_CHECK_RESULT();
+       HWRM_UNLOCK();
+       PMD_DRV_LOG(DEBUG, "%s %d freed\n", BNXT_REP_PF(rep_bp) ? "PFR" : "VFR",
+                   rep_bp->vf_id);
+       return rc;
+}