[dpdk-dev] [PATCH 0/3] fix compile issues

[dpdk-dev] [PATCH 0/3] fix compile issues

[Helin Zhang]

It fixes compile issues for bonding, i40e, and testpmd on ICC 13.0.0.

Helin Zhang (3):
  bonding: fix ICC compile issue
  i40e: fix ICC compile issue
  app/testpmd: fix ICC compile issue

 app/test-pmd/cmdline.c                 |  2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c |  3 ++-
 drivers/net/i40e/i40e_ethdev.c         | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

-- 
1.8.1.4

[dpdk-dev] [PATCH 1/3] bonding: fix ICC compile issue

[Helin Zhang]

It fixes compile issue on ICC 13.0.0.

Error logs:
rte_eth_bond_pmd.c(1327): error #188: enumerated type
mixed with another type
slave_eth_dev->data->dev_conf.rxmode.mq_mode |= ETH_MQ_RX_RSS;

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index bbff664..1b71304 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1324,7 +1324,8 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 
 		slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf =
 				bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;
-		slave_eth_dev->data->dev_conf.rxmode.mq_mode |= ETH_MQ_RX_RSS;
+		slave_eth_dev->data->dev_conf.rxmode.mq_mode |=
+			(enum rte_eth_rx_mq_mode)ETH_MQ_RX_RSS;
 	}
 
 	/* Configure device */
-- 
1.8.1.4

[dpdk-dev] [PATCH 2/3] i40e: fix ICC compile issue

[Helin Zhang]

It fixes compile issue on ICC 13.0.0.

Error logs:
i40e_ethdev.c(7943): error #188: enumerated type mixed with another type
    PMD_INIT_LOG(ERR,

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ddf3d38..8c1809a 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -7942,7 +7942,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 	if (ret) {
 		PMD_INIT_LOG(ERR,
 			 "couldn't get PF vsi bw config, err %s aq_err %s\n",
-			 i40e_stat_str(hw, ret),
+			 i40e_stat_str(hw, (enum i40e_status_code)ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
 		return -EINVAL;
 	}
@@ -7953,7 +7953,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 	if (ret) {
 		PMD_INIT_LOG(ERR,
 			 "couldn't get PF vsi ets bw config, err %s aq_err %s\n",
-			 i40e_stat_str(hw, ret),
+			 i40e_stat_str(hw, (enum i40e_status_code)ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
 		return -EINVAL;
 	}
@@ -8122,7 +8122,7 @@ i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 tc_map)
 	if (ret) {
 		PMD_INIT_LOG(ERR,
 			 "Failed updating vsi bw info, err %s aq_err %s",
-			 i40e_stat_str(hw, ret),
+			 i40e_stat_str(hw, (enum i40e_status_code)ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
 		goto out;
 	}
@@ -8173,9 +8173,9 @@ i40e_dcb_hw_configure(struct i40e_pf *pf,
 	if (ret) {
 		PMD_INIT_LOG(ERR,
 			 "Set DCB Config failed, err %s aq_err %s\n",
-			 i40e_stat_str(hw, ret),
+			 i40e_stat_str(hw, (enum i40e_status_code)ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
-		return ret;
+		return (enum i40e_status_code)ret;
 	}
 	/* set receive Arbiter to RR mode and ETS scheme by default */
 	for (i = 0; i <= I40E_PRTDCB_RETSTCC_MAX_INDEX; i++) {
-- 
1.8.1.4

[dpdk-dev] [PATCH 3/3] app/testpmd: fix ICC compile issue

[Helin Zhang]

It fixes compile issue on ICC 13.0.0.

Error logs:
app/test-pmd/cmdline.c(8160): error #188: enumerated type mixed
with another type
    entry.input.flow.tunnel_flow.tunnel_type =

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 app/test-pmd/cmdline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index c637198..38cf923 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8158,7 +8158,7 @@ cmd_flow_director_filter_parsed(void *parsed_result,
 				 &res->mac_addr,
 				 sizeof(struct ether_addr));
 		entry.input.flow.tunnel_flow.tunnel_type =
-			str2fdir_tunneltype(res->tunnel_type);
+	(enum rte_eth_fdir_tunnel_type)str2fdir_tunneltype(res->tunnel_type);
 		entry.input.flow.tunnel_flow.tunnel_id =
 			rte_cpu_to_be_32(res->tunnel_id_value);
 	}
-- 
1.8.1.4

Re: [dpdk-dev] [PATCH 1/3] bonding: fix ICC compile issue

[De Lara Guarch, Pablo]

Hi Helin,

> -----Original Message-----
> From: Zhang, Helin
> Sent: Friday, November 06, 2015 7:49 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo; Zhang, Helin
> Subject: [PATCH 1/3] bonding: fix ICC compile issue
> 
> It fixes compile issue on ICC 13.0.0.
> 
> Error logs:
> rte_eth_bond_pmd.c(1327): error #188: enumerated type
> mixed with another type
> slave_eth_dev->data->dev_conf.rxmode.mq_mode |= ETH_MQ_RX_RSS;
> 
> Signed-off-by: Helin Zhang <helin.zhang@intel.com>

There is already a patch for this:

http://dpdk.org/dev/patchwork/patch/8698/

Re: [dpdk-dev] [PATCH 2/3] i40e: fix ICC compile issue

[De Lara Guarch, Pablo]

Hi Helin,


> -----Original Message-----
> From: Zhang, Helin
> Sent: Friday, November 06, 2015 7:49 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo; Zhang, Helin
> Subject: [PATCH 2/3] i40e: fix ICC compile issue
> 
> It fixes compile issue on ICC 13.0.0.
> 
> Error logs:
> i40e_ethdev.c(7943): error #188: enumerated type mixed with another type
>     PMD_INIT_LOG(ERR,
> 
> Signed-off-by: Helin Zhang <helin.zhang@intel.com>
> ---
>  drivers/net/i40e/i40e_ethdev.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index ddf3d38..8c1809a 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -7942,7 +7942,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
>  	if (ret) {
>  		PMD_INIT_LOG(ERR,
>  			 "couldn't get PF vsi bw config, err %s aq_err %s\n",
> -			 i40e_stat_str(hw, ret),
> +			 i40e_stat_str(hw, (enum i40e_status_code)ret),
>  			 i40e_aq_str(hw, hw->aq.asq_last_status));
>  		return -EINVAL;
>  	}
> @@ -7953,7 +7953,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
>  	if (ret) {
>  		PMD_INIT_LOG(ERR,
>  			 "couldn't get PF vsi ets bw config, err %s aq_err
> %s\n",
> -			 i40e_stat_str(hw, ret),
> +			 i40e_stat_str(hw, (enum i40e_status_code)ret),
>  			 i40e_aq_str(hw, hw->aq.asq_last_status));
>  		return -EINVAL;
>  	}
> @@ -8122,7 +8122,7 @@ i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 tc_map)
>  	if (ret) {
>  		PMD_INIT_LOG(ERR,
>  			 "Failed updating vsi bw info, err %s aq_err %s",
> -			 i40e_stat_str(hw, ret),
> +			 i40e_stat_str(hw, (enum i40e_status_code)ret),
>  			 i40e_aq_str(hw, hw->aq.asq_last_status));
>  		goto out;
>  	}
> @@ -8173,9 +8173,9 @@ i40e_dcb_hw_configure(struct i40e_pf *pf,
>  	if (ret) {
>  		PMD_INIT_LOG(ERR,
>  			 "Set DCB Config failed, err %s aq_err %s\n",
> -			 i40e_stat_str(hw, ret),
> +			 i40e_stat_str(hw, (enum i40e_status_code)ret),
>  			 i40e_aq_str(hw, hw->aq.asq_last_status));
> -		return ret;
> +		return (enum i40e_status_code)ret;
>  	}
>  	/* set receive Arbiter to RR mode and ETS scheme by default */
>  	for (i = 0; i <= I40E_PRTDCB_RETSTCC_MAX_INDEX; i++) {
> --
> 1.8.1.4

I think it is best to change the variable type, instead of casting,
since i40e_aq_query_vsi_bw_config for instance is returning a enum i40e_status_code and not an int.

Thanks,
Pablo

[dpdk-dev] [PATCH v2 0/2] fix compile issues on ICC

[Helin Zhang]

It fixes compile issues for i40e, and testpmd on ICC 13.0.0.

v2 changes:
Corrected the variable/function type, to replace casting.

Helin Zhang (2):
  i40e: fix ICC compile issue
  app/testpmd: fix ICC compile issue

 app/test-pmd/cmdline.c         |  4 ++--
 drivers/net/i40e/i40e_ethdev.c | 34 +++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 17 deletions(-)

-- 
1.8.1.4

[dpdk-dev] [PATCH v2 1/2] i40e: fix ICC compile issue

[Helin Zhang]

It fixes compile issue on ICC 13.0.0.

Error logs:
i40e_ethdev.c(7943): error #188: enumerated type mixed with another type
    PMD_INIT_LOG(ERR,

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

v2 changes:
Corrected the variable/function type, to replace casting.

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ddf3d38..30fb106 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -3418,7 +3418,7 @@ bitmap_is_subset(uint8_t src1, uint8_t src2)
 	return !((src1 ^ src2) & src2);
 }
 
-static int
+static enum i40e_status_code
 validate_tcmap_parameter(struct i40e_vsi *vsi, uint8_t enabled_tcmap)
 {
 	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
@@ -3426,14 +3426,14 @@ validate_tcmap_parameter(struct i40e_vsi *vsi, uint8_t enabled_tcmap)
 	/* If DCB is not supported, only default TC is supported */
 	if (!hw->func_caps.dcb && enabled_tcmap != I40E_DEFAULT_TCMAP) {
 		PMD_DRV_LOG(ERR, "DCB is not enabled, only TC0 is supported");
-		return -EINVAL;
+		return I40E_NOT_SUPPORTED;
 	}
 
 	if (!bitmap_is_subset(hw->func_caps.enabled_tcmap, enabled_tcmap)) {
 		PMD_DRV_LOG(ERR, "Enabled TC map 0x%x not applicable to "
 			    "HW support 0x%x", hw->func_caps.enabled_tcmap,
 			    enabled_tcmap);
-		return -EINVAL;
+		return I40E_NOT_SUPPORTED;
 	}
 	return I40E_SUCCESS;
 }
@@ -3518,12 +3518,13 @@ i40e_vsi_update_tc_bandwidth(struct i40e_vsi *vsi, uint8_t enabled_tcmap)
 	return I40E_SUCCESS;
 }
 
-static int
+static enum i40e_status_code
 i40e_vsi_config_tc_queue_mapping(struct i40e_vsi *vsi,
 				 struct i40e_aqc_vsi_properties_data *info,
 				 uint8_t enabled_tcmap)
 {
-	int ret, i, total_tc = 0;
+	enum i40e_status_code ret;
+	int i, total_tc = 0;
 	uint16_t qpnum_per_tc, bsf, qp_idx;
 
 	ret = validate_tcmap_parameter(vsi, enabled_tcmap);
@@ -7928,13 +7929,14 @@ i40e_parse_dcb_configure(struct rte_eth_dev *dev,
  *
  * Returns 0 on success, negative value on failure
  */
-static int
+static enum i40e_status_code
 i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 {
 	struct i40e_aqc_query_vsi_ets_sla_config_resp bw_ets_config = {0};
 	struct i40e_aqc_query_vsi_bw_config_resp bw_config = {0};
 	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
-	int i, ret;
+	enum i40e_status_code ret;
+	int i;
 	uint32_t tc_bw_max;
 
 	/* Get the VSI level BW configuration */
@@ -7944,7 +7946,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 			 "couldn't get PF vsi bw config, err %s aq_err %s\n",
 			 i40e_stat_str(hw, ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
-		return -EINVAL;
+		return ret;
 	}
 
 	/* Get the VSI level BW configuration per TC */
@@ -7955,7 +7957,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 			 "couldn't get PF vsi ets bw config, err %s aq_err %s\n",
 			 i40e_stat_str(hw, ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
-		return -EINVAL;
+		return ret;
 	}
 
 	if (bw_config.tc_valid_bits != bw_ets_config.tc_valid_bits) {
@@ -7983,15 +7985,16 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 			 __func__, vsi->seid, i, bw_config.qs_handles[i]);
 	}
 
-	return 0;
+	return ret;
 }
 
-static int
+static enum i40e_status_code
 i40e_vsi_update_queue_mapping(struct i40e_vsi *vsi,
 			      struct i40e_aqc_vsi_properties_data *info,
 			      uint8_t enabled_tcmap)
 {
-	int ret, i, total_tc = 0;
+	enum i40e_status_code ret;
+	int i, total_tc = 0;
 	uint16_t qpnum_per_tc, bsf, qp_idx;
 	struct rte_eth_dev_data *dev_data = I40E_VSI_TO_DEV_DATA(vsi);
 
@@ -8058,13 +8061,13 @@ i40e_vsi_update_queue_mapping(struct i40e_vsi *vsi,
  *
  * Returns 0 on success, negative value on failure
  */
-static int
+static enum i40e_status_code
 i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 tc_map)
 {
 	struct i40e_aqc_configure_vsi_tc_bw_data bw_data;
 	struct i40e_vsi_context ctxt;
 	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
-	int ret = 0;
+	enum i40e_status_code ret = I40E_SUCCESS;
 	int i;
 
 	/* Check if enabled_tc is same as existing or new TCs */
@@ -8150,7 +8153,8 @@ i40e_dcb_hw_configure(struct i40e_pf *pf,
 	struct i40e_dcbx_config *old_cfg = &hw->local_dcbx_config;
 	struct i40e_vsi *main_vsi = pf->main_vsi;
 	struct i40e_vsi_list *vsi_list;
-	int i, ret;
+	enum i40e_status_code ret;
+	int i;
 	uint32_t val;
 
 	/* Use the FW API if FW > v4.4*/
-- 
1.8.1.4

[dpdk-dev] [PATCH v2 2/2] app/testpmd: fix ICC compile issue

[Helin Zhang]

It fixes compile issue on ICC 13.0.0.

Error logs:
app/test-pmd/cmdline.c(8160): error #188: enumerated type mixed
with another type
    entry.input.flow.tunnel_flow.tunnel_type =
        str2fdir_tunneltype(res->tunnel_type);

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 app/test-pmd/cmdline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

v2 changes:
Corrected the variable/function type, to replace casting.

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index c637198..cc9ece6 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -7996,14 +7996,14 @@ str2flowtype(char *string)
 	return RTE_ETH_FLOW_UNKNOWN;
 }
 
-static uint8_t
+static enum rte_eth_fdir_tunnel_type
 str2fdir_tunneltype(char *string)
 {
 	uint8_t i = 0;
 
 	static const struct {
 		char str[32];
-		uint8_t type;
+		enum rte_eth_fdir_tunnel_type type;
 	} tunneltype_str[] = {
 		{"NVGRE", RTE_FDIR_TUNNEL_TYPE_NVGRE},
 		{"VxLAN", RTE_FDIR_TUNNEL_TYPE_VXLAN},
-- 
1.8.1.4

Re: [dpdk-dev] [PATCH v2 0/2] fix compile issues on ICC

[De Lara Guarch, Pablo]

Hi Helin,

> -----Original Message-----
> From: Zhang, Helin
> Sent: Monday, November 09, 2015 2:46 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo; Zhang, Helin
> Subject: [PATCH v2 0/2] fix compile issues on ICC
> 
> It fixes compile issues for i40e, and testpmd on ICC 13.0.0.
> 
> v2 changes:
> Corrected the variable/function type, to replace casting.
> 
> Helin Zhang (2):
>   i40e: fix ICC compile issue
>   app/testpmd: fix ICC compile issue
> 
>  app/test-pmd/cmdline.c         |  4 ++--
>  drivers/net/i40e/i40e_ethdev.c | 34 +++++++++++++++++++---------------
>  2 files changed, 21 insertions(+), 17 deletions(-)
> 
> --
> 1.8.1.4

Sorry, I missed that you should add a "Fixes" line on each patch.

Thanks,
Pablo

[dpdk-dev] [PATCH v3 0/2] fix compile issues on ICC

[Helin Zhang]

It fixes compile issues for i40e, and testpmd on ICC 13.0.0.

v2 changes:
Corrected the variable/function type, to replace casting.

v3 changes:
Added 'Fixes' line in the commit logs.

Helin Zhang (2):
  i40e: fix ICC compile issue
  app/testpmd: fix ICC compile issue

 app/test-pmd/cmdline.c         |  4 ++--
 drivers/net/i40e/i40e_ethdev.c | 34 +++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 17 deletions(-)

-- 
1.8.1.4

[dpdk-dev] [PATCH v3 1/2] i40e: fix ICC compile issue

[Helin Zhang]

It fixes compile issue on ICC 13.0.0.

Error logs:
i40e_ethdev.c(7943): error #188: enumerated type mixed with another type
    PMD_INIT_LOG(ERR,

Fixes: c8b9a3e3fe1b ("i40e: support DCB mode")

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

v2 changes:
Corrected the variable/function type, to replace casting.

v3 changes:
Added 'Fixes' line in the commit logs.

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index ddf3d38..30fb106 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -3418,7 +3418,7 @@ bitmap_is_subset(uint8_t src1, uint8_t src2)
 	return !((src1 ^ src2) & src2);
 }
 
-static int
+static enum i40e_status_code
 validate_tcmap_parameter(struct i40e_vsi *vsi, uint8_t enabled_tcmap)
 {
 	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
@@ -3426,14 +3426,14 @@ validate_tcmap_parameter(struct i40e_vsi *vsi, uint8_t enabled_tcmap)
 	/* If DCB is not supported, only default TC is supported */
 	if (!hw->func_caps.dcb && enabled_tcmap != I40E_DEFAULT_TCMAP) {
 		PMD_DRV_LOG(ERR, "DCB is not enabled, only TC0 is supported");
-		return -EINVAL;
+		return I40E_NOT_SUPPORTED;
 	}
 
 	if (!bitmap_is_subset(hw->func_caps.enabled_tcmap, enabled_tcmap)) {
 		PMD_DRV_LOG(ERR, "Enabled TC map 0x%x not applicable to "
 			    "HW support 0x%x", hw->func_caps.enabled_tcmap,
 			    enabled_tcmap);
-		return -EINVAL;
+		return I40E_NOT_SUPPORTED;
 	}
 	return I40E_SUCCESS;
 }
@@ -3518,12 +3518,13 @@ i40e_vsi_update_tc_bandwidth(struct i40e_vsi *vsi, uint8_t enabled_tcmap)
 	return I40E_SUCCESS;
 }
 
-static int
+static enum i40e_status_code
 i40e_vsi_config_tc_queue_mapping(struct i40e_vsi *vsi,
 				 struct i40e_aqc_vsi_properties_data *info,
 				 uint8_t enabled_tcmap)
 {
-	int ret, i, total_tc = 0;
+	enum i40e_status_code ret;
+	int i, total_tc = 0;
 	uint16_t qpnum_per_tc, bsf, qp_idx;
 
 	ret = validate_tcmap_parameter(vsi, enabled_tcmap);
@@ -7928,13 +7929,14 @@ i40e_parse_dcb_configure(struct rte_eth_dev *dev,
  *
  * Returns 0 on success, negative value on failure
  */
-static int
+static enum i40e_status_code
 i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 {
 	struct i40e_aqc_query_vsi_ets_sla_config_resp bw_ets_config = {0};
 	struct i40e_aqc_query_vsi_bw_config_resp bw_config = {0};
 	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
-	int i, ret;
+	enum i40e_status_code ret;
+	int i;
 	uint32_t tc_bw_max;
 
 	/* Get the VSI level BW configuration */
@@ -7944,7 +7946,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 			 "couldn't get PF vsi bw config, err %s aq_err %s\n",
 			 i40e_stat_str(hw, ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
-		return -EINVAL;
+		return ret;
 	}
 
 	/* Get the VSI level BW configuration per TC */
@@ -7955,7 +7957,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 			 "couldn't get PF vsi ets bw config, err %s aq_err %s\n",
 			 i40e_stat_str(hw, ret),
 			 i40e_aq_str(hw, hw->aq.asq_last_status));
-		return -EINVAL;
+		return ret;
 	}
 
 	if (bw_config.tc_valid_bits != bw_ets_config.tc_valid_bits) {
@@ -7983,15 +7985,16 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
 			 __func__, vsi->seid, i, bw_config.qs_handles[i]);
 	}
 
-	return 0;
+	return ret;
 }
 
-static int
+static enum i40e_status_code
 i40e_vsi_update_queue_mapping(struct i40e_vsi *vsi,
 			      struct i40e_aqc_vsi_properties_data *info,
 			      uint8_t enabled_tcmap)
 {
-	int ret, i, total_tc = 0;
+	enum i40e_status_code ret;
+	int i, total_tc = 0;
 	uint16_t qpnum_per_tc, bsf, qp_idx;
 	struct rte_eth_dev_data *dev_data = I40E_VSI_TO_DEV_DATA(vsi);
 
@@ -8058,13 +8061,13 @@ i40e_vsi_update_queue_mapping(struct i40e_vsi *vsi,
  *
  * Returns 0 on success, negative value on failure
  */
-static int
+static enum i40e_status_code
 i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 tc_map)
 {
 	struct i40e_aqc_configure_vsi_tc_bw_data bw_data;
 	struct i40e_vsi_context ctxt;
 	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
-	int ret = 0;
+	enum i40e_status_code ret = I40E_SUCCESS;
 	int i;
 
 	/* Check if enabled_tc is same as existing or new TCs */
@@ -8150,7 +8153,8 @@ i40e_dcb_hw_configure(struct i40e_pf *pf,
 	struct i40e_dcbx_config *old_cfg = &hw->local_dcbx_config;
 	struct i40e_vsi *main_vsi = pf->main_vsi;
 	struct i40e_vsi_list *vsi_list;
-	int i, ret;
+	enum i40e_status_code ret;
+	int i;
 	uint32_t val;
 
 	/* Use the FW API if FW > v4.4*/
-- 
1.8.1.4

[dpdk-dev] [PATCH v3 2/2] app/testpmd: fix ICC compile issue

[Helin Zhang]

It fixes compile issue on ICC 13.0.0.

Error logs:
app/test-pmd/cmdline.c(8160): error #188: enumerated type mixed
with another type
    entry.input.flow.tunnel_flow.tunnel_type =
        str2fdir_tunneltype(res->tunnel_type);

Fixes: 53b2bb9b7ea7 ("app/testpmd: new flow director commands")

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 app/test-pmd/cmdline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

v2 changes:
Corrected the variable/function type, to replace casting.

v3 changes:
Added 'Fixes' line in the commit logs.

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2d43efa..3cb973c 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8019,14 +8019,14 @@ str2flowtype(char *string)
 	return RTE_ETH_FLOW_UNKNOWN;
 }
 
-static uint8_t
+static enum rte_eth_fdir_tunnel_type
 str2fdir_tunneltype(char *string)
 {
 	uint8_t i = 0;
 
 	static const struct {
 		char str[32];
-		uint8_t type;
+		enum rte_eth_fdir_tunnel_type type;
 	} tunneltype_str[] = {
 		{"NVGRE", RTE_FDIR_TUNNEL_TYPE_NVGRE},
 		{"VxLAN", RTE_FDIR_TUNNEL_TYPE_VXLAN},
-- 
1.8.1.4

Re: [dpdk-dev] [PATCH v3 0/2] fix compile issues on ICC

[Thomas Monjalon]

> > It fixes compile issues for i40e, and testpmd on ICC 13.0.0.
> > 
> > v2 changes:
> > Corrected the variable/function type, to replace casting.
> > 
> > v3 changes:
> > Added 'Fixes' line in the commit logs.
> > 
> > Helin Zhang (2):
> >   i40e: fix ICC compile issue
> >   app/testpmd: fix ICC compile issue
> > 
> >  app/test-pmd/cmdline.c         |  4 ++--
> >  drivers/net/i40e/i40e_ethdev.c | 34 +++++++++++++++++++---------------
> >  2 files changed, 21 insertions(+), 17 deletions(-)
> > 
> > --
> > 1.8.1.4
> 
> Series-acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks