New upstream version 17.11.1

[deb_dpdk.git] / drivers / net / i40e / rte_pmd_i40e.c

diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index aeb92af..f726a9c 100644 (file)
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -1525,7 +1525,14 @@ i40e_check_profile_info(uint16_t port, uint8_t *profile_info_sec)
        struct rte_pmd_i40e_profile_info *pinfo, *p;
        uint32_t i;
        int ret;
+       static const uint32_t group_mask = 0x00ff0000;
 
+       pinfo = (struct rte_pmd_i40e_profile_info *)(profile_info_sec +
+                            sizeof(struct i40e_profile_section_header));
+       if (pinfo->track_id == 0) {
+               PMD_DRV_LOG(INFO, "Read-only profile.");
+               return 0;
+       }
        buff = rte_zmalloc("pinfo_list",
                           (I40E_PROFILE_INFO_SIZE * I40E_MAX_PROFILE_NUM + 4),
                           0);
@@ -1544,8 +1551,6 @@ i40e_check_profile_info(uint16_t port, uint8_t *profile_info_sec)
                return -1;
        }
        p_list = (struct rte_pmd_i40e_profile_list *)buff;
-       pinfo = (struct rte_pmd_i40e_profile_info *)(profile_info_sec +
-                            sizeof(struct i40e_profile_section_header));
        for (i = 0; i < p_list->p_count; i++) {
                p = &p_list->p_info[i];
                if (pinfo->track_id == p->track_id) {
@@ -1554,6 +1559,23 @@ i40e_check_profile_info(uint16_t port, uint8_t *profile_info_sec)
                        return 1;
                }
        }
+       for (i = 0; i < p_list->p_count; i++) {
+               p = &p_list->p_info[i];
+               if ((p->track_id & group_mask) == 0) {
+                       PMD_DRV_LOG(INFO, "Profile of the group 0 exists.");
+                       rte_free(buff);
+                       return 2;
+               }
+       }
+       for (i = 0; i < p_list->p_count; i++) {
+               p = &p_list->p_info[i];
+               if ((pinfo->track_id & group_mask) !=
+                   (p->track_id & group_mask)) {
+                       PMD_DRV_LOG(INFO, "Profile of different group exists.");
+                       rte_free(buff);
+                       return 3;
+               }
+       }
 
        rte_free(buff);
        return 0;
@@ -1573,6 +1595,7 @@ rte_pmd_i40e_process_ddp_package(uint16_t port, uint8_t *buff,
        uint8_t *profile_info_sec;
        int is_exist;
        enum i40e_status_code status = I40E_SUCCESS;
+       static const uint32_t type_mask = 0xff000000;
 
        if (op != RTE_PMD_I40E_PKG_OP_WR_ADD &&
                op != RTE_PMD_I40E_PKG_OP_WR_ONLY &&
@@ -1624,6 +1647,10 @@ rte_pmd_i40e_process_ddp_package(uint16_t port, uint8_t *buff,
                return -EINVAL;
        }
 
+       /* force read-only track_id for type 0 */
+       if ((track_id & type_mask) == 0)
+               track_id = 0;
+
        /* Find profile segment */
        profile_seg_hdr = i40e_find_segment_in_package(SEGMENT_TYPE_I40E,
                                                       pkg_hdr);
@@ -1657,12 +1684,17 @@ rte_pmd_i40e_process_ddp_package(uint16_t port, uint8_t *buff,
 
        if (op == RTE_PMD_I40E_PKG_OP_WR_ADD) {
                if (is_exist) {
-                       PMD_DRV_LOG(ERR, "Profile already exists.");
+                       if (is_exist == 1)
+                               PMD_DRV_LOG(ERR, "Profile already exists.");
+                       else if (is_exist == 2)
+                               PMD_DRV_LOG(ERR, "Profile of group 0 already exists.");
+                       else if (is_exist == 3)
+                               PMD_DRV_LOG(ERR, "Profile of different group already exists");
                        rte_free(profile_info_sec);
                        return -EEXIST;
                }
        } else if (op == RTE_PMD_I40E_PKG_OP_WR_DEL) {
-               if (!is_exist) {
+               if (is_exist != 1) {
                        PMD_DRV_LOG(ERR, "Profile does not exist.");
                        rte_free(profile_info_sec);
                        return -EACCES;
@@ -2845,22 +2877,23 @@ i40e_flush_queue_region_all_conf(struct rte_eth_dev *dev,
                return 0;
        }
 
-       info->queue_region_number = 1;
-       info->region[0].queue_num = main_vsi->nb_used_qps;
-       info->region[0].queue_start_index = 0;
+       if (info->queue_region_number) {
+               info->queue_region_number = 1;
+               info->region[0].queue_num = main_vsi->nb_used_qps;
+               info->region[0].queue_start_index = 0;
 
-       ret = i40e_vsi_update_queue_region_mapping(hw, pf);
-       if (ret != I40E_SUCCESS)
-               PMD_DRV_LOG(INFO, "Failed to flush queue region mapping.");
-
-       ret = i40e_dcb_init_configure(dev, TRUE);
-       if (ret != I40E_SUCCESS) {
-               PMD_DRV_LOG(INFO, "Failed to flush dcb.");
-               pf->flags &= ~I40E_FLAG_DCB;
-       }
+               ret = i40e_vsi_update_queue_region_mapping(hw, pf);
+               if (ret != I40E_SUCCESS)
+                       PMD_DRV_LOG(INFO, "Failed to flush queue region mapping.");
 
-       i40e_init_queue_region_conf(dev);
+               ret = i40e_dcb_init_configure(dev, TRUE);
+               if (ret != I40E_SUCCESS) {
+                       PMD_DRV_LOG(INFO, "Failed to flush dcb.");
+                       pf->flags &= ~I40E_FLAG_DCB;
+               }
 
+               i40e_init_queue_region_conf(dev);
+       }
        return 0;
 }