Imported Upstream version 16.11
[deb_dpdk.git] / drivers / net / qede / base / ecore_l2.c
index 9e6ef5a..74f61b0 100644 (file)
@@ -35,9 +35,9 @@ ecore_sp_eth_vport_start(struct ecore_hwfn *p_hwfn,
 {
        struct vport_start_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
        struct ecore_sp_init_data init_data;
        u8 abs_vport_id = 0;
+       enum _ecore_status_t rc = ECORE_NOTIMPL;
        u16 rx_mode = 0;
 
        rc = ecore_fw_vport(p_hwfn, p_params->vport_id, &abs_vport_id);
@@ -84,6 +84,8 @@ ecore_sp_eth_vport_start(struct ecore_hwfn *p_hwfn,
                p_ramrod->tpa_param.tpa_min_size_to_start = p_params->mtu / 2;
                p_ramrod->tpa_param.tpa_ipv4_en_flg = 1;
                p_ramrod->tpa_param.tpa_ipv6_en_flg = 1;
+               p_ramrod->tpa_param.tpa_ipv4_tunn_en_flg = 1;
+               p_ramrod->tpa_param.tpa_ipv6_tunn_en_flg = 1;
                p_ramrod->tpa_param.tpa_pkt_split_flg = 1;
                p_ramrod->tpa_param.tpa_gro_consistent_flg = 1;
                break;
@@ -97,6 +99,9 @@ ecore_sp_eth_vport_start(struct ecore_hwfn *p_hwfn,
                p_ramrod->tx_switching_en = 0;
 #endif
 
+       p_ramrod->ctl_frame_mac_check_en = !!p_params->check_mac;
+       p_ramrod->ctl_frame_ethtype_check_en = !!p_params->check_ethtype;
+
        /* Software Function ID in hwfn (PFs are 0 - 15, VFs are 16 - 135) */
        p_ramrod->sw_fid = ecore_concrete_to_sw_fid(p_hwfn->p_dev,
                                                    p_params->concrete_fid);
@@ -202,10 +207,12 @@ ecore_sp_vport_update_rss(struct ecore_hwfn *p_hwfn,
 static void
 ecore_sp_update_accept_mode(struct ecore_hwfn *p_hwfn,
                            struct vport_update_ramrod_data *p_ramrod,
-                           struct ecore_filter_accept_flags flags)
+                           struct ecore_filter_accept_flags accept_flags)
 {
-       p_ramrod->common.update_rx_mode_flg = flags.update_rx_mode_config;
-       p_ramrod->common.update_tx_mode_flg = flags.update_tx_mode_config;
+       p_ramrod->common.update_rx_mode_flg =
+                                       accept_flags.update_rx_mode_config;
+       p_ramrod->common.update_tx_mode_flg =
+                                       accept_flags.update_tx_mode_config;
 
 #ifndef ASIC_ONLY
        /* On B0 emulation we cannot enable Tx, since this would cause writes
@@ -220,74 +227,55 @@ ecore_sp_update_accept_mode(struct ecore_hwfn *p_hwfn,
 
        /* Set Rx mode accept flags */
        if (p_ramrod->common.update_rx_mode_flg) {
-               __le16 *state = &p_ramrod->rx_mode.state;
-               u8 accept_filter = flags.rx_accept_filter;
-
-/*
- *             SET_FIELD(*state, ETH_VPORT_RX_MODE_UCAST_DROP_ALL,
- *                       !!(accept_filter & ECORE_ACCEPT_NONE));
- */
-
-               SET_FIELD(*state, ETH_VPORT_RX_MODE_UCAST_ACCEPT_ALL,
-                         (!!(accept_filter & ECORE_ACCEPT_UCAST_MATCHED) &&
-                          !!(accept_filter & ECORE_ACCEPT_UCAST_UNMATCHED)));
+               u8 accept_filter = accept_flags.rx_accept_filter;
+               u16 state = 0;
 
-               SET_FIELD(*state, ETH_VPORT_RX_MODE_UCAST_DROP_ALL,
+               SET_FIELD(state, ETH_VPORT_RX_MODE_UCAST_DROP_ALL,
                          !(!!(accept_filter & ECORE_ACCEPT_UCAST_MATCHED) ||
-                           !!(accept_filter & ECORE_ACCEPT_UCAST_UNMATCHED)));
+                          !!(accept_filter & ECORE_ACCEPT_UCAST_UNMATCHED)));
 
-               SET_FIELD(*state, ETH_VPORT_RX_MODE_UCAST_ACCEPT_UNMATCHED,
+               SET_FIELD(state, ETH_VPORT_RX_MODE_UCAST_ACCEPT_UNMATCHED,
                          !!(accept_filter & ECORE_ACCEPT_UCAST_UNMATCHED));
-/*
- *             SET_FIELD(*state, ETH_VPORT_RX_MODE_MCAST_DROP_ALL,
- *                       !!(accept_filter & ECORE_ACCEPT_NONE));
- */
-               SET_FIELD(*state, ETH_VPORT_RX_MODE_MCAST_DROP_ALL,
+
+               SET_FIELD(state, ETH_VPORT_RX_MODE_MCAST_DROP_ALL,
                          !(!!(accept_filter & ECORE_ACCEPT_MCAST_MATCHED) ||
                            !!(accept_filter & ECORE_ACCEPT_MCAST_UNMATCHED)));
 
-               SET_FIELD(*state, ETH_VPORT_RX_MODE_MCAST_ACCEPT_ALL,
+               SET_FIELD(state, ETH_VPORT_RX_MODE_MCAST_ACCEPT_ALL,
                          (!!(accept_filter & ECORE_ACCEPT_MCAST_MATCHED) &&
                           !!(accept_filter & ECORE_ACCEPT_MCAST_UNMATCHED)));
 
-               SET_FIELD(*state, ETH_VPORT_RX_MODE_BCAST_ACCEPT_ALL,
+               SET_FIELD(state, ETH_VPORT_RX_MODE_BCAST_ACCEPT_ALL,
                          !!(accept_filter & ECORE_ACCEPT_BCAST));
 
+               p_ramrod->rx_mode.state = OSAL_CPU_TO_LE16(state);
                DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
                           "p_ramrod->rx_mode.state = 0x%x\n",
-                          p_ramrod->rx_mode.state);
+                          state);
        }
 
        /* Set Tx mode accept flags */
        if (p_ramrod->common.update_tx_mode_flg) {
-               __le16 *state = &p_ramrod->tx_mode.state;
-               u8 accept_filter = flags.tx_accept_filter;
+               u8 accept_filter = accept_flags.tx_accept_filter;
+               u16 state = 0;
 
-               SET_FIELD(*state, ETH_VPORT_TX_MODE_UCAST_DROP_ALL,
+               SET_FIELD(state, ETH_VPORT_TX_MODE_UCAST_DROP_ALL,
                          !!(accept_filter & ECORE_ACCEPT_NONE));
 
-               SET_FIELD(*state, ETH_VPORT_TX_MODE_MCAST_DROP_ALL,
+               SET_FIELD(state, ETH_VPORT_TX_MODE_MCAST_DROP_ALL,
                          !!(accept_filter & ECORE_ACCEPT_NONE));
 
-               SET_FIELD(*state, ETH_VPORT_TX_MODE_MCAST_ACCEPT_ALL,
+               SET_FIELD(state, ETH_VPORT_TX_MODE_MCAST_ACCEPT_ALL,
                          (!!(accept_filter & ECORE_ACCEPT_MCAST_MATCHED) &&
                           !!(accept_filter & ECORE_ACCEPT_MCAST_UNMATCHED)));
 
-               SET_FIELD(*state, ETH_VPORT_TX_MODE_BCAST_ACCEPT_ALL,
+               SET_FIELD(state, ETH_VPORT_TX_MODE_BCAST_ACCEPT_ALL,
                          !!(accept_filter & ECORE_ACCEPT_BCAST));
-               /* @DPDK */
-               /* ETH_VPORT_RX_MODE_UCAST_ACCEPT_ALL and
-                * ETH_VPORT_TX_MODE_UCAST_ACCEPT_ALL
-                * needs to be set for VF-VF communication to work
-                * when dest macaddr is unknown.
-                */
-               SET_FIELD(*state, ETH_VPORT_TX_MODE_UCAST_ACCEPT_ALL,
-                         (!!(accept_filter & ECORE_ACCEPT_UCAST_MATCHED) &&
-                          !!(accept_filter & ECORE_ACCEPT_UCAST_UNMATCHED)));
 
+               p_ramrod->tx_mode.state = OSAL_CPU_TO_LE16(state);
                DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
                           "p_ramrod->tx_mode.state = 0x%x\n",
-                          p_ramrod->tx_mode.state);
+                          state);
        }
 }
 
@@ -351,12 +339,12 @@ ecore_sp_vport_update(struct ecore_hwfn *p_hwfn,
                      struct ecore_spq_comp_cb *p_comp_data)
 {
        struct ecore_rss_params *p_rss_params = p_params->rss_params;
+       struct vport_update_ramrod_data_cmn *p_cmn;
+       struct ecore_sp_init_data init_data;
        struct vport_update_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
-       struct ecore_sp_init_data init_data;
        u8 abs_vport_id = 0, val;
-       u16 wordval;
+       enum _ecore_status_t rc = ECORE_NOTIMPL;
 
        if (IS_VF(p_hwfn->p_dev)) {
                rc = ecore_vf_pf_vport_update(p_hwfn, p_params);
@@ -382,30 +370,31 @@ ecore_sp_vport_update(struct ecore_hwfn *p_hwfn,
 
        /* Copy input params to ramrod according to FW struct */
        p_ramrod = &p_ent->ramrod.vport_update;
+       p_cmn = &p_ramrod->common;
 
-       p_ramrod->common.vport_id = abs_vport_id;
+       p_cmn->vport_id = abs_vport_id;
+
+       p_cmn->rx_active_flg = p_params->vport_active_rx_flg;
+       p_cmn->update_rx_active_flg = p_params->update_vport_active_rx_flg;
+       p_cmn->tx_active_flg = p_params->vport_active_tx_flg;
+       p_cmn->update_tx_active_flg = p_params->update_vport_active_tx_flg;
 
-       p_ramrod->common.rx_active_flg = p_params->vport_active_rx_flg;
-       p_ramrod->common.tx_active_flg = p_params->vport_active_tx_flg;
-       val = p_params->update_vport_active_rx_flg;
-       p_ramrod->common.update_rx_active_flg = val;
-       val = p_params->update_vport_active_tx_flg;
-       p_ramrod->common.update_tx_active_flg = val;
+       p_cmn->accept_any_vlan = p_params->accept_any_vlan;
+       val = p_params->update_accept_any_vlan_flg;
+       p_cmn->update_accept_any_vlan_flg = val;
+
+       p_cmn->inner_vlan_removal_en = p_params->inner_vlan_removal_flg;
        val = p_params->update_inner_vlan_removal_flg;
-       p_ramrod->common.update_inner_vlan_removal_en_flg = val;
-       val = p_params->inner_vlan_removal_flg;
-       p_ramrod->common.inner_vlan_removal_en = val;
-       val = p_params->silent_vlan_removal_flg;
-       p_ramrod->common.silent_vlan_removal_en = val;
-       val = p_params->update_tx_switching_flg;
-       p_ramrod->common.update_tx_switching_en_flg = val;
+       p_cmn->update_inner_vlan_removal_en_flg = val;
+
+       p_cmn->default_vlan_en = p_params->default_vlan_enable_flg;
        val = p_params->update_default_vlan_enable_flg;
-       p_ramrod->common.update_default_vlan_en_flg = val;
-       p_ramrod->common.default_vlan_en = p_params->default_vlan_enable_flg;
-       val = p_params->update_default_vlan_flg;
-       p_ramrod->common.update_default_vlan_flg = val;
-       wordval = p_params->default_vlan;
-       p_ramrod->common.default_vlan = OSAL_CPU_TO_LE16(wordval);
+       p_cmn->update_default_vlan_en_flg = val;
+
+       p_cmn->default_vlan = OSAL_CPU_TO_LE16(p_params->default_vlan);
+       p_cmn->update_default_vlan_flg = p_params->update_default_vlan_flg;
+
+       p_cmn->silent_vlan_removal_en = p_params->silent_vlan_removal_flg;
 
        p_ramrod->common.tx_switching_en = p_params->tx_switching_flg;
 
@@ -419,17 +408,15 @@ ecore_sp_vport_update(struct ecore_hwfn *p_hwfn,
                        p_ramrod->common.update_tx_switching_en_flg = 1;
                }
 #endif
+       p_cmn->update_tx_switching_en_flg = p_params->update_tx_switching_flg;
 
+       p_cmn->anti_spoofing_en = p_params->anti_spoofing_en;
        val = p_params->update_anti_spoofing_en_flg;
        p_ramrod->common.update_anti_spoofing_en_flg = val;
-       p_ramrod->common.anti_spoofing_en = p_params->anti_spoofing_en;
-       p_ramrod->common.accept_any_vlan = p_params->accept_any_vlan;
-       val = p_params->update_accept_any_vlan_flg;
-       p_ramrod->common.update_accept_any_vlan_flg = val;
 
        rc = ecore_sp_vport_update_rss(p_hwfn, p_ramrod, p_rss_params);
        if (rc != ECORE_SUCCESS) {
-               /* Return spq entry which is taken in ecore_sp_init_request() */
+               /* Return spq entry which is taken in ecore_sp_init_request()*/
                ecore_spq_return_entry(p_hwfn, p_ent);
                return rc;
        }
@@ -440,6 +427,11 @@ ecore_sp_vport_update(struct ecore_hwfn *p_hwfn,
        ecore_sp_update_accept_mode(p_hwfn, p_ramrod, p_params->accept_flags);
        ecore_sp_vport_update_sge_tpa(p_hwfn, p_ramrod,
                                      p_params->sge_tpa_params);
+       if (p_params->mtu) {
+               p_ramrod->common.update_mtu_flg = 1;
+               p_ramrod->common.mtu = OSAL_CPU_TO_LE16(p_params->mtu);
+       }
+
        return ecore_spq_post(p_hwfn, p_ent, OSAL_NULL);
 }
 
@@ -449,8 +441,8 @@ enum _ecore_status_t ecore_sp_vport_stop(struct ecore_hwfn *p_hwfn,
        struct vport_stop_ramrod_data *p_ramrod;
        struct ecore_sp_init_data init_data;
        struct ecore_spq_entry *p_ent;
-       enum _ecore_status_t rc;
        u8 abs_vport_id = 0;
+       enum _ecore_status_t rc;
 
        if (IS_VF(p_hwfn->p_dev))
                return ecore_vf_pf_vport_stop(p_hwfn);
@@ -499,20 +491,20 @@ ecore_filter_accept_cmd(struct ecore_dev *p_dev,
                        enum spq_mode comp_mode,
                        struct ecore_spq_comp_cb *p_comp_data)
 {
-       struct ecore_sp_vport_update_params update_params;
+       struct ecore_sp_vport_update_params vport_update_params;
        int i, rc;
 
        /* Prepare and send the vport rx_mode change */
-       OSAL_MEMSET(&update_params, 0, sizeof(update_params));
-       update_params.vport_id = vport;
-       update_params.accept_flags = accept_flags;
-       update_params.update_accept_any_vlan_flg = update_accept_any_vlan;
-       update_params.accept_any_vlan = accept_any_vlan;
+       OSAL_MEMSET(&vport_update_params, 0, sizeof(vport_update_params));
+       vport_update_params.vport_id = vport;
+       vport_update_params.accept_flags = accept_flags;
+       vport_update_params.update_accept_any_vlan_flg = update_accept_any_vlan;
+       vport_update_params.accept_any_vlan = accept_any_vlan;
 
        for_each_hwfn(p_dev, i) {
                struct ecore_hwfn *p_hwfn = &p_dev->hwfns[i];
 
-               update_params.opaque_fid = p_hwfn->hw_info.opaque_fid;
+               vport_update_params.opaque_fid = p_hwfn->hw_info.opaque_fid;
 
                if (IS_VF(p_dev)) {
                        rc = ecore_vf_pf_accept_flags(p_hwfn, &accept_flags);
@@ -521,7 +513,7 @@ ecore_filter_accept_cmd(struct ecore_dev *p_dev,
                        continue;
                }
 
-               rc = ecore_sp_vport_update(p_hwfn, &update_params,
+               rc = ecore_sp_vport_update(p_hwfn, &vport_update_params,
                                           comp_mode, p_comp_data);
                if (rc != ECORE_SUCCESS) {
                        DP_ERR(p_dev, "Update rx_mode failed %d\n", rc);
@@ -556,39 +548,38 @@ enum _ecore_status_t
 ecore_sp_eth_rxq_start_ramrod(struct ecore_hwfn *p_hwfn,
                              u16 opaque_fid,
                              u32 cid,
-                             u16 rx_queue_id,
-                             u8 vport_id,
-                             u8 stats_id,
-                             u16 sb,
-                             u8 sb_index,
+                             struct ecore_queue_start_common_params *p_params,
                              u16 bd_max_bytes,
                              dma_addr_t bd_chain_phys_addr,
-                             dma_addr_t cqe_pbl_addr, u16 cqe_pbl_size)
+                             dma_addr_t cqe_pbl_addr,
+                             u16 cqe_pbl_size, bool b_use_zone_a_prod)
 {
-       struct ecore_hw_cid_data *p_rx_cid = &p_hwfn->p_rx_cids[rx_queue_id];
        struct rx_queue_start_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
        struct ecore_sp_init_data init_data;
+       struct ecore_hw_cid_data *p_rx_cid;
        u16 abs_rx_q_id = 0;
        u8 abs_vport_id = 0;
+       enum _ecore_status_t rc = ECORE_NOTIMPL;
 
        /* Store information for the stop */
+       p_rx_cid = &p_hwfn->p_rx_cids[p_params->queue_id];
        p_rx_cid->cid = cid;
        p_rx_cid->opaque_fid = opaque_fid;
-       p_rx_cid->vport_id = vport_id;
+       p_rx_cid->vport_id = p_params->vport_id;
 
-       rc = ecore_fw_vport(p_hwfn, vport_id, &abs_vport_id);
+       rc = ecore_fw_vport(p_hwfn, p_params->vport_id, &abs_vport_id);
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       rc = ecore_fw_l2_queue(p_hwfn, rx_queue_id, &abs_rx_q_id);
+       rc = ecore_fw_l2_queue(p_hwfn, p_params->queue_id, &abs_rx_q_id);
        if (rc != ECORE_SUCCESS)
                return rc;
 
        DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
                   "opaque_fid=0x%x, cid=0x%x, rx_qid=0x%x, vport_id=0x%x, sb_id=0x%x\n",
-                  opaque_fid, cid, rx_queue_id, vport_id, sb);
+                  opaque_fid, cid, p_params->queue_id,
+                  p_params->vport_id, p_params->sb);
 
        /* Get SPQ entry */
        OSAL_MEMSET(&init_data, 0, sizeof(init_data));
@@ -604,10 +595,10 @@ ecore_sp_eth_rxq_start_ramrod(struct ecore_hwfn *p_hwfn,
 
        p_ramrod = &p_ent->ramrod.rx_queue_start;
 
-       p_ramrod->sb_id = OSAL_CPU_TO_LE16(sb);
-       p_ramrod->sb_index = sb_index;
+       p_ramrod->sb_id = OSAL_CPU_TO_LE16(p_params->sb);
+       p_ramrod->sb_index = (u8)p_params->sb_idx;
        p_ramrod->vport_id = abs_vport_id;
-       p_ramrod->stats_counter_id = stats_id;
+       p_ramrod->stats_counter_id = p_params->stats_id;
        p_ramrod->rx_queue_id = OSAL_CPU_TO_LE16(abs_rx_q_id);
        p_ramrod->complete_cqe_flg = 0;
        p_ramrod->complete_event_flg = 1;
@@ -618,73 +609,82 @@ ecore_sp_eth_rxq_start_ramrod(struct ecore_hwfn *p_hwfn,
        p_ramrod->num_of_pbl_pages = OSAL_CPU_TO_LE16(cqe_pbl_size);
        DMA_REGPAIR_LE(p_ramrod->cqe_pbl_addr, cqe_pbl_addr);
 
+       if (p_params->vf_qid || b_use_zone_a_prod) {
+               p_ramrod->vf_rx_prod_index = (u8)p_params->vf_qid;
+               DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                          "Queue%s is meant for VF rxq[%02x]\n",
+                          b_use_zone_a_prod ? " [legacy]" : "",
+                          p_params->vf_qid);
+               p_ramrod->vf_rx_prod_use_zone_a = b_use_zone_a_prod;
+       }
+
        return ecore_spq_post(p_hwfn, p_ent, OSAL_NULL);
 }
 
-enum _ecore_status_t ecore_sp_eth_rx_queue_start(struct ecore_hwfn *p_hwfn,
-                                                u16 opaque_fid,
-                                                u8 rx_queue_id,
-                                                u8 vport_id,
-                                                u8 stats_id,
-                                                u16 sb,
-                                                u8 sb_index,
-                                                u16 bd_max_bytes,
-                                                dma_addr_t bd_chain_phys_addr,
-                                                dma_addr_t cqe_pbl_addr,
-                                                u16 cqe_pbl_size,
-                                                void OSAL_IOMEM * *pp_prod)
+enum _ecore_status_t
+ecore_sp_eth_rx_queue_start(struct ecore_hwfn *p_hwfn,
+                           u16 opaque_fid,
+                           struct ecore_queue_start_common_params *p_params,
+                           u16 bd_max_bytes,
+                           dma_addr_t bd_chain_phys_addr,
+                           dma_addr_t cqe_pbl_addr,
+                           u16 cqe_pbl_size,
+                           void OSAL_IOMEM * *pp_prod)
 {
-       struct ecore_hw_cid_data *p_rx_cid = &p_hwfn->p_rx_cids[rx_queue_id];
-       u8 abs_stats_id = 0;
+       struct ecore_hw_cid_data *p_rx_cid;
+       u32 init_prod_val = 0;
        u16 abs_l2_queue = 0;
+       u8 abs_stats_id = 0;
        enum _ecore_status_t rc;
-       u64 init_prod_val = 0;
 
        if (IS_VF(p_hwfn->p_dev)) {
                return ecore_vf_pf_rxq_start(p_hwfn,
-                                            rx_queue_id,
-                                            sb,
-                                            sb_index,
+                                            p_params->queue_id,
+                                            p_params->sb,
+                                            (u8)p_params->sb_idx,
                                             bd_max_bytes,
                                             bd_chain_phys_addr,
                                             cqe_pbl_addr,
                                             cqe_pbl_size, pp_prod);
        }
 
-       rc = ecore_fw_l2_queue(p_hwfn, rx_queue_id, &abs_l2_queue);
+       rc = ecore_fw_l2_queue(p_hwfn, p_params->queue_id, &abs_l2_queue);
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       rc = ecore_fw_vport(p_hwfn, stats_id, &abs_stats_id);
+       rc = ecore_fw_vport(p_hwfn, p_params->stats_id, &abs_stats_id);
        if (rc != ECORE_SUCCESS)
                return rc;
 
        *pp_prod = (u8 OSAL_IOMEM *)p_hwfn->regview +
-           GTT_BAR0_MAP_REG_MSDM_RAM + MSTORM_PRODS_OFFSET(abs_l2_queue);
+           GTT_BAR0_MAP_REG_MSDM_RAM +
+           MSTORM_ETH_PF_PRODS_OFFSET(abs_l2_queue);
 
        /* Init the rcq, rx bd and rx sge (if valid) producers to 0 */
-       __internal_ram_wr(p_hwfn, *pp_prod, sizeof(u64),
+       __internal_ram_wr(p_hwfn, *pp_prod, sizeof(u32),
                          (u32 *)(&init_prod_val));
 
        /* Allocate a CID for the queue */
-       rc = ecore_cxt_acquire_cid(p_hwfn, PROTOCOLID_ETH, &p_rx_cid->cid);
+       p_rx_cid = &p_hwfn->p_rx_cids[p_params->queue_id];
+       rc = ecore_cxt_acquire_cid(p_hwfn, PROTOCOLID_ETH,
+                                  &p_rx_cid->cid);
        if (rc != ECORE_SUCCESS) {
                DP_NOTICE(p_hwfn, true, "Failed to acquire cid\n");
                return rc;
        }
        p_rx_cid->b_cid_allocated = true;
+       p_params->stats_id = abs_stats_id;
+       p_params->vf_qid = 0;
 
        rc = ecore_sp_eth_rxq_start_ramrod(p_hwfn,
                                           opaque_fid,
                                           p_rx_cid->cid,
-                                          rx_queue_id,
-                                          vport_id,
-                                          abs_stats_id,
-                                          sb,
-                                          sb_index,
+                                          p_params,
                                           bd_max_bytes,
                                           bd_chain_phys_addr,
-                                          cqe_pbl_addr, cqe_pbl_size);
+                                          cqe_pbl_addr,
+                                          cqe_pbl_size,
+                                          false);
 
        if (rc != ECORE_SUCCESS)
                ecore_sp_release_queue_cid(p_hwfn, p_rx_cid);
@@ -703,10 +703,10 @@ ecore_sp_eth_rx_queues_update(struct ecore_hwfn *p_hwfn,
 {
        struct rx_queue_update_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
        struct ecore_sp_init_data init_data;
        struct ecore_hw_cid_data *p_rx_cid;
        u16 qid, abs_rx_q_id = 0;
+       enum _ecore_status_t rc = ECORE_NOTIMPL;
        u8 i;
 
        if (IS_VF(p_hwfn->p_dev))
@@ -758,9 +758,9 @@ ecore_sp_eth_rx_queue_stop(struct ecore_hwfn *p_hwfn,
        struct ecore_hw_cid_data *p_rx_cid = &p_hwfn->p_rx_cids[rx_queue_id];
        struct rx_queue_stop_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
        struct ecore_sp_init_data init_data;
        u16 abs_rx_q_id = 0;
+       enum _ecore_status_t rc = ECORE_NOTIMPL;
 
        if (IS_VF(p_hwfn->p_dev))
                return ecore_vf_pf_rxq_stop(p_hwfn, rx_queue_id,
@@ -788,7 +788,7 @@ ecore_sp_eth_rx_queue_stop(struct ecore_hwfn *p_hwfn,
         * In addition, VFs require the answer to come as eqe to PF.
         */
        p_ramrod->complete_cqe_flg = (!!(p_rx_cid->opaque_fid ==
-                                         p_hwfn->hw_info.opaque_fid) &&
+                                        p_hwfn->hw_info.opaque_fid) &&
                                      !eq_completion_only) || cqe_completion;
        p_ramrod->complete_event_flg = !(p_rx_cid->opaque_fid ==
                                         p_hwfn->hw_info.opaque_fid) ||
@@ -806,33 +806,30 @@ ecore_sp_eth_rx_queue_stop(struct ecore_hwfn *p_hwfn,
 enum _ecore_status_t
 ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
                              u16 opaque_fid,
-                             u16 tx_queue_id,
                              u32 cid,
-                             u8 vport_id,
-                             u8 stats_id,
-                             u16 sb,
-                             u8 sb_index,
+                             struct ecore_queue_start_common_params *p_params,
                              dma_addr_t pbl_addr,
                              u16 pbl_size,
                              union ecore_qm_pq_params *p_pq_params)
 {
-       struct ecore_hw_cid_data *p_tx_cid = &p_hwfn->p_tx_cids[tx_queue_id];
        struct tx_queue_start_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
        struct ecore_sp_init_data init_data;
+       struct ecore_hw_cid_data *p_tx_cid;
        u16 pq_id, abs_tx_q_id = 0;
        u8 abs_vport_id;
+       enum _ecore_status_t rc = ECORE_NOTIMPL;
 
        /* Store information for the stop */
+       p_tx_cid = &p_hwfn->p_tx_cids[p_params->queue_id];
        p_tx_cid->cid = cid;
        p_tx_cid->opaque_fid = opaque_fid;
 
-       rc = ecore_fw_vport(p_hwfn, vport_id, &abs_vport_id);
+       rc = ecore_fw_vport(p_hwfn, p_params->vport_id, &abs_vport_id);
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       rc = ecore_fw_l2_queue(p_hwfn, tx_queue_id, &abs_tx_q_id);
+       rc = ecore_fw_l2_queue(p_hwfn, p_params->queue_id, &abs_tx_q_id);
        if (rc != ECORE_SUCCESS)
                return rc;
 
@@ -851,15 +848,14 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
        p_ramrod = &p_ent->ramrod.tx_queue_start;
        p_ramrod->vport_id = abs_vport_id;
 
-       p_ramrod->sb_id = OSAL_CPU_TO_LE16(sb);
-       p_ramrod->sb_index = sb_index;
-       p_ramrod->stats_counter_id = stats_id;
+       p_ramrod->sb_id = OSAL_CPU_TO_LE16(p_params->sb);
+       p_ramrod->sb_index = (u8)p_params->sb_idx;
+       p_ramrod->stats_counter_id = p_params->stats_id;
 
        p_ramrod->queue_zone_id = OSAL_CPU_TO_LE16(abs_tx_q_id);
 
        p_ramrod->pbl_size = OSAL_CPU_TO_LE16(pbl_size);
-       p_ramrod->pbl_base_addr.hi = DMA_HI_LE(pbl_addr);
-       p_ramrod->pbl_base_addr.lo = DMA_LO_LE(pbl_addr);
+       DMA_REGPAIR_LE(p_ramrod->pbl_base_addr, pbl_addr);
 
        pq_id = ecore_get_qm_pq(p_hwfn, PROTOCOLID_ETH, p_pq_params);
        p_ramrod->qm_pq_id = OSAL_CPU_TO_LE16(pq_id);
@@ -867,37 +863,40 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
        return ecore_spq_post(p_hwfn, p_ent, OSAL_NULL);
 }
 
-enum _ecore_status_t ecore_sp_eth_tx_queue_start(struct ecore_hwfn *p_hwfn,
-                                                u16 opaque_fid,
-                                                u16 tx_queue_id,
-                                                u8 vport_id,
-                                                u8 stats_id,
-                                                u16 sb,
-                                                u8 sb_index,
-                                                dma_addr_t pbl_addr,
-                                                u16 pbl_size,
-                                                void OSAL_IOMEM * *pp_doorbell)
+enum _ecore_status_t
+ecore_sp_eth_tx_queue_start(struct ecore_hwfn *p_hwfn,
+                           u16 opaque_fid,
+                           struct ecore_queue_start_common_params *p_params,
+                           u8 tc,
+                           dma_addr_t pbl_addr,
+                           u16 pbl_size,
+                           void OSAL_IOMEM * *pp_doorbell)
 {
-       struct ecore_hw_cid_data *p_tx_cid = &p_hwfn->p_tx_cids[tx_queue_id];
+       struct ecore_hw_cid_data *p_tx_cid;
        union ecore_qm_pq_params pq_params;
-       enum _ecore_status_t rc;
        u8 abs_stats_id = 0;
+       enum _ecore_status_t rc;
 
        if (IS_VF(p_hwfn->p_dev)) {
                return ecore_vf_pf_txq_start(p_hwfn,
-                                            tx_queue_id,
-                                            sb,
-                                            sb_index,
-                                            pbl_addr, pbl_size, pp_doorbell);
+                                            p_params->queue_id,
+                                            p_params->sb,
+                                            (u8)p_params->sb_idx,
+                                            pbl_addr,
+                                            pbl_size,
+                                            pp_doorbell);
        }
 
-       rc = ecore_fw_vport(p_hwfn, stats_id, &abs_stats_id);
+       rc = ecore_fw_vport(p_hwfn, p_params->stats_id, &abs_stats_id);
        if (rc != ECORE_SUCCESS)
                return rc;
 
+       p_tx_cid = &p_hwfn->p_tx_cids[p_params->queue_id];
        OSAL_MEMSET(p_tx_cid, 0, sizeof(*p_tx_cid));
        OSAL_MEMSET(&pq_params, 0, sizeof(pq_params));
 
+       pq_params.eth.tc = tc;
+
        /* Allocate a CID for the queue */
        rc = ecore_cxt_acquire_cid(p_hwfn, PROTOCOLID_ETH, &p_tx_cid->cid);
        if (rc != ECORE_SUCCESS) {
@@ -908,18 +907,19 @@ enum _ecore_status_t ecore_sp_eth_tx_queue_start(struct ecore_hwfn *p_hwfn,
 
        DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
                   "opaque_fid=0x%x, cid=0x%x, tx_qid=0x%x, vport_id=0x%x, sb_id=0x%x\n",
-                  opaque_fid, p_tx_cid->cid, tx_queue_id, vport_id, sb);
+                   opaque_fid, p_tx_cid->cid, p_params->queue_id,
+                   p_params->vport_id, p_params->sb);
+
+       p_params->stats_id = abs_stats_id;
 
        /* TODO - set tc in the pq_params for multi-cos */
        rc = ecore_sp_eth_txq_start_ramrod(p_hwfn,
                                           opaque_fid,
-                                          tx_queue_id,
                                           p_tx_cid->cid,
-                                          vport_id,
-                                          abs_stats_id,
-                                          sb,
-                                          sb_index,
-                                          pbl_addr, pbl_size, &pq_params);
+                                          p_params,
+                                          pbl_addr,
+                                          pbl_size,
+                                          &pq_params);
 
        *pp_doorbell = (u8 OSAL_IOMEM *)p_hwfn->doorbells +
            DB_ADDR(p_tx_cid->cid, DQ_DEMS_LEGACY);
@@ -939,10 +939,9 @@ enum _ecore_status_t ecore_sp_eth_tx_queue_stop(struct ecore_hwfn *p_hwfn,
                                                u16 tx_queue_id)
 {
        struct ecore_hw_cid_data *p_tx_cid = &p_hwfn->p_tx_cids[tx_queue_id];
-       struct tx_queue_stop_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
        struct ecore_sp_init_data init_data;
+       enum _ecore_status_t rc = ECORE_NOTIMPL;
 
        if (IS_VF(p_hwfn->p_dev))
                return ecore_vf_pf_txq_stop(p_hwfn, tx_queue_id);
@@ -959,8 +958,6 @@ enum _ecore_status_t ecore_sp_eth_tx_queue_stop(struct ecore_hwfn *p_hwfn,
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       p_ramrod = &p_ent->ramrod.tx_queue_stop;
-
        rc = ecore_spq_post(p_hwfn, p_ent, OSAL_NULL);
        if (rc != ECORE_SUCCESS)
                return rc;
@@ -1011,8 +1008,8 @@ ecore_filter_ucast_common(struct ecore_hwfn *p_hwfn,
                          enum spq_mode comp_mode,
                          struct ecore_spq_comp_cb *p_comp_data)
 {
-       struct vport_filter_update_ramrod_data *p_ramrod;
        u8 vport_to_add_to = 0, vport_to_remove_from = 0;
+       struct vport_filter_update_ramrod_data *p_ramrod;
        struct eth_filter_cmd *p_first_filter;
        struct eth_filter_cmd *p_second_filter;
        struct ecore_sp_init_data init_data;
@@ -1243,7 +1240,7 @@ static u32 ecore_calc_crc32c(u8 *crc32_packet,
        return crc32_result;
 }
 
-static OSAL_INLINE u32 ecore_crc32c_le(u32 seed, u8 *mac, u32 len)
+static u32 ecore_crc32c_le(u32 seed, u8 *mac, u32 len)
 {
        u32 packet_buf[2] = { 0 };
 
@@ -1266,18 +1263,22 @@ ecore_sp_eth_filter_mcast(struct ecore_hwfn *p_hwfn,
                          enum spq_mode comp_mode,
                          struct ecore_spq_comp_cb *p_comp_data)
 {
-       struct vport_update_ramrod_data *p_ramrod = OSAL_NULL;
        unsigned long bins[ETH_MULTICAST_MAC_BINS_IN_REGS];
+       struct vport_update_ramrod_data *p_ramrod = OSAL_NULL;
        struct ecore_spq_entry *p_ent = OSAL_NULL;
        struct ecore_sp_init_data init_data;
-       enum _ecore_status_t rc;
        u8 abs_vport_id = 0;
+       enum _ecore_status_t rc;
        int i;
 
-       rc = ecore_fw_vport(p_hwfn,
-                           (p_filter_cmd->opcode == ECORE_FILTER_ADD) ?
-                           p_filter_cmd->vport_to_add_to :
-                           p_filter_cmd->vport_to_remove_from, &abs_vport_id);
+       if (p_filter_cmd->opcode == ECORE_FILTER_ADD)
+               rc = ecore_fw_vport(p_hwfn,
+                                   p_filter_cmd->vport_to_add_to,
+                                   &abs_vport_id);
+       else
+               rc = ecore_fw_vport(p_hwfn,
+                                   p_filter_cmd->vport_to_remove_from,
+                                   &abs_vport_id);
        if (rc != ECORE_SUCCESS)
                return rc;
 
@@ -1304,11 +1305,10 @@ ecore_sp_eth_filter_mcast(struct ecore_hwfn *p_hwfn,
                    0, sizeof(p_ramrod->approx_mcast.bins));
        OSAL_MEMSET(bins, 0, sizeof(unsigned long) *
                    ETH_MULTICAST_MAC_BINS_IN_REGS);
-
+       /* filter ADD op is explicit set op and it removes
+       *  any existing filters for the vport.
+       */
        if (p_filter_cmd->opcode == ECORE_FILTER_ADD) {
-               /* filter ADD op is explicit set op and it removes
-                *  any existing filters for the vport.
-                */
                for (i = 0; i < p_filter_cmd->num_mc_addrs; i++) {
                        u32 bit;
 
@@ -1353,14 +1353,16 @@ ecore_filter_mcast_cmd(struct ecore_dev *p_dev,
 
        for_each_hwfn(p_dev, i) {
                struct ecore_hwfn *p_hwfn = &p_dev->hwfns[i];
+               u16 opaque_fid;
 
                if (IS_VF(p_dev)) {
                        ecore_vf_pf_filter_mcast(p_hwfn, p_filter_cmd);
                        continue;
                }
 
+               opaque_fid = p_hwfn->hw_info.opaque_fid;
                rc = ecore_sp_eth_filter_mcast(p_hwfn,
-                                              p_hwfn->hw_info.opaque_fid,
+                                              opaque_fid,
                                               p_filter_cmd,
                                               comp_mode, p_comp_data);
                if (rc != ECORE_SUCCESS)
@@ -1381,14 +1383,16 @@ ecore_filter_ucast_cmd(struct ecore_dev *p_dev,
 
        for_each_hwfn(p_dev, i) {
                struct ecore_hwfn *p_hwfn = &p_dev->hwfns[i];
+               u16 opaque_fid;
 
                if (IS_VF(p_dev)) {
                        rc = ecore_vf_pf_filter_ucast(p_hwfn, p_filter_cmd);
                        continue;
                }
 
+               opaque_fid = p_hwfn->hw_info.opaque_fid;
                rc = ecore_sp_eth_filter_ucast(p_hwfn,
-                                              p_hwfn->hw_info.opaque_fid,
+                                              opaque_fid,
                                               p_filter_cmd,
                                               comp_mode, p_comp_data);
                if (rc != ECORE_SUCCESS)
@@ -1398,77 +1402,6 @@ ecore_filter_ucast_cmd(struct ecore_dev *p_dev,
        return rc;
 }
 
-/* IOV related */
-enum _ecore_status_t ecore_sp_vf_start(struct ecore_hwfn *p_hwfn,
-                                      u32 concrete_vfid, u16 opaque_vfid)
-{
-       struct vf_start_ramrod_data *p_ramrod = OSAL_NULL;
-       struct ecore_spq_entry *p_ent = OSAL_NULL;
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
-       struct ecore_sp_init_data init_data;
-
-       /* Get SPQ entry */
-       OSAL_MEMSET(&init_data, 0, sizeof(init_data));
-       init_data.cid = ecore_spq_get_cid(p_hwfn);
-       init_data.opaque_fid = opaque_vfid;
-       init_data.comp_mode = ECORE_SPQ_MODE_EBLOCK;
-
-       rc = ecore_sp_init_request(p_hwfn, &p_ent,
-                                  COMMON_RAMROD_VF_START,
-                                  PROTOCOLID_COMMON, &init_data);
-       if (rc != ECORE_SUCCESS)
-               return rc;
-
-       p_ramrod = &p_ent->ramrod.vf_start;
-
-       p_ramrod->vf_id = GET_FIELD(concrete_vfid, PXP_CONCRETE_FID_VFID);
-       p_ramrod->opaque_fid = OSAL_CPU_TO_LE16(opaque_vfid);
-
-       switch (p_hwfn->hw_info.personality) {
-       case ECORE_PCI_ETH:
-               p_ramrod->personality = PERSONALITY_ETH;
-               break;
-       default:
-               DP_NOTICE(p_hwfn, true, "Unknown VF personality %d\n",
-                         p_hwfn->hw_info.personality);
-               return ECORE_INVAL;
-       }
-
-       return ecore_spq_post(p_hwfn, p_ent, OSAL_NULL);
-}
-
-enum _ecore_status_t ecore_sp_vf_update(struct ecore_hwfn *p_hwfn)
-{
-       return ECORE_NOTIMPL;
-}
-
-enum _ecore_status_t ecore_sp_vf_stop(struct ecore_hwfn *p_hwfn,
-                                     u32 concrete_vfid, u16 opaque_vfid)
-{
-       enum _ecore_status_t rc = ECORE_NOTIMPL;
-       struct vf_stop_ramrod_data *p_ramrod = OSAL_NULL;
-       struct ecore_spq_entry *p_ent = OSAL_NULL;
-       struct ecore_sp_init_data init_data;
-
-       /* Get SPQ entry */
-       OSAL_MEMSET(&init_data, 0, sizeof(init_data));
-       init_data.cid = ecore_spq_get_cid(p_hwfn);
-       init_data.opaque_fid = opaque_vfid;
-       init_data.comp_mode = ECORE_SPQ_MODE_EBLOCK;
-
-       rc = ecore_sp_init_request(p_hwfn, &p_ent,
-                                  COMMON_RAMROD_VF_STOP,
-                                  PROTOCOLID_COMMON, &init_data);
-       if (rc != ECORE_SUCCESS)
-               return rc;
-
-       p_ramrod = &p_ent->ramrod.vf_stop;
-
-       p_ramrod->vf_id = GET_FIELD(concrete_vfid, PXP_CONCRETE_FID_VFID);
-
-       return ecore_spq_post(p_hwfn, p_ent, OSAL_NULL);
-}
-
 /* Statistics related code */
 static void __ecore_get_vport_pstats_addrlen(struct ecore_hwfn *p_hwfn,
                                             u32 *p_addr, u32 *p_len,
@@ -1636,51 +1569,51 @@ static void __ecore_get_vport_port_stats(struct ecore_hwfn *p_hwfn,
                          OFFSETOF(struct public_port, stats),
                          sizeof(port_stats));
 
-       p_stats->rx_64_byte_packets += port_stats.pmm.r64;
-       p_stats->rx_65_to_127_byte_packets += port_stats.pmm.r127;
-       p_stats->rx_128_to_255_byte_packets += port_stats.pmm.r255;
-       p_stats->rx_256_to_511_byte_packets += port_stats.pmm.r511;
-       p_stats->rx_512_to_1023_byte_packets += port_stats.pmm.r1023;
-       p_stats->rx_1024_to_1518_byte_packets += port_stats.pmm.r1518;
-       p_stats->rx_1519_to_1522_byte_packets += port_stats.pmm.r1522;
-       p_stats->rx_1519_to_2047_byte_packets += port_stats.pmm.r2047;
-       p_stats->rx_2048_to_4095_byte_packets += port_stats.pmm.r4095;
-       p_stats->rx_4096_to_9216_byte_packets += port_stats.pmm.r9216;
-       p_stats->rx_9217_to_16383_byte_packets += port_stats.pmm.r16383;
-       p_stats->rx_crc_errors += port_stats.pmm.rfcs;
-       p_stats->rx_mac_crtl_frames += port_stats.pmm.rxcf;
-       p_stats->rx_pause_frames += port_stats.pmm.rxpf;
-       p_stats->rx_pfc_frames += port_stats.pmm.rxpp;
-       p_stats->rx_align_errors += port_stats.pmm.raln;
-       p_stats->rx_carrier_errors += port_stats.pmm.rfcr;
-       p_stats->rx_oversize_packets += port_stats.pmm.rovr;
-       p_stats->rx_jabbers += port_stats.pmm.rjbr;
-       p_stats->rx_undersize_packets += port_stats.pmm.rund;
-       p_stats->rx_fragments += port_stats.pmm.rfrg;
-       p_stats->tx_64_byte_packets += port_stats.pmm.t64;
-       p_stats->tx_65_to_127_byte_packets += port_stats.pmm.t127;
-       p_stats->tx_128_to_255_byte_packets += port_stats.pmm.t255;
-       p_stats->tx_256_to_511_byte_packets += port_stats.pmm.t511;
-       p_stats->tx_512_to_1023_byte_packets += port_stats.pmm.t1023;
-       p_stats->tx_1024_to_1518_byte_packets += port_stats.pmm.t1518;
-       p_stats->tx_1519_to_2047_byte_packets += port_stats.pmm.t2047;
-       p_stats->tx_2048_to_4095_byte_packets += port_stats.pmm.t4095;
-       p_stats->tx_4096_to_9216_byte_packets += port_stats.pmm.t9216;
-       p_stats->tx_9217_to_16383_byte_packets += port_stats.pmm.t16383;
-       p_stats->tx_pause_frames += port_stats.pmm.txpf;
-       p_stats->tx_pfc_frames += port_stats.pmm.txpp;
-       p_stats->tx_lpi_entry_count += port_stats.pmm.tlpiec;
-       p_stats->tx_total_collisions += port_stats.pmm.tncl;
-       p_stats->rx_mac_bytes += port_stats.pmm.rbyte;
-       p_stats->rx_mac_uc_packets += port_stats.pmm.rxuca;
-       p_stats->rx_mac_mc_packets += port_stats.pmm.rxmca;
-       p_stats->rx_mac_bc_packets += port_stats.pmm.rxbca;
-       p_stats->rx_mac_frames_ok += port_stats.pmm.rxpok;
-       p_stats->tx_mac_bytes += port_stats.pmm.tbyte;
-       p_stats->tx_mac_uc_packets += port_stats.pmm.txuca;
-       p_stats->tx_mac_mc_packets += port_stats.pmm.txmca;
-       p_stats->tx_mac_bc_packets += port_stats.pmm.txbca;
-       p_stats->tx_mac_ctrl_frames += port_stats.pmm.txcf;
+       p_stats->rx_64_byte_packets += port_stats.eth.r64;
+       p_stats->rx_65_to_127_byte_packets += port_stats.eth.r127;
+       p_stats->rx_128_to_255_byte_packets += port_stats.eth.r255;
+       p_stats->rx_256_to_511_byte_packets += port_stats.eth.r511;
+       p_stats->rx_512_to_1023_byte_packets += port_stats.eth.r1023;
+       p_stats->rx_1024_to_1518_byte_packets += port_stats.eth.r1518;
+       p_stats->rx_1519_to_1522_byte_packets += port_stats.eth.r1522;
+       p_stats->rx_1519_to_2047_byte_packets += port_stats.eth.r2047;
+       p_stats->rx_2048_to_4095_byte_packets += port_stats.eth.r4095;
+       p_stats->rx_4096_to_9216_byte_packets += port_stats.eth.r9216;
+       p_stats->rx_9217_to_16383_byte_packets += port_stats.eth.r16383;
+       p_stats->rx_crc_errors += port_stats.eth.rfcs;
+       p_stats->rx_mac_crtl_frames += port_stats.eth.rxcf;
+       p_stats->rx_pause_frames += port_stats.eth.rxpf;
+       p_stats->rx_pfc_frames += port_stats.eth.rxpp;
+       p_stats->rx_align_errors += port_stats.eth.raln;
+       p_stats->rx_carrier_errors += port_stats.eth.rfcr;
+       p_stats->rx_oversize_packets += port_stats.eth.rovr;
+       p_stats->rx_jabbers += port_stats.eth.rjbr;
+       p_stats->rx_undersize_packets += port_stats.eth.rund;
+       p_stats->rx_fragments += port_stats.eth.rfrg;
+       p_stats->tx_64_byte_packets += port_stats.eth.t64;
+       p_stats->tx_65_to_127_byte_packets += port_stats.eth.t127;
+       p_stats->tx_128_to_255_byte_packets += port_stats.eth.t255;
+       p_stats->tx_256_to_511_byte_packets += port_stats.eth.t511;
+       p_stats->tx_512_to_1023_byte_packets += port_stats.eth.t1023;
+       p_stats->tx_1024_to_1518_byte_packets += port_stats.eth.t1518;
+       p_stats->tx_1519_to_2047_byte_packets += port_stats.eth.t2047;
+       p_stats->tx_2048_to_4095_byte_packets += port_stats.eth.t4095;
+       p_stats->tx_4096_to_9216_byte_packets += port_stats.eth.t9216;
+       p_stats->tx_9217_to_16383_byte_packets += port_stats.eth.t16383;
+       p_stats->tx_pause_frames += port_stats.eth.txpf;
+       p_stats->tx_pfc_frames += port_stats.eth.txpp;
+       p_stats->tx_lpi_entry_count += port_stats.eth.tlpiec;
+       p_stats->tx_total_collisions += port_stats.eth.tncl;
+       p_stats->rx_mac_bytes += port_stats.eth.rbyte;
+       p_stats->rx_mac_uc_packets += port_stats.eth.rxuca;
+       p_stats->rx_mac_mc_packets += port_stats.eth.rxmca;
+       p_stats->rx_mac_bc_packets += port_stats.eth.rxbca;
+       p_stats->rx_mac_frames_ok += port_stats.eth.rxpok;
+       p_stats->tx_mac_bytes += port_stats.eth.tbyte;
+       p_stats->tx_mac_uc_packets += port_stats.eth.txuca;
+       p_stats->tx_mac_mc_packets += port_stats.eth.txmca;
+       p_stats->tx_mac_bc_packets += port_stats.eth.txbca;
+       p_stats->tx_mac_ctrl_frames += port_stats.eth.txcf;
        for (j = 0; j < 8; j++) {
                p_stats->brb_truncates += port_stats.brb.brb_truncate[j];
                p_stats->brb_discards += port_stats.brb.brb_discard[j];
@@ -1737,7 +1670,7 @@ static void _ecore_get_vport_stats(struct ecore_dev *p_dev,
                                        IS_PF(p_dev) ? true : false);
 
 out:
-               if (IS_PF(p_dev))
+               if (IS_PF(p_dev) && p_ptt)
                        ecore_ptt_release(p_hwfn, p_ptt);
        }
 }