patch 'net/hns3: remove ROH devices' has been queued to stable release 22.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.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 11/14/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/e8e117b4b2a668a3e820b795d381ace9a2b9da5f

Thanks.

Luca Boccassi

---
>From e8e117b4b2a668a3e820b795d381ace9a2b9da5f Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Sat, 26 Oct 2024 14:38:35 +0800
Subject: [PATCH] net/hns3: remove ROH devices

[ upstream commit feb4548ffd80bf249239d99bf9053ecf78f815d1 ]

The devices added in commit 3f1436d7006c ("net/hns3: support new device")
is no longer available, so revert it.

Fixes: 3f1436d7006c ("net/hns3: support new device")

Signed-off-by: Dengdui Huang <huangdengdui at huawei.com>
Acked-by: Jie Hai <haijie1 at huawei.com>
---
 drivers/net/hns3/hns3_cmd.c    | 4 +---
 drivers/net/hns3/hns3_ethdev.c | 2 --
 drivers/net/hns3/hns3_ethdev.h | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index fb515ed0ee..7bdf7740c1 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -539,9 +539,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
 	if (device_id == HNS3_DEV_ID_25GE_RDMA ||
 	    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_100G_ROH ||
-	    device_id == HNS3_DEV_ID_200G_ROH)
+	    device_id == HNS3_DEV_ID_200G_RDMA)
 		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 0050d46ae7..9b0b3776f4 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -6650,8 +6650,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_50GE_RDMA) },
 	{ 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 1afe4c4ff7..5445170c8b 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -28,9 +28,7 @@
 #define HNS3_DEV_ID_25GE_RDMA			0xA222
 #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.45.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-12 22:06:59.421331504 +0000
+++ 0023-net-hns3-remove-ROH-devices.patch	2024-11-12 22:06:58.671307265 +0000
@@ -1 +1 @@
-From feb4548ffd80bf249239d99bf9053ecf78f815d1 Mon Sep 17 00:00:00 2001
+From e8e117b4b2a668a3e820b795d381ace9a2b9da5f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit feb4548ffd80bf249239d99bf9053ecf78f815d1 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 3c5fdbef8f..146444e2fa 100644
+index fb515ed0ee..7bdf7740c1 100644
@@ -24 +25 @@
-@@ -545,9 +545,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
+@@ -539,9 +539,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
@@ -36 +37 @@
-index 365b852969..d748eca0b5 100644
+index 0050d46ae7..9b0b3776f4 100644
@@ -39 +40 @@
-@@ -6651,8 +6651,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
+@@ -6650,8 +6650,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
@@ -49 +50 @@
-index 799b61038a..7824503bb8 100644
+index 1afe4c4ff7..5445170c8b 100644