[dpdk-stable] patch 'net/ice: fix RXDID default value in DCF' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/12/21. 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.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/e244e8c066d4a5473f546ea9e31ec221eb3118cd

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From e244e8c066d4a5473f546ea9e31ec221eb3118cd Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Tue, 17 Aug 2021 11:41:23 +0800
Subject: [PATCH] net/ice: fix RXDID default value in DCF
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit fb50aadcb3c0e137c8751d6c47faf75945df9577 ]

Since DPDK 20.11 the default rxdid is changed from 16 to 22, but the
DCF data path didn't change, the patch fix the gap.

Fixes: 12443386a0b0 ("net/ice: support flex Rx descriptor RxDID22")

Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Tested-by: Zhimin Huang <zhiminx.huang at intel.com>
---
 drivers/net/ice/ice_dcf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c
index 294ddcd2e1..3925a51f12 100644
--- a/drivers/net/ice/ice_dcf.c
+++ b/drivers/net/ice/ice_dcf.c
@@ -828,7 +828,7 @@ ice_dcf_init_rss(struct ice_dcf_hw *hw)
 
 #define IAVF_RXDID_LEGACY_0 0
 #define IAVF_RXDID_LEGACY_1 1
-#define IAVF_RXDID_COMMS_GENERIC 16
+#define IAVF_RXDID_COMMS_OVS_1 22
 
 int
 ice_dcf_configure_queues(struct ice_dcf_hw *hw)
@@ -876,8 +876,8 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)
 		if (hw->vf_res->vf_cap_flags &
 		    VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
 		    hw->supported_rxdid &
-		    BIT(IAVF_RXDID_COMMS_GENERIC)) {
-			vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_GENERIC;
+		    BIT(IAVF_RXDID_COMMS_OVS_1)) {
+			vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_OVS_1;
 			PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
 				    "Queue[%d]", vc_qp->rxq.rxdid, i);
 		} else {
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:03.103181160 +0800
+++ 0022-net-ice-fix-RXDID-default-value-in-DCF.patch	2021-11-10 14:17:01.760746991 +0800
@@ -1 +1 @@
-From fb50aadcb3c0e137c8751d6c47faf75945df9577 Mon Sep 17 00:00:00 2001
+From e244e8c066d4a5473f546ea9e31ec221eb3118cd Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit fb50aadcb3c0e137c8751d6c47faf75945df9577 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 4c2e0c7216..5b23cc90e0 100644
+index 294ddcd2e1..3925a51f12 100644
@@ -22 +24 @@
-@@ -847,7 +847,7 @@ ice_dcf_init_rss(struct ice_dcf_hw *hw)
+@@ -828,7 +828,7 @@ ice_dcf_init_rss(struct ice_dcf_hw *hw)
@@ -31 +33 @@
-@@ -895,8 +895,8 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)
+@@ -876,8 +876,8 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)