ethdev: make stats and xstats reset callbacks return int
[dpdk.git] / drivers / net / ice / ice_ethdev.c
index 9705d6f..46ed708 100644 (file)
 #include "base/ice_dcb.h"
 #include "ice_ethdev.h"
 #include "ice_rxtx.h"
+#include "ice_switch_filter.h"
+
+/* devargs */
+#define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
+
+static const char * const ice_valid_args[] = {
+       ICE_SAFE_MODE_SUPPORT_ARG,
+       NULL
+};
 
-#define ICE_MAX_QP_NUM "max_queue_pair_num"
 #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100
-#define ICE_DFLT_PKG_FILE "/lib/firmware/intel/ice/ddp/ice.pkg"
+
+/* DDP package search path */
+#define ICE_PKG_FILE_DEFAULT "/lib/firmware/intel/ice/ddp/ice.pkg"
+#define ICE_PKG_FILE_UPDATES "/lib/firmware/updates/intel/ice/ddp/ice.pkg"
+#define ICE_PKG_FILE_SEARCH_PATH_DEFAULT "/lib/firmware/intel/ice/ddp/"
+#define ICE_PKG_FILE_SEARCH_PATH_UPDATES "/lib/firmware/updates/intel/ice/ddp/"
+
+#define ICE_OS_DEFAULT_PKG_NAME                "ICE OS Default Package"
+#define ICE_COMMS_PKG_NAME                     "ICE COMMS Package"
+#define ICE_MAX_PKG_FILENAME_SIZE   256
 
 int ice_logtype_init;
 int ice_logtype_driver;
@@ -28,8 +45,8 @@ static int ice_dev_start(struct rte_eth_dev *dev);
 static void ice_dev_stop(struct rte_eth_dev *dev);
 static void ice_dev_close(struct rte_eth_dev *dev);
 static int ice_dev_reset(struct rte_eth_dev *dev);
-static void ice_dev_info_get(struct rte_eth_dev *dev,
-                            struct rte_eth_dev_info *dev_info);
+static int ice_dev_info_get(struct rte_eth_dev *dev,
+                           struct rte_eth_dev_info *dev_info);
 static int ice_link_update(struct rte_eth_dev *dev,
                           int wait_to_complete);
 static int ice_dev_set_link_up(struct rte_eth_dev *dev);
@@ -50,8 +67,8 @@ static int ice_rss_hash_update(struct rte_eth_dev *dev,
                               struct rte_eth_rss_conf *rss_conf);
 static int ice_rss_hash_conf_get(struct rte_eth_dev *dev,
                                 struct rte_eth_rss_conf *rss_conf);
-static void ice_promisc_enable(struct rte_eth_dev *dev);
-static void ice_promisc_disable(struct rte_eth_dev *dev);
+static int ice_promisc_enable(struct rte_eth_dev *dev);
+static int ice_promisc_disable(struct rte_eth_dev *dev);
 static void ice_allmulti_enable(struct rte_eth_dev *dev);
 static void ice_allmulti_disable(struct rte_eth_dev *dev);
 static int ice_vlan_filter_set(struct rte_eth_dev *dev,
@@ -77,12 +94,20 @@ static int ice_get_eeprom(struct rte_eth_dev *dev,
                          struct rte_dev_eeprom_info *eeprom);
 static int ice_stats_get(struct rte_eth_dev *dev,
                         struct rte_eth_stats *stats);
-static void ice_stats_reset(struct rte_eth_dev *dev);
+static int ice_stats_reset(struct rte_eth_dev *dev);
 static int ice_xstats_get(struct rte_eth_dev *dev,
                          struct rte_eth_xstat *xstats, unsigned int n);
 static int ice_xstats_get_names(struct rte_eth_dev *dev,
                                struct rte_eth_xstat_name *xstats_names,
                                unsigned int limit);
+static int ice_dev_filter_ctrl(struct rte_eth_dev *dev,
+                       enum rte_filter_type filter_type,
+                       enum rte_filter_op filter_op,
+                       void *arg);
+static int ice_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
+                       struct rte_eth_udp_tunnel *udp_tunnel);
+static int ice_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
+                       struct rte_eth_udp_tunnel *udp_tunnel);
 
 static const struct rte_pci_id pci_id_ice_map[] = {
        { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_BACKPLANE) },
@@ -141,6 +166,9 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
        .xstats_get                   = ice_xstats_get,
        .xstats_get_names             = ice_xstats_get_names,
        .xstats_reset                 = ice_stats_reset,
+       .filter_ctrl                  = ice_dev_filter_ctrl,
+       .udp_tunnel_port_add          = ice_dev_udp_tunnel_port_add,
+       .udp_tunnel_port_del          = ice_dev_udp_tunnel_port_del,
 };
 
 /* store statistics names and its offset in stats structure */
@@ -153,13 +181,13 @@ static const struct ice_xstats_name_off ice_stats_strings[] = {
        {"rx_unicast_packets", offsetof(struct ice_eth_stats, rx_unicast)},
        {"rx_multicast_packets", offsetof(struct ice_eth_stats, rx_multicast)},
        {"rx_broadcast_packets", offsetof(struct ice_eth_stats, rx_broadcast)},
-       {"rx_dropped", offsetof(struct ice_eth_stats, rx_discards)},
+       {"rx_dropped_packets", offsetof(struct ice_eth_stats, rx_discards)},
        {"rx_unknown_protocol_packets", offsetof(struct ice_eth_stats,
                rx_unknown_protocol)},
        {"tx_unicast_packets", offsetof(struct ice_eth_stats, tx_unicast)},
        {"tx_multicast_packets", offsetof(struct ice_eth_stats, tx_multicast)},
        {"tx_broadcast_packets", offsetof(struct ice_eth_stats, tx_broadcast)},
-       {"tx_dropped", offsetof(struct ice_eth_stats, tx_discards)},
+       {"tx_dropped_packets", offsetof(struct ice_eth_stats, tx_discards)},
 };
 
 #define ICE_NB_ETH_XSTATS (sizeof(ice_stats_strings) / \
@@ -238,59 +266,6 @@ ice_init_controlq_parameter(struct ice_hw *hw)
        hw->mailboxq.sq_buf_size = ICE_MAILBOXQ_BUF_SZ;
 }
 
-static int
-ice_check_qp_num(const char *key, const char *qp_value,
-                __rte_unused void *opaque)
-{
-       char *end = NULL;
-       int num = 0;
-
-       while (isblank(*qp_value))
-               qp_value++;
-
-       num = strtoul(qp_value, &end, 10);
-
-       if (!num || (*end == '-') || errno) {
-               PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", "
-                           "value must be > 0",
-                           qp_value, key);
-               return -1;
-       }
-
-       return num;
-}
-
-static int
-ice_config_max_queue_pair_num(struct rte_devargs *devargs)
-{
-       struct rte_kvargs *kvlist;
-       const char *queue_num_key = ICE_MAX_QP_NUM;
-       int ret;
-
-       if (!devargs)
-               return 0;
-
-       kvlist = rte_kvargs_parse(devargs->args, NULL);
-       if (!kvlist)
-               return 0;
-
-       if (!rte_kvargs_count(kvlist, queue_num_key)) {
-               rte_kvargs_free(kvlist);
-               return 0;
-       }
-
-       if (rte_kvargs_process(kvlist, queue_num_key,
-                              ice_check_qp_num, NULL) < 0) {
-               rte_kvargs_free(kvlist);
-               return 0;
-       }
-       ret = rte_kvargs_process(kvlist, queue_num_key,
-                                ice_check_qp_num, NULL);
-       rte_kvargs_free(kvlist);
-
-       return ret;
-}
-
 static int
 ice_res_pool_init(struct ice_res_pool_info *pool, uint32_t base,
                  uint32_t num)
@@ -1106,7 +1081,7 @@ ice_interrupt_handler(void *param)
 done:
        /* Enable interrupt */
        ice_pf_enable_irq0(hw);
-       rte_intr_enable(dev->intr_handle);
+       rte_intr_ack(dev->intr_handle);
 }
 
 /*  Initialize SW parameters of PF */
@@ -1116,13 +1091,9 @@ ice_pf_sw_init(struct rte_eth_dev *dev)
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct ice_hw *hw = ICE_PF_TO_HW(pf);
 
-       if (ice_config_max_queue_pair_num(dev->device->devargs) > 0)
-               pf->lan_nb_qp_max =
-                       ice_config_max_queue_pair_num(dev->device->devargs);
-       else
-               pf->lan_nb_qp_max =
-                       (uint16_t)RTE_MIN(hw->func_caps.common_cap.num_txq,
-                                         hw->func_caps.common_cap.num_rxq);
+       pf->lan_nb_qp_max =
+               (uint16_t)RTE_MIN(hw->func_caps.common_cap.num_txq,
+                                 hw->func_caps.common_cap.num_rxq);
 
        pf->lan_nb_qps = pf->lan_nb_qp_max;
 
@@ -1301,15 +1272,132 @@ ice_pf_setup(struct ice_pf *pf)
        return 0;
 }
 
+/* PCIe configuration space setting */
+#define PCI_CFG_SPACE_SIZE          256
+#define PCI_CFG_SPACE_EXP_SIZE      4096
+#define PCI_EXT_CAP_ID(header)      (int)((header) & 0x0000ffff)
+#define PCI_EXT_CAP_NEXT(header)    (((header) >> 20) & 0xffc)
+#define PCI_EXT_CAP_ID_DSN          0x03
+
+static int
+ice_pci_find_next_ext_capability(struct rte_pci_device *dev, int cap)
+{
+       uint32_t header;
+       int ttl;
+       int pos = PCI_CFG_SPACE_SIZE;
+
+       /* minimum 8 bytes per capability */
+       ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8;
+
+       if (rte_pci_read_config(dev, &header, 4, pos) < 0) {
+               PMD_INIT_LOG(ERR, "ice error reading extended capabilities\n");
+               return -1;
+       }
+
+       /*
+        * If we have no capabilities, this is indicated by cap ID,
+        * cap version and next pointer all being 0.
+        */
+       if (header == 0)
+               return 0;
+
+       while (ttl-- > 0) {
+               if (PCI_EXT_CAP_ID(header) == cap)
+                       return pos;
+
+               pos = PCI_EXT_CAP_NEXT(header);
+
+               if (pos < PCI_CFG_SPACE_SIZE)
+                       break;
+
+               if (rte_pci_read_config(dev, &header, 4, pos) < 0) {
+                       PMD_INIT_LOG(ERR, "ice error reading extended capabilities\n");
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
+/*
+ * Extract device serial number from PCIe Configuration Space and
+ * determine the pkg file path according to the DSN.
+ */
+static int
+ice_pkg_file_search_path(struct rte_pci_device *pci_dev, char *pkg_file)
+{
+       int pos;
+       char opt_ddp_filename[ICE_MAX_PKG_FILENAME_SIZE];
+       uint32_t dsn_low, dsn_high;
+       memset(opt_ddp_filename, 0, ICE_MAX_PKG_FILENAME_SIZE);
+
+       pos = ice_pci_find_next_ext_capability(pci_dev, PCI_EXT_CAP_ID_DSN);
+
+       if (pos) {
+               rte_pci_read_config(pci_dev, &dsn_low, 4, pos + 4);
+               rte_pci_read_config(pci_dev, &dsn_high, 4, pos + 8);
+               snprintf(opt_ddp_filename, ICE_MAX_PKG_FILENAME_SIZE,
+                        "ice-%08x%08x.pkg", dsn_high, dsn_low);
+       } else {
+               PMD_INIT_LOG(ERR, "Failed to read device serial number\n");
+               goto fail_dsn;
+       }
+
+       strncpy(pkg_file, ICE_PKG_FILE_SEARCH_PATH_UPDATES,
+               ICE_MAX_PKG_FILENAME_SIZE);
+       if (!access(strcat(pkg_file, opt_ddp_filename), 0))
+               return 0;
+
+       strncpy(pkg_file, ICE_PKG_FILE_SEARCH_PATH_DEFAULT,
+               ICE_MAX_PKG_FILENAME_SIZE);
+       if (!access(strcat(pkg_file, opt_ddp_filename), 0))
+               return 0;
+
+fail_dsn:
+       strncpy(pkg_file, ICE_PKG_FILE_UPDATES, ICE_MAX_PKG_FILENAME_SIZE);
+       if (!access(pkg_file, 0))
+               return 0;
+       strncpy(pkg_file, ICE_PKG_FILE_DEFAULT, ICE_MAX_PKG_FILENAME_SIZE);
+       return 0;
+}
+
+static enum ice_pkg_type
+ice_load_pkg_type(struct ice_hw *hw)
+{
+       enum ice_pkg_type package_type;
+
+       /* store the activated package type (OS default or Comms) */
+       if (!strncmp((char *)hw->active_pkg_name, ICE_OS_DEFAULT_PKG_NAME,
+               ICE_PKG_NAME_SIZE))
+               package_type = ICE_PKG_TYPE_OS_DEFAULT;
+       else if (!strncmp((char *)hw->active_pkg_name, ICE_COMMS_PKG_NAME,
+               ICE_PKG_NAME_SIZE))
+               package_type = ICE_PKG_TYPE_COMMS;
+       else
+               package_type = ICE_PKG_TYPE_UNKNOWN;
+
+       PMD_INIT_LOG(NOTICE, "Active package is: %d.%d.%d.%d, %s",
+               hw->active_pkg_ver.major, hw->active_pkg_ver.minor,
+               hw->active_pkg_ver.update, hw->active_pkg_ver.draft,
+               hw->active_pkg_name);
+
+       return package_type;
+}
+
 static int ice_load_pkg(struct rte_eth_dev *dev)
 {
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       const char *pkg_file = ICE_DFLT_PKG_FILE;
+       char pkg_file[ICE_MAX_PKG_FILENAME_SIZE];
        int err;
        uint8_t *buf;
        int buf_len;
        FILE *file;
        struct stat fstat;
+       struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
+       struct ice_adapter *ad =
+               ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+
+       ice_pkg_file_search_path(pci_dev, pkg_file);
 
        file = fopen(pkg_file, "rb");
        if (!file)  {
@@ -1349,6 +1437,10 @@ static int ice_load_pkg(struct rte_eth_dev *dev)
                PMD_INIT_LOG(ERR, "ice_copy_and_init_hw failed: %d\n", err);
                goto fail_exit;
        }
+
+       /* store the loaded pkg type info */
+       ad->active_pkg_type = ice_load_pkg_type(hw);
+
        err = ice_init_hw_tbls(hw);
        if (err) {
                PMD_INIT_LOG(ERR, "ice_init_hw_tbls failed: %d\n", err);
@@ -1364,6 +1456,97 @@ fail_exit:
        return err;
 }
 
+static void
+ice_base_queue_get(struct ice_pf *pf)
+{
+       uint32_t reg;
+       struct ice_hw *hw = ICE_PF_TO_HW(pf);
+
+       reg = ICE_READ_REG(hw, PFLAN_RX_QALLOC);
+       if (reg & PFLAN_RX_QALLOC_VALID_M) {
+               pf->base_queue = reg & PFLAN_RX_QALLOC_FIRSTQ_M;
+       } else {
+               PMD_INIT_LOG(WARNING, "Failed to get Rx base queue"
+                                       " index");
+       }
+}
+
+static int
+parse_bool(const char *key, const char *value, void *args)
+{
+       int *i = (int *)args;
+       char *end;
+       int num;
+
+       num = strtoul(value, &end, 10);
+
+       if (num != 0 && num != 1) {
+               PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", "
+                       "value must be 0 or 1",
+                       value, key);
+               return -1;
+       }
+
+       *i = num;
+       return 0;
+}
+
+static int ice_parse_devargs(struct rte_eth_dev *dev)
+{
+       struct ice_adapter *ad =
+               ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct rte_devargs *devargs = dev->device->devargs;
+       struct rte_kvargs *kvlist;
+       int ret;
+
+       if (devargs == NULL)
+               return 0;
+
+       kvlist = rte_kvargs_parse(devargs->args, ice_valid_args);
+       if (kvlist == NULL) {
+               PMD_INIT_LOG(ERR, "Invalid kvargs key\n");
+               return -EINVAL;
+       }
+
+       ret = rte_kvargs_process(kvlist, ICE_SAFE_MODE_SUPPORT_ARG,
+                                &parse_bool, &ad->devargs.safe_mode_support);
+
+       rte_kvargs_free(kvlist);
+       return ret;
+}
+
+/* Forward LLDP packets to default VSI by set switch rules */
+static int
+ice_vsi_config_sw_lldp(struct ice_vsi *vsi,  bool on)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_fltr_list_entry *s_list_itr = NULL;
+       struct LIST_HEAD_TYPE list_head;
+       int ret = 0;
+
+       INIT_LIST_HEAD(&list_head);
+
+       s_list_itr = (struct ice_fltr_list_entry *)
+                       ice_malloc(hw, sizeof(*s_list_itr));
+       if (!s_list_itr)
+               return -ENOMEM;
+       s_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_ETHERTYPE;
+       s_list_itr->fltr_info.vsi_handle = vsi->idx;
+       s_list_itr->fltr_info.l_data.ethertype_mac.ethertype =
+                       RTE_ETHER_TYPE_LLDP;
+       s_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI;
+       s_list_itr->fltr_info.flag = ICE_FLTR_RX;
+       s_list_itr->fltr_info.src_id = ICE_SRC_ID_LPORT;
+       LIST_ADD(&s_list_itr->list_entry, &list_head);
+       if (on)
+               ret = ice_add_eth_mac(hw, &list_head);
+       else
+               ret = ice_remove_eth_mac(hw, &list_head);
+
+       rte_free(s_list_itr);
+       return ret;
+}
+
 static int
 ice_dev_init(struct rte_eth_dev *dev)
 {
@@ -1381,6 +1564,15 @@ ice_dev_init(struct rte_eth_dev *dev)
        dev->tx_pkt_burst = ice_xmit_pkts;
        dev->tx_pkt_prepare = ice_prep_pkts;
 
+       /* for secondary processes, we don't initialise any further as primary
+        * has already done this work.
+        */
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+               ice_set_rx_function(dev);
+               ice_set_tx_function(dev);
+               return 0;
+       }
+
        ice_set_default_ptype_table(dev);
        pci_dev = RTE_DEV_TO_PCI(dev->device);
        intr_handle = &pci_dev->intr_handle;
@@ -1397,6 +1589,12 @@ ice_dev_init(struct rte_eth_dev *dev)
        hw->bus.device = pci_dev->addr.devid;
        hw->bus.func = pci_dev->addr.function;
 
+       ret = ice_parse_devargs(dev);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "Failed to parse devargs");
+               return -EINVAL;
+       }
+
        ice_init_controlq_parameter(hw);
 
        ret = ice_init_hw(hw);
@@ -1407,8 +1605,14 @@ ice_dev_init(struct rte_eth_dev *dev)
 
        ret = ice_load_pkg(dev);
        if (ret) {
+               if (ad->devargs.safe_mode_support == 0) {
+                       PMD_INIT_LOG(ERR, "Failed to load the DDP package,"
+                                       "Use safe-mode-support=1 to enter Safe Mode");
+                       return ret;
+               }
+
                PMD_INIT_LOG(WARNING, "Failed to load the DDP package,"
-                               "Entering Safe Mode");
+                                       "Entering Safe Mode");
                ad->is_safe_mode = 1;
        }
 
@@ -1447,10 +1651,16 @@ ice_dev_init(struct rte_eth_dev *dev)
        /* Disable double vlan by default */
        ice_vsi_config_double_vlan(vsi, FALSE);
 
-       ret = ice_aq_stop_lldp(hw, TRUE, NULL);
+       ret = ice_aq_stop_lldp(hw, TRUE, FALSE, NULL);
        if (ret != ICE_SUCCESS)
                PMD_INIT_LOG(DEBUG, "lldp has already stopped\n");
-
+       ret = ice_init_dcb(hw, TRUE);
+       if (ret != ICE_SUCCESS)
+               PMD_INIT_LOG(DEBUG, "Failed to init DCB\n");
+       /* Forward LLDP packets to default VSI */
+       ret = ice_vsi_config_sw_lldp(vsi, TRUE);
+       if (ret != ICE_SUCCESS)
+               PMD_INIT_LOG(DEBUG, "Failed to cfg lldp\n");
        /* register callback func to eal lib */
        rte_intr_callback_register(intr_handle,
                                   ice_interrupt_handler, dev);
@@ -1460,12 +1670,18 @@ ice_dev_init(struct rte_eth_dev *dev)
        /* enable uio intr after callback register */
        rte_intr_enable(intr_handle);
 
+       /* get base queue pairs index  in the device */
+       ice_base_queue_get(pf);
+
+       TAILQ_INIT(&pf->flow_list);
+
        return 0;
 
 err_pf_setup:
        ice_res_pool_destroy(&pf->msix_pool);
 err_msix_pool_init:
        rte_free(dev->data->mac_addrs);
+       dev->data->mac_addrs = NULL;
 err_init_mac:
        ice_sched_cleanup_all(hw);
        rte_free(hw->port_info);
@@ -1602,6 +1818,11 @@ ice_dev_uninit(struct rte_eth_dev *dev)
 {
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct rte_flow *p_flow;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
 
        ice_dev_close(dev);
 
@@ -1619,11 +1840,18 @@ ice_dev_uninit(struct rte_eth_dev *dev)
        rte_intr_callback_unregister(intr_handle,
                                     ice_interrupt_handler, dev);
 
+       /* Remove all flows */
+       while ((p_flow = TAILQ_FIRST(&pf->flow_list))) {
+               TAILQ_REMOVE(&pf->flow_list, p_flow, node);
+               ice_free_switch_filter_rule(p_flow->rule);
+               rte_free(p_flow);
+       }
+
        return 0;
 }
 
 static int
-ice_dev_configure(__rte_unused struct rte_eth_dev *dev)
+ice_dev_configure(struct rte_eth_dev *dev)
 {
        struct ice_adapter *ad =
                ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
@@ -2007,7 +2235,7 @@ ice_dev_reset(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -2127,6 +2355,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->default_txportconf.nb_queues = 1;
        dev_info->default_rxportconf.ring_size = ICE_BUF_SIZE_MIN;
        dev_info->default_txportconf.ring_size = ICE_BUF_SIZE_MIN;
+
+       return 0;
 }
 
 static inline int
@@ -2296,7 +2526,7 @@ ice_force_phys_link_state(struct ice_hw *hw, bool link_up)
        else
                cfg.caps &= ~ICE_AQ_PHY_ENA_LINK;
 
-       status = ice_aq_set_phy_cfg(hw, pi->lport, &cfg, NULL);
+       status = ice_aq_set_phy_cfg(hw, pi, &cfg, NULL);
 
 out:
        ice_free(hw, pcaps);
@@ -2873,7 +3103,7 @@ ice_rss_hash_conf_get(struct rte_eth_dev *dev,
        return 0;
 }
 
-static void
+static int
 ice_promisc_enable(struct rte_eth_dev *dev)
 {
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -2881,18 +3111,26 @@ ice_promisc_enable(struct rte_eth_dev *dev)
        struct ice_vsi *vsi = pf->main_vsi;
        enum ice_status status;
        uint8_t pmask;
+       int ret = 0;
 
        pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX |
                ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
 
        status = ice_set_vsi_promisc(hw, vsi->idx, pmask, 0);
-       if (status == ICE_ERR_ALREADY_EXISTS)
+       switch (status) {
+       case ICE_ERR_ALREADY_EXISTS:
                PMD_DRV_LOG(DEBUG, "Promisc mode has already been enabled");
-       else if (status != ICE_SUCCESS)
+       case ICE_SUCCESS:
+               break;
+       default:
                PMD_DRV_LOG(ERR, "Failed to enable promisc, err=%d", status);
+               ret = -EAGAIN;
+       }
+
+       return ret;
 }
 
-static void
+static int
 ice_promisc_disable(struct rte_eth_dev *dev)
 {
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -2900,13 +3138,18 @@ ice_promisc_disable(struct rte_eth_dev *dev)
        struct ice_vsi *vsi = pf->main_vsi;
        enum ice_status status;
        uint8_t pmask;
+       int ret = 0;
 
        pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX |
                ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
 
        status = ice_clear_vsi_promisc(hw, vsi->idx, pmask, 0);
-       if (status != ICE_SUCCESS)
+       if (status != ICE_SUCCESS) {
                PMD_DRV_LOG(ERR, "Failed to clear promisc, err=%d", status);
+               ret = -EAGAIN;
+       }
+
+       return ret;
 }
 
 static void
@@ -2960,7 +3203,7 @@ static int ice_rx_queue_intr_enable(struct rte_eth_dev *dev,
        val &= ~GLINT_DYN_CTL_WB_ON_ITR_M;
 
        ICE_WRITE_REG(hw, GLINT_DYN_CTL(msix_intr), val);
-       rte_intr_enable(&pci_dev->intr_handle);
+       rte_intr_ack(&pci_dev->intr_handle);
 
        return 0;
 }
@@ -3507,7 +3750,7 @@ ice_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 }
 
 /* Reset the statistics */
-static void
+static int
 ice_stats_reset(struct rte_eth_dev *dev)
 {
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -3520,6 +3763,8 @@ ice_stats_reset(struct rte_eth_dev *dev)
 
        /* read the stats, reading current register values into offset */
        ice_read_stats_registers(pf, hw);
+
+       return 0;
 }
 
 static uint32_t
@@ -3603,6 +3848,81 @@ static int ice_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
        return count;
 }
 
+static int
+ice_dev_filter_ctrl(struct rte_eth_dev *dev,
+                    enum rte_filter_type filter_type,
+                    enum rte_filter_op filter_op,
+                    void *arg)
+{
+       int ret = 0;
+
+       if (!dev)
+               return -EINVAL;
+
+       switch (filter_type) {
+       case RTE_ETH_FILTER_GENERIC:
+               if (filter_op != RTE_ETH_FILTER_GET)
+                       return -EINVAL;
+               *(const void **)arg = &ice_flow_ops;
+               break;
+       default:
+               PMD_DRV_LOG(WARNING, "Filter type (%d) not supported",
+                                       filter_type);
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+/* Add UDP tunneling port */
+static int
+ice_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
+                            struct rte_eth_udp_tunnel *udp_tunnel)
+{
+       int ret = 0;
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       if (udp_tunnel == NULL)
+               return -EINVAL;
+
+       switch (udp_tunnel->prot_type) {
+       case RTE_TUNNEL_TYPE_VXLAN:
+               ret = ice_create_tunnel(hw, TNL_VXLAN, udp_tunnel->udp_port);
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "Invalid tunnel type");
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+/* Delete UDP tunneling port */
+static int
+ice_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
+                            struct rte_eth_udp_tunnel *udp_tunnel)
+{
+       int ret = 0;
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       if (udp_tunnel == NULL)
+               return -EINVAL;
+
+       switch (udp_tunnel->prot_type) {
+       case RTE_TUNNEL_TYPE_VXLAN:
+               ret = ice_destroy_tunnel(hw, udp_tunnel->udp_port, 0);
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "Invalid tunnel type");
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
 static int
 ice_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
              struct rte_pci_device *pci_dev)
@@ -3620,8 +3940,7 @@ ice_pci_remove(struct rte_pci_device *pci_dev)
 
 static struct rte_pci_driver rte_ice_pmd = {
        .id_table = pci_id_ice_map,
-       .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
-                    RTE_PCI_DRV_IOVA_AS_VA,
+       .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
        .probe = ice_pci_probe,
        .remove = ice_pci_remove,
 };
@@ -3635,7 +3954,7 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(net_ice,
-                             ICE_MAX_QP_NUM "=<int>");
+                             ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>");
 
 RTE_INIT(ice_init_log)
 {