[dpdk-stable] patch 'net/ice: fix VSI context' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 549b16da5630940f51985115d6db34311c7468bb Mon Sep 17 00:00:00 2001
From: Beilei Xing <beilei.xing at intel.com>
Date: Sat, 14 Dec 2019 14:14:17 +0800
Subject: [PATCH] net/ice: fix VSI context

[ upstream commit a9faa2223aa84ed8a09a0ea4d5e16bd05b588059 ]

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")

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

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index de189daba9..8b34ed9c71 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);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:40.698571000 +0000
+++ 0046-net-ice-fix-VSI-context.patch	2020-02-11 11:17:38.400001347 +0000
@@ -1,8 +1,10 @@
-From a9faa2223aa84ed8a09a0ea4d5e16bd05b588059 Mon Sep 17 00:00:00 2001
+From 549b16da5630940f51985115d6db34311c7468bb Mon Sep 17 00:00:00 2001
 From: Beilei Xing <beilei.xing at intel.com>
 Date: Sat, 14 Dec 2019 14:14:17 +0800
 Subject: [PATCH] net/ice: fix VSI context
 
+[ upstream commit a9faa2223aa84ed8a09a0ea4d5e16bd05b588059 ]
+
 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.
@@ -10,7 +12,6 @@
 control VSI.
 
 Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
-Cc: stable at dpdk.org
 
 Signed-off-by: Beilei Xing <beilei.xing at intel.com>
 Acked-by: Jingjing Wu <jingjing.wu at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
-index 2cbd82c946..cf99fc358e 100644
+index de189daba9..8b34ed9c71 100644
 --- a/drivers/net/ice/ice_ethdev.c
 +++ b/drivers/net/ice/ice_ethdev.c
-@@ -1576,7 +1576,7 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
+@@ -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);
@@ -31,7 +32,7 @@
  		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);
-@@ -1604,9 +1604,10 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
+@@ -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);