67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
|
From e09cc47f4eb826f3bfbc93c579d891cf18310d81 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dengdui Huang <huangdengdui@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")
|
||
|
|
Cc: stable@dpdk.org
|
||
|
|
|
||
|
|
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
|
||
|
|
Acked-by: Jie Hai <haijie1@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 001ff49..2c16644 100644
|
||
|
|
--- a/drivers/net/hns3/hns3_cmd.c
|
||
|
|
+++ b/drivers/net/hns3/hns3_cmd.c
|
||
|
|
@@ -545,9 +545,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 2340fb2..cc2edb3 100644
|
||
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
||
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
||
|
|
@@ -6651,8 +6651,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 c190d51..00d226d 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.33.0
|
||
|
|
|