net/ena: rework RSS configuration

[dpdk.git] / drivers / net / qede / base / ecore_l2.c

diff --git a/drivers/net/qede/base/ecore_l2.c b/drivers/net/qede/base/ecore_l2.c
index 5dcdc84..af234de 100644 (file)
--- a/drivers/net/qede/base/ecore_l2.c
+++ b/drivers/net/qede/base/ecore_l2.c
@@ -29,7 +29,7 @@
 
 struct ecore_l2_info {
        u32 queues;
-       unsigned long **pp_qid_usage;
+       u32 **pp_qid_usage;
 
        /* The lock is meant to synchronize access to the qid usage */
        osal_mutex_t lock;
@@ -38,7 +38,7 @@ struct ecore_l2_info {
 enum _ecore_status_t ecore_l2_alloc(struct ecore_hwfn *p_hwfn)
 {
        struct ecore_l2_info *p_l2_info;
-       unsigned long **pp_qids;
+       u32 **pp_qids;
        u32 i;
 
        if (!ECORE_IS_L2_PERSONALITY(p_hwfn))
@@ -2116,7 +2116,7 @@ void ecore_arfs_mode_configure(struct ecore_hwfn *p_hwfn,
                               struct ecore_ptt *p_ptt,
                               struct ecore_arfs_config_params *p_cfg_params)
 {
-       if (OSAL_TEST_BIT(ECORE_MF_DISABLE_ARFS, &p_hwfn->p_dev->mf_bits))
+       if (OSAL_GET_BIT(ECORE_MF_DISABLE_ARFS, &p_hwfn->p_dev->mf_bits))
                return;
 
        if (p_cfg_params->mode != ECORE_FILTER_CONFIG_MODE_DISABLE) {
@@ -2323,18 +2323,17 @@ ecore_eth_tx_queue_maxrate(struct ecore_hwfn *p_hwfn,
                           struct ecore_ptt *p_ptt,
                           struct ecore_queue_cid *p_cid, u32 rate)
 {
-       struct ecore_mcp_link_state *p_link;
+       u16 rl_id;
        u8 vport;
 
        vport = (u8)ecore_get_qm_vport_idx_rl(p_hwfn, p_cid->rel.queue_id);
-       p_link = &ECORE_LEADING_HWFN(p_hwfn->p_dev)->mcp_info->link_output;
 
        DP_VERBOSE(p_hwfn, ECORE_MSG_LINK,
                   "About to rate limit qm vport %d for queue %d with rate %d\n",
                   vport, p_cid->rel.queue_id, rate);
 
-       return ecore_init_vport_rl(p_hwfn, p_ptt, vport, rate,
-                                  p_link->speed);
+       rl_id = vport; /* The "rl_id" is set as the "vport_id" */
+       return ecore_init_global_rl(p_hwfn, p_ptt, rl_id, rate);
 }
 
 #define RSS_TSTORM_UPDATE_STATUS_MAX_POLL_COUNT    100
@@ -2358,8 +2357,7 @@ ecore_update_eth_rss_ind_table_entry(struct ecore_hwfn *p_hwfn,
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       addr = (u8 OSAL_IOMEM *)p_hwfn->regview +
-              GTT_BAR0_MAP_REG_TSDM_RAM +
+       addr = (u8 *)p_hwfn->regview + GTT_BAR0_MAP_REG_TSDM_RAM +
               TSTORM_ETH_RSS_UPDATE_OFFSET(p_hwfn->rel_pf_id);
 
        *(u64 *)(&update_data) = DIRECT_REG_RD64(p_hwfn, addr);