[dpdk-stable] patch 'net/ice/base: fix VSI ID mask to 10 bits' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/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 d4d6d0560a9fb1ce894bb37a389b912b35cb5743 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Thu, 11 Jun 2020 16:43:29 +0800
Subject: [PATCH] net/ice/base: fix VSI ID mask to 10 bits

[ upstream commit 072158c6527c02277ea2a03f844f9b2103c33d42 ]

set_rss_lut failed due to incorrect vsi_id mask. vsi_id is 10 bit
but mask was 0x1FF whereas it should be 0x3FF.

For vsi_num >= 512, FW set_rss_lut has been failing with return code
EACCESS (vsi ownership issue) because software was providing
incorrect vsi_num (dropping 10th bit due to incorrect mask) for
set_rss_lut admin command

Fixes: a90fae1d0755 ("net/ice/base: add admin queue structures and commands")

Signed-off-by: Kiran Patil <kiran.patil at intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/base/ice_adminq_cmd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h
index d196434f4..2118247a7 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -1935,7 +1935,7 @@ struct ice_aqc_get_set_rss_keys {
 struct ice_aqc_get_set_rss_lut {
 #define ICE_AQC_GSET_RSS_LUT_VSI_VALID	BIT(15)
 #define ICE_AQC_GSET_RSS_LUT_VSI_ID_S	0
-#define ICE_AQC_GSET_RSS_LUT_VSI_ID_M	(0x1FF << ICE_AQC_GSET_RSS_LUT_VSI_ID_S)
+#define ICE_AQC_GSET_RSS_LUT_VSI_ID_M	(0x3FF << ICE_AQC_GSET_RSS_LUT_VSI_ID_S)
 	__le16 vsi_id;
 #define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S	0
 #define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_M	\
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:50.874068911 +0100
+++ 0059-net-ice-base-fix-VSI-ID-mask-to-10-bits.patch	2020-07-24 12:53:48.279006311 +0100
@@ -1,8 +1,10 @@
-From 072158c6527c02277ea2a03f844f9b2103c33d42 Mon Sep 17 00:00:00 2001
+From d4d6d0560a9fb1ce894bb37a389b912b35cb5743 Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang at intel.com>
 Date: Thu, 11 Jun 2020 16:43:29 +0800
 Subject: [PATCH] net/ice/base: fix VSI ID mask to 10 bits
 
+[ upstream commit 072158c6527c02277ea2a03f844f9b2103c33d42 ]
+
 set_rss_lut failed due to incorrect vsi_id mask. vsi_id is 10 bit
 but mask was 0x1FF whereas it should be 0x3FF.
 
@@ -12,7 +14,6 @@
 set_rss_lut admin command
 
 Fixes: a90fae1d0755 ("net/ice/base: add admin queue structures and commands")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kiran Patil <kiran.patil at intel.com>
 Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
@@ -23,10 +24,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h
-index eaf6c3d0e..9ee5b4eb5 100644
+index d196434f4..2118247a7 100644
 --- a/drivers/net/ice/base/ice_adminq_cmd.h
 +++ b/drivers/net/ice/base/ice_adminq_cmd.h
-@@ -1992,7 +1992,7 @@ struct ice_aqc_get_set_rss_keys {
+@@ -1935,7 +1935,7 @@ struct ice_aqc_get_set_rss_keys {
  struct ice_aqc_get_set_rss_lut {
  #define ICE_AQC_GSET_RSS_LUT_VSI_VALID	BIT(15)
  #define ICE_AQC_GSET_RSS_LUT_VSI_ID_S	0