net/qede: fix reporting PF driver as disabled
[dpdk.git] / drivers / net / qede / qede_ethdev.c
index e91e627..b5fa1a2 100644 (file)
 
 /* Globals */
 static const struct qed_eth_ops *qed_ops;
-static const char *drivername = "qede pmd";
 static int64_t timer_period = 1;
 
+/* VXLAN tunnel classification mapping */
+const struct _qede_vxlan_tunn_types {
+       uint16_t rte_filter_type;
+       enum ecore_filter_ucast_type qede_type;
+       enum ecore_tunn_clss qede_tunn_clss;
+       const char *string;
+} qede_tunn_types[] = {
+       {
+               ETH_TUNNEL_FILTER_OMAC,
+               ECORE_FILTER_MAC,
+               ECORE_TUNN_CLSS_MAC_VLAN,
+               "outer-mac"
+       },
+       {
+               ETH_TUNNEL_FILTER_TENID,
+               ECORE_FILTER_VNI,
+               ECORE_TUNN_CLSS_MAC_VNI,
+               "vni"
+       },
+       {
+               ETH_TUNNEL_FILTER_IMAC,
+               ECORE_FILTER_INNER_MAC,
+               ECORE_TUNN_CLSS_INNER_MAC_VLAN,
+               "inner-mac"
+       },
+       {
+               ETH_TUNNEL_FILTER_IVLAN,
+               ECORE_FILTER_INNER_VLAN,
+               ECORE_TUNN_CLSS_INNER_MAC_VLAN,
+               "inner-vlan"
+       },
+       {
+               ETH_TUNNEL_FILTER_OMAC | ETH_TUNNEL_FILTER_TENID,
+               ECORE_FILTER_MAC_VNI_PAIR,
+               ECORE_TUNN_CLSS_MAC_VNI,
+               "outer-mac and vni"
+       },
+       {
+               ETH_TUNNEL_FILTER_OMAC | ETH_TUNNEL_FILTER_IMAC,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "outer-mac and inner-mac"
+       },
+       {
+               ETH_TUNNEL_FILTER_OMAC | ETH_TUNNEL_FILTER_IVLAN,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "outer-mac and inner-vlan"
+       },
+       {
+               ETH_TUNNEL_FILTER_TENID | ETH_TUNNEL_FILTER_IMAC,
+               ECORE_FILTER_INNER_MAC_VNI_PAIR,
+               ECORE_TUNN_CLSS_INNER_MAC_VNI,
+               "vni and inner-mac",
+       },
+       {
+               ETH_TUNNEL_FILTER_TENID | ETH_TUNNEL_FILTER_IVLAN,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "vni and inner-vlan",
+       },
+       {
+               ETH_TUNNEL_FILTER_IMAC | ETH_TUNNEL_FILTER_IVLAN,
+               ECORE_FILTER_INNER_PAIR,
+               ECORE_TUNN_CLSS_INNER_MAC_VLAN,
+               "inner-mac and inner-vlan",
+       },
+       {
+               ETH_TUNNEL_FILTER_OIP,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "outer-IP"
+       },
+       {
+               ETH_TUNNEL_FILTER_IIP,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "inner-IP"
+       },
+       {
+               RTE_TUNNEL_FILTER_IMAC_IVLAN,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "IMAC_IVLAN"
+       },
+       {
+               RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "IMAC_IVLAN_TENID"
+       },
+       {
+               RTE_TUNNEL_FILTER_IMAC_TENID,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "IMAC_TENID"
+       },
+       {
+               RTE_TUNNEL_FILTER_OMAC_TENID_IMAC,
+               ECORE_FILTER_UNUSED,
+               MAX_ECORE_TUNN_CLSS,
+               "OMAC_TENID_IMAC"
+       },
+};
+
 struct rte_qede_xstats_name_off {
        char name[RTE_ETH_XSTATS_NAME_SIZE];
        uint64_t offset;
@@ -223,47 +327,194 @@ static void qede_print_adapter_info(struct qede_dev *qdev)
        DP_INFO(edev, "*********************************\n");
 }
 
+static void qede_set_ucast_cmn_params(struct ecore_filter_ucast *ucast)
+{
+       memset(ucast, 0, sizeof(struct ecore_filter_ucast));
+       ucast->is_rx_filter = true;
+       ucast->is_tx_filter = true;
+       /* ucast->assert_on_error = true; - For debug */
+}
+
+static void qede_set_cmn_tunn_param(struct ecore_tunn_update_params *params,
+                                    uint8_t clss, uint64_t mode, uint64_t mask)
+{
+       memset(params, 0, sizeof(struct ecore_tunn_update_params));
+       params->tunn_mode = mode;
+       params->tunn_mode_update_mask = mask;
+       params->update_tx_pf_clss = 1;
+       params->update_rx_pf_clss = 1;
+       params->tunn_clss_vxlan = clss;
+}
+
 static int
-qede_set_ucast_rx_mac(struct qede_dev *qdev,
-                     enum qed_filter_xcast_params_type opcode,
-                     uint8_t mac[ETHER_ADDR_LEN])
+qede_ucast_filter(struct rte_eth_dev *eth_dev, struct ecore_filter_ucast *ucast,
+                 bool add)
 {
-       struct ecore_dev *edev = &qdev->edev;
-       struct qed_filter_params filter_cmd;
-
-       memset(&filter_cmd, 0, sizeof(filter_cmd));
-       filter_cmd.type = QED_FILTER_TYPE_UCAST;
-       filter_cmd.filter.ucast.type = opcode;
-       filter_cmd.filter.ucast.mac_valid = 1;
-       rte_memcpy(&filter_cmd.filter.ucast.mac[0], &mac[0], ETHER_ADDR_LEN);
-       return qdev->ops->filter_config(edev, &filter_cmd);
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct qede_ucast_entry *tmp = NULL;
+       struct qede_ucast_entry *u;
+       struct ether_addr *mac_addr;
+
+       mac_addr  = (struct ether_addr *)ucast->mac;
+       if (add) {
+               SLIST_FOREACH(tmp, &qdev->uc_list_head, list) {
+                       if ((memcmp(mac_addr, &tmp->mac,
+                                   ETHER_ADDR_LEN) == 0) &&
+                            ucast->vlan == tmp->vlan) {
+                               DP_ERR(edev, "Unicast MAC is already added"
+                                      " with vlan = %u, vni = %u\n",
+                                      ucast->vlan,  ucast->vni);
+                                       return -EEXIST;
+                       }
+               }
+               u = rte_malloc(NULL, sizeof(struct qede_ucast_entry),
+                              RTE_CACHE_LINE_SIZE);
+               if (!u) {
+                       DP_ERR(edev, "Did not allocate memory for ucast\n");
+                       return -ENOMEM;
+               }
+               ether_addr_copy(mac_addr, &u->mac);
+               u->vlan = ucast->vlan;
+               u->vni = ucast->vni;
+               SLIST_INSERT_HEAD(&qdev->uc_list_head, u, list);
+               qdev->num_uc_addr++;
+       } else {
+               SLIST_FOREACH(tmp, &qdev->uc_list_head, list) {
+                       if ((memcmp(mac_addr, &tmp->mac,
+                                   ETHER_ADDR_LEN) == 0) &&
+                           ucast->vlan == tmp->vlan      &&
+                           ucast->vni == tmp->vni)
+                       break;
+               }
+               if (tmp == NULL) {
+                       DP_INFO(edev, "Unicast MAC is not found\n");
+                       return -EINVAL;
+               }
+               SLIST_REMOVE(&qdev->uc_list_head, tmp, qede_ucast_entry, list);
+               qdev->num_uc_addr--;
+       }
+
+       return 0;
 }
 
-static void
-qede_mac_addr_add(struct rte_eth_dev *eth_dev, struct ether_addr *mac_addr,
-                 uint32_t index, __rte_unused uint32_t pool)
+static int
+qede_mcast_filter(struct rte_eth_dev *eth_dev, struct ecore_filter_ucast *mcast,
+                 bool add)
 {
-       struct qede_dev *qdev = eth_dev->data->dev_private;
-       struct ecore_dev *edev = &qdev->edev;
-       int rc;
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct ether_addr *mac_addr;
+       struct qede_mcast_entry *tmp = NULL;
+       struct qede_mcast_entry *m;
+
+       mac_addr  = (struct ether_addr *)mcast->mac;
+       if (add) {
+               SLIST_FOREACH(tmp, &qdev->mc_list_head, list) {
+                       if (memcmp(mac_addr, &tmp->mac, ETHER_ADDR_LEN) == 0) {
+                               DP_ERR(edev,
+                                       "Multicast MAC is already added\n");
+                               return -EEXIST;
+                       }
+               }
+               m = rte_malloc(NULL, sizeof(struct qede_mcast_entry),
+                       RTE_CACHE_LINE_SIZE);
+               if (!m) {
+                       DP_ERR(edev,
+                               "Did not allocate memory for mcast\n");
+                       return -ENOMEM;
+               }
+               ether_addr_copy(mac_addr, &m->mac);
+               SLIST_INSERT_HEAD(&qdev->mc_list_head, m, list);
+               qdev->num_mc_addr++;
+       } else {
+               SLIST_FOREACH(tmp, &qdev->mc_list_head, list) {
+                       if (memcmp(mac_addr, &tmp->mac, ETHER_ADDR_LEN) == 0)
+                               break;
+               }
+               if (tmp == NULL) {
+                       DP_INFO(edev, "Multicast mac is not found\n");
+                       return -EINVAL;
+               }
+               SLIST_REMOVE(&qdev->mc_list_head, tmp,
+                            qede_mcast_entry, list);
+               qdev->num_mc_addr--;
+       }
 
-       PMD_INIT_FUNC_TRACE(edev);
+       return 0;
+}
 
-       if (index >= qdev->dev_info.num_mac_addrs) {
-               DP_ERR(edev, "Index %u is above MAC filter limit %u\n",
-                      index, qdev->dev_info.num_mac_addrs);
-               return;
+static enum _ecore_status_t
+qede_mac_int_ops(struct rte_eth_dev *eth_dev, struct ecore_filter_ucast *ucast,
+                bool add)
+{
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       enum _ecore_status_t rc;
+       struct ecore_filter_mcast mcast;
+       struct qede_mcast_entry *tmp;
+       uint16_t j = 0;
+
+       /* Multicast */
+       if (is_multicast_ether_addr((struct ether_addr *)ucast->mac)) {
+               if (add) {
+                       if (qdev->num_mc_addr >= ECORE_MAX_MC_ADDRS) {
+                               DP_ERR(edev,
+                                      "Mcast filter table limit exceeded, "
+                                      "Please enable mcast promisc mode\n");
+                               return -ECORE_INVAL;
+                       }
+               }
+               rc = qede_mcast_filter(eth_dev, ucast, add);
+               if (rc == 0) {
+                       DP_INFO(edev, "num_mc_addrs = %u\n", qdev->num_mc_addr);
+                       memset(&mcast, 0, sizeof(mcast));
+                       mcast.num_mc_addrs = qdev->num_mc_addr;
+                       mcast.opcode = ECORE_FILTER_ADD;
+                       SLIST_FOREACH(tmp, &qdev->mc_list_head, list) {
+                               ether_addr_copy(&tmp->mac,
+                                       (struct ether_addr *)&mcast.mac[j]);
+                               j++;
+                       }
+                       rc = ecore_filter_mcast_cmd(edev, &mcast,
+                                                   ECORE_SPQ_MODE_CB, NULL);
+               }
+               if (rc != ECORE_SUCCESS) {
+                       DP_ERR(edev, "Failed to add multicast filter"
+                              " rc = %d, op = %d\n", rc, add);
+               }
+       } else { /* Unicast */
+               if (add) {
+                       if (qdev->num_uc_addr >= qdev->dev_info.num_mac_addrs) {
+                               DP_ERR(edev,
+                                      "Ucast filter table limit exceeded,"
+                                      " Please enable promisc mode\n");
+                               return -ECORE_INVAL;
+                       }
+               }
+               rc = qede_ucast_filter(eth_dev, ucast, add);
+               if (rc == 0)
+                       rc = ecore_filter_ucast_cmd(edev, ucast,
+                                                   ECORE_SPQ_MODE_CB, NULL);
+               if (rc != ECORE_SUCCESS) {
+                       DP_ERR(edev, "MAC filter failed, rc = %d, op = %d\n",
+                              rc, add);
+               }
        }
 
-       /* Adding macaddr even though promiscuous mode is set */
-       if (rte_eth_promiscuous_get(eth_dev->data->port_id) == 1)
-               DP_INFO(edev, "Port is in promisc mode, yet adding it\n");
+       return rc;
+}
 
-       /* Add MAC filters according to the unicast secondary macs */
-       rc = qede_set_ucast_rx_mac(qdev, QED_FILTER_XCAST_TYPE_ADD,
-                                  mac_addr->addr_bytes);
-       if (rc)
-               DP_ERR(edev, "Unable to add macaddr rc=%d\n", rc);
+static void
+qede_mac_addr_add(struct rte_eth_dev *eth_dev, struct ether_addr *mac_addr,
+                 uint32_t index, __rte_unused uint32_t pool)
+{
+       struct ecore_filter_ucast ucast;
+
+       qede_set_ucast_cmn_params(&ucast);
+       ucast.type = ECORE_FILTER_MAC;
+       ether_addr_copy(mac_addr, (struct ether_addr *)&ucast.mac);
+       (void)qede_mac_int_ops(eth_dev, &ucast, 1);
 }
 
 static void
@@ -272,6 +523,7 @@ qede_mac_addr_remove(struct rte_eth_dev *eth_dev, uint32_t index)
        struct qede_dev *qdev = eth_dev->data->dev_private;
        struct ecore_dev *edev = &qdev->edev;
        struct ether_addr mac_addr;
+       struct ecore_filter_ucast ucast;
        int rc;
 
        PMD_INIT_FUNC_TRACE(edev);
@@ -282,12 +534,15 @@ qede_mac_addr_remove(struct rte_eth_dev *eth_dev, uint32_t index)
                return;
        }
 
+       qede_set_ucast_cmn_params(&ucast);
+       ucast.opcode = ECORE_FILTER_REMOVE;
+       ucast.type = ECORE_FILTER_MAC;
+
        /* Use the index maintained by rte */
-       ether_addr_copy(&eth_dev->data->mac_addrs[index], &mac_addr);
-       rc = qede_set_ucast_rx_mac(qdev, QED_FILTER_XCAST_TYPE_DEL,
-                                  mac_addr.addr_bytes);
-       if (rc)
-               DP_ERR(edev, "Unable to remove macaddr rc=%d\n", rc);
+       ether_addr_copy(&eth_dev->data->mac_addrs[index],
+                       (struct ether_addr *)&ucast.mac);
+
+       ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB, NULL);
 }
 
 static void
@@ -295,6 +550,7 @@ qede_mac_addr_set(struct rte_eth_dev *eth_dev, struct ether_addr *mac_addr)
 {
        struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
        struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct ecore_filter_ucast ucast;
        int rc;
 
        if (IS_VF(edev) && !ecore_vf_check_mac(ECORE_LEADING_HWFN(edev),
@@ -306,10 +562,13 @@ qede_mac_addr_set(struct rte_eth_dev *eth_dev, struct ether_addr *mac_addr)
        }
 
        /* First remove the primary mac */
-       rc = qede_set_ucast_rx_mac(qdev, QED_FILTER_XCAST_TYPE_DEL,
-                                  qdev->primary_mac.addr_bytes);
-
-       if (rc) {
+       qede_set_ucast_cmn_params(&ucast);
+       ucast.opcode = ECORE_FILTER_REMOVE;
+       ucast.type = ECORE_FILTER_MAC;
+       ether_addr_copy(&qdev->primary_mac,
+                       (struct ether_addr *)&ucast.mac);
+       rc = ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB, NULL);
+       if (rc != 0) {
                DP_ERR(edev, "Unable to remove current macaddr"
                             " Reverting to previous default mac\n");
                ether_addr_copy(&qdev->primary_mac,
@@ -318,18 +577,15 @@ qede_mac_addr_set(struct rte_eth_dev *eth_dev, struct ether_addr *mac_addr)
        }
 
        /* Add new MAC */
-       rc = qede_set_ucast_rx_mac(qdev, QED_FILTER_XCAST_TYPE_ADD,
-                                  mac_addr->addr_bytes);
-
-       if (rc)
+       ucast.opcode = ECORE_FILTER_ADD;
+       ether_addr_copy(mac_addr, (struct ether_addr *)&ucast.mac);
+       rc = ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB, NULL);
+       if (rc != 0)
                DP_ERR(edev, "Unable to add new default mac\n");
        else
                ether_addr_copy(mac_addr, &qdev->primary_mac);
 }
 
-
-
-
 static void qede_config_accept_any_vlan(struct qede_dev *qdev, bool action)
 {
        struct ecore_dev *edev = &qdev->edev;
@@ -415,22 +671,6 @@ static void qede_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)
                mask, rxmode->hw_vlan_strip, rxmode->hw_vlan_filter);
 }
 
-static int qede_set_ucast_rx_vlan(struct qede_dev *qdev,
-                                 enum qed_filter_xcast_params_type opcode,
-                                 uint16_t vid)
-{
-       struct qed_filter_params filter_cmd;
-       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
-
-       memset(&filter_cmd, 0, sizeof(filter_cmd));
-       filter_cmd.type = QED_FILTER_TYPE_UCAST;
-       filter_cmd.filter.ucast.type = opcode;
-       filter_cmd.filter.ucast.vlan_valid = 1;
-       filter_cmd.filter.ucast.vlan = vid;
-
-       return qdev->ops->filter_config(edev, &filter_cmd);
-}
-
 static int qede_vlan_filter_set(struct rte_eth_dev *eth_dev,
                                uint16_t vlan_id, int on)
 {
@@ -439,6 +679,7 @@ static int qede_vlan_filter_set(struct rte_eth_dev *eth_dev,
        struct qed_dev_eth_info *dev_info = &qdev->dev_info;
        struct qede_vlan_entry *tmp = NULL;
        struct qede_vlan_entry *vlan;
+       struct ecore_filter_ucast ucast;
        int rc;
 
        if (on) {
@@ -465,9 +706,13 @@ static int qede_vlan_filter_set(struct rte_eth_dev *eth_dev,
                        return -ENOMEM;
                }
 
-               rc = qede_set_ucast_rx_vlan(qdev, QED_FILTER_XCAST_TYPE_ADD,
-                                           vlan_id);
-               if (rc) {
+               qede_set_ucast_cmn_params(&ucast);
+               ucast.opcode = ECORE_FILTER_ADD;
+               ucast.type = ECORE_FILTER_VLAN;
+               ucast.vlan = vlan_id;
+               rc = ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB,
+                                           NULL);
+               if (rc != 0) {
                        DP_ERR(edev, "Failed to add VLAN %u rc %d\n", vlan_id,
                               rc);
                        rte_free(vlan);
@@ -497,9 +742,13 @@ static int qede_vlan_filter_set(struct rte_eth_dev *eth_dev,
 
                SLIST_REMOVE(&qdev->vlan_list_head, tmp, qede_vlan_entry, list);
 
-               rc = qede_set_ucast_rx_vlan(qdev, QED_FILTER_XCAST_TYPE_DEL,
-                                           vlan_id);
-               if (rc) {
+               qede_set_ucast_cmn_params(&ucast);
+               ucast.opcode = ECORE_FILTER_REMOVE;
+               ucast.type = ECORE_FILTER_VLAN;
+               ucast.vlan = vlan_id;
+               rc = ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB,
+                                           NULL);
+               if (rc != 0) {
                        DP_ERR(edev, "Failed to delete VLAN %u rc %d\n",
                               vlan_id, rc);
                } else {
@@ -539,6 +788,54 @@ static int qede_init_vport(struct qede_dev *qdev)
        return 0;
 }
 
+static void qede_prandom_bytes(uint32_t *buff)
+{
+       uint8_t i;
+
+       srand((unsigned int)time(NULL));
+       for (i = 0; i < ECORE_RSS_KEY_SIZE; i++)
+               buff[i] = rand();
+}
+
+static int qede_config_rss(struct rte_eth_dev *eth_dev)
+{
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       uint32_t def_rss_key[ECORE_RSS_KEY_SIZE];
+       struct rte_eth_rss_reta_entry64 reta_conf[2];
+       struct rte_eth_rss_conf rss_conf;
+       uint32_t i, id, pos, q;
+
+       rss_conf = eth_dev->data->dev_conf.rx_adv_conf.rss_conf;
+       if (!rss_conf.rss_key) {
+               DP_INFO(edev, "Applying driver default key\n");
+               rss_conf.rss_key_len = ECORE_RSS_KEY_SIZE * sizeof(uint32_t);
+               qede_prandom_bytes(&def_rss_key[0]);
+               rss_conf.rss_key = (uint8_t *)&def_rss_key[0];
+       }
+
+       /* Configure RSS hash */
+       if (qede_rss_hash_update(eth_dev, &rss_conf))
+               return -EINVAL;
+
+       /* Configure default RETA */
+       memset(reta_conf, 0, sizeof(reta_conf));
+       for (i = 0; i < ECORE_RSS_IND_TABLE_SIZE; i++)
+               reta_conf[i / RTE_RETA_GROUP_SIZE].mask = UINT64_MAX;
+
+       for (i = 0; i < ECORE_RSS_IND_TABLE_SIZE; i++) {
+               id = i / RTE_RETA_GROUP_SIZE;
+               pos = i % RTE_RETA_GROUP_SIZE;
+               q = i % QEDE_RSS_COUNT(qdev);
+               reta_conf[id].reta[pos] = q;
+       }
+       if (qede_rss_reta_update(eth_dev, &reta_conf[0],
+                                ECORE_RSS_IND_TABLE_SIZE))
+               return -EINVAL;
+
+       return 0;
+}
+
 static int qede_dev_configure(struct rte_eth_dev *eth_dev)
 {
        struct qede_dev *qdev = eth_dev->data->dev_private;
@@ -607,6 +904,26 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
        if (rc != 0)
                return rc;
 
+       /* Do RSS configuration after vport-start */
+       switch (rxmode->mq_mode) {
+       case ETH_MQ_RX_RSS:
+               rc = qede_config_rss(eth_dev);
+               if (rc != 0) {
+                       qdev->ops->vport_stop(edev, 0);
+                       qede_dealloc_fp_resc(eth_dev);
+                       return -EINVAL;
+               }
+       break;
+       case ETH_MQ_RX_NONE:
+               DP_INFO(edev, "RSS is disabled\n");
+       break;
+       default:
+               DP_ERR(edev, "Unsupported RSS mode\n");
+               qdev->ops->vport_stop(edev, 0);
+               qede_dealloc_fp_resc(eth_dev);
+               return -EINVAL;
+       }
+
        SLIST_INIT(&qdev->vlan_list_head);
 
        /* Add primary mac for PF */
@@ -660,26 +977,25 @@ qede_dev_info_get(struct rte_eth_dev *eth_dev,
        dev_info->max_rx_queues = (uint16_t)QEDE_MAX_RSS_CNT(qdev);
        dev_info->max_tx_queues = dev_info->max_rx_queues;
        dev_info->max_mac_addrs = qdev->dev_info.num_mac_addrs;
-       if (IS_VF(edev))
-               dev_info->max_vfs = 0;
-       else
-               dev_info->max_vfs = (uint16_t)NUM_OF_VFS(&qdev->edev);
-       dev_info->driver_name = qdev->drv_ver;
+       dev_info->max_vfs = 0;
        dev_info->reta_size = ECORE_RSS_IND_TABLE_SIZE;
+       dev_info->hash_key_size = ECORE_RSS_KEY_SIZE * sizeof(uint32_t);
        dev_info->flow_type_rss_offloads = (uint64_t)QEDE_RSS_OFFLOAD_ALL;
 
        dev_info->default_txconf = (struct rte_eth_txconf) {
                .txq_flags = QEDE_TXQ_FLAGS,
        };
 
-       dev_info->rx_offload_capa = (DEV_RX_OFFLOAD_VLAN_STRIP |
-                                    DEV_RX_OFFLOAD_IPV4_CKSUM |
-                                    DEV_RX_OFFLOAD_UDP_CKSUM |
-                                    DEV_RX_OFFLOAD_TCP_CKSUM);
-       dev_info->tx_offload_capa = (DEV_TX_OFFLOAD_VLAN_INSERT |
-                                    DEV_TX_OFFLOAD_IPV4_CKSUM |
-                                    DEV_TX_OFFLOAD_UDP_CKSUM |
-                                    DEV_TX_OFFLOAD_TCP_CKSUM);
+       dev_info->rx_offload_capa = (DEV_RX_OFFLOAD_VLAN_STRIP  |
+                                    DEV_RX_OFFLOAD_IPV4_CKSUM  |
+                                    DEV_RX_OFFLOAD_UDP_CKSUM   |
+                                    DEV_RX_OFFLOAD_TCP_CKSUM   |
+                                    DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM);
+       dev_info->tx_offload_capa = (DEV_TX_OFFLOAD_VLAN_INSERT |
+                                    DEV_TX_OFFLOAD_IPV4_CKSUM  |
+                                    DEV_TX_OFFLOAD_UDP_CKSUM   |
+                                    DEV_TX_OFFLOAD_TCP_CKSUM   |
+                                    DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM);
 
        memset(&link, 0, sizeof(struct qed_link_output));
        qdev->ops->common->get_link(edev, &link);
@@ -743,22 +1059,6 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete)
        return ((curr->link_status == link.link_up) ? -1 : 0);
 }
 
-static void
-qede_rx_mode_setting(struct rte_eth_dev *eth_dev,
-                    enum qed_filter_rx_mode_type accept_flags)
-{
-       struct qede_dev *qdev = eth_dev->data->dev_private;
-       struct ecore_dev *edev = &qdev->edev;
-       struct qed_filter_params rx_mode;
-
-       DP_INFO(edev, "%s mode %u\n", __func__, accept_flags);
-
-       memset(&rx_mode, 0, sizeof(struct qed_filter_params));
-       rx_mode.type = QED_FILTER_TYPE_RX_MODE;
-       rx_mode.filter.accept_flags = accept_flags;
-       qdev->ops->filter_config(edev, &rx_mode);
-}
-
 static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev)
 {
        struct qede_dev *qdev = eth_dev->data->dev_private;
@@ -771,7 +1071,7 @@ static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev)
        if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1)
                type |= QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC;
 
-       qede_rx_mode_setting(eth_dev, type);
+       qed_configure_filter_rx_mode(eth_dev, type);
 }
 
 static void qede_promiscuous_disable(struct rte_eth_dev *eth_dev)
@@ -782,10 +1082,11 @@ static void qede_promiscuous_disable(struct rte_eth_dev *eth_dev)
        PMD_INIT_FUNC_TRACE(edev);
 
        if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1)
-               qede_rx_mode_setting(eth_dev,
-                                    QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC);
+               qed_configure_filter_rx_mode(eth_dev,
+                               QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC);
        else
-               qede_rx_mode_setting(eth_dev, QED_FILTER_RX_MODE_TYPE_REGULAR);
+               qed_configure_filter_rx_mode(eth_dev,
+                               QED_FILTER_RX_MODE_TYPE_REGULAR);
 }
 
 static void qede_poll_sp_sb_cb(void *param)
@@ -975,6 +1276,7 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
        for (i = 0; i < RTE_DIM(qede_xstats_strings); i++) {
                xstats[stat_idx].value = *(uint64_t *)(((char *)&stats) +
                                             qede_xstats_strings[i].offset);
+               xstats[stat_idx].id = stat_idx;
                stat_idx++;
        }
 
@@ -984,6 +1286,7 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
                                xstats[stat_idx].value = *(uint64_t *)(
                                        ((char *)(qdev->fp_array[(qid)].rxq)) +
                                         qede_rxq_xstats_strings[i].offset);
+                               xstats[stat_idx].id = stat_idx;
                                stat_idx++;
                        }
                }
@@ -1044,15 +1347,17 @@ static void qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
        if (rte_eth_promiscuous_get(eth_dev->data->port_id) == 1)
                type |= QED_FILTER_RX_MODE_TYPE_PROMISC;
 
-       qede_rx_mode_setting(eth_dev, type);
+       qed_configure_filter_rx_mode(eth_dev, type);
 }
 
 static void qede_allmulticast_disable(struct rte_eth_dev *eth_dev)
 {
        if (rte_eth_promiscuous_get(eth_dev->data->port_id) == 1)
-               qede_rx_mode_setting(eth_dev, QED_FILTER_RX_MODE_TYPE_PROMISC);
+               qed_configure_filter_rx_mode(eth_dev,
+                               QED_FILTER_RX_MODE_TYPE_PROMISC);
        else
-               qede_rx_mode_setting(eth_dev, QED_FILTER_RX_MODE_TYPE_REGULAR);
+               qed_configure_filter_rx_mode(eth_dev,
+                               QED_FILTER_RX_MODE_TYPE_REGULAR);
 }
 
 static int qede_flow_ctrl_set(struct rte_eth_dev *eth_dev,
@@ -1132,7 +1437,7 @@ qede_dev_supported_ptypes_get(struct rte_eth_dev *eth_dev)
        return NULL;
 }
 
-void qede_init_rss_caps(uint8_t *rss_caps, uint64_t hf)
+static void qede_init_rss_caps(uint8_t *rss_caps, uint64_t hf)
 {
        *rss_caps = 0;
        *rss_caps |= (hf & ETH_RSS_IPV4)              ? ECORE_RSS_IPV4 : 0;
@@ -1146,71 +1451,100 @@ void qede_init_rss_caps(uint8_t *rss_caps, uint64_t hf)
 static int qede_rss_hash_update(struct rte_eth_dev *eth_dev,
                                struct rte_eth_rss_conf *rss_conf)
 {
-       struct qed_update_vport_params vport_update_params;
-       struct qede_dev *qdev = eth_dev->data->dev_private;
-       struct ecore_dev *edev = &qdev->edev;
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct ecore_sp_vport_update_params vport_update_params;
+       struct ecore_rss_params rss_params;
+       struct ecore_rss_params params;
+       struct ecore_hwfn *p_hwfn;
        uint32_t *key = (uint32_t *)rss_conf->rss_key;
        uint64_t hf = rss_conf->rss_hf;
-       int i;
+       uint8_t len = rss_conf->rss_key_len;
+       uint8_t i;
+       int rc;
 
        memset(&vport_update_params, 0, sizeof(vport_update_params));
+       memset(&rss_params, 0, sizeof(rss_params));
+
+       DP_INFO(edev, "RSS hf = 0x%lx len = %u key = %p\n",
+               (unsigned long)hf, len, key);
 
        if (hf != 0) {
-               /* Enable RSS */
-               qede_init_rss_caps(&qdev->rss_params.rss_caps, hf);
-               memcpy(&vport_update_params.rss_params, &qdev->rss_params,
-                      sizeof(vport_update_params.rss_params));
-               if (key)
-                       memcpy(qdev->rss_params.rss_key, rss_conf->rss_key,
-                              rss_conf->rss_key_len);
-               vport_update_params.update_rss_flg = 1;
-               qdev->rss_enabled = 1;
-       } else {
-               /* Disable RSS */
-               qdev->rss_enabled = 0;
+               /* Enabling RSS */
+               DP_INFO(edev, "Enabling rss\n");
+
+               /* RSS caps */
+               qede_init_rss_caps(&rss_params.rss_caps, hf);
+               rss_params.update_rss_capabilities = 1;
+
+               /* RSS hash key */
+               if (key) {
+                       if (len > (ECORE_RSS_KEY_SIZE * sizeof(uint32_t))) {
+                               DP_ERR(edev, "RSS key length exceeds limit\n");
+                               return -EINVAL;
+                       }
+                       DP_INFO(edev, "Applying user supplied hash key\n");
+                       rss_params.update_rss_key = 1;
+                       memcpy(&rss_params.rss_key, key, len);
+               }
+               rss_params.rss_enable = 1;
        }
 
-       /* If the mapping doesn't fit any supported, return */
-       if (qdev->rss_params.rss_caps == 0 && hf != 0)
-               return -EINVAL;
-
-       DP_INFO(edev, "%s\n", (vport_update_params.update_rss_flg) ?
-                               "Enabling RSS" : "Disabling RSS");
-
+       rss_params.update_rss_config = 1;
+       /* tbl_size has to be set with capabilities */
+       rss_params.rss_table_size_log = 7;
        vport_update_params.vport_id = 0;
+       vport_update_params.rss_params = &rss_params;
 
-       return qdev->ops->vport_update(edev, &vport_update_params);
+       for_each_hwfn(edev, i) {
+               p_hwfn = &edev->hwfns[i];
+               vport_update_params.opaque_fid = p_hwfn->hw_info.opaque_fid;
+               rc = ecore_sp_vport_update(p_hwfn, &vport_update_params,
+                                          ECORE_SPQ_MODE_EBLOCK, NULL);
+               if (rc) {
+                       DP_ERR(edev, "vport-update for RSS failed\n");
+                       return rc;
+               }
+       }
+       qdev->rss_enable = rss_params.rss_enable;
+
+       /* Update local structure for hash query */
+       qdev->rss_conf.rss_hf = hf;
+       qdev->rss_conf.rss_key_len = len;
+       if (qdev->rss_enable) {
+               if  (qdev->rss_conf.rss_key == NULL) {
+                       qdev->rss_conf.rss_key = (uint8_t *)malloc(len);
+                       if (qdev->rss_conf.rss_key == NULL) {
+                               DP_ERR(edev, "No memory to store RSS key\n");
+                               return -ENOMEM;
+                       }
+               }
+               if (key && len) {
+                       DP_INFO(edev, "Storing RSS key\n");
+                       memcpy(qdev->rss_conf.rss_key, key, len);
+               }
+       } else if (!qdev->rss_enable && len == 0) {
+               if (qdev->rss_conf.rss_key) {
+                       free(qdev->rss_conf.rss_key);
+                       qdev->rss_conf.rss_key = NULL;
+                       DP_INFO(edev, "Free RSS key\n");
+               }
+       }
+
+       return 0;
 }
 
-int qede_rss_hash_conf_get(struct rte_eth_dev *eth_dev,
+static int qede_rss_hash_conf_get(struct rte_eth_dev *eth_dev,
                           struct rte_eth_rss_conf *rss_conf)
 {
-       struct qede_dev *qdev = eth_dev->data->dev_private;
-       uint64_t hf;
-
-       if (rss_conf->rss_key_len < sizeof(qdev->rss_params.rss_key))
-               return -EINVAL;
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
 
-       if (rss_conf->rss_key)
-               memcpy(rss_conf->rss_key, qdev->rss_params.rss_key,
-                      sizeof(qdev->rss_params.rss_key));
-
-       hf = 0;
-       hf |= (qdev->rss_params.rss_caps & ECORE_RSS_IPV4)     ?
-                       ETH_RSS_IPV4 : 0;
-       hf |= (qdev->rss_params.rss_caps & ECORE_RSS_IPV6)     ?
-                       ETH_RSS_IPV6 : 0;
-       hf |= (qdev->rss_params.rss_caps & ECORE_RSS_IPV6)     ?
-                       ETH_RSS_IPV6_EX : 0;
-       hf |= (qdev->rss_params.rss_caps & ECORE_RSS_IPV4_TCP) ?
-                       ETH_RSS_NONFRAG_IPV4_TCP : 0;
-       hf |= (qdev->rss_params.rss_caps & ECORE_RSS_IPV6_TCP) ?
-                       ETH_RSS_NONFRAG_IPV6_TCP : 0;
-       hf |= (qdev->rss_params.rss_caps & ECORE_RSS_IPV6_TCP) ?
-                       ETH_RSS_IPV6_TCP_EX : 0;
-
-       rss_conf->rss_hf = hf;
+       rss_conf->rss_hf = qdev->rss_conf.rss_hf;
+       rss_conf->rss_key_len = qdev->rss_conf.rss_key_len;
 
+       if (rss_conf->rss_key && qdev->rss_conf.rss_key)
+               memcpy(rss_conf->rss_key, qdev->rss_conf.rss_key,
+                      rss_conf->rss_key_len);
        return 0;
 }
 
@@ -1218,10 +1552,14 @@ static int qede_rss_reta_update(struct rte_eth_dev *eth_dev,
                                struct rte_eth_rss_reta_entry64 *reta_conf,
                                uint16_t reta_size)
 {
-       struct qed_update_vport_params vport_update_params;
-       struct qede_dev *qdev = eth_dev->data->dev_private;
-       struct ecore_dev *edev = &qdev->edev;
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct ecore_sp_vport_update_params vport_update_params;
+       struct ecore_rss_params params;
+       struct ecore_hwfn *p_hwfn;
        uint16_t i, idx, shift;
+       uint8_t entry;
+       int rc;
 
        if (reta_size > ETH_RSS_RETA_SIZE_128) {
                DP_ERR(edev, "reta_size %d is not supported by hardware\n",
@@ -1230,42 +1568,67 @@ static int qede_rss_reta_update(struct rte_eth_dev *eth_dev,
        }
 
        memset(&vport_update_params, 0, sizeof(vport_update_params));
-       memcpy(&vport_update_params.rss_params, &qdev->rss_params,
-              sizeof(vport_update_params.rss_params));
+       memset(&params, 0, sizeof(params));
 
        for (i = 0; i < reta_size; i++) {
                idx = i / RTE_RETA_GROUP_SIZE;
                shift = i % RTE_RETA_GROUP_SIZE;
                if (reta_conf[idx].mask & (1ULL << shift)) {
-                       uint8_t entry = reta_conf[idx].reta[shift];
-                       qdev->rss_params.rss_ind_table[i] = entry;
+                       entry = reta_conf[idx].reta[shift];
+                       params.rss_ind_table[i] = entry;
                }
        }
 
-       vport_update_params.update_rss_flg = 1;
+       /* Fix up RETA for CMT mode device */
+       if (edev->num_hwfns > 1)
+               qdev->rss_enable = qed_update_rss_parm_cmt(edev,
+                                       &params.rss_ind_table[0]);
+       params.update_rss_ind_table = 1;
+       params.rss_table_size_log = 7;
+       params.update_rss_config = 1;
        vport_update_params.vport_id = 0;
+       /* Use the current value of rss_enable */
+       params.rss_enable = qdev->rss_enable;
+       vport_update_params.rss_params = &params;
+
+       for_each_hwfn(edev, i) {
+               p_hwfn = &edev->hwfns[i];
+               vport_update_params.opaque_fid = p_hwfn->hw_info.opaque_fid;
+               rc = ecore_sp_vport_update(p_hwfn, &vport_update_params,
+                                          ECORE_SPQ_MODE_EBLOCK, NULL);
+               if (rc) {
+                       DP_ERR(edev, "vport-update for RSS failed\n");
+                       return rc;
+               }
+       }
 
-       return qdev->ops->vport_update(edev, &vport_update_params);
+       /* Update the local copy for RETA query command */
+       memcpy(qdev->rss_ind_table, params.rss_ind_table,
+              sizeof(params.rss_ind_table));
+
+       return 0;
 }
 
-int qede_rss_reta_query(struct rte_eth_dev *eth_dev,
-                       struct rte_eth_rss_reta_entry64 *reta_conf,
-                       uint16_t reta_size)
+static int qede_rss_reta_query(struct rte_eth_dev *eth_dev,
+                              struct rte_eth_rss_reta_entry64 *reta_conf,
+                              uint16_t reta_size)
 {
        struct qede_dev *qdev = eth_dev->data->dev_private;
+       struct ecore_dev *edev = &qdev->edev;
        uint16_t i, idx, shift;
+       uint8_t entry;
 
        if (reta_size > ETH_RSS_RETA_SIZE_128) {
-               struct ecore_dev *edev = &qdev->edev;
                DP_ERR(edev, "reta_size %d is not supported\n",
                       reta_size);
+               return -EINVAL;
        }
 
        for (i = 0; i < reta_size; i++) {
                idx = i / RTE_RETA_GROUP_SIZE;
                shift = i % RTE_RETA_GROUP_SIZE;
                if (reta_conf[idx].mask & (1ULL << shift)) {
-                       uint8_t entry = qdev->rss_params.rss_ind_table[i];
+                       entry = qdev->rss_ind_table[i];
                        reta_conf[idx].reta[shift] = entry;
                }
        }
@@ -1305,6 +1668,283 @@ int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
        return 0;
 }
 
+static int
+qede_conf_udp_dst_port(struct rte_eth_dev *eth_dev,
+                      struct rte_eth_udp_tunnel *tunnel_udp,
+                      bool add)
+{
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct ecore_tunn_update_params params;
+       struct ecore_hwfn *p_hwfn;
+       int rc, i;
+
+       PMD_INIT_FUNC_TRACE(edev);
+
+       memset(&params, 0, sizeof(params));
+       if (tunnel_udp->prot_type == RTE_TUNNEL_TYPE_VXLAN) {
+               params.update_vxlan_udp_port = 1;
+               params.vxlan_udp_port = (add) ? tunnel_udp->udp_port :
+                                       QEDE_VXLAN_DEF_PORT;
+               for_each_hwfn(edev, i) {
+                       p_hwfn = &edev->hwfns[i];
+                       rc = ecore_sp_pf_update_tunn_cfg(p_hwfn, &params,
+                                               ECORE_SPQ_MODE_CB, NULL);
+                       if (rc != ECORE_SUCCESS) {
+                               DP_ERR(edev, "Unable to config UDP port %u\n",
+                                       params.vxlan_udp_port);
+                               return rc;
+                       }
+               }
+       }
+
+       return 0;
+}
+
+int
+qede_udp_dst_port_del(struct rte_eth_dev *eth_dev,
+                     struct rte_eth_udp_tunnel *tunnel_udp)
+{
+       return qede_conf_udp_dst_port(eth_dev, tunnel_udp, false);
+}
+
+int
+qede_udp_dst_port_add(struct rte_eth_dev *eth_dev,
+                     struct rte_eth_udp_tunnel *tunnel_udp)
+{
+       return qede_conf_udp_dst_port(eth_dev, tunnel_udp, true);
+}
+
+static void qede_get_ecore_tunn_params(uint32_t filter, uint32_t *type,
+                                      uint32_t *clss, char *str)
+{
+       uint16_t j;
+       *clss = MAX_ECORE_TUNN_CLSS;
+
+       for (j = 0; j < RTE_DIM(qede_tunn_types); j++) {
+               if (filter == qede_tunn_types[j].rte_filter_type) {
+                       *type = qede_tunn_types[j].qede_type;
+                       *clss = qede_tunn_types[j].qede_tunn_clss;
+                       strcpy(str, qede_tunn_types[j].string);
+                       return;
+               }
+       }
+}
+
+static int
+qede_set_ucast_tunn_cmn_param(struct ecore_filter_ucast *ucast,
+                             const struct rte_eth_tunnel_filter_conf *conf,
+                             uint32_t type)
+{
+       /* Init commmon ucast params first */
+       qede_set_ucast_cmn_params(ucast);
+
+       /* Copy out the required fields based on classification type */
+       ucast->type = type;
+
+       switch (type) {
+       case ECORE_FILTER_VNI:
+               ucast->vni = conf->tenant_id;
+       break;
+       case ECORE_FILTER_INNER_VLAN:
+               ucast->vlan = conf->inner_vlan;
+       break;
+       case ECORE_FILTER_MAC:
+               memcpy(ucast->mac, conf->outer_mac.addr_bytes,
+                      ETHER_ADDR_LEN);
+       break;
+       case ECORE_FILTER_INNER_MAC:
+               memcpy(ucast->mac, conf->inner_mac.addr_bytes,
+                      ETHER_ADDR_LEN);
+       break;
+       case ECORE_FILTER_MAC_VNI_PAIR:
+               memcpy(ucast->mac, conf->outer_mac.addr_bytes,
+                       ETHER_ADDR_LEN);
+               ucast->vni = conf->tenant_id;
+       break;
+       case ECORE_FILTER_INNER_MAC_VNI_PAIR:
+               memcpy(ucast->mac, conf->inner_mac.addr_bytes,
+                       ETHER_ADDR_LEN);
+               ucast->vni = conf->tenant_id;
+       break;
+       case ECORE_FILTER_INNER_PAIR:
+               memcpy(ucast->mac, conf->inner_mac.addr_bytes,
+                       ETHER_ADDR_LEN);
+               ucast->vlan = conf->inner_vlan;
+       break;
+       default:
+               return -EINVAL;
+       }
+
+       return ECORE_SUCCESS;
+}
+
+static int qede_vxlan_tunn_config(struct rte_eth_dev *eth_dev,
+                                 enum rte_filter_op filter_op,
+                                 const struct rte_eth_tunnel_filter_conf *conf)
+{
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct ecore_tunn_update_params params;
+       struct ecore_hwfn *p_hwfn;
+       enum ecore_filter_ucast_type type;
+       enum ecore_tunn_clss clss;
+       struct ecore_filter_ucast ucast;
+       char str[80];
+       uint16_t filter_type;
+       int rc, i;
+
+       filter_type = conf->filter_type | qdev->vxlan_filter_type;
+       /* First determine if the given filter classification is supported */
+       qede_get_ecore_tunn_params(filter_type, &type, &clss, str);
+       if (clss == MAX_ECORE_TUNN_CLSS) {
+               DP_ERR(edev, "Wrong filter type\n");
+               return -EINVAL;
+       }
+       /* Init tunnel ucast params */
+       rc = qede_set_ucast_tunn_cmn_param(&ucast, conf, type);
+       if (rc != ECORE_SUCCESS) {
+               DP_ERR(edev, "Unsupported VxLAN filter type 0x%x\n",
+                               conf->filter_type);
+               return rc;
+       }
+       DP_INFO(edev, "Rule: \"%s\", op %d, type 0x%x\n",
+               str, filter_op, ucast.type);
+       switch (filter_op) {
+       case RTE_ETH_FILTER_ADD:
+               ucast.opcode = ECORE_FILTER_ADD;
+
+               /* Skip MAC/VLAN if filter is based on VNI */
+               if (!(filter_type & ETH_TUNNEL_FILTER_TENID)) {
+                       rc = qede_mac_int_ops(eth_dev, &ucast, 1);
+                       if (rc == 0) {
+                               /* Enable accept anyvlan */
+                               qede_config_accept_any_vlan(qdev, true);
+                       }
+               } else {
+                       rc = qede_ucast_filter(eth_dev, &ucast, 1);
+                       if (rc == 0)
+                               rc = ecore_filter_ucast_cmd(edev, &ucast,
+                                                   ECORE_SPQ_MODE_CB, NULL);
+               }
+
+               if (rc != ECORE_SUCCESS)
+                       return rc;
+
+               qdev->vxlan_filter_type = filter_type;
+
+               DP_INFO(edev, "Enabling VXLAN tunneling\n");
+               qede_set_cmn_tunn_param(&params, clss,
+                                       (1 << ECORE_MODE_VXLAN_TUNN),
+                                       (1 << ECORE_MODE_VXLAN_TUNN));
+               for_each_hwfn(edev, i) {
+                       p_hwfn = &edev->hwfns[i];
+                       rc = ecore_sp_pf_update_tunn_cfg(p_hwfn,
+                               &params, ECORE_SPQ_MODE_CB, NULL);
+                       if (rc != ECORE_SUCCESS) {
+                               DP_ERR(edev, "Failed to update tunn_clss %u\n",
+                                       params.tunn_clss_vxlan);
+                       }
+               }
+               qdev->num_tunn_filters++; /* Filter added successfully */
+       break;
+       case RTE_ETH_FILTER_DELETE:
+               ucast.opcode = ECORE_FILTER_REMOVE;
+
+               if (!(filter_type & ETH_TUNNEL_FILTER_TENID)) {
+                       rc = qede_mac_int_ops(eth_dev, &ucast, 0);
+               } else {
+                       rc = qede_ucast_filter(eth_dev, &ucast, 0);
+                       if (rc == 0)
+                               rc = ecore_filter_ucast_cmd(edev, &ucast,
+                                                   ECORE_SPQ_MODE_CB, NULL);
+               }
+               if (rc != ECORE_SUCCESS)
+                       return rc;
+
+               qdev->vxlan_filter_type = filter_type;
+               qdev->num_tunn_filters--;
+
+               /* Disable VXLAN if VXLAN filters become 0 */
+               if (qdev->num_tunn_filters == 0) {
+                       DP_INFO(edev, "Disabling VXLAN tunneling\n");
+
+                       /* Use 0 as tunnel mode */
+                       qede_set_cmn_tunn_param(&params, clss, 0,
+                                               (1 << ECORE_MODE_VXLAN_TUNN));
+                       for_each_hwfn(edev, i) {
+                               p_hwfn = &edev->hwfns[i];
+                               rc = ecore_sp_pf_update_tunn_cfg(p_hwfn,
+                                       &params, ECORE_SPQ_MODE_CB, NULL);
+                               if (rc != ECORE_SUCCESS) {
+                                       DP_ERR(edev,
+                                               "Failed to update tunn_clss %u\n",
+                                               params.tunn_clss_vxlan);
+                                       break;
+                               }
+                       }
+               }
+       break;
+       default:
+               DP_ERR(edev, "Unsupported operation %d\n", filter_op);
+               return -EINVAL;
+       }
+       DP_INFO(edev, "Current VXLAN filters %d\n", qdev->num_tunn_filters);
+
+       return 0;
+}
+
+int qede_dev_filter_ctrl(struct rte_eth_dev *eth_dev,
+                        enum rte_filter_type filter_type,
+                        enum rte_filter_op filter_op,
+                        void *arg)
+{
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       struct rte_eth_tunnel_filter_conf *filter_conf =
+                       (struct rte_eth_tunnel_filter_conf *)arg;
+
+       switch (filter_type) {
+       case RTE_ETH_FILTER_TUNNEL:
+               switch (filter_conf->tunnel_type) {
+               case RTE_TUNNEL_TYPE_VXLAN:
+                       DP_INFO(edev,
+                               "Packet steering to the specified Rx queue"
+                               " is not supported with VXLAN tunneling");
+                       return(qede_vxlan_tunn_config(eth_dev, filter_op,
+                                                     filter_conf));
+               /* Place holders for future tunneling support */
+               case RTE_TUNNEL_TYPE_GENEVE:
+               case RTE_TUNNEL_TYPE_TEREDO:
+               case RTE_TUNNEL_TYPE_NVGRE:
+               case RTE_TUNNEL_TYPE_IP_IN_GRE:
+               case RTE_L2_TUNNEL_TYPE_E_TAG:
+                       DP_ERR(edev, "Unsupported tunnel type %d\n",
+                               filter_conf->tunnel_type);
+                       return -EINVAL;
+               case RTE_TUNNEL_TYPE_NONE:
+               default:
+                       return 0;
+               }
+               break;
+       case RTE_ETH_FILTER_FDIR:
+       case RTE_ETH_FILTER_MACVLAN:
+       case RTE_ETH_FILTER_ETHERTYPE:
+       case RTE_ETH_FILTER_FLEXIBLE:
+       case RTE_ETH_FILTER_SYN:
+       case RTE_ETH_FILTER_NTUPLE:
+       case RTE_ETH_FILTER_HASH:
+       case RTE_ETH_FILTER_L2_TUNNEL:
+       case RTE_ETH_FILTER_MAX:
+       default:
+               DP_ERR(edev, "Unsupported filter type %d\n",
+                       filter_type);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 static const struct eth_dev_ops qede_eth_dev_ops = {
        .dev_configure = qede_dev_configure,
        .dev_infos_get = qede_dev_info_get,
@@ -1340,6 +1980,9 @@ static const struct eth_dev_ops qede_eth_dev_ops = {
        .reta_update  = qede_rss_reta_update,
        .reta_query  = qede_rss_reta_query,
        .mtu_set = qede_set_mtu,
+       .filter_ctrl = qede_dev_filter_ctrl,
+       .udp_tunnel_port_add = qede_udp_dst_port_add,
+       .udp_tunnel_port_del = qede_udp_dst_port_del,
 };
 
 static const struct eth_dev_ops qede_eth_vf_dev_ops = {