net/qede/base: allow PMD to control vport and RSS engine ids

Let PMD have control over the vport-id and rss-eng-id of a given VF
during initialization.

Signed-off-by: Rasesh Mody <rasesh.mody@cavium.com>

diff --git a/drivers/net/qede/base/ecore_iov_api.h b/drivers/net/qede/base/ecore_iov_api.h
index b8dc47b..6a0fc5a 100644 (file)
--- a/drivers/net/qede/base/ecore_iov_api.h
+++ b/drivers/net/qede/base/ecore_iov_api.h
@@ -103,6 +103,11 @@ struct ecore_iov_vf_init_params {
         */
        u16 req_rx_queue[ECORE_MAX_VF_CHAINS_PER_PF];
        u16 req_tx_queue[ECORE_MAX_VF_CHAINS_PER_PF];
+
+       u8 vport_id;
+
+       /* Should be set in case RSS is going to be used for VF */
+       u8 rss_eng_id;
 };
 
 #ifdef CONFIG_ECORE_SW_CHANNEL
@@ -416,16 +421,6 @@ ecore_iov_bulletin_set_forced_untagged_default(struct ecore_hwfn *p_hwfn,
 void ecore_iov_get_vfs_opaque_fid(struct ecore_hwfn *p_hwfn, int vfid,
                                  u16 *opaque_fid);
 
-/**
- * @brief Get VFs VPORT id.
- *
- * @param p_hwfn
- * @param vfid
- * @param vport id
- */
-void ecore_iov_get_vfs_vport_id(struct ecore_hwfn *p_hwfn, int vfid,
-                               u8 *p_vport_id);
-
 /**
  * @brief Set forced VLAN [pvid] in PFs copy of bulletin board
  *        and configures FW/HW to support the configuration.

diff --git a/drivers/net/qede/base/ecore_sriov.c b/drivers/net/qede/base/ecore_sriov.c
index 4ffa8d0..20b51c4 100644 (file)
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -426,8 +426,6 @@ static void ecore_iov_setup_vfdb(struct ecore_hwfn *p_hwfn)
                return;
        }
 
-       p_iov_info->base_vport_id = 1;  /* @@@TBD resource allocation */
-
        for (idx = 0; idx < p_iov->total_vfs; idx++) {
                struct ecore_vf_info *vf = &p_iov_info->vfs_array[idx];
                u32 concrete;
@@ -456,8 +454,6 @@ static void ecore_iov_setup_vfdb(struct ecore_hwfn *p_hwfn)
                /* TODO - need to devise a better way of getting opaque */
                vf->opaque_fid = (p_hwfn->hw_info.opaque_fid & 0xff) |
                    (vf->abs_vf_id << 8);
-               /* @@TBD MichalK - add base vport_id of VFs to equation */
-               vf->vport_id = p_iov_info->base_vport_id + idx;
 
                vf->num_mac_filters = ECORE_ETH_VF_NUM_MAC_FILTERS;
                vf->num_vlan_filters = ECORE_ETH_VF_NUM_VLAN_FILTERS;
@@ -1019,6 +1015,34 @@ ecore_iov_init_hw_for_vf(struct ecore_hwfn *p_hwfn,
                return ECORE_INVAL;
        }
 
+       /* Perform sanity checking on the requested vport/rss */
+       if (p_params->vport_id >= RESC_NUM(p_hwfn, ECORE_VPORT)) {
+               DP_NOTICE(p_hwfn, true, "VF[%d] - can't use VPORT %02x\n",
+                         p_params->rel_vf_id, p_params->vport_id);
+               return ECORE_INVAL;
+       }
+
+       if ((p_params->num_queues > 1) &&
+           (p_params->rss_eng_id >= RESC_NUM(p_hwfn, ECORE_RSS_ENG))) {
+               DP_NOTICE(p_hwfn, true, "VF[%d] - can't use RSS_ENG %02x\n",
+                         p_params->rel_vf_id, p_params->rss_eng_id);
+               return ECORE_INVAL;
+       }
+
+       /* TODO - remove this once we get confidence of change */
+       if (!p_params->vport_id) {
+               DP_NOTICE(p_hwfn, false,
+                         "VF[%d] - Unlikely that VF uses vport0. Forgotten?\n",
+                         p_params->rel_vf_id);
+       }
+       if ((!p_params->rss_eng_id) && (p_params->num_queues > 1)) {
+               DP_NOTICE(p_hwfn, false,
+                         "VF[%d] - Unlikely that VF uses RSS_eng0. Forgotten?\n",
+                         p_params->rel_vf_id);
+       }
+       vf->vport_id = p_params->vport_id;
+       vf->rss_eng_id = p_params->rss_eng_id;
+
        /* Perform sanity checking on the requested queue_id */
        for (i = 0; i < p_params->num_queues; i++) {
                u16 min_vf_qzone = (u16)FEAT_NUM(p_hwfn, ECORE_PF_L2_QUE);
@@ -2752,7 +2776,7 @@ ecore_iov_vp_update_rss_param(struct ecore_hwfn *p_hwfn,
                VFPF_UPDATE_RSS_KEY_FLAG);
 
        p_rss->rss_enable = p_rss_tlv->rss_enable;
-       p_rss->rss_eng_id = vf->relative_vf_id + 1;
+       p_rss->rss_eng_id = vf->rss_eng_id;
        p_rss->rss_caps = p_rss_tlv->rss_caps;
        p_rss->rss_table_size_log = p_rss_tlv->rss_table_size_log;
        OSAL_MEMCPY(p_rss->rss_key, p_rss_tlv->rss_key,
@@ -3974,18 +3998,6 @@ void ecore_iov_get_vfs_opaque_fid(struct ecore_hwfn *p_hwfn, int vfid,
        *opaque_fid = vf_info->opaque_fid;
 }
 
-void ecore_iov_get_vfs_vport_id(struct ecore_hwfn *p_hwfn, int vfid,
-                               u8 *p_vort_id)
-{
-       struct ecore_vf_info *vf_info;
-
-       vf_info = ecore_iov_get_vf_info(p_hwfn, (u16)vfid, true);
-       if (!vf_info)
-               return;
-
-       *p_vort_id = vf_info->vport_id;
-}
-
 void ecore_iov_bulletin_set_forced_vlan(struct ecore_hwfn *p_hwfn,
                                        u16 pvid, int vfid)
 {

diff --git a/drivers/net/qede/base/ecore_sriov.h b/drivers/net/qede/base/ecore_sriov.h
index d32f931..66e9271 100644 (file)
--- a/drivers/net/qede/base/ecore_sriov.h
+++ b/drivers/net/qede/base/ecore_sriov.h
@@ -111,6 +111,7 @@ struct ecore_vf_info {
        u16                     mtu;
 
        u8                      vport_id;
+       u8                      rss_eng_id;
        u8                      relative_vf_id;
        u8                      abs_vf_id;
 #define ECORE_VF_ABS_ID(p_hwfn, p_vf)  (ECORE_PATH_ID(p_hwfn) ? \
@@ -155,7 +156,6 @@ struct ecore_pf_iov {
        struct ecore_vf_info    vfs_array[E4_MAX_NUM_VFS];
        u64                     pending_events[ECORE_VF_ARRAY_LENGTH];
        u64                     pending_flr[ECORE_VF_ARRAY_LENGTH];
-       u16                     base_vport_id;
 
 #ifndef REMOVE_DBG
        /* This doesn't serve anything functionally, but it makes windows