patch 'net/hns3: support new device' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/95826daab3c1f4210dc15790178d10a3068bd0c5

Thanks.

Kevin

---
>From 95826daab3c1f4210dc15790178d10a3068bd0c5 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1 at huawei.com>
Date: Fri, 15 Mar 2024 10:54:48 +0800
Subject: [PATCH] net/hns3: support new device

[ upstream commit 3f1436d7006c2659232305ef2b8b186796319041 ]

This patch introduces the new devices, which are on-chip network
interface controllers with RDMA/DCB/ROH supporting. One is 100GE
and the other is 200GE. Both can be found on HIP09/HIP10 SoCs.

Signed-off-by: Jie Hai <haijie1 at huawei.com>
---
 doc/guides/nics/hns3.rst       | 2 +-
 drivers/net/hns3/hns3_cmd.c    | 4 +++-
 drivers/net/hns3/hns3_ethdev.c | 2 ++
 drivers/net/hns3/hns3_ethdev.h | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
index 380024600b..836a91f86e 100644
--- a/doc/guides/nics/hns3.rst
+++ b/doc/guides/nics/hns3.rst
@@ -7,5 +7,5 @@ HNS3 Poll Mode Driver
 The hns3 PMD (**librte_net_hns3**) provides poll mode driver support
 for the inbuilt HiSilicon Network Subsystem(HNS) network engine
-found in the HiSilicon Kunpeng 920 SoC and Kunpeng 930 SoC .
+found in the HiSilicon Kunpeng 920 SoC (HIP08) and Kunpeng 930 SoC (HIP09/HIP10).
 
 Features
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index 9ca2c0cbb9..924ac0cae3 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -544,5 +544,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
 	    device_id == HNS3_DEV_ID_50GE_RDMA ||
 	    device_id == HNS3_DEV_ID_100G_RDMA_MACSEC ||
-	    device_id == HNS3_DEV_ID_200G_RDMA)
+	    device_id == HNS3_DEV_ID_200G_RDMA ||
+	    device_id == HNS3_DEV_ID_100G_ROH ||
+	    device_id == HNS3_DEV_ID_200G_ROH)
 		hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_DCB_B, 1);
 }
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 4f60b83b3a..56af4a5ddd 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -6714,4 +6714,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_RDMA_MACSEC) },
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_RDMA) },
+	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_ROH) },
+	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_ROH) },
 	{ .vendor_id = 0, }, /* sentinel */
 };
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 5ba9503bf8..4476251d7d 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -29,5 +29,7 @@
 #define HNS3_DEV_ID_50GE_RDMA			0xA224
 #define HNS3_DEV_ID_100G_RDMA_MACSEC		0xA226
+#define HNS3_DEV_ID_100G_ROH	                0xA227
 #define HNS3_DEV_ID_200G_RDMA			0xA228
+#define HNS3_DEV_ID_200G_ROH	                0xA22C
 #define HNS3_DEV_ID_100G_VF			0xA22E
 #define HNS3_DEV_ID_100G_RDMA_PFC_VF		0xA22F
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.133927089 +0100
+++ 0007-net-hns3-support-new-device.patch	2024-04-04 10:49:33.711457635 +0100
@@ -1 +1 @@
-From 3f1436d7006c2659232305ef2b8b186796319041 Mon Sep 17 00:00:00 2001
+From 95826daab3c1f4210dc15790178d10a3068bd0c5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3f1436d7006c2659232305ef2b8b186796319041 ]
+
@@ -10,2 +11,0 @@
-Cc: stable at dpdk.org
-
@@ -14,6 +14,5 @@
- doc/guides/nics/hns3.rst               | 2 +-
- doc/guides/rel_notes/release_24_03.rst | 4 ++++
- drivers/net/hns3/hns3_cmd.c            | 4 +++-
- drivers/net/hns3/hns3_ethdev.c         | 2 ++
- drivers/net/hns3/hns3_ethdev.h         | 2 ++
- 5 files changed, 12 insertions(+), 2 deletions(-)
+ doc/guides/nics/hns3.rst       | 2 +-
+ drivers/net/hns3/hns3_cmd.c    | 4 +++-
+ drivers/net/hns3/hns3_ethdev.c | 2 ++
+ drivers/net/hns3/hns3_ethdev.h | 2 ++
+ 4 files changed, 8 insertions(+), 2 deletions(-)
@@ -22 +21 @@
-index 3b0613fc1b..3e84d1ff1c 100644
+index 380024600b..836a91f86e 100644
@@ -32,13 +30,0 @@
-diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst
-index 8e809456aa..14826ea08f 100644
---- a/doc/guides/rel_notes/release_24_03.rst
-+++ b/doc/guides/rel_notes/release_24_03.rst
-@@ -124,4 +124,8 @@ New Features
-   * Added support for 5760X device family.
- 
-+* **Updated HiSilicon hns3 ethdev driver.**
-+
-+  * Added new device supporting RDMA/DCB/ROH with PCI IDs: ``0xa227, 0xa22c``.
-+
- * **Updated Marvell cnxk net driver.**
- 
@@ -46 +32 @@
-index 2c1664485b..001ff49b36 100644
+index 9ca2c0cbb9..924ac0cae3 100644
@@ -49 +35 @@
-@@ -546,5 +546,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
+@@ -544,5 +544,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
@@ -59 +45 @@
-index b10d1216d2..9730b9a7e9 100644
+index 4f60b83b3a..56af4a5ddd 100644
@@ -62 +48 @@
-@@ -6650,4 +6650,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
+@@ -6714,4 +6714,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
@@ -70 +56 @@
-index 12d8299def..e70c5fff2a 100644
+index 5ba9503bf8..4476251d7d 100644