New upstream version 17.11.4
[deb_dpdk.git] / drivers / net / qede / base / ecore_vf.c
index be8b1ec..334db6b 100644 (file)
@@ -44,7 +44,7 @@ static void *ecore_vf_pf_prep(struct ecore_hwfn *p_hwfn, u16 type, u16 length)
        OSAL_MEMSET(p_iov->pf2vf_reply, 0, sizeof(union pfvf_tlvs));
 
        /* Init type and length */
-       p_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset, type, length);
+       p_tlv = ecore_add_tlv(&p_iov->offset, type, length);
 
        /* Init first tlv header */
        ((struct vfpf_first_tlv *)p_tlv)->reply_address =
@@ -65,13 +65,23 @@ static void ecore_vf_pf_req_end(struct ecore_hwfn *p_hwfn,
        OSAL_MUTEX_RELEASE(&p_hwfn->vf_iov_info->mutex);
 }
 
-static int ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
-                            u8 *done, u32 resp_size)
+#ifdef CONFIG_ECORE_SW_CHANNEL
+/* The SW channel implementation of Windows needs to know the 'exact'
+ * response size of any given message. That means that for future
+ * messages we'd be unable to send TLVs to PF if he'll be unable to
+ * answer them if the |response| != |default response|.
+ * We'd need to handshake in acquire capabilities for any such.
+ */
+#endif
+static enum _ecore_status_t
+ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
+                 u8 *done, u32 resp_size)
 {
        union vfpf_tlvs *p_req = p_hwfn->vf_iov_info->vf2pf_request;
        struct ustorm_trigger_vf_zone trigger;
        struct ustorm_vf_zone *zone_data;
-       int rc = ECORE_SUCCESS, time = 100;
+       enum _ecore_status_t rc = ECORE_SUCCESS;
+       int time = 100;
 
        zone_data = (struct ustorm_vf_zone *)PXP_VF_BAR0_START_USDM_ZONE_B;
 
@@ -81,16 +91,6 @@ static int ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
        /* need to add the END TLV to the message size */
        resp_size += sizeof(struct channel_list_end_tlv);
 
-       if (!p_hwfn->p_dev->b_hw_channel) {
-               rc = OSAL_VF_SEND_MSG2PF(p_hwfn->p_dev,
-                                        done,
-                                        p_req,
-                                        p_hwfn->vf_iov_info->pf2vf_reply,
-                                        sizeof(union vfpf_tlvs), resp_size);
-               /* TODO - no prints about message ? */
-               return rc;
-       }
-
        /* Send TLVs over HW channel */
        OSAL_MEMSET(&trigger, 0, sizeof(struct ustorm_trigger_vf_zone));
        trigger.vf_pf_msg_valid = 1;
@@ -130,36 +130,118 @@ static int ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
        }
 
        if (!*done) {
-               DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
-                          "VF <-- PF Timeout [Type %d]\n",
-                          p_req->first_tlv.tl.type);
+               DP_NOTICE(p_hwfn, true,
+                         "VF <-- PF Timeout [Type %d]\n",
+                         p_req->first_tlv.tl.type);
                rc = ECORE_TIMEOUT;
-               return rc;
        } else {
-               DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
-                          "PF response: %d [Type %d]\n",
-                          *done, p_req->first_tlv.tl.type);
+               if ((*done != PFVF_STATUS_SUCCESS) &&
+                   (*done != PFVF_STATUS_NO_RESOURCE))
+                       DP_NOTICE(p_hwfn, false,
+                                 "PF response: %d [Type %d]\n",
+                                 *done, p_req->first_tlv.tl.type);
+               else
+                       DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                                  "PF response: %d [Type %d]\n",
+                                  *done, p_req->first_tlv.tl.type);
+       }
+
+       return rc;
+}
+
+static void ecore_vf_pf_add_qid(struct ecore_hwfn *p_hwfn,
+                               struct ecore_queue_cid *p_cid)
+{
+       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
+       struct vfpf_qid_tlv *p_qid_tlv;
+
+       /* Only add QIDs for the queue if it was negotiated with PF */
+       if (!(p_iov->acquire_resp.pfdev_info.capabilities &
+             PFVF_ACQUIRE_CAP_QUEUE_QIDS))
+               return;
+
+       p_qid_tlv = ecore_add_tlv(&p_iov->offset,
+                                 CHANNEL_TLV_QID, sizeof(*p_qid_tlv));
+       p_qid_tlv->qid = p_cid->qid_usage_idx;
+}
+
+enum _ecore_status_t _ecore_vf_pf_release(struct ecore_hwfn *p_hwfn,
+                                         bool b_final)
+{
+       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
+       struct pfvf_def_resp_tlv *resp;
+       struct vfpf_first_tlv *req;
+       u32 size;
+       enum _ecore_status_t rc;
+
+       /* clear mailbox and prep first tlv */
+       req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_RELEASE, sizeof(*req));
+
+       /* add list termination tlv */
+       ecore_add_tlv(&p_iov->offset,
+                     CHANNEL_TLV_LIST_END,
+                     sizeof(struct channel_list_end_tlv));
+
+       resp = &p_iov->pf2vf_reply->default_resp;
+       rc = ecore_send_msg2pf(p_hwfn, &resp->hdr.status, sizeof(*resp));
+
+       if (rc == ECORE_SUCCESS && resp->hdr.status != PFVF_STATUS_SUCCESS)
+               rc = ECORE_AGAIN;
+
+       ecore_vf_pf_req_end(p_hwfn, rc);
+       if (!b_final)
+               return rc;
+
+       p_hwfn->b_int_enabled = 0;
+
+       if (p_iov->vf2pf_request)
+               OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev,
+                                      p_iov->vf2pf_request,
+                                      p_iov->vf2pf_request_phys,
+                                      sizeof(union vfpf_tlvs));
+       if (p_iov->pf2vf_reply)
+               OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev,
+                                      p_iov->pf2vf_reply,
+                                      p_iov->pf2vf_reply_phys,
+                                      sizeof(union pfvf_tlvs));
+
+       if (p_iov->bulletin.p_virt) {
+               size = sizeof(struct ecore_bulletin_content);
+               OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev,
+                                      p_iov->bulletin.p_virt,
+                                      p_iov->bulletin.phys,
+                                      size);
        }
 
+#ifdef CONFIG_ECORE_LOCK_ALLOC
+       OSAL_MUTEX_DEALLOC(&p_iov->mutex);
+#endif
+
+       OSAL_FREE(p_hwfn->p_dev, p_hwfn->vf_iov_info);
+       p_hwfn->vf_iov_info = OSAL_NULL;
+
        return rc;
 }
 
+enum _ecore_status_t ecore_vf_pf_release(struct ecore_hwfn *p_hwfn)
+{
+       return _ecore_vf_pf_release(p_hwfn, true);
+}
+
 #define VF_ACQUIRE_THRESH 3
 static void ecore_vf_pf_acquire_reduce_resc(struct ecore_hwfn *p_hwfn,
                                            struct vf_pf_resc_request *p_req,
                                            struct pf_vf_resc *p_resp)
 {
        DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
-                  "PF unwilling to fullill resource request: rxq [%02x/%02x]"
-                  " txq [%02x/%02x] sbs [%02x/%02x] mac [%02x/%02x]"
-                  " vlan [%02x/%02x] mc [%02x/%02x]."
-                  " Try PF recommended amount\n",
+                  "PF unwilling to fullill resource request: rxq [%02x/%02x] txq [%02x/%02x] sbs [%02x/%02x] mac [%02x/%02x] vlan [%02x/%02x] mc [%02x/%02x] cids [%02x/%02x]. Try PF recommended amount\n",
                   p_req->num_rxqs, p_resp->num_rxqs,
                   p_req->num_rxqs, p_resp->num_txqs,
                   p_req->num_sbs, p_resp->num_sbs,
                   p_req->num_mac_filters, p_resp->num_mac_filters,
                   p_req->num_vlan_filters, p_resp->num_vlan_filters,
-                  p_req->num_mc_filters, p_resp->num_mc_filters);
+                  p_req->num_mc_filters, p_resp->num_mc_filters,
+                  p_req->num_cids, p_resp->num_cids);
 
        /* humble our request */
        p_req->num_txqs = p_resp->num_txqs;
@@ -168,6 +250,7 @@ static void ecore_vf_pf_acquire_reduce_resc(struct ecore_hwfn *p_hwfn,
        p_req->num_mac_filters = p_resp->num_mac_filters;
        p_req->num_vlan_filters = p_resp->num_vlan_filters;
        p_req->num_mc_filters = p_resp->num_mc_filters;
+       p_req->num_cids = p_resp->num_cids;
 }
 
 static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
@@ -194,6 +277,7 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
        p_resc->num_sbs = ECORE_MAX_VF_CHAINS_PER_PF;
        p_resc->num_mac_filters = ECORE_ETH_VF_NUM_MAC_FILTERS;
        p_resc->num_vlan_filters = ECORE_ETH_VF_NUM_VLAN_FILTERS;
+       p_resc->num_cids = ECORE_ETH_VF_DEFAULT_NUM_CIDS;
 
        OSAL_MEMSET(&vf_sw_info, 0, sizeof(vf_sw_info));
        OSAL_VF_FILL_ACQUIRE_RESC_REQ(p_hwfn, &req->resc_request, &vf_sw_info);
@@ -210,12 +294,17 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
        /* Fill capability field with any non-deprecated config we support */
        req->vfdev_info.capabilities |= VFPF_ACQUIRE_CAP_100G;
 
+       /* If we've mapped the doorbell bar, try using queue qids */
+       if (p_iov->b_doorbell_bar)
+               req->vfdev_info.capabilities |= VFPF_ACQUIRE_CAP_PHYSICAL_BAR |
+                                               VFPF_ACQUIRE_CAP_QUEUE_QIDS;
+
        /* pf 2 vf bulletin board address */
        req->bulletin_addr = p_iov->bulletin.phys;
        req->bulletin_size = p_iov->bulletin.size;
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -230,10 +319,8 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
                /* send acquire request */
                rc = ecore_send_msg2pf(p_hwfn,
                                       &resp->hdr.status, sizeof(*resp));
-
-               /* PF timeout */
-               if (rc)
-                       return rc;
+               if (rc != ECORE_SUCCESS)
+                       goto exit;
 
                /* copy acquire response from buffer to p_hwfn */
                OSAL_MEMCPY(&p_iov->acquire_resp,
@@ -294,8 +381,17 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
                                                " override\n");
                                        req->vfdev_info.capabilities |=
                                                VFPF_ACQUIRE_CAP_PRE_FP_HSI;
+                                       continue;
                                }
                        }
+
+                       /* If PF/VF are using same Major, PF must have had
+                        * it's reasons. Simply fail.
+                        */
+                       DP_NOTICE(p_hwfn, false,
+                                 "PF rejected acquisition by VF\n");
+                       rc = ECORE_INVAL;
+                       goto exit;
                } else {
                        DP_ERR(p_hwfn,
                               "PF returned err %d to VF acquisition request\n",
@@ -310,6 +406,15 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
            VFPF_ACQUIRE_CAP_PRE_FP_HSI)
                p_iov->b_pre_fp_hsi = true;
 
+       /* In case PF doesn't support multi-queue Tx, update the number of
+        * CIDs to reflect the number of queues [older PFs didn't fill that
+        * field].
+        */
+       if (!(resp->pfdev_info.capabilities &
+             PFVF_ACQUIRE_CAP_QUEUE_QIDS))
+               resp->resc.num_cids = resp->resc.num_rxqs +
+                                     resp->resc.num_txqs;
+
        rc = OSAL_VF_UPDATE_ACQUIRE_RESC_RESP(p_hwfn, &resp->resc);
        if (rc) {
                DP_NOTICE(p_hwfn, true,
@@ -325,7 +430,7 @@ static enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
 
        /* get HW info */
        p_hwfn->p_dev->type = resp->pfdev_info.dev_type;
-       p_hwfn->p_dev->chip_rev = resp->pfdev_info.chip_rev;
+       p_hwfn->p_dev->chip_rev = (u8)resp->pfdev_info.chip_rev;
 
        DP_INFO(p_hwfn, "Chip details - %s%d\n",
                ECORE_IS_BB(p_hwfn->p_dev) ? "BB" : "AH",
@@ -357,10 +462,28 @@ exit:
        return rc;
 }
 
+u32 ecore_vf_hw_bar_size(struct ecore_hwfn *p_hwfn,
+                        enum BAR_ID bar_id)
+{
+       u32 bar_size;
+
+       /* Regview size is fixed */
+       if (bar_id == BAR_ID_0)
+               return 1 << 17;
+
+       /* Doorbell is received from PF */
+       bar_size = p_hwfn->vf_iov_info->acquire_resp.pfdev_info.bar_size;
+       if (bar_size)
+               return 1 << bar_size;
+       return 0;
+}
+
 enum _ecore_status_t ecore_vf_hw_prepare(struct ecore_hwfn *p_hwfn)
 {
+       struct ecore_hwfn *p_lead = ECORE_LEADING_HWFN(p_hwfn->p_dev);
        struct ecore_vf_iov *p_iov;
        u32 reg;
+       enum _ecore_status_t rc;
 
        /* Set number of hwfns - might be overridden once leading hwfn learns
         * actual configuration from PF.
@@ -368,10 +491,6 @@ enum _ecore_status_t ecore_vf_hw_prepare(struct ecore_hwfn *p_hwfn)
        if (IS_LEAD_HWFN(p_hwfn))
                p_hwfn->p_dev->num_hwfns = 1;
 
-       /* Set the doorbell bar. Assumption: regview is set */
-       p_hwfn->doorbells = (u8 OSAL_IOMEM *)p_hwfn->regview +
-           PXP_VF_BAR0_START_DQ;
-
        reg = PXP_VF_BAR0_ME_OPAQUE_ADDRESS;
        p_hwfn->hw_info.opaque_fid = (u16)REG_RD(p_hwfn, reg);
 
@@ -386,7 +505,30 @@ enum _ecore_status_t ecore_vf_hw_prepare(struct ecore_hwfn *p_hwfn)
                return ECORE_NOMEM;
        }
 
-       OSAL_MEMSET(p_iov, 0, sizeof(*p_iov));
+       /* Doorbells are tricky; Upper-layer has alreday set the hwfn doorbell
+        * value, but there are several incompatibily scenarios where that
+        * would be incorrect and we'd need to override it.
+        */
+       if (p_hwfn->doorbells == OSAL_NULL) {
+               p_hwfn->doorbells = (u8 OSAL_IOMEM *)p_hwfn->regview +
+                                                    PXP_VF_BAR0_START_DQ;
+       } else if (p_hwfn == p_lead) {
+               /* For leading hw-function, value is always correct, but need
+                * to handle scenario where legacy PF would not support 100g
+                * mapped bars later.
+                */
+               p_iov->b_doorbell_bar = true;
+       } else {
+               /* here, value would be correct ONLY if the leading hwfn
+                * received indication that mapped-bars are supported.
+                */
+               if (p_lead->vf_iov_info->b_doorbell_bar)
+                       p_iov->b_doorbell_bar = true;
+               else
+                       p_hwfn->doorbells = (u8 OSAL_IOMEM *)
+                                           p_hwfn->regview +
+                                           PXP_VF_BAR0_START_DQ;
+       }
 
        /* Allocate vf2pf msg */
        p_iov->vf2pf_request = OSAL_DMA_ALLOC_COHERENT(p_hwfn->p_dev,
@@ -430,14 +572,44 @@ enum _ecore_status_t ecore_vf_hw_prepare(struct ecore_hwfn *p_hwfn)
                   p_iov->bulletin.p_virt, (unsigned long)p_iov->bulletin.phys,
                   p_iov->bulletin.size);
 
+#ifdef CONFIG_ECORE_LOCK_ALLOC
        OSAL_MUTEX_ALLOC(p_hwfn, &p_iov->mutex);
+#endif
        OSAL_MUTEX_INIT(&p_iov->mutex);
 
        p_hwfn->vf_iov_info = p_iov;
 
        p_hwfn->hw_info.personality = ECORE_PCI_ETH;
 
-       return ecore_vf_pf_acquire(p_hwfn);
+       rc = ecore_vf_pf_acquire(p_hwfn);
+
+       /* If VF is 100g using a mapped bar and PF is too old to support that,
+        * acquisition would succeed - but the VF would have no way knowing
+        * the size of the doorbell bar configured in HW and thus will not
+        * know how to split it for 2nd hw-function.
+        * In this case we re-try without the indication of the mapped
+        * doorbell.
+        */
+       if (rc == ECORE_SUCCESS &&
+           p_iov->b_doorbell_bar &&
+           !ecore_vf_hw_bar_size(p_hwfn, BAR_ID_1) &&
+           ECORE_IS_CMT(p_hwfn->p_dev)) {
+               rc = _ecore_vf_pf_release(p_hwfn, false);
+               if (rc != ECORE_SUCCESS)
+                       return rc;
+
+               p_iov->b_doorbell_bar = false;
+               p_hwfn->doorbells = (u8 OSAL_IOMEM *)p_hwfn->regview +
+                                                    PXP_VF_BAR0_START_DQ;
+               rc = ecore_vf_pf_acquire(p_hwfn);
+       }
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                  "Regview [%p], Doorbell [%p], Device-doorbell [%p]\n",
+                  p_hwfn->regview, p_hwfn->doorbells,
+                  p_hwfn->p_dev->doorbells);
+
+       return rc;
 
 free_vf2pf_request:
        OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev, p_iov->vf2pf_request,
@@ -453,20 +625,174 @@ free_p_iov:
 #define MSTORM_QZONE_START(dev)   (TSTORM_QZONE_START + \
                                   (TSTORM_QZONE_SIZE * NUM_OF_L2_QUEUES(dev)))
 
-enum _ecore_status_t ecore_vf_pf_rxq_start(struct ecore_hwfn *p_hwfn,
-                                          u8 rx_qid,
-                                          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)
+/* @DPDK - changed enum ecore_tunn_clss to enum ecore_tunn_mode */
+static void
+__ecore_vf_prep_tunn_req_tlv(struct vfpf_update_tunn_param_tlv *p_req,
+                            struct ecore_tunn_update_type *p_src,
+                            enum ecore_tunn_mode mask, u8 *p_cls)
+{
+       if (p_src->b_update_mode) {
+               p_req->tun_mode_update_mask |= (1 << mask);
+
+               if (p_src->b_mode_enabled)
+                       p_req->tunn_mode |= (1 << mask);
+       }
+
+       *p_cls = p_src->tun_cls;
+}
+
+/* @DPDK - changed enum ecore_tunn_clss to enum ecore_tunn_mode */
+static void
+ecore_vf_prep_tunn_req_tlv(struct vfpf_update_tunn_param_tlv *p_req,
+                          struct ecore_tunn_update_type *p_src,
+                          enum ecore_tunn_mode mask, u8 *p_cls,
+                          struct ecore_tunn_update_udp_port *p_port,
+                          u8 *p_update_port, u16 *p_udp_port)
+{
+       if (p_port->b_update_port) {
+               *p_update_port = 1;
+               *p_udp_port = p_port->port;
+       }
+
+       __ecore_vf_prep_tunn_req_tlv(p_req, p_src, mask, p_cls);
+}
+
+void ecore_vf_set_vf_start_tunn_update_param(struct ecore_tunnel_info *p_tun)
+{
+       if (p_tun->vxlan.b_mode_enabled)
+               p_tun->vxlan.b_update_mode = true;
+       if (p_tun->l2_geneve.b_mode_enabled)
+               p_tun->l2_geneve.b_update_mode = true;
+       if (p_tun->ip_geneve.b_mode_enabled)
+               p_tun->ip_geneve.b_update_mode = true;
+       if (p_tun->l2_gre.b_mode_enabled)
+               p_tun->l2_gre.b_update_mode = true;
+       if (p_tun->ip_gre.b_mode_enabled)
+               p_tun->ip_gre.b_update_mode = true;
+
+       p_tun->b_update_rx_cls = true;
+       p_tun->b_update_tx_cls = true;
+}
+
+static void
+__ecore_vf_update_tunn_param(struct ecore_tunn_update_type *p_tun,
+                            u16 feature_mask, u8 tunn_mode, u8 tunn_cls,
+                            enum ecore_tunn_mode val)
+{
+       if (feature_mask & (1 << val)) {
+               p_tun->b_mode_enabled = tunn_mode;
+               p_tun->tun_cls = tunn_cls;
+       } else {
+               p_tun->b_mode_enabled = false;
+       }
+}
+
+static void
+ecore_vf_update_tunn_param(struct ecore_hwfn *p_hwfn,
+                          struct ecore_tunnel_info *p_tun,
+                          struct pfvf_update_tunn_param_tlv *p_resp)
+{
+       /* Update mode and classes provided by PF */
+       u16 feat_mask = p_resp->tunn_feature_mask;
+
+       __ecore_vf_update_tunn_param(&p_tun->vxlan, feat_mask,
+                                    p_resp->vxlan_mode, p_resp->vxlan_clss,
+                                    ECORE_MODE_VXLAN_TUNN);
+       __ecore_vf_update_tunn_param(&p_tun->l2_geneve, feat_mask,
+                                    p_resp->l2geneve_mode,
+                                    p_resp->l2geneve_clss,
+                                    ECORE_MODE_L2GENEVE_TUNN);
+       __ecore_vf_update_tunn_param(&p_tun->ip_geneve, feat_mask,
+                                    p_resp->ipgeneve_mode,
+                                    p_resp->ipgeneve_clss,
+                                    ECORE_MODE_IPGENEVE_TUNN);
+       __ecore_vf_update_tunn_param(&p_tun->l2_gre, feat_mask,
+                                    p_resp->l2gre_mode, p_resp->l2gre_clss,
+                                    ECORE_MODE_L2GRE_TUNN);
+       __ecore_vf_update_tunn_param(&p_tun->ip_gre, feat_mask,
+                                    p_resp->ipgre_mode, p_resp->ipgre_clss,
+                                    ECORE_MODE_IPGRE_TUNN);
+       p_tun->geneve_port.port = p_resp->geneve_udp_port;
+       p_tun->vxlan_port.port = p_resp->vxlan_udp_port;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                  "tunn mode: vxlan=0x%x, l2geneve=0x%x, ipgeneve=0x%x, l2gre=0x%x, ipgre=0x%x",
+                  p_tun->vxlan.b_mode_enabled, p_tun->l2_geneve.b_mode_enabled,
+                  p_tun->ip_geneve.b_mode_enabled,
+                  p_tun->l2_gre.b_mode_enabled,
+                  p_tun->ip_gre.b_mode_enabled);
+}
+
+enum _ecore_status_t
+ecore_vf_pf_tunnel_param_update(struct ecore_hwfn *p_hwfn,
+                               struct ecore_tunnel_info *p_src)
+{
+       struct ecore_tunnel_info *p_tun = &p_hwfn->p_dev->tunnel;
+       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
+       struct pfvf_update_tunn_param_tlv *p_resp;
+       struct vfpf_update_tunn_param_tlv *p_req;
+       enum _ecore_status_t rc;
+
+       p_req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_UPDATE_TUNN_PARAM,
+                                sizeof(*p_req));
+
+       if (p_src->b_update_rx_cls && p_src->b_update_tx_cls)
+               p_req->update_tun_cls = 1;
+
+       ecore_vf_prep_tunn_req_tlv(p_req, &p_src->vxlan, ECORE_MODE_VXLAN_TUNN,
+                                  &p_req->vxlan_clss, &p_src->vxlan_port,
+                                  &p_req->update_vxlan_port,
+                                  &p_req->vxlan_port);
+       ecore_vf_prep_tunn_req_tlv(p_req, &p_src->l2_geneve,
+                                  ECORE_MODE_L2GENEVE_TUNN,
+                                  &p_req->l2geneve_clss, &p_src->geneve_port,
+                                  &p_req->update_geneve_port,
+                                  &p_req->geneve_port);
+       __ecore_vf_prep_tunn_req_tlv(p_req, &p_src->ip_geneve,
+                                    ECORE_MODE_IPGENEVE_TUNN,
+                                    &p_req->ipgeneve_clss);
+       __ecore_vf_prep_tunn_req_tlv(p_req, &p_src->l2_gre,
+                                    ECORE_MODE_L2GRE_TUNN, &p_req->l2gre_clss);
+       __ecore_vf_prep_tunn_req_tlv(p_req, &p_src->ip_gre,
+                                    ECORE_MODE_IPGRE_TUNN, &p_req->ipgre_clss);
+
+       /* add list termination tlv */
+       ecore_add_tlv(&p_iov->offset,
+                     CHANNEL_TLV_LIST_END,
+                     sizeof(struct channel_list_end_tlv));
+
+       p_resp = &p_iov->pf2vf_reply->tunn_param_resp;
+       rc = ecore_send_msg2pf(p_hwfn, &p_resp->hdr.status, sizeof(*p_resp));
+
+       if (rc)
+               goto exit;
+
+       if (p_resp->hdr.status != PFVF_STATUS_SUCCESS) {
+               DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                          "Failed to update tunnel parameters\n");
+               rc = ECORE_INVAL;
+       }
+
+       ecore_vf_update_tunn_param(p_hwfn, p_tun, p_resp);
+exit:
+       ecore_vf_pf_req_end(p_hwfn, rc);
+       return rc;
+}
+
+enum _ecore_status_t
+ecore_vf_pf_rxq_start(struct ecore_hwfn *p_hwfn,
+                     struct ecore_queue_cid *p_cid,
+                     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_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct pfvf_start_queue_resp_tlv *resp;
        struct vfpf_start_rxq_tlv *req;
-       int rc;
+       u16 rx_qid = p_cid->rel.queue_id;
+       enum _ecore_status_t rc;
 
        /* clear mailbox and prep first tlv */
        req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_START_RXQ, sizeof(*req));
@@ -475,19 +801,20 @@ enum _ecore_status_t ecore_vf_pf_rxq_start(struct ecore_hwfn *p_hwfn,
        req->cqe_pbl_addr = cqe_pbl_addr;
        req->cqe_pbl_size = cqe_pbl_size;
        req->rxq_addr = bd_chain_phys_addr;
-       req->hw_sb = sb;
-       req->sb_index = sb_index;
+       req->hw_sb = p_cid->sb_igu_id;
+       req->sb_index = p_cid->sb_idx;
        req->bd_max_bytes = bd_max_bytes;
        req->stat_id = -1; /* Keep initialized, for future compatibility */
 
        /* If PF is legacy, we'll need to calculate producers ourselves
         * as well as clean them.
         */
-       if (pp_prod && p_iov->b_pre_fp_hsi) {
+       if (p_iov->b_pre_fp_hsi) {
                u8 hw_qid = p_iov->acquire_resp.resc.hw_qid[rx_qid];
                u32 init_prod_val = 0;
 
-               *pp_prod = (u8 OSAL_IOMEM *)p_hwfn->regview +
+               *pp_prod = (u8 OSAL_IOMEM *)
+                          p_hwfn->regview +
                           MSTORM_QZONE_START(p_hwfn->p_dev) +
                           (hw_qid) * MSTORM_QZONE_SIZE;
 
@@ -496,8 +823,10 @@ enum _ecore_status_t ecore_vf_pf_rxq_start(struct ecore_hwfn *p_hwfn,
                                  (u32 *)(&init_prod_val));
        }
 
+       ecore_vf_pf_add_qid(p_hwfn, p_cid);
+
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -512,7 +841,7 @@ enum _ecore_status_t ecore_vf_pf_rxq_start(struct ecore_hwfn *p_hwfn,
        }
 
        /* Learn the address of the producer from the response */
-       if (pp_prod && !p_iov->b_pre_fp_hsi) {
+       if (!p_iov->b_pre_fp_hsi) {
                u32 init_prod_val = 0;
 
                *pp_prod = (u8 OSAL_IOMEM *)p_hwfn->regview + resp->offset;
@@ -536,22 +865,25 @@ exit:
 }
 
 enum _ecore_status_t ecore_vf_pf_rxq_stop(struct ecore_hwfn *p_hwfn,
-                                         u16 rx_qid, bool cqe_completion)
+                                         struct ecore_queue_cid *p_cid,
+                                         bool cqe_completion)
 {
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct vfpf_stop_rxqs_tlv *req;
        struct pfvf_def_resp_tlv *resp;
-       int rc;
+       enum _ecore_status_t rc;
 
        /* clear mailbox and prep first tlv */
        req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_STOP_RXQS, sizeof(*req));
 
-       req->rx_qid = rx_qid;
+       req->rx_qid = p_cid->rel.queue_id;
        req->num_rxqs = 1;
        req->cqe_completion = cqe_completion;
 
+       ecore_vf_pf_add_qid(p_hwfn, p_cid);
+
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -571,32 +903,33 @@ exit:
        return rc;
 }
 
-enum _ecore_status_t ecore_vf_pf_txq_start(struct ecore_hwfn *p_hwfn,
-                                          u16 tx_queue_id,
-                                          u16 sb,
-                                          u8 sb_index,
-                                          dma_addr_t pbl_addr,
-                                          u16 pbl_size,
-                                          void OSAL_IOMEM **pp_doorbell)
+enum _ecore_status_t
+ecore_vf_pf_txq_start(struct ecore_hwfn *p_hwfn,
+                     struct ecore_queue_cid *p_cid,
+                     dma_addr_t pbl_addr, u16 pbl_size,
+                     void OSAL_IOMEM **pp_doorbell)
 {
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct pfvf_start_queue_resp_tlv *resp;
        struct vfpf_start_txq_tlv *req;
-       int rc;
+       u16 qid = p_cid->rel.queue_id;
+       enum _ecore_status_t rc;
 
        /* clear mailbox and prep first tlv */
        req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_START_TXQ, sizeof(*req));
 
-       req->tx_qid = tx_queue_id;
+       req->tx_qid = qid;
 
        /* Tx */
        req->pbl_addr = pbl_addr;
        req->pbl_size = pbl_size;
-       req->hw_sb = sb;
-       req->sb_index = sb_index;
+       req->hw_sb = p_cid->sb_igu_id;
+       req->sb_index = p_cid->sb_idx;
+
+       ecore_vf_pf_add_qid(p_hwfn, p_cid);
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -610,46 +943,46 @@ enum _ecore_status_t ecore_vf_pf_txq_start(struct ecore_hwfn *p_hwfn,
                goto exit;
        }
 
-       if (pp_doorbell) {
-               /* Modern PFs provide the actual offsets, while legacy
-                * provided only the queue id.
-                */
-               if (!p_iov->b_pre_fp_hsi) {
-                       *pp_doorbell = (u8 OSAL_IOMEM *)p_hwfn->doorbells +
-                                                      resp->offset;
-               } else {
-                       u8 cid = p_iov->acquire_resp.resc.cid[tx_queue_id];
-
+       /* Modern PFs provide the actual offsets, while legacy
+        * provided only the queue id.
+        */
+       if (!p_iov->b_pre_fp_hsi) {
                *pp_doorbell = (u8 OSAL_IOMEM *)p_hwfn->doorbells +
-                               DB_ADDR_VF(cid, DQ_DEMS_LEGACY);
-               }
+                                               resp->offset;
+       } else {
+               u8 cid = p_iov->acquire_resp.resc.cid[qid];
 
-               DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
-                          "Txq[0x%02x]: doorbell at %p [offset 0x%08x]\n",
-                          tx_queue_id, *pp_doorbell, resp->offset);
+               *pp_doorbell = (u8 OSAL_IOMEM *)p_hwfn->doorbells +
+                                               DB_ADDR_VF(cid, DQ_DEMS_LEGACY);
        }
 
+       DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                  "Txq[0x%02x]: doorbell at %p [offset 0x%08x]\n",
+                  qid, *pp_doorbell, resp->offset);
 exit:
        ecore_vf_pf_req_end(p_hwfn, rc);
 
        return rc;
 }
 
-enum _ecore_status_t ecore_vf_pf_txq_stop(struct ecore_hwfn *p_hwfn, u16 tx_qid)
+enum _ecore_status_t ecore_vf_pf_txq_stop(struct ecore_hwfn *p_hwfn,
+                                         struct ecore_queue_cid *p_cid)
 {
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct vfpf_stop_txqs_tlv *req;
        struct pfvf_def_resp_tlv *resp;
-       int rc;
+       enum _ecore_status_t rc;
 
        /* clear mailbox and prep first tlv */
        req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_STOP_TXQS, sizeof(*req));
 
-       req->tx_qid = tx_qid;
+       req->tx_qid = p_cid->rel.queue_id;
        req->num_txqs = 1;
 
+       ecore_vf_pf_add_qid(p_hwfn, p_cid);
+
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -670,28 +1003,42 @@ exit:
 }
 
 enum _ecore_status_t ecore_vf_pf_rxqs_update(struct ecore_hwfn *p_hwfn,
-                                            u16 rx_queue_id,
+                                            struct ecore_queue_cid **pp_cid,
                                             u8 num_rxqs,
-                                            u8 comp_cqe_flg, u8 comp_event_flg)
+                                            u8 comp_cqe_flg,
+                                            u8 comp_event_flg)
 {
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct pfvf_def_resp_tlv *resp = &p_iov->pf2vf_reply->default_resp;
        struct vfpf_update_rxq_tlv *req;
-       int rc;
+       enum _ecore_status_t rc;
+
+       /* Starting with CHANNEL_TLV_QID and the need for additional queue
+        * information, this API stopped supporting multiple rxqs.
+        * TODO - remove this and change the API to accept a single queue-cid
+        * in a follow-up patch.
+        */
+       if (num_rxqs != 1) {
+               DP_NOTICE(p_hwfn, true,
+                         "VFs can no longer update more than a single queue\n");
+               return ECORE_INVAL;
+       }
 
        /* clear mailbox and prep first tlv */
        req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_UPDATE_RXQ, sizeof(*req));
 
-       req->rx_qid = rx_queue_id;
-       req->num_rxqs = num_rxqs;
+       req->rx_qid = (*pp_cid)->rel.queue_id;
+       req->num_rxqs = 1;
 
        if (comp_cqe_flg)
                req->flags |= VFPF_RXQ_UPD_COMPLETE_CQE_FLAG;
        if (comp_event_flg)
                req->flags |= VFPF_RXQ_UPD_COMPLETE_EVENT_FLAG;
 
+       ecore_vf_pf_add_qid(p_hwfn, *pp_cid);
+
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -706,7 +1053,6 @@ enum _ecore_status_t ecore_vf_pf_rxqs_update(struct ecore_hwfn *p_hwfn,
 
 exit:
        ecore_vf_pf_req_end(p_hwfn, rc);
-
        return rc;
 }
 
@@ -719,7 +1065,8 @@ ecore_vf_pf_vport_start(struct ecore_hwfn *p_hwfn, u8 vport_id,
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct vfpf_vport_start_tlv *req;
        struct pfvf_def_resp_tlv *resp;
-       int rc, i;
+       enum _ecore_status_t rc;
+       int i;
 
        /* clear mailbox and prep first tlv */
        req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_VPORT_START, sizeof(*req));
@@ -732,12 +1079,15 @@ ecore_vf_pf_vport_start(struct ecore_hwfn *p_hwfn, u8 vport_id,
        req->only_untagged = only_untagged;
 
        /* status blocks */
-       for (i = 0; i < p_hwfn->vf_iov_info->acquire_resp.resc.num_sbs; i++)
-               if (p_hwfn->sbs_info[i])
-                       req->sb_addr[i] = p_hwfn->sbs_info[i]->sb_phys;
+       for (i = 0; i < p_hwfn->vf_iov_info->acquire_resp.resc.num_sbs; i++) {
+               struct ecore_sb_info *p_sb = p_hwfn->vf_iov_info->sbs_info[i];
+
+               if (p_sb)
+                       req->sb_addr[i] = p_sb->sb_phys;
+       }
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -761,14 +1111,14 @@ enum _ecore_status_t ecore_vf_pf_vport_stop(struct ecore_hwfn *p_hwfn)
 {
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct pfvf_def_resp_tlv *resp = &p_iov->pf2vf_reply->default_resp;
-       int rc;
+       enum _ecore_status_t rc;
 
        /* clear mailbox and prep first tlv */
        ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_VPORT_TEARDOWN,
                         sizeof(struct vfpf_first_tlv));
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -859,7 +1209,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
        u8 update_rx, update_tx;
        u32 resp_size = 0;
        u16 size, tlv;
-       int rc;
+       enum _ecore_status_t rc;
 
        resp = &p_iov->pf2vf_reply->default_resp;
        resp_size = sizeof(*resp);
@@ -875,7 +1225,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
                struct vfpf_vport_update_activate_tlv *p_act_tlv;
 
                size = sizeof(struct vfpf_vport_update_activate_tlv);
-               p_act_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset,
+               p_act_tlv = ecore_add_tlv(&p_iov->offset,
                                          CHANNEL_TLV_VPORT_UPDATE_ACTIVATE,
                                          size);
                resp_size += sizeof(struct pfvf_def_resp_tlv);
@@ -895,7 +1245,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
                struct vfpf_vport_update_vlan_strip_tlv *p_vlan_tlv;
 
                size = sizeof(struct vfpf_vport_update_vlan_strip_tlv);
-               p_vlan_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset,
+               p_vlan_tlv = ecore_add_tlv(&p_iov->offset,
                                           CHANNEL_TLV_VPORT_UPDATE_VLAN_STRIP,
                                           size);
                resp_size += sizeof(struct pfvf_def_resp_tlv);
@@ -908,7 +1258,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
 
                size = sizeof(struct vfpf_vport_update_tx_switch_tlv);
                tlv = CHANNEL_TLV_VPORT_UPDATE_TX_SWITCH;
-               p_tx_switch_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset,
+               p_tx_switch_tlv = ecore_add_tlv(&p_iov->offset,
                                                tlv, size);
                resp_size += sizeof(struct pfvf_def_resp_tlv);
 
@@ -919,14 +1269,13 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
                struct vfpf_vport_update_mcast_bin_tlv *p_mcast_tlv;
 
                size = sizeof(struct vfpf_vport_update_mcast_bin_tlv);
-               p_mcast_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset,
+               p_mcast_tlv = ecore_add_tlv(&p_iov->offset,
                                            CHANNEL_TLV_VPORT_UPDATE_MCAST,
                                            size);
                resp_size += sizeof(struct pfvf_def_resp_tlv);
 
                OSAL_MEMCPY(p_mcast_tlv->bins, p_params->bins,
-                           sizeof(unsigned long) *
-                           ETH_MULTICAST_MAC_BINS_IN_REGS);
+                           sizeof(u32) * ETH_MULTICAST_MAC_BINS_IN_REGS);
        }
 
        update_rx = p_params->accept_flags.update_rx_mode_config;
@@ -937,7 +1286,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
 
                tlv = CHANNEL_TLV_VPORT_UPDATE_ACCEPT_PARAM;
                size = sizeof(struct vfpf_vport_update_accept_param_tlv);
-               p_accept_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset, tlv, size);
+               p_accept_tlv = ecore_add_tlv(&p_iov->offset, tlv, size);
                resp_size += sizeof(struct pfvf_def_resp_tlv);
 
                if (update_rx) {
@@ -956,9 +1305,10 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
        if (p_params->rss_params) {
                struct ecore_rss_params *rss_params = p_params->rss_params;
                struct vfpf_vport_update_rss_tlv *p_rss_tlv;
+               int i, table_size;
 
                size = sizeof(struct vfpf_vport_update_rss_tlv);
-               p_rss_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset,
+               p_rss_tlv = ecore_add_tlv(&p_iov->offset,
                                          CHANNEL_TLV_VPORT_UPDATE_RSS, size);
                resp_size += sizeof(struct pfvf_def_resp_tlv);
 
@@ -977,8 +1327,16 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
                p_rss_tlv->rss_enable = rss_params->rss_enable;
                p_rss_tlv->rss_caps = rss_params->rss_caps;
                p_rss_tlv->rss_table_size_log = rss_params->rss_table_size_log;
-               OSAL_MEMCPY(p_rss_tlv->rss_ind_table, rss_params->rss_ind_table,
-                           sizeof(rss_params->rss_ind_table));
+
+               table_size = OSAL_MIN_T(int, T_ETH_INDIRECTION_TABLE_SIZE,
+                                       1 << p_rss_tlv->rss_table_size_log);
+               for (i = 0; i < table_size; i++) {
+                       struct ecore_queue_cid *p_queue;
+
+                       p_queue = rss_params->rss_ind_table[i];
+                       p_rss_tlv->rss_ind_table[i] = p_queue->rel.queue_id;
+               }
+
                OSAL_MEMCPY(p_rss_tlv->rss_key, rss_params->rss_key,
                            sizeof(rss_params->rss_key));
        }
@@ -988,8 +1346,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
 
                size = sizeof(struct vfpf_vport_update_accept_any_vlan_tlv);
                tlv = CHANNEL_TLV_VPORT_UPDATE_ACCEPT_ANY_VLAN;
-               p_any_vlan_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset,
-                                              tlv, size);
+               p_any_vlan_tlv = ecore_add_tlv(&p_iov->offset, tlv, size);
 
                resp_size += sizeof(struct pfvf_def_resp_tlv);
                p_any_vlan_tlv->accept_any_vlan = p_params->accept_any_vlan;
@@ -1003,7 +1360,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
 
                sge_tpa_params = p_params->sge_tpa_params;
                size = sizeof(struct vfpf_vport_update_sge_tpa_tlv);
-               p_sge_tpa_tlv = ecore_add_tlv(p_hwfn, &p_iov->offset,
+               p_sge_tpa_tlv = ecore_add_tlv(&p_iov->offset,
                                              CHANNEL_TLV_VPORT_UPDATE_SGE_TPA,
                                              size);
                resp_size += sizeof(struct pfvf_def_resp_tlv);
@@ -1027,6 +1384,12 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
                if (sge_tpa_params->tpa_gro_consistent_flg)
                        p_sge_tpa_tlv->sge_tpa_flags |=
                            VFPF_TPA_GRO_CONSIST_FLAG;
+               if (sge_tpa_params->tpa_ipv4_tunn_en_flg)
+                       p_sge_tpa_tlv->sge_tpa_flags |=
+                           VFPF_TPA_TUNN_IPV4_EN_FLAG;
+               if (sge_tpa_params->tpa_ipv6_tunn_en_flg)
+                       p_sge_tpa_tlv->sge_tpa_flags |=
+                           VFPF_TPA_TUNN_IPV6_EN_FLAG;
 
                p_sge_tpa_tlv->tpa_max_aggs_num =
                    sge_tpa_params->tpa_max_aggs_num;
@@ -1041,7 +1404,7 @@ ecore_vf_pf_vport_update(struct ecore_hwfn *p_hwfn,
        }
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -1067,13 +1430,13 @@ enum _ecore_status_t ecore_vf_pf_reset(struct ecore_hwfn *p_hwfn)
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct pfvf_def_resp_tlv *resp;
        struct vfpf_first_tlv *req;
-       int rc;
+       enum _ecore_status_t rc;
 
        /* clear mailbox and prep first tlv */
        req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_CLOSE, sizeof(*req));
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -1095,56 +1458,6 @@ exit:
        return rc;
 }
 
-enum _ecore_status_t ecore_vf_pf_release(struct ecore_hwfn *p_hwfn)
-{
-       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
-       struct pfvf_def_resp_tlv *resp;
-       struct vfpf_first_tlv *req;
-       u32 size;
-       int rc;
-
-       /* clear mailbox and prep first tlv */
-       req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_RELEASE, sizeof(*req));
-
-       /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
-                     CHANNEL_TLV_LIST_END,
-                     sizeof(struct channel_list_end_tlv));
-
-       resp = &p_iov->pf2vf_reply->default_resp;
-       rc = ecore_send_msg2pf(p_hwfn, &resp->hdr.status, sizeof(*resp));
-
-       if (rc == ECORE_SUCCESS && resp->hdr.status != PFVF_STATUS_SUCCESS)
-               rc = ECORE_AGAIN;
-
-       ecore_vf_pf_req_end(p_hwfn, rc);
-
-       p_hwfn->b_int_enabled = 0;
-
-       if (p_iov->vf2pf_request)
-               OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev,
-                                      p_iov->vf2pf_request,
-                                      p_iov->vf2pf_request_phys,
-                                      sizeof(union vfpf_tlvs));
-       if (p_iov->pf2vf_reply)
-               OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev,
-                                      p_iov->pf2vf_reply,
-                                      p_iov->pf2vf_reply_phys,
-                                      sizeof(union pfvf_tlvs));
-
-       if (p_iov->bulletin.p_virt) {
-               size = sizeof(struct ecore_bulletin_content);
-               OSAL_DMA_FREE_COHERENT(p_hwfn->p_dev,
-                                      p_iov->bulletin.p_virt,
-                                      p_iov->bulletin.phys, size);
-       }
-
-       OSAL_FREE(p_hwfn->p_dev, p_hwfn->vf_iov_info);
-       p_hwfn->vf_iov_info = OSAL_NULL;
-
-       return rc;
-}
-
 void ecore_vf_pf_filter_mcast(struct ecore_hwfn *p_hwfn,
                              struct ecore_filter_mcast *p_filter_cmd)
 {
@@ -1159,7 +1472,7 @@ void ecore_vf_pf_filter_mcast(struct ecore_hwfn *p_hwfn,
                        u32 bit;
 
                        bit = ecore_mcast_bin_from_mac(p_filter_cmd->mac[i]);
-                       OSAL_SET_BIT(bit, sp_params.bins);
+                       sp_params.bins[bit / 32] |= 1 << (bit % 32);
                }
        }
 
@@ -1173,7 +1486,7 @@ enum _ecore_status_t ecore_vf_pf_filter_ucast(struct ecore_hwfn *p_hwfn,
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct vfpf_ucast_filter_tlv *req;
        struct pfvf_def_resp_tlv *resp;
-       int rc;
+       enum _ecore_status_t rc;
 
        /* Sanitize */
        if (p_ucast->opcode == ECORE_FILTER_MOVE) {
@@ -1190,7 +1503,7 @@ enum _ecore_status_t ecore_vf_pf_filter_ucast(struct ecore_hwfn *p_hwfn,
        req->vlan = p_ucast->vlan;
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -1214,14 +1527,14 @@ enum _ecore_status_t ecore_vf_pf_int_cleanup(struct ecore_hwfn *p_hwfn)
 {
        struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
        struct pfvf_def_resp_tlv *resp = &p_iov->pf2vf_reply->default_resp;
-       int rc;
+       enum _ecore_status_t rc;
 
        /* clear mailbox and prep first tlv */
        ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_INT_CLEANUP,
                         sizeof(struct vfpf_first_tlv));
 
        /* add list termination tlv */
-       ecore_add_tlv(p_hwfn, &p_iov->offset,
+       ecore_add_tlv(&p_iov->offset,
                      CHANNEL_TLV_LIST_END,
                      sizeof(struct channel_list_end_tlv));
 
@@ -1240,6 +1553,114 @@ exit:
        return rc;
 }
 
+enum _ecore_status_t ecore_vf_pf_get_coalesce(struct ecore_hwfn *p_hwfn,
+                                             u16 *p_coal,
+                                             struct ecore_queue_cid *p_cid)
+{
+       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
+       struct pfvf_read_coal_resp_tlv *resp;
+       struct vfpf_read_coal_req_tlv *req;
+       enum _ecore_status_t rc;
+
+       /* clear mailbox and prep header tlv */
+       req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_COALESCE_READ,
+                              sizeof(*req));
+       req->qid = p_cid->rel.queue_id;
+       req->is_rx = p_cid->b_is_rx ? 1 : 0;
+
+       ecore_add_tlv(&p_iov->offset, CHANNEL_TLV_LIST_END,
+                     sizeof(struct channel_list_end_tlv));
+       resp = &p_iov->pf2vf_reply->read_coal_resp;
+
+       rc = ecore_send_msg2pf(p_hwfn, &resp->hdr.status, sizeof(*resp));
+       if (rc != ECORE_SUCCESS)
+               goto exit;
+
+       if (resp->hdr.status != PFVF_STATUS_SUCCESS)
+               goto exit;
+
+       *p_coal = resp->coal;
+exit:
+       ecore_vf_pf_req_end(p_hwfn, rc);
+
+       return rc;
+}
+
+enum _ecore_status_t
+ecore_vf_pf_set_coalesce(struct ecore_hwfn *p_hwfn, u16 rx_coal, u16 tx_coal,
+                        struct ecore_queue_cid     *p_cid)
+{
+       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
+       struct vfpf_update_coalesce *req;
+       struct pfvf_def_resp_tlv *resp;
+       enum _ecore_status_t rc;
+
+       /* clear mailbox and prep header tlv */
+       req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_COALESCE_UPDATE,
+                              sizeof(*req));
+
+       req->rx_coal = rx_coal;
+       req->tx_coal = tx_coal;
+       req->qid = p_cid->rel.queue_id;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                  "Setting coalesce rx_coal = %d, tx_coal = %d at queue = %d\n",
+                  rx_coal, tx_coal, req->qid);
+
+       /* add list termination tlv */
+       ecore_add_tlv(&p_iov->offset, CHANNEL_TLV_LIST_END,
+                     sizeof(struct channel_list_end_tlv));
+
+       resp = &p_iov->pf2vf_reply->default_resp;
+       rc = ecore_send_msg2pf(p_hwfn, &resp->hdr.status, sizeof(*resp));
+
+       if (rc != ECORE_SUCCESS)
+               goto exit;
+
+       if (resp->hdr.status != PFVF_STATUS_SUCCESS)
+               goto exit;
+
+       p_hwfn->p_dev->rx_coalesce_usecs = rx_coal;
+       p_hwfn->p_dev->tx_coalesce_usecs = tx_coal;
+
+exit:
+       ecore_vf_pf_req_end(p_hwfn, rc);
+       return rc;
+}
+
+enum _ecore_status_t
+ecore_vf_pf_update_mtu(struct ecore_hwfn *p_hwfn, u16 mtu)
+{
+       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
+       struct vfpf_update_mtu_tlv *p_req;
+       struct pfvf_def_resp_tlv *p_resp;
+       enum _ecore_status_t rc;
+
+       if (!mtu)
+               return ECORE_INVAL;
+
+       /* clear mailbox and prep header tlv */
+       p_req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_UPDATE_MTU,
+                                sizeof(*p_req));
+       p_req->mtu = mtu;
+       DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                  "Requesting MTU update to %d\n", mtu);
+
+       /* add list termination tlv */
+       ecore_add_tlv(&p_iov->offset,
+                     CHANNEL_TLV_LIST_END,
+                     sizeof(struct channel_list_end_tlv));
+
+       p_resp = &p_iov->pf2vf_reply->default_resp;
+       rc = ecore_send_msg2pf(p_hwfn, &p_resp->hdr.status, sizeof(*p_resp));
+       if (p_resp->hdr.status == PFVF_STATUS_NOT_SUPPORTED)
+               rc = ECORE_INVAL;
+
+       ecore_vf_pf_req_end(p_hwfn, rc);
+
+       return rc;
+}
+
 u16 ecore_vf_get_igu_sb_id(struct ecore_hwfn *p_hwfn,
                           u16               sb_id)
 {
@@ -1253,6 +1674,24 @@ u16 ecore_vf_get_igu_sb_id(struct ecore_hwfn *p_hwfn,
        return p_iov->acquire_resp.resc.hw_sbs[sb_id].hw_sb_id;
 }
 
+void ecore_vf_set_sb_info(struct ecore_hwfn *p_hwfn,
+                         u16 sb_id, struct ecore_sb_info *p_sb)
+{
+       struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
+
+       if (!p_iov) {
+               DP_NOTICE(p_hwfn, true, "vf_sriov_info isn't initialized\n");
+               return;
+       }
+
+       if (sb_id >= PFVF_MAX_SBS_PER_VF) {
+               DP_NOTICE(p_hwfn, true, "Can't configure SB %04x\n", sb_id);
+               return;
+       }
+
+       p_iov->sbs_info[sb_id] = p_sb;
+}
+
 enum _ecore_status_t ecore_vf_read_bulletin(struct ecore_hwfn *p_hwfn,
                                            u8 *p_change)
 {
@@ -1271,8 +1710,8 @@ enum _ecore_status_t ecore_vf_read_bulletin(struct ecore_hwfn *p_hwfn,
                return ECORE_SUCCESS;
 
        /* Verify the bulletin we see is valid */
-       crc = ecore_crc32(0, (u8 *)&shadow + crc_size,
-                         p_iov->bulletin.size - crc_size);
+       crc = OSAL_CRC32(0, (u8 *)&shadow + crc_size,
+                        p_iov->bulletin.size - crc_size);
        if (crc != shadow.crc)
                return ECORE_AGAIN;
 
@@ -1287,8 +1726,7 @@ enum _ecore_status_t ecore_vf_read_bulletin(struct ecore_hwfn *p_hwfn,
        return ECORE_SUCCESS;
 }
 
-void __ecore_vf_get_link_params(struct ecore_hwfn *p_hwfn,
-                               struct ecore_mcp_link_params *p_params,
+void __ecore_vf_get_link_params(struct ecore_mcp_link_params *p_params,
                                struct ecore_bulletin_content *p_bulletin)
 {
        OSAL_MEMSET(p_params, 0, sizeof(*p_params));
@@ -1305,12 +1743,11 @@ void __ecore_vf_get_link_params(struct ecore_hwfn *p_hwfn,
 void ecore_vf_get_link_params(struct ecore_hwfn *p_hwfn,
                              struct ecore_mcp_link_params *params)
 {
-       __ecore_vf_get_link_params(p_hwfn, params,
+       __ecore_vf_get_link_params(params,
                                   &p_hwfn->vf_iov_info->bulletin_shadow);
 }
 
-void __ecore_vf_get_link_state(struct ecore_hwfn *p_hwfn,
-                              struct ecore_mcp_link_state *p_link,
+void __ecore_vf_get_link_state(struct ecore_mcp_link_state *p_link,
                               struct ecore_bulletin_content *p_bulletin)
 {
        OSAL_MEMSET(p_link, 0, sizeof(*p_link));
@@ -1332,12 +1769,11 @@ void __ecore_vf_get_link_state(struct ecore_hwfn *p_hwfn,
 void ecore_vf_get_link_state(struct ecore_hwfn *p_hwfn,
                             struct ecore_mcp_link_state *link)
 {
-       __ecore_vf_get_link_state(p_hwfn, link,
+       __ecore_vf_get_link_state(link,
                                  &p_hwfn->vf_iov_info->bulletin_shadow);
 }
 
-void __ecore_vf_get_link_caps(struct ecore_hwfn *p_hwfn,
-                             struct ecore_mcp_link_capabilities *p_link_caps,
+void __ecore_vf_get_link_caps(struct ecore_mcp_link_capabilities *p_link_caps,
                              struct ecore_bulletin_content *p_bulletin)
 {
        OSAL_MEMSET(p_link_caps, 0, sizeof(*p_link_caps));
@@ -1347,7 +1783,7 @@ void __ecore_vf_get_link_caps(struct ecore_hwfn *p_hwfn,
 void ecore_vf_get_link_caps(struct ecore_hwfn *p_hwfn,
                            struct ecore_mcp_link_capabilities *p_link_caps)
 {
-       __ecore_vf_get_link_caps(p_hwfn, p_link_caps,
+       __ecore_vf_get_link_caps(p_link_caps,
                                 &p_hwfn->vf_iov_info->bulletin_shadow);
 }
 
@@ -1356,6 +1792,12 @@ void ecore_vf_get_num_rxqs(struct ecore_hwfn *p_hwfn, u8 *num_rxqs)
        *num_rxqs = p_hwfn->vf_iov_info->acquire_resp.resc.num_rxqs;
 }
 
+void ecore_vf_get_num_txqs(struct ecore_hwfn *p_hwfn,
+                          u8 *num_txqs)
+{
+       *num_txqs = p_hwfn->vf_iov_info->acquire_resp.resc.num_txqs;
+}
+
 void ecore_vf_get_port_mac(struct ecore_hwfn *p_hwfn, u8 *port_mac)
 {
        OSAL_MEMCPY(port_mac,
@@ -1372,23 +1814,21 @@ void ecore_vf_get_num_vlan_filters(struct ecore_hwfn *p_hwfn,
        *num_vlan_filters = p_vf->acquire_resp.resc.num_vlan_filters;
 }
 
-/* @DPDK */
-void ecore_vf_get_num_mac_filters(struct ecore_hwfn *p_hwfn,
-                                 u32 *num_mac)
+void ecore_vf_get_num_sbs(struct ecore_hwfn *p_hwfn,
+                         u32 *num_sbs)
 {
        struct ecore_vf_iov *p_vf;
 
        p_vf = p_hwfn->vf_iov_info;
-       *num_mac = p_vf->acquire_resp.resc.num_mac_filters;
+       *num_sbs = (u32)p_vf->acquire_resp.resc.num_sbs;
 }
 
-void ecore_vf_get_num_sbs(struct ecore_hwfn *p_hwfn,
-                         u32 *num_sbs)
+void ecore_vf_get_num_mac_filters(struct ecore_hwfn *p_hwfn,
+                                 u32 *num_mac_filters)
 {
-       struct ecore_vf_iov *p_vf;
+       struct ecore_vf_iov *p_vf = p_hwfn->vf_iov_info;
 
-       p_vf = p_hwfn->vf_iov_info;
-       *num_sbs = (u32)p_vf->acquire_resp.resc.num_sbs;
+       *num_mac_filters = p_vf->acquire_resp.resc.num_mac_filters;
 }
 
 bool ecore_vf_check_mac(struct ecore_hwfn *p_hwfn, u8 *mac)
@@ -1428,6 +1868,18 @@ bool ecore_vf_bulletin_get_forced_mac(struct ecore_hwfn *hwfn, u8 *dst_mac,
        return true;
 }
 
+void ecore_vf_bulletin_get_udp_ports(struct ecore_hwfn *p_hwfn,
+                                    u16 *p_vxlan_port,
+                                    u16 *p_geneve_port)
+{
+       struct ecore_bulletin_content *p_bulletin;
+
+       p_bulletin = &p_hwfn->vf_iov_info->bulletin_shadow;
+
+       *p_vxlan_port = p_bulletin->vxlan_udp_port;
+       *p_geneve_port = p_bulletin->geneve_udp_port;
+}
+
 bool ecore_vf_bulletin_get_forced_vlan(struct ecore_hwfn *hwfn, u16 *dst_pvid)
 {
        struct ecore_bulletin_content *bulletin;
@@ -1461,3 +1913,10 @@ void ecore_vf_get_fw_version(struct ecore_hwfn *p_hwfn,
        *fw_rev = info->fw_rev;
        *fw_eng = info->fw_eng;
 }
+
+#ifdef CONFIG_ECORE_SW_CHANNEL
+void ecore_vf_set_hw_channel(struct ecore_hwfn *p_hwfn, bool b_is_hw)
+{
+       p_hwfn->vf_iov_info->b_hw_channel = b_is_hw;
+}
+#endif