net/bnxt: modify HWRM command to create reps

Use cfa pair alloc for configuring reps.
Instead of cfa_vfr_alloc for Wh+ and cfa_pair_alloc for Stingray,
converge to cfa_pair_alloc/free for both devices. Set the command
request structure bits accordingly.
As part of this, remove the old cfa_vfr_alloc cmd definitions as FW
has deprecated support for those commands.

Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Shahaji Bhosle <sbhosle@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
index 5fe3dd0..e0efe4b 100644 (file)
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -156,6 +156,7 @@ New Features
   * Added support for RSS hash level selection.
   * Updated HWRM structures to 1.10.1.70 version.
   * Added TRUFLOW support for Stingray devices.
+  * Added support for representors on MAIA cores of SR.
 
 * **Updated Cisco enic driver.**
 

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index a951bca..5717819 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -836,12 +836,14 @@ struct bnxt_representor {
 #define BNXT_REP_Q_F2R_VALID           BIT(2)
 #define BNXT_REP_FC_R2F_VALID          BIT(3)
 #define BNXT_REP_FC_F2R_VALID          BIT(4)
+#define BNXT_REP_BASED_PF_VALID                BIT(5)
        uint32_t                flags;
        uint16_t                fw_fid;
 #define        BNXT_DFLT_VNIC_ID_INVALID       0xFFFF
        uint16_t                dflt_vnic_id;
        uint16_t                svif;
        uint16_t                vfr_tx_cfa_action;
+       uint8_t                 parent_pf_idx; /* Logical PF index */
        uint32_t                dpdk_port_id;
        uint32_t                rep_based_pf;
        uint8_t                 rep_q_r2f;
@@ -863,7 +865,9 @@ struct bnxt_representor {
        uint64_t                rx_drop_bytes[BNXT_MAX_VF_REP_RINGS];
 };
 
-#define BNXT_REP_PF(vfr_bp)    ((vfr_bp)->flags & BNXT_REP_IS_PF)
+#define BNXT_REP_PF(vfr_bp)            ((vfr_bp)->flags & BNXT_REP_IS_PF)
+#define BNXT_REP_BASED_PF(vfr_bp)      \
+               ((vfr_bp)->flags & BNXT_REP_BASED_PF_VALID)
 
 struct bnxt_vf_rep_tx_queue {
        struct bnxt_tx_queue *txq;

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 6757d36..b150227 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -5768,6 +5768,8 @@ bnxt_parse_devarg_rep_based_pf(__rte_unused const char *key,
        }
 
        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;

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 361f995..8470212 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -5671,55 +5671,6 @@ 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)
 {
@@ -5760,8 +5711,9 @@ int bnxt_hwrm_cfa_pair_alloc(struct bnxt *bp, struct bnxt_representor *rep_bp)
        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.pf_b_id = rep_bp->parent_pf_idx;
+       req.vf_b_id = BNXT_REP_PF(rep_bp) ? rte_cpu_to_le_16(((uint16_t)-1)) :
+                                               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 */
 
@@ -5803,10 +5755,10 @@ int bnxt_hwrm_cfa_pair_free(struct bnxt *bp, struct bnxt_representor *rep_bp)
        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.pf_b_id = rep_bp->parent_pf_idx;
        req.pair_mode = HWRM_CFA_PAIR_FREE_INPUT_PAIR_MODE_REP2FN_TRUFLOW;
-
+       req.vf_id = BNXT_REP_PF(rep_bp) ? rte_cpu_to_le_16(((uint16_t)-1)) :
+                                               rte_cpu_to_le_16(rep_bp->vf_id);
        rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
        HWRM_CHECK_RESULT();
        HWRM_UNLOCK();

diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index a7fa7f6..23ca6ab 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -297,8 +297,6 @@ int bnxt_hwrm_port_phy_qcaps(struct bnxt *bp);
 int bnxt_hwrm_oem_cmd(struct bnxt *bp, uint32_t entry_num);
 int bnxt_clear_one_vnic_filter(struct bnxt *bp,
                               struct bnxt_filter_info *filter);
-int bnxt_hwrm_cfa_vfr_alloc(struct bnxt *bp, uint16_t vf_idx);
-int bnxt_hwrm_cfa_vfr_free(struct bnxt *bp, uint16_t vf_idx);
 void bnxt_hwrm_free_vf_info(struct bnxt *bp);
 int bnxt_hwrm_first_vf_id_query(struct bnxt *bp, uint16_t fid,
                                uint16_t *first_vf_id);

diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index b4566c9..e5ba090 100644 (file)
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -216,8 +216,9 @@ int bnxt_representor_init(struct rte_eth_dev *eth_dev, void *params)
                    "Switch domain id %d: Representor Device %d init done\n",
                    vf_rep_bp->switch_domain_id, vf_rep_bp->vf_id);
 
-       if (vf_rep_bp->rep_based_pf) {
+       if (BNXT_REP_BASED_PF(vf_rep_bp)) {
                vf_rep_bp->fw_fid = vf_rep_bp->rep_based_pf + 1;
+               vf_rep_bp->parent_pf_idx = vf_rep_bp->rep_based_pf;
                if (!(BNXT_REP_PF(vf_rep_bp))) {
                        /* VF representor for the remote PF,get first_vf_id */
                        rc = bnxt_hwrm_first_vf_id_query(parent_bp,
@@ -237,6 +238,10 @@ int bnxt_representor_init(struct rte_eth_dev *eth_dev, void *params)
                }
        }  else {
                vf_rep_bp->fw_fid = rep_params->vf_id + parent_bp->first_vf_id;
+               if (BNXT_VF_IS_TRUSTED(parent_bp))
+                       vf_rep_bp->parent_pf_idx = parent_bp->parent->fid - 1;
+               else
+                       vf_rep_bp->parent_pf_idx = parent_bp->fw_fid - 1;
        }
 
        PMD_DRV_LOG(INFO, "vf_rep->fw_fid = %d\n", vf_rep_bp->fw_fid);
@@ -329,11 +334,7 @@ static int bnxt_tf_vfr_alloc(struct rte_eth_dev *vfr_ethdev)
        /* update the port id so you can backtrack to ethdev */
        vfr->dpdk_port_id = vfr_ethdev->data->port_id;
 
-       if (BNXT_STINGRAY(parent_bp)) {
-               rc = bnxt_hwrm_cfa_pair_alloc(parent_bp, vfr);
-       } else {
-               rc = bnxt_hwrm_cfa_vfr_alloc(parent_bp, vfr->vf_id);
-       }
+       rc = bnxt_hwrm_cfa_pair_alloc(parent_bp, vfr);
        if (rc) {
                BNXT_TF_DBG(ERR, "Failed in hwrm vfr alloc vfr:%u rc=%d\n",
                            vfr->vf_id, rc);
@@ -468,10 +469,7 @@ static int bnxt_vfr_free(struct bnxt_representor *vfr)
                    vfr->vf_id);
        vfr->vfr_tx_cfa_action = 0;
 
-       if (BNXT_STINGRAY(parent_bp))
-               rc = bnxt_hwrm_cfa_pair_free(parent_bp, vfr);
-       else
-               rc = bnxt_hwrm_cfa_vfr_free(parent_bp, vfr->vf_id);
+       rc = bnxt_hwrm_cfa_pair_free(parent_bp, vfr);
 
        return rc;
 }