[dpdk-stable] patch 'net/hns3: fix some incomplete command structures' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 019572c6dd21b43703535a03c8a4dd57104de881 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Tue, 25 Aug 2020 19:53:05 +0800
Subject: [PATCH] net/hns3: fix some incomplete command structures

[ upstream commit e2a8cae024a5de4d08bc79dead9528e9ce6836c5 ]

The descriptor of the command between firmware and driver consists of
8-byte header and 24-byte data field. The contents sent to firmware are
packaged into a command structure as the data field of command
descriptor.

There are some command structures in hns3_dcb.h file that are less than
24 byte. So this patch fixes these incomplete command structures.

Fixes: 62e3ccc2b94c ("net/hns3: support flow control")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
 drivers/net/hns3/hns3_dcb.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_dcb.h b/drivers/net/hns3/hns3_dcb.h
index 9c2c5f21c1..1d6fe5dfdf 100644
--- a/drivers/net/hns3/hns3_dcb.h
+++ b/drivers/net/hns3/hns3_dcb.h
@@ -24,16 +24,19 @@ enum hns3_shap_bucket {
 struct hns3_priority_weight_cmd {
 	uint8_t pri_id;
 	uint8_t dwrr;
+	uint8_t rsvd[22];
 };
 
 struct hns3_qs_weight_cmd {
 	uint16_t qs_id;
 	uint8_t dwrr;
+	uint8_t rsvd[21];
 };
 
 struct hns3_pg_weight_cmd {
 	uint8_t pg_id;
 	uint8_t dwrr;
+	uint8_t rsvd[22];
 };
 
 struct hns3_ets_tc_weight_cmd {
@@ -48,6 +51,7 @@ struct hns3_qs_to_pri_link_cmd {
 	uint8_t priority;
 #define HNS3_DCB_QS_PRI_LINK_VLD_MSK	BIT(0)
 	uint8_t link_vld;
+	uint8_t rsvd1[18];
 };
 
 struct hns3_nq_to_qs_link_cmd {
@@ -55,6 +59,7 @@ struct hns3_nq_to_qs_link_cmd {
 	uint16_t rsvd;
 #define HNS3_DCB_Q_QS_LINK_VLD_MSK	BIT(10)
 	uint16_t qset_id;
+	uint8_t rsvd1[18];
 };
 
 #define HNS3_DCB_SHAP_IR_B_MSK  GENMASK(7, 0)
@@ -72,12 +77,14 @@ struct hns3_pri_shapping_cmd {
 	uint8_t pri_id;
 	uint8_t rsvd[3];
 	uint32_t pri_shapping_para;
+	uint32_t rsvd1[4];
 };
 
 struct hns3_pg_shapping_cmd {
 	uint8_t pg_id;
 	uint8_t rsvd[3];
 	uint32_t pg_shapping_para;
+	uint32_t rsvd1[4];
 };
 
 #define HNS3_BP_GRP_NUM		32
@@ -90,16 +97,18 @@ struct hns3_bp_to_qs_map_cmd {
 	uint8_t rsvd[2];
 	uint8_t qs_group_id;
 	uint32_t qs_bit_map;
-	uint32_t rsvd1;
+	uint32_t rsvd1[4];
 };
 
 struct hns3_pfc_en_cmd {
 	uint8_t tx_rx_en_bitmap;
 	uint8_t pri_en_bitmap;
+	uint8_t rsvd[22];
 };
 
 struct hns3_port_shapping_cmd {
 	uint32_t port_shapping_para;
+	uint32_t rsvd[5];
 };
 
 struct hns3_cfg_pause_param_cmd {
@@ -117,6 +126,7 @@ struct hns3_pg_to_pri_link_cmd {
 	uint8_t pg_id;
 	uint8_t rsvd1[3];
 	uint8_t pri_bit_map;
+	uint8_t rsvd2[19];
 };
 
 enum hns3_shaper_level {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.356151519 +0000
+++ 0018-net-hns3-fix-some-incomplete-command-structures.patch	2020-10-28 10:35:11.436829023 +0000
@@ -1,8 +1,10 @@
-From e2a8cae024a5de4d08bc79dead9528e9ce6836c5 Mon Sep 17 00:00:00 2001
+From 019572c6dd21b43703535a03c8a4dd57104de881 Mon Sep 17 00:00:00 2001
 From: Huisong Li <lihuisong at huawei.com>
 Date: Tue, 25 Aug 2020 19:53:05 +0800
 Subject: [PATCH] net/hns3: fix some incomplete command structures
 
+[ upstream commit e2a8cae024a5de4d08bc79dead9528e9ce6836c5 ]
+
 The descriptor of the command between firmware and driver consists of
 8-byte header and 24-byte data field. The contents sent to firmware are
 packaged into a command structure as the data field of command
@@ -12,7 +14,6 @@
 24 byte. So this patch fixes these incomplete command structures.
 
 Fixes: 62e3ccc2b94c ("net/hns3: support flow control")
-Cc: stable at dpdk.org
 
 Signed-off-by: Huisong Li <lihuisong at huawei.com>
 Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
@@ -21,10 +22,10 @@
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/hns3/hns3_dcb.h b/drivers/net/hns3/hns3_dcb.h
-index 1636c5ae88..557d88bc18 100644
+index 9c2c5f21c1..1d6fe5dfdf 100644
 --- a/drivers/net/hns3/hns3_dcb.h
 +++ b/drivers/net/hns3/hns3_dcb.h
-@@ -26,16 +26,19 @@ enum hns3_shap_bucket {
+@@ -24,16 +24,19 @@ enum hns3_shap_bucket {
  struct hns3_priority_weight_cmd {
  	uint8_t pri_id;
  	uint8_t dwrr;
@@ -44,7 +45,7 @@
  };
  
  struct hns3_ets_tc_weight_cmd {
-@@ -50,6 +53,7 @@ struct hns3_qs_to_pri_link_cmd {
+@@ -48,6 +51,7 @@ struct hns3_qs_to_pri_link_cmd {
  	uint8_t priority;
  #define HNS3_DCB_QS_PRI_LINK_VLD_MSK	BIT(0)
  	uint8_t link_vld;
@@ -52,7 +53,7 @@
  };
  
  struct hns3_nq_to_qs_link_cmd {
-@@ -57,6 +61,7 @@ struct hns3_nq_to_qs_link_cmd {
+@@ -55,6 +59,7 @@ struct hns3_nq_to_qs_link_cmd {
  	uint16_t rsvd;
  #define HNS3_DCB_Q_QS_LINK_VLD_MSK	BIT(10)
  	uint16_t qset_id;
@@ -60,7 +61,7 @@
  };
  
  #define HNS3_DCB_SHAP_IR_B_MSK  GENMASK(7, 0)
-@@ -74,12 +79,14 @@ struct hns3_pri_shapping_cmd {
+@@ -72,12 +77,14 @@ struct hns3_pri_shapping_cmd {
  	uint8_t pri_id;
  	uint8_t rsvd[3];
  	uint32_t pri_shapping_para;
@@ -75,7 +76,7 @@
  };
  
  #define HNS3_BP_GRP_NUM		32
-@@ -92,16 +99,18 @@ struct hns3_bp_to_qs_map_cmd {
+@@ -90,16 +97,18 @@ struct hns3_bp_to_qs_map_cmd {
  	uint8_t rsvd[2];
  	uint8_t qs_group_id;
  	uint32_t qs_bit_map;
@@ -95,7 +96,7 @@
  };
  
  struct hns3_cfg_pause_param_cmd {
-@@ -119,6 +128,7 @@ struct hns3_pg_to_pri_link_cmd {
+@@ -117,6 +126,7 @@ struct hns3_pg_to_pri_link_cmd {
  	uint8_t pg_id;
  	uint8_t rsvd1[3];
  	uint8_t pri_bit_map;