net/ice: support advance Rx/Tx
[dpdk.git] / drivers / net / ice / ice_ethdev.c
index eed0c30..c0c530f 100644 (file)
@@ -23,6 +23,42 @@ static void 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_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
+static int ice_vlan_offload_set(struct rte_eth_dev *dev, int mask);
+static int ice_vlan_tpid_set(struct rte_eth_dev *dev,
+                            enum rte_vlan_type vlan_type,
+                            uint16_t tpid);
+static int ice_rss_reta_update(struct rte_eth_dev *dev,
+                              struct rte_eth_rss_reta_entry64 *reta_conf,
+                              uint16_t reta_size);
+static int ice_rss_reta_query(struct rte_eth_dev *dev,
+                             struct rte_eth_rss_reta_entry64 *reta_conf,
+                             uint16_t reta_size);
+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 int ice_vlan_filter_set(struct rte_eth_dev *dev,
+                              uint16_t vlan_id,
+                              int on);
+static int ice_macaddr_set(struct rte_eth_dev *dev,
+                          struct ether_addr *mac_addr);
+static int ice_macaddr_add(struct rte_eth_dev *dev,
+                          struct ether_addr *mac_addr,
+                          __rte_unused uint32_t index,
+                          uint32_t pool);
+static void ice_macaddr_remove(struct rte_eth_dev *dev, uint32_t index);
+static int ice_rx_queue_intr_enable(struct rte_eth_dev *dev,
+                                   uint16_t queue_id);
+static int ice_rx_queue_intr_disable(struct rte_eth_dev *dev,
+                                    uint16_t queue_id);
+static int ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
+                             size_t fw_size);
+static int ice_vlan_pvid_set(struct rte_eth_dev *dev,
+                            uint16_t pvid, int on);
+static int ice_get_eeprom_length(struct rte_eth_dev *dev);
+static int ice_get_eeprom(struct rte_eth_dev *dev,
+                         struct rte_dev_eeprom_info *eeprom);
 
 static const struct rte_pci_id pci_id_ice_map[] = {
        { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_BACKPLANE) },
@@ -48,8 +84,25 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
        .dev_infos_get                = ice_dev_info_get,
        .dev_supported_ptypes_get     = ice_dev_supported_ptypes_get,
        .link_update                  = ice_link_update,
+       .mtu_set                      = ice_mtu_set,
+       .mac_addr_set                 = ice_macaddr_set,
+       .mac_addr_add                 = ice_macaddr_add,
+       .mac_addr_remove              = ice_macaddr_remove,
+       .vlan_filter_set              = ice_vlan_filter_set,
+       .vlan_offload_set             = ice_vlan_offload_set,
+       .vlan_tpid_set                = ice_vlan_tpid_set,
+       .reta_update                  = ice_rss_reta_update,
+       .reta_query                   = ice_rss_reta_query,
+       .rss_hash_update              = ice_rss_hash_update,
+       .rss_hash_conf_get            = ice_rss_hash_conf_get,
+       .rx_queue_intr_enable         = ice_rx_queue_intr_enable,
+       .rx_queue_intr_disable        = ice_rx_queue_intr_disable,
+       .fw_version_get               = ice_fw_version_get,
+       .vlan_pvid_set                = ice_vlan_pvid_set,
        .rxq_info_get                 = ice_rxq_info_get,
        .txq_info_get                 = ice_txq_info_get,
+       .get_eeprom_length            = ice_get_eeprom_length,
+       .get_eeprom                   = ice_get_eeprom,
        .rx_queue_count               = ice_rx_queue_count,
 };
 
@@ -337,6 +390,421 @@ ice_init_mac_address(struct rte_eth_dev *dev)
        return 0;
 }
 
+/* Find out specific MAC filter */
+static struct ice_mac_filter *
+ice_find_mac_filter(struct ice_vsi *vsi, struct ether_addr *macaddr)
+{
+       struct ice_mac_filter *f;
+
+       TAILQ_FOREACH(f, &vsi->mac_list, next) {
+               if (is_same_ether_addr(macaddr, &f->mac_info.mac_addr))
+                       return f;
+       }
+
+       return NULL;
+}
+
+static int
+ice_add_mac_filter(struct ice_vsi *vsi, struct ether_addr *mac_addr)
+{
+       struct ice_fltr_list_entry *m_list_itr = NULL;
+       struct ice_mac_filter *f;
+       struct LIST_HEAD_TYPE list_head;
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret = 0;
+
+       /* If it's added and configured, return */
+       f = ice_find_mac_filter(vsi, mac_addr);
+       if (f) {
+               PMD_DRV_LOG(INFO, "This MAC filter already exists.");
+               return 0;
+       }
+
+       INIT_LIST_HEAD(&list_head);
+
+       m_list_itr = (struct ice_fltr_list_entry *)
+               ice_malloc(hw, sizeof(*m_list_itr));
+       if (!m_list_itr) {
+               ret = -ENOMEM;
+               goto DONE;
+       }
+       ice_memcpy(m_list_itr->fltr_info.l_data.mac.mac_addr,
+                  mac_addr, ETH_ALEN, ICE_NONDMA_TO_NONDMA);
+       m_list_itr->fltr_info.src_id = ICE_SRC_ID_VSI;
+       m_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI;
+       m_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_MAC;
+       m_list_itr->fltr_info.flag = ICE_FLTR_TX;
+       m_list_itr->fltr_info.vsi_handle = vsi->idx;
+
+       LIST_ADD(&m_list_itr->list_entry, &list_head);
+
+       /* Add the mac */
+       ret = ice_add_mac(hw, &list_head);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR, "Failed to add MAC filter");
+               ret = -EINVAL;
+               goto DONE;
+       }
+       /* Add the mac addr into mac list */
+       f = rte_zmalloc(NULL, sizeof(*f), 0);
+       if (!f) {
+               PMD_DRV_LOG(ERR, "failed to allocate memory");
+               ret = -ENOMEM;
+               goto DONE;
+       }
+       rte_memcpy(&f->mac_info.mac_addr, mac_addr, ETH_ADDR_LEN);
+       TAILQ_INSERT_TAIL(&vsi->mac_list, f, next);
+       vsi->mac_num++;
+
+       ret = 0;
+
+DONE:
+       rte_free(m_list_itr);
+       return ret;
+}
+
+static int
+ice_remove_mac_filter(struct ice_vsi *vsi, struct ether_addr *mac_addr)
+{
+       struct ice_fltr_list_entry *m_list_itr = NULL;
+       struct ice_mac_filter *f;
+       struct LIST_HEAD_TYPE list_head;
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret = 0;
+
+       /* Can't find it, return an error */
+       f = ice_find_mac_filter(vsi, mac_addr);
+       if (!f)
+               return -EINVAL;
+
+       INIT_LIST_HEAD(&list_head);
+
+       m_list_itr = (struct ice_fltr_list_entry *)
+               ice_malloc(hw, sizeof(*m_list_itr));
+       if (!m_list_itr) {
+               ret = -ENOMEM;
+               goto DONE;
+       }
+       ice_memcpy(m_list_itr->fltr_info.l_data.mac.mac_addr,
+                  mac_addr, ETH_ALEN, ICE_NONDMA_TO_NONDMA);
+       m_list_itr->fltr_info.src_id = ICE_SRC_ID_VSI;
+       m_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI;
+       m_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_MAC;
+       m_list_itr->fltr_info.flag = ICE_FLTR_TX;
+       m_list_itr->fltr_info.vsi_handle = vsi->idx;
+
+       LIST_ADD(&m_list_itr->list_entry, &list_head);
+
+       /* remove the mac filter */
+       ret = ice_remove_mac(hw, &list_head);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR, "Failed to remove MAC filter");
+               ret = -EINVAL;
+               goto DONE;
+       }
+
+       /* Remove the mac addr from mac list */
+       TAILQ_REMOVE(&vsi->mac_list, f, next);
+       rte_free(f);
+       vsi->mac_num--;
+
+       ret = 0;
+DONE:
+       rte_free(m_list_itr);
+       return ret;
+}
+
+/* Find out specific VLAN filter */
+static struct ice_vlan_filter *
+ice_find_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
+{
+       struct ice_vlan_filter *f;
+
+       TAILQ_FOREACH(f, &vsi->vlan_list, next) {
+               if (vlan_id == f->vlan_info.vlan_id)
+                       return f;
+       }
+
+       return NULL;
+}
+
+static int
+ice_add_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
+{
+       struct ice_fltr_list_entry *v_list_itr = NULL;
+       struct ice_vlan_filter *f;
+       struct LIST_HEAD_TYPE list_head;
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret = 0;
+
+       if (!vsi || vlan_id > ETHER_MAX_VLAN_ID)
+               return -EINVAL;
+
+       /* If it's added and configured, return. */
+       f = ice_find_vlan_filter(vsi, vlan_id);
+       if (f) {
+               PMD_DRV_LOG(INFO, "This VLAN filter already exists.");
+               return 0;
+       }
+
+       if (!vsi->vlan_anti_spoof_on && !vsi->vlan_filter_on)
+               return 0;
+
+       INIT_LIST_HEAD(&list_head);
+
+       v_list_itr = (struct ice_fltr_list_entry *)
+                     ice_malloc(hw, sizeof(*v_list_itr));
+       if (!v_list_itr) {
+               ret = -ENOMEM;
+               goto DONE;
+       }
+       v_list_itr->fltr_info.l_data.vlan.vlan_id = vlan_id;
+       v_list_itr->fltr_info.src_id = ICE_SRC_ID_VSI;
+       v_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI;
+       v_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_VLAN;
+       v_list_itr->fltr_info.flag = ICE_FLTR_TX;
+       v_list_itr->fltr_info.vsi_handle = vsi->idx;
+
+       LIST_ADD(&v_list_itr->list_entry, &list_head);
+
+       /* Add the vlan */
+       ret = ice_add_vlan(hw, &list_head);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR, "Failed to add VLAN filter");
+               ret = -EINVAL;
+               goto DONE;
+       }
+
+       /* Add vlan into vlan list */
+       f = rte_zmalloc(NULL, sizeof(*f), 0);
+       if (!f) {
+               PMD_DRV_LOG(ERR, "failed to allocate memory");
+               ret = -ENOMEM;
+               goto DONE;
+       }
+       f->vlan_info.vlan_id = vlan_id;
+       TAILQ_INSERT_TAIL(&vsi->vlan_list, f, next);
+       vsi->vlan_num++;
+
+       ret = 0;
+
+DONE:
+       rte_free(v_list_itr);
+       return ret;
+}
+
+static int
+ice_remove_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
+{
+       struct ice_fltr_list_entry *v_list_itr = NULL;
+       struct ice_vlan_filter *f;
+       struct LIST_HEAD_TYPE list_head;
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret = 0;
+
+       /**
+        * Vlan 0 is the generic filter for untagged packets
+        * and can't be removed.
+        */
+       if (!vsi || vlan_id == 0 || vlan_id > ETHER_MAX_VLAN_ID)
+               return -EINVAL;
+
+       /* Can't find it, return an error */
+       f = ice_find_vlan_filter(vsi, vlan_id);
+       if (!f)
+               return -EINVAL;
+
+       INIT_LIST_HEAD(&list_head);
+
+       v_list_itr = (struct ice_fltr_list_entry *)
+                     ice_malloc(hw, sizeof(*v_list_itr));
+       if (!v_list_itr) {
+               ret = -ENOMEM;
+               goto DONE;
+       }
+
+       v_list_itr->fltr_info.l_data.vlan.vlan_id = vlan_id;
+       v_list_itr->fltr_info.src_id = ICE_SRC_ID_VSI;
+       v_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI;
+       v_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_VLAN;
+       v_list_itr->fltr_info.flag = ICE_FLTR_TX;
+       v_list_itr->fltr_info.vsi_handle = vsi->idx;
+
+       LIST_ADD(&v_list_itr->list_entry, &list_head);
+
+       /* remove the vlan filter */
+       ret = ice_remove_vlan(hw, &list_head);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR, "Failed to remove VLAN filter");
+               ret = -EINVAL;
+               goto DONE;
+       }
+
+       /* Remove the vlan id from vlan list */
+       TAILQ_REMOVE(&vsi->vlan_list, f, next);
+       rte_free(f);
+       vsi->vlan_num--;
+
+       ret = 0;
+DONE:
+       rte_free(v_list_itr);
+       return ret;
+}
+
+static int
+ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
+{
+       struct ice_mac_filter *m_f;
+       struct ice_vlan_filter *v_f;
+       int ret = 0;
+
+       if (!vsi || !vsi->mac_num)
+               return -EINVAL;
+
+       TAILQ_FOREACH(m_f, &vsi->mac_list, next) {
+               ret = ice_remove_mac_filter(vsi, &m_f->mac_info.mac_addr);
+               if (ret != ICE_SUCCESS) {
+                       ret = -EINVAL;
+                       goto DONE;
+               }
+       }
+
+       if (vsi->vlan_num == 0)
+               return 0;
+
+       TAILQ_FOREACH(v_f, &vsi->vlan_list, next) {
+               ret = ice_remove_vlan_filter(vsi, v_f->vlan_info.vlan_id);
+               if (ret != ICE_SUCCESS) {
+                       ret = -EINVAL;
+                       goto DONE;
+               }
+       }
+
+DONE:
+       return ret;
+}
+
+static int
+ice_vsi_config_qinq_insertion(struct ice_vsi *vsi, bool on)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_vsi_ctx ctxt;
+       uint8_t qinq_flags;
+       int ret = 0;
+
+       /* Check if it has been already on or off */
+       if (vsi->info.valid_sections &
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID)) {
+               if (on) {
+                       if ((vsi->info.outer_tag_flags &
+                            ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST) ==
+                           ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST)
+                               return 0; /* already on */
+               } else {
+                       if (!(vsi->info.outer_tag_flags &
+                             ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST))
+                               return 0; /* already off */
+               }
+       }
+
+       if (on)
+               qinq_flags = ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST;
+       else
+               qinq_flags = 0;
+       /* clear global insertion and use per packet insertion */
+       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_INSERT);
+       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST);
+       vsi->info.outer_tag_flags |= qinq_flags;
+       /* use default vlan type 0x8100 */
+       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);
+       vsi->info.outer_tag_flags |= ICE_DFLT_OUTER_TAG_TYPE <<
+                                    ICE_AQ_VSI_OUTER_TAG_TYPE_S;
+       (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
+       ctxt.info.valid_sections =
+                       rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);
+       ctxt.vsi_num = vsi->vsi_id;
+       ret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);
+       if (ret) {
+               PMD_DRV_LOG(INFO,
+                           "Update VSI failed to %s qinq stripping",
+                           on ? "enable" : "disable");
+               return -EINVAL;
+       }
+
+       vsi->info.valid_sections |=
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);
+
+       return ret;
+}
+
+static int
+ice_vsi_config_qinq_stripping(struct ice_vsi *vsi, bool on)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_vsi_ctx ctxt;
+       uint8_t qinq_flags;
+       int ret = 0;
+
+       /* Check if it has been already on or off */
+       if (vsi->info.valid_sections &
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID)) {
+               if (on) {
+                       if ((vsi->info.outer_tag_flags &
+                            ICE_AQ_VSI_OUTER_TAG_MODE_M) ==
+                           ICE_AQ_VSI_OUTER_TAG_COPY)
+                               return 0; /* already on */
+               } else {
+                       if ((vsi->info.outer_tag_flags &
+                            ICE_AQ_VSI_OUTER_TAG_MODE_M) ==
+                           ICE_AQ_VSI_OUTER_TAG_NOTHING)
+                               return 0; /* already off */
+               }
+       }
+
+       if (on)
+               qinq_flags = ICE_AQ_VSI_OUTER_TAG_COPY;
+       else
+               qinq_flags = ICE_AQ_VSI_OUTER_TAG_NOTHING;
+       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_MODE_M);
+       vsi->info.outer_tag_flags |= qinq_flags;
+       /* use default vlan type 0x8100 */
+       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);
+       vsi->info.outer_tag_flags |= ICE_DFLT_OUTER_TAG_TYPE <<
+                                    ICE_AQ_VSI_OUTER_TAG_TYPE_S;
+       (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
+       ctxt.info.valid_sections =
+                       rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);
+       ctxt.vsi_num = vsi->vsi_id;
+       ret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);
+       if (ret) {
+               PMD_DRV_LOG(INFO,
+                           "Update VSI failed to %s qinq stripping",
+                           on ? "enable" : "disable");
+               return -EINVAL;
+       }
+
+       vsi->info.valid_sections |=
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);
+
+       return ret;
+}
+
+static int
+ice_vsi_config_double_vlan(struct ice_vsi *vsi, int on)
+{
+       int ret;
+
+       ret = ice_vsi_config_qinq_stripping(vsi, on);
+       if (ret)
+               PMD_DRV_LOG(ERR, "Fail to set qinq stripping - %d", ret);
+
+       ret = ice_vsi_config_qinq_insertion(vsi, on);
+       if (ret)
+               PMD_DRV_LOG(ERR, "Fail to set qinq insertion - %d", ret);
+
+       return ret;
+}
+
 /* Enable IRQ0 */
 static void
 ice_pf_enable_irq0(struct ice_hw *hw)
@@ -545,6 +1013,9 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
        struct ice_vsi *vsi = NULL;
        struct ice_vsi_ctx vsi_ctx;
        int ret;
+       struct ether_addr broadcast = {
+               .addr_bytes = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff} };
+       struct ether_addr mac_addr;
        uint16_t max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };
        uint8_t tc_bitmap = 0x1;
 
@@ -630,6 +1101,21 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
        pf->vsis_allocated = vsi_ctx.vsis_allocd;
        pf->vsis_unallocated = vsi_ctx.vsis_unallocated;
 
+       /* MAC configuration */
+       rte_memcpy(pf->dev_addr.addr_bytes,
+                  hw->port_info->mac.perm_addr,
+                  ETH_ADDR_LEN);
+
+       rte_memcpy(&mac_addr, &pf->dev_addr, ETHER_ADDR_LEN);
+       ret = ice_add_mac_filter(vsi, &mac_addr);
+       if (ret != ICE_SUCCESS)
+               PMD_INIT_LOG(ERR, "Failed to add dflt MAC filter");
+
+       rte_memcpy(&mac_addr, &broadcast, ETHER_ADDR_LEN);
+       ret = ice_add_mac_filter(vsi, &mac_addr);
+       if (ret != ICE_SUCCESS)
+               PMD_INIT_LOG(ERR, "Failed to add MAC filter");
+
        /* At the beginning, only TC0. */
        /* What we need here is the maximam number of the TX queues.
         * Currently vsi->nb_qps means it.
@@ -678,6 +1164,7 @@ ice_dev_init(struct rte_eth_dev *dev)
        struct rte_intr_handle *intr_handle;
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi;
        int ret;
 
        dev->dev_ops = &ice_eth_dev_ops;
@@ -733,6 +1220,11 @@ ice_dev_init(struct rte_eth_dev *dev)
                goto err_pf_setup;
        }
 
+       vsi = pf->main_vsi;
+
+       /* Disable double vlan by default */
+       ice_vsi_config_double_vlan(vsi, FALSE);
+
        /* register callback func to eal lib */
        rte_intr_callback_register(intr_handle,
                                   ice_interrupt_handler, dev);
@@ -768,6 +1260,8 @@ ice_release_vsi(struct ice_vsi *vsi)
 
        hw = ICE_VSI_TO_HW(vsi);
 
+       ice_remove_all_mac_vlan_filters(vsi);
+
        memset(&vsi_ctx, 0, sizeof(vsi_ctx));
 
        vsi_ctx.vsi_num = vsi->vsi_id;
@@ -783,11 +1277,40 @@ ice_release_vsi(struct ice_vsi *vsi)
        return 0;
 }
 
+static void
+ice_vsi_disable_queues_intr(struct ice_vsi *vsi)
+{
+       struct rte_eth_dev *dev = vsi->adapter->eth_dev;
+       struct rte_pci_device *pci_dev = ICE_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       uint16_t msix_intr, i;
+
+       /* disable interrupt and also clear all the exist config */
+       for (i = 0; i < vsi->nb_qps; i++) {
+               ICE_WRITE_REG(hw, QINT_TQCTL(vsi->base_queue + i), 0);
+               ICE_WRITE_REG(hw, QINT_RQCTL(vsi->base_queue + i), 0);
+               rte_wmb();
+       }
+
+       if (rte_intr_allow_others(intr_handle))
+               /* vfio-pci */
+               for (i = 0; i < vsi->nb_msix; i++) {
+                       msix_intr = vsi->msix_intr + i;
+                       ICE_WRITE_REG(hw, GLINT_DYN_CTL(msix_intr),
+                                     GLINT_DYN_CTL_WB_ON_ITR_M);
+               }
+       else
+               /* igb_uio */
+               ICE_WRITE_REG(hw, GLINT_DYN_CTL(0), GLINT_DYN_CTL_WB_ON_ITR_M);
+}
+
 static void
 ice_dev_stop(struct rte_eth_dev *dev)
 {
        struct rte_eth_dev_data *data = dev->data;
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *main_vsi = pf->main_vsi;
        struct rte_pci_device *pci_dev = ICE_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        uint16_t i;
@@ -804,6 +1327,9 @@ ice_dev_stop(struct rte_eth_dev *dev)
        for (i = 0; i < data->nb_tx_queues; i++)
                ice_tx_queue_stop(dev, i);
 
+       /* disable all queue interrupts */
+       ice_vsi_disable_queues_intr(main_vsi);
+
        /* Clear all queues and release mbufs */
        ice_clear_queues(dev);
 
@@ -931,6 +1457,158 @@ static int ice_init_rss(struct ice_pf *pf)
        return 0;
 }
 
+static void
+__vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
+                      int base_queue, int nb_queue)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       uint32_t val, val_tx;
+       int i;
+
+       for (i = 0; i < nb_queue; i++) {
+               /*do actual bind*/
+               val = (msix_vect & QINT_RQCTL_MSIX_INDX_M) |
+                     (0 < QINT_RQCTL_ITR_INDX_S) | QINT_RQCTL_CAUSE_ENA_M;
+               val_tx = (msix_vect & QINT_TQCTL_MSIX_INDX_M) |
+                        (0 < QINT_TQCTL_ITR_INDX_S) | QINT_TQCTL_CAUSE_ENA_M;
+
+               PMD_DRV_LOG(INFO, "queue %d is binding to vect %d",
+                           base_queue + i, msix_vect);
+               /* set ITR0 value */
+               ICE_WRITE_REG(hw, GLINT_ITR(0, msix_vect), 0x10);
+               ICE_WRITE_REG(hw, QINT_RQCTL(base_queue + i), val);
+               ICE_WRITE_REG(hw, QINT_TQCTL(base_queue + i), val_tx);
+       }
+}
+
+static void
+ice_vsi_queues_bind_intr(struct ice_vsi *vsi)
+{
+       struct rte_eth_dev *dev = vsi->adapter->eth_dev;
+       struct rte_pci_device *pci_dev = ICE_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       uint16_t msix_vect = vsi->msix_intr;
+       uint16_t nb_msix = RTE_MIN(vsi->nb_msix, intr_handle->nb_efd);
+       uint16_t queue_idx = 0;
+       int record = 0;
+       int i;
+
+       /* clear Rx/Tx queue interrupt */
+       for (i = 0; i < vsi->nb_used_qps; i++) {
+               ICE_WRITE_REG(hw, QINT_TQCTL(vsi->base_queue + i), 0);
+               ICE_WRITE_REG(hw, QINT_RQCTL(vsi->base_queue + i), 0);
+       }
+
+       /* PF bind interrupt */
+       if (rte_intr_dp_is_en(intr_handle)) {
+               queue_idx = 0;
+               record = 1;
+       }
+
+       for (i = 0; i < vsi->nb_used_qps; i++) {
+               if (nb_msix <= 1) {
+                       if (!rte_intr_allow_others(intr_handle))
+                               msix_vect = ICE_MISC_VEC_ID;
+
+                       /* uio mapping all queue to one msix_vect */
+                       __vsi_queues_bind_intr(vsi, msix_vect,
+                                              vsi->base_queue + i,
+                                              vsi->nb_used_qps - i);
+
+                       for (; !!record && i < vsi->nb_used_qps; i++)
+                               intr_handle->intr_vec[queue_idx + i] =
+                                       msix_vect;
+                       break;
+               }
+
+               /* vfio 1:1 queue/msix_vect mapping */
+               __vsi_queues_bind_intr(vsi, msix_vect,
+                                      vsi->base_queue + i, 1);
+
+               if (!!record)
+                       intr_handle->intr_vec[queue_idx + i] = msix_vect;
+
+               msix_vect++;
+               nb_msix--;
+       }
+}
+
+static void
+ice_vsi_enable_queues_intr(struct ice_vsi *vsi)
+{
+       struct rte_eth_dev *dev = vsi->adapter->eth_dev;
+       struct rte_pci_device *pci_dev = ICE_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       uint16_t msix_intr, i;
+
+       if (rte_intr_allow_others(intr_handle))
+               for (i = 0; i < vsi->nb_used_qps; i++) {
+                       msix_intr = vsi->msix_intr + i;
+                       ICE_WRITE_REG(hw, GLINT_DYN_CTL(msix_intr),
+                                     GLINT_DYN_CTL_INTENA_M |
+                                     GLINT_DYN_CTL_CLEARPBA_M |
+                                     GLINT_DYN_CTL_ITR_INDX_M |
+                                     GLINT_DYN_CTL_WB_ON_ITR_M);
+               }
+       else
+               ICE_WRITE_REG(hw, GLINT_DYN_CTL(0),
+                             GLINT_DYN_CTL_INTENA_M |
+                             GLINT_DYN_CTL_CLEARPBA_M |
+                             GLINT_DYN_CTL_ITR_INDX_M |
+                             GLINT_DYN_CTL_WB_ON_ITR_M);
+}
+
+static int
+ice_rxq_intr_setup(struct rte_eth_dev *dev)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct rte_pci_device *pci_dev = ICE_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct ice_vsi *vsi = pf->main_vsi;
+       uint32_t intr_vector = 0;
+
+       rte_intr_disable(intr_handle);
+
+       /* check and configure queue intr-vector mapping */
+       if ((rte_intr_cap_multiple(intr_handle) ||
+            !RTE_ETH_DEV_SRIOV(dev).active) &&
+           dev->data->dev_conf.intr_conf.rxq != 0) {
+               intr_vector = dev->data->nb_rx_queues;
+               if (intr_vector > ICE_MAX_INTR_QUEUE_NUM) {
+                       PMD_DRV_LOG(ERR, "At most %d intr queues supported",
+                                   ICE_MAX_INTR_QUEUE_NUM);
+                       return -ENOTSUP;
+               }
+               if (rte_intr_efd_enable(intr_handle, intr_vector))
+                       return -1;
+       }
+
+       if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {
+               intr_handle->intr_vec =
+               rte_zmalloc(NULL, dev->data->nb_rx_queues * sizeof(int),
+                           0);
+               if (!intr_handle->intr_vec) {
+                       PMD_DRV_LOG(ERR,
+                                   "Failed to allocate %d rx_queues intr_vec",
+                                   dev->data->nb_rx_queues);
+                       return -ENOMEM;
+               }
+       }
+
+       /* Map queues with MSIX interrupt */
+       vsi->nb_used_qps = dev->data->nb_rx_queues;
+       ice_vsi_queues_bind_intr(vsi);
+
+       /* Enable interrupts for all the queues */
+       ice_vsi_enable_queues_intr(vsi);
+
+       rte_intr_enable(intr_handle);
+
+       return 0;
+}
+
 static int
 ice_dev_start(struct rte_eth_dev *dev)
 {
@@ -967,6 +1645,10 @@ ice_dev_start(struct rte_eth_dev *dev)
 
        ice_set_rx_function(dev);
 
+       /* enable Rx interrput and mapping Rx queue to interrupt vector */
+       if (ice_rxq_intr_setup(dev))
+               return -EIO;
+
        ret = ice_aq_set_event_mask(hw, hw->port_info->lport,
                                    ((u16)(ICE_AQ_LINK_EVENT_LINK_FAULT |
                                     ICE_AQ_LINK_EVENT_PHY_TEMP_ALARM |
@@ -1035,24 +1717,34 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->max_vfs = pci_dev->max_vfs;
 
        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_QINQ_STRIP |
                DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_KEEP_CRC;
+               DEV_RX_OFFLOAD_VLAN_EXTEND |
+               DEV_RX_OFFLOAD_JUMBO_FRAME |
+               DEV_RX_OFFLOAD_KEEP_CRC |
+               DEV_RX_OFFLOAD_SCATTER |
+               DEV_RX_OFFLOAD_VLAN_FILTER;
        dev_info->tx_offload_capa =
+               DEV_TX_OFFLOAD_VLAN_INSERT |
+               DEV_TX_OFFLOAD_QINQ_INSERT |
                DEV_TX_OFFLOAD_IPV4_CKSUM |
                DEV_TX_OFFLOAD_UDP_CKSUM |
                DEV_TX_OFFLOAD_TCP_CKSUM |
                DEV_TX_OFFLOAD_SCTP_CKSUM |
                DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
                DEV_TX_OFFLOAD_TCP_TSO |
-               DEV_TX_OFFLOAD_MULTI_SEGS;
+               DEV_TX_OFFLOAD_MULTI_SEGS |
+               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
        dev_info->rx_queue_offload_capa = 0;
        dev_info->tx_queue_offload_capa = 0;
 
        dev_info->reta_size = hw->func_caps.common_cap.rss_table_size;
        dev_info->hash_key_size = (VSIQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);
+       dev_info->flow_type_rss_offloads = ICE_RSS_OFFLOAD_ALL;
 
        dev_info->default_rxconf = (struct rte_eth_rxconf) {
                .rx_thresh = {
@@ -1225,6 +1917,721 @@ out:
        return 0;
 }
 
+static int
+ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct rte_eth_dev_data *dev_data = pf->dev_data;
+       uint32_t frame_size = mtu + ETHER_HDR_LEN
+                             + ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE;
+
+       /* check if mtu is within the allowed range */
+       if (mtu < ETHER_MIN_MTU || frame_size > ICE_FRAME_SIZE_MAX)
+               return -EINVAL;
+
+       /* mtu setting is forbidden if port is start */
+       if (dev_data->dev_started) {
+               PMD_DRV_LOG(ERR,
+                           "port %d must be stopped before configuration",
+                           dev_data->port_id);
+               return -EBUSY;
+       }
+
+       if (frame_size > ETHER_MAX_LEN)
+               dev_data->dev_conf.rxmode.offloads |=
+                       DEV_RX_OFFLOAD_JUMBO_FRAME;
+       else
+               dev_data->dev_conf.rxmode.offloads &=
+                       ~DEV_RX_OFFLOAD_JUMBO_FRAME;
+
+       dev_data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
+
+       return 0;
+}
+
+static int ice_macaddr_set(struct rte_eth_dev *dev,
+                          struct ether_addr *mac_addr)
+{
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       struct ice_mac_filter *f;
+       uint8_t flags = 0;
+       int ret;
+
+       if (!is_valid_assigned_ether_addr(mac_addr)) {
+               PMD_DRV_LOG(ERR, "Tried to set invalid MAC address.");
+               return -EINVAL;
+       }
+
+       TAILQ_FOREACH(f, &vsi->mac_list, next) {
+               if (is_same_ether_addr(&pf->dev_addr, &f->mac_info.mac_addr))
+                       break;
+       }
+
+       if (!f) {
+               PMD_DRV_LOG(ERR, "Failed to find filter for default mac");
+               return -EIO;
+       }
+
+       ret = ice_remove_mac_filter(vsi, &f->mac_info.mac_addr);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR, "Failed to delete mac filter");
+               return -EIO;
+       }
+       ret = ice_add_mac_filter(vsi, mac_addr);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR, "Failed to add mac filter");
+               return -EIO;
+       }
+       memcpy(&pf->dev_addr, mac_addr, ETH_ADDR_LEN);
+
+       flags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;
+       ret = ice_aq_manage_mac_write(hw, mac_addr->addr_bytes, flags, NULL);
+       if (ret != ICE_SUCCESS)
+               PMD_DRV_LOG(ERR, "Failed to set manage mac");
+
+       return 0;
+}
+
+/* Add a MAC address, and update filters */
+static int
+ice_macaddr_add(struct rte_eth_dev *dev,
+               struct ether_addr *mac_addr,
+               __rte_unused uint32_t index,
+               __rte_unused uint32_t pool)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       int ret;
+
+       ret = ice_add_mac_filter(vsi, mac_addr);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR, "Failed to add MAC filter");
+               return -EINVAL;
+       }
+
+       return ICE_SUCCESS;
+}
+
+/* Remove a MAC address, and update filters */
+static void
+ice_macaddr_remove(struct rte_eth_dev *dev, uint32_t index)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       struct rte_eth_dev_data *data = dev->data;
+       struct ether_addr *macaddr;
+       int ret;
+
+       macaddr = &data->mac_addrs[index];
+       ret = ice_remove_mac_filter(vsi, macaddr);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "Failed to remove MAC filter");
+               return;
+       }
+}
+
+static int
+ice_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       int ret;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (on) {
+               ret = ice_add_vlan_filter(vsi, vlan_id);
+               if (ret < 0) {
+                       PMD_DRV_LOG(ERR, "Failed to add vlan filter");
+                       return -EINVAL;
+               }
+       } else {
+               ret = ice_remove_vlan_filter(vsi, vlan_id);
+               if (ret < 0) {
+                       PMD_DRV_LOG(ERR, "Failed to remove vlan filter");
+                       return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
+/* Configure vlan filter on or off */
+static int
+ice_vsi_config_vlan_filter(struct ice_vsi *vsi, bool on)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_vsi_ctx ctxt;
+       uint8_t sec_flags, sw_flags2;
+       int ret = 0;
+
+       sec_flags = ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<
+                   ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S;
+       sw_flags2 = ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA;
+
+       if (on) {
+               vsi->info.sec_flags |= sec_flags;
+               vsi->info.sw_flags2 |= sw_flags2;
+       } else {
+               vsi->info.sec_flags &= ~sec_flags;
+               vsi->info.sw_flags2 &= ~sw_flags2;
+       }
+       vsi->info.sw_id = hw->port_info->sw_id;
+       (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
+       ctxt.info.valid_sections =
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_SW_VALID |
+                                ICE_AQ_VSI_PROP_SECURITY_VALID);
+       ctxt.vsi_num = vsi->vsi_id;
+
+       ret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);
+       if (ret) {
+               PMD_DRV_LOG(INFO, "Update VSI failed to %s vlan rx pruning",
+                           on ? "enable" : "disable");
+               ret = -EINVAL;
+       } else {
+               vsi->info.valid_sections |=
+                       rte_cpu_to_le_16(ICE_AQ_VSI_PROP_SW_VALID |
+                                        ICE_AQ_VSI_PROP_SECURITY_VALID);
+       }
+
+       return ret;
+}
+
+static int
+ice_vsi_config_vlan_stripping(struct ice_vsi *vsi, bool on)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_vsi_ctx ctxt;
+       uint8_t vlan_flags;
+       int ret = 0;
+
+       /* Check if it has been already on or off */
+       if (vsi->info.valid_sections &
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID)) {
+               if (on) {
+                       if ((vsi->info.vlan_flags &
+                            ICE_AQ_VSI_VLAN_EMOD_M) ==
+                           ICE_AQ_VSI_VLAN_EMOD_STR_BOTH)
+                               return 0; /* already on */
+               } else {
+                       if ((vsi->info.vlan_flags &
+                            ICE_AQ_VSI_VLAN_EMOD_M) ==
+                           ICE_AQ_VSI_VLAN_EMOD_NOTHING)
+                               return 0; /* already off */
+               }
+       }
+
+       if (on)
+               vlan_flags = ICE_AQ_VSI_VLAN_EMOD_STR_BOTH;
+       else
+               vlan_flags = ICE_AQ_VSI_VLAN_EMOD_NOTHING;
+       vsi->info.vlan_flags &= ~(ICE_AQ_VSI_VLAN_EMOD_M);
+       vsi->info.vlan_flags |= vlan_flags;
+       (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
+       ctxt.info.valid_sections =
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);
+       ctxt.vsi_num = vsi->vsi_id;
+       ret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);
+       if (ret) {
+               PMD_DRV_LOG(INFO, "Update VSI failed to %s vlan stripping",
+                           on ? "enable" : "disable");
+               return -EINVAL;
+       }
+
+       vsi->info.valid_sections |=
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);
+
+       return ret;
+}
+
+static int
+ice_vlan_offload_set(struct rte_eth_dev *dev, int mask)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       struct rte_eth_rxmode *rxmode;
+
+       rxmode = &dev->data->dev_conf.rxmode;
+       if (mask & ETH_VLAN_FILTER_MASK) {
+               if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
+                       ice_vsi_config_vlan_filter(vsi, TRUE);
+               else
+                       ice_vsi_config_vlan_filter(vsi, FALSE);
+       }
+
+       if (mask & ETH_VLAN_STRIP_MASK) {
+               if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
+                       ice_vsi_config_vlan_stripping(vsi, TRUE);
+               else
+                       ice_vsi_config_vlan_stripping(vsi, FALSE);
+       }
+
+       if (mask & ETH_VLAN_EXTEND_MASK) {
+               if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)
+                       ice_vsi_config_double_vlan(vsi, TRUE);
+               else
+                       ice_vsi_config_double_vlan(vsi, FALSE);
+       }
+
+       return 0;
+}
+
+static int
+ice_vlan_tpid_set(struct rte_eth_dev *dev,
+                 enum rte_vlan_type vlan_type,
+                 uint16_t tpid)
+{
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint64_t reg_r = 0, reg_w = 0;
+       uint16_t reg_id = 0;
+       int ret = 0;
+       int qinq = dev->data->dev_conf.rxmode.offloads &
+                  DEV_RX_OFFLOAD_VLAN_EXTEND;
+
+       switch (vlan_type) {
+       case ETH_VLAN_TYPE_OUTER:
+               if (qinq)
+                       reg_id = 3;
+               else
+                       reg_id = 5;
+       break;
+       case ETH_VLAN_TYPE_INNER:
+               if (qinq) {
+                       reg_id = 5;
+               } else {
+                       PMD_DRV_LOG(ERR,
+                                   "Unsupported vlan type in single vlan.");
+                       return -EINVAL;
+               }
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "Unsupported vlan type %d", vlan_type);
+               return -EINVAL;
+       }
+       reg_r = ICE_READ_REG(hw, GL_SWT_L2TAGCTRL(reg_id));
+       PMD_DRV_LOG(DEBUG, "Debug read from ICE GL_SWT_L2TAGCTRL[%d]: "
+                   "0x%08"PRIx64"", reg_id, reg_r);
+
+       reg_w = reg_r & (~(GL_SWT_L2TAGCTRL_ETHERTYPE_M));
+       reg_w |= ((uint64_t)tpid << GL_SWT_L2TAGCTRL_ETHERTYPE_S);
+       if (reg_r == reg_w) {
+               PMD_DRV_LOG(DEBUG, "No need to write");
+               return 0;
+       }
+
+       ICE_WRITE_REG(hw, GL_SWT_L2TAGCTRL(reg_id), reg_w);
+       PMD_DRV_LOG(DEBUG, "Debug write 0x%08"PRIx64" to "
+                   "ICE GL_SWT_L2TAGCTRL[%d]", reg_w, reg_id);
+
+       return ret;
+}
+
+static int
+ice_get_rss_lut(struct ice_vsi *vsi, uint8_t *lut, uint16_t lut_size)
+{
+       struct ice_pf *pf = ICE_VSI_TO_PF(vsi);
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret;
+
+       if (!lut)
+               return -EINVAL;
+
+       if (pf->flags & ICE_FLAG_RSS_AQ_CAPABLE) {
+               ret = ice_aq_get_rss_lut(hw, vsi->idx, TRUE,
+                                        lut, lut_size);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Failed to get RSS lookup table");
+                       return -EINVAL;
+               }
+       } else {
+               uint64_t *lut_dw = (uint64_t *)lut;
+               uint16_t i, lut_size_dw = lut_size / 4;
+
+               for (i = 0; i < lut_size_dw; i++)
+                       lut_dw[i] = ICE_READ_REG(hw, PFQF_HLUT(i));
+       }
+
+       return 0;
+}
+
+static int
+ice_set_rss_lut(struct ice_vsi *vsi, uint8_t *lut, uint16_t lut_size)
+{
+       struct ice_pf *pf = ICE_VSI_TO_PF(vsi);
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret;
+
+       if (!vsi || !lut)
+               return -EINVAL;
+
+       if (pf->flags & ICE_FLAG_RSS_AQ_CAPABLE) {
+               ret = ice_aq_set_rss_lut(hw, vsi->idx, TRUE,
+                                        lut, lut_size);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Failed to set RSS lookup table");
+                       return -EINVAL;
+               }
+       } else {
+               uint64_t *lut_dw = (uint64_t *)lut;
+               uint16_t i, lut_size_dw = lut_size / 4;
+
+               for (i = 0; i < lut_size_dw; i++)
+                       ICE_WRITE_REG(hw, PFQF_HLUT(i), lut_dw[i]);
+
+               ice_flush(hw);
+       }
+
+       return 0;
+}
+
+static int
+ice_rss_reta_update(struct rte_eth_dev *dev,
+                   struct rte_eth_rss_reta_entry64 *reta_conf,
+                   uint16_t reta_size)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint16_t i, lut_size = hw->func_caps.common_cap.rss_table_size;
+       uint16_t idx, shift;
+       uint8_t *lut;
+       int ret;
+
+       if (reta_size != lut_size ||
+           reta_size > ETH_RSS_RETA_SIZE_512) {
+               PMD_DRV_LOG(ERR,
+                           "The size of hash lookup table configured (%d)"
+                           "doesn't match the number hardware can "
+                           "supported (%d)",
+                           reta_size, lut_size);
+               return -EINVAL;
+       }
+
+       lut = rte_zmalloc(NULL, reta_size, 0);
+       if (!lut) {
+               PMD_DRV_LOG(ERR, "No memory can be allocated");
+               return -ENOMEM;
+       }
+       ret = ice_get_rss_lut(pf->main_vsi, lut, reta_size);
+       if (ret)
+               goto out;
+
+       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))
+                       lut[i] = reta_conf[idx].reta[shift];
+       }
+       ret = ice_set_rss_lut(pf->main_vsi, lut, reta_size);
+
+out:
+       rte_free(lut);
+
+       return ret;
+}
+
+static int
+ice_rss_reta_query(struct rte_eth_dev *dev,
+                  struct rte_eth_rss_reta_entry64 *reta_conf,
+                  uint16_t reta_size)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint16_t i, lut_size = hw->func_caps.common_cap.rss_table_size;
+       uint16_t idx, shift;
+       uint8_t *lut;
+       int ret;
+
+       if (reta_size != lut_size ||
+           reta_size > ETH_RSS_RETA_SIZE_512) {
+               PMD_DRV_LOG(ERR,
+                           "The size of hash lookup table configured (%d)"
+                           "doesn't match the number hardware can "
+                           "supported (%d)",
+                           reta_size, lut_size);
+               return -EINVAL;
+       }
+
+       lut = rte_zmalloc(NULL, reta_size, 0);
+       if (!lut) {
+               PMD_DRV_LOG(ERR, "No memory can be allocated");
+               return -ENOMEM;
+       }
+
+       ret = ice_get_rss_lut(pf->main_vsi, lut, reta_size);
+       if (ret)
+               goto out;
+
+       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))
+                       reta_conf[idx].reta[shift] = lut[i];
+       }
+
+out:
+       rte_free(lut);
+
+       return ret;
+}
+
+static int
+ice_set_rss_key(struct ice_vsi *vsi, uint8_t *key, uint8_t key_len)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret = 0;
+
+       if (!key || key_len == 0) {
+               PMD_DRV_LOG(DEBUG, "No key to be configured");
+               return 0;
+       } else if (key_len != (VSIQF_HKEY_MAX_INDEX + 1) *
+                  sizeof(uint32_t)) {
+               PMD_DRV_LOG(ERR, "Invalid key length %u", key_len);
+               return -EINVAL;
+       }
+
+       struct ice_aqc_get_set_rss_keys *key_dw =
+               (struct ice_aqc_get_set_rss_keys *)key;
+
+       ret = ice_aq_set_rss_key(hw, vsi->idx, key_dw);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "Failed to configure RSS key via AQ");
+               ret = -EINVAL;
+       }
+
+       return ret;
+}
+
+static int
+ice_get_rss_key(struct ice_vsi *vsi, uint8_t *key, uint8_t *key_len)
+{
+       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       int ret;
+
+       if (!key || !key_len)
+               return -EINVAL;
+
+       ret = ice_aq_get_rss_key
+               (hw, vsi->idx,
+                (struct ice_aqc_get_set_rss_keys *)key);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "Failed to get RSS key via AQ");
+               return -EINVAL;
+       }
+       *key_len = (VSIQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);
+
+       return 0;
+}
+
+static int
+ice_rss_hash_update(struct rte_eth_dev *dev,
+                   struct rte_eth_rss_conf *rss_conf)
+{
+       enum ice_status status = ICE_SUCCESS;
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+
+       /* set hash key */
+       status = ice_set_rss_key(vsi, rss_conf->rss_key, rss_conf->rss_key_len);
+       if (status)
+               return status;
+
+       /* TODO: hash enable config, ice_add_rss_cfg */
+       return 0;
+}
+
+static int
+ice_rss_hash_conf_get(struct rte_eth_dev *dev,
+                     struct rte_eth_rss_conf *rss_conf)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+
+       ice_get_rss_key(vsi, rss_conf->rss_key,
+                       &rss_conf->rss_key_len);
+
+       /* TODO: default set to 0 as hf config is not supported now */
+       rss_conf->rss_hf = 0;
+       return 0;
+}
+
+static int ice_rx_queue_intr_enable(struct rte_eth_dev *dev,
+                                   uint16_t queue_id)
+{
+       struct rte_pci_device *pci_dev = ICE_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint32_t val;
+       uint16_t msix_intr;
+
+       msix_intr = intr_handle->intr_vec[queue_id];
+
+       val = GLINT_DYN_CTL_INTENA_M | GLINT_DYN_CTL_CLEARPBA_M |
+             GLINT_DYN_CTL_ITR_INDX_M;
+       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);
+
+       return 0;
+}
+
+static int ice_rx_queue_intr_disable(struct rte_eth_dev *dev,
+                                    uint16_t queue_id)
+{
+       struct rte_pci_device *pci_dev = ICE_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint16_t msix_intr;
+
+       msix_intr = intr_handle->intr_vec[queue_id];
+
+       ICE_WRITE_REG(hw, GLINT_DYN_CTL(msix_intr), GLINT_DYN_CTL_WB_ON_ITR_M);
+
+       return 0;
+}
+
+static int
+ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
+{
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       int ret;
+
+       ret = snprintf(fw_version, fw_size, "%d.%d.%05d %d.%d",
+                      hw->fw_maj_ver, hw->fw_min_ver, hw->fw_build,
+                      hw->api_maj_ver, hw->api_min_ver);
+
+       /* add the size of '\0' */
+       ret += 1;
+       if (fw_size < (u32)ret)
+               return ret;
+       else
+               return 0;
+}
+
+static int
+ice_vsi_vlan_pvid_set(struct ice_vsi *vsi, struct ice_vsi_vlan_pvid_info *info)
+{
+       struct ice_hw *hw;
+       struct ice_vsi_ctx ctxt;
+       uint8_t vlan_flags = 0;
+       int ret;
+
+       if (!vsi || !info) {
+               PMD_DRV_LOG(ERR, "invalid parameters");
+               return -EINVAL;
+       }
+
+       if (info->on) {
+               vsi->info.pvid = info->config.pvid;
+               /**
+                * If insert pvid is enabled, only tagged pkts are
+                * allowed to be sent out.
+                */
+               vlan_flags = ICE_AQ_VSI_PVLAN_INSERT_PVID |
+                            ICE_AQ_VSI_VLAN_MODE_UNTAGGED;
+       } else {
+               vsi->info.pvid = 0;
+               if (info->config.reject.tagged == 0)
+                       vlan_flags |= ICE_AQ_VSI_VLAN_MODE_TAGGED;
+
+               if (info->config.reject.untagged == 0)
+                       vlan_flags |= ICE_AQ_VSI_VLAN_MODE_UNTAGGED;
+       }
+       vsi->info.vlan_flags &= ~(ICE_AQ_VSI_PVLAN_INSERT_PVID |
+                                 ICE_AQ_VSI_VLAN_MODE_M);
+       vsi->info.vlan_flags |= vlan_flags;
+       memset(&ctxt, 0, sizeof(ctxt));
+       rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
+       ctxt.info.valid_sections =
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);
+       ctxt.vsi_num = vsi->vsi_id;
+
+       hw = ICE_VSI_TO_HW(vsi);
+       ret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);
+       if (ret != ICE_SUCCESS) {
+               PMD_DRV_LOG(ERR,
+                           "update VSI for VLAN insert failed, err %d",
+                           ret);
+               return -EINVAL;
+       }
+
+       vsi->info.valid_sections |=
+               rte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);
+
+       return ret;
+}
+
+static int
+ice_vlan_pvid_set(struct rte_eth_dev *dev, uint16_t pvid, int on)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       struct rte_eth_dev_data *data = pf->dev_data;
+       struct ice_vsi_vlan_pvid_info info;
+       int ret;
+
+       memset(&info, 0, sizeof(info));
+       info.on = on;
+       if (info.on) {
+               info.config.pvid = pvid;
+       } else {
+               info.config.reject.tagged =
+                       data->dev_conf.txmode.hw_vlan_reject_tagged;
+               info.config.reject.untagged =
+                       data->dev_conf.txmode.hw_vlan_reject_untagged;
+       }
+
+       ret = ice_vsi_vlan_pvid_set(vsi, &info);
+       if (ret < 0) {
+               PMD_DRV_LOG(ERR, "Failed to set pvid.");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int
+ice_get_eeprom_length(struct rte_eth_dev *dev)
+{
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       /* Convert word count to byte count */
+       return hw->nvm.sr_words << 1;
+}
+
+static int
+ice_get_eeprom(struct rte_eth_dev *dev,
+              struct rte_dev_eeprom_info *eeprom)
+{
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint16_t *data = eeprom->data;
+       uint16_t offset, length, i;
+       enum ice_status ret_code = ICE_SUCCESS;
+
+       offset = eeprom->offset >> 1;
+       length = eeprom->length >> 1;
+
+       if (offset > hw->nvm.sr_words ||
+           offset + length > hw->nvm.sr_words) {
+               PMD_DRV_LOG(ERR, "Requested EEPROM bytes out of range.");
+               return -EINVAL;
+       }
+
+       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+       for (i = 0; i < length; i++) {
+               ret_code = ice_read_sr_word(hw, offset + i, &data[i]);
+               if (ret_code != ICE_SUCCESS) {
+                       PMD_DRV_LOG(ERR, "EEPROM read failed.");
+                       return -EIO;
+               }
+       }
+
+       return 0;
+}
+
 static int
 ice_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
              struct rte_pci_device *pci_dev)