net/ice: correct VSI context

Message ID 1576304057-20355-1-git-send-email-beilei.xing@intel.com (mailing list archive)
State Accepted, archived
Delegated to: xiaolong ye
Headers
Series net/ice: correct VSI context |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/travis-robot success Travis build: passed
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/Intel-compilation fail apply issues

Commit Message

Xing, Beilei Dec. 14, 2019, 6:14 a.m. UTC
  There'll always be a MDD event triggered when adding
a FDIR rule. The root cause is 'LAN enable' is not
configured during control VSI setup.
Besides, correct FDIR fields for both main VSI and
control VSI.

Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
Cc: stable@dpdk.org

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
  

Comments

Jingjing Wu Dec. 30, 2019, 3:38 a.m. UTC | #1
> -----Original Message-----
> From: Xing, Beilei <beilei.xing@intel.com>
> Sent: Saturday, December 14, 2019 2:14 PM
> To: Wu, Jingjing <jingjing.wu@intel.com>; dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: stable@dpdk.org
> Subject: [PATCH] net/ice: correct VSI context
> 
> There'll always be a MDD event triggered when adding
> a FDIR rule. The root cause is 'LAN enable' is not
> configured during control VSI setup.
> Besides, correct FDIR fields for both main VSI and
> control VSI.
> 
> Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
  
Xiaolong Ye Jan. 3, 2020, 7:41 a.m. UTC | #2
On 12/30, Wu, Jingjing wrote:
>
>
>> -----Original Message-----
>> From: Xing, Beilei <beilei.xing@intel.com>
>> Sent: Saturday, December 14, 2019 2:14 PM
>> To: Wu, Jingjing <jingjing.wu@intel.com>; dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>
>> Cc: stable@dpdk.org
>> Subject: [PATCH] net/ice: correct VSI context
>> 
>> There'll always be a MDD event triggered when adding
>> a FDIR rule. The root cause is 'LAN enable' is not
>> configured during control VSI setup.
>> Besides, correct FDIR fields for both main VSI and
>> control VSI.
>> 
>> Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
>> Cc: stable@dpdk.org
>> 
>> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
>Acked-by: Jingjing Wu <jingjing.wu@intel.com>

Applied to dpdk-next-net-intel, Thanks.
  

Patch

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index de189da..8b34ed9 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1573,7 +1573,7 @@  ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
 		cfg = ICE_AQ_VSI_PROP_SECURITY_VALID |
 			ICE_AQ_VSI_PROP_FLOW_DIR_VALID;
 		vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg);
-		cfg = ICE_AQ_VSI_FD_ENABLE | ICE_AQ_VSI_FD_PROG_ENABLE;
+		cfg = ICE_AQ_VSI_FD_ENABLE;
 		vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg);
 		vsi_ctx.info.max_fd_fltr_dedicated =
 			rte_cpu_to_le_16(hw->func_caps.fd_fltr_guar);
@@ -1601,9 +1601,10 @@  ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
 
 		cfg = ICE_AQ_VSI_PROP_FLOW_DIR_VALID;
 		vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg);
-		cfg = ICE_AQ_VSI_FD_ENABLE | ICE_AQ_VSI_FD_PROG_ENABLE;
+		cfg = ICE_AQ_VSI_FD_PROG_ENABLE;
 		vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg);
 		vsi_ctx.info.sw_id = hw->port_info->sw_id;
+		vsi_ctx.info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;
 		ret = ice_vsi_config_tc_queue_mapping(vsi,
 						      &vsi_ctx.info,
 						      ICE_DEFAULT_TCMAP);