!593 sync some patches from upstream about bugfix
From: @chenyi211 Reviewed-by: @li-huisong Signed-off-by: @li-huisong
This commit is contained in:
openeuler-ci-bot
Gitee
commit
34ebea8740
182
0431-dma-hisilicon-remove-support-for-HIP09-platform.patch
Normal file
182
0431-dma-hisilicon-remove-support-for-HIP09-platform.patch
Normal file
@ -0,0 +1,182 @@
|
||||
From 105935aea2804a338160d5828735e1bdb9668d78 Mon Sep 17 00:00:00 2001
|
||||
From: Chengwen Feng <fengchengwen@huawei.com>
|
||||
Date: Mon, 29 Apr 2024 15:15:31 +0800
|
||||
Subject: [PATCH 431/432] dma/hisilicon: remove support for HIP09 platform
|
||||
|
||||
The DMA for HIP09 is no longer available, so delete it.
|
||||
|
||||
Cc: stable@dpdk.org
|
||||
|
||||
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
||||
Signed-off-by: chenyi <chenyi211@huawei.com>
|
||||
---
|
||||
doc/guides/dmadevs/hisilicon.rst | 1 -
|
||||
drivers/dma/hisilicon/hisi_dmadev.c | 40 +----------------------------
|
||||
drivers/dma/hisilicon/hisi_dmadev.h | 35 +------------------------
|
||||
3 files changed, 2 insertions(+), 74 deletions(-)
|
||||
|
||||
diff --git a/doc/guides/dmadevs/hisilicon.rst b/doc/guides/dmadevs/hisilicon.rst
|
||||
index 8c1f0f8886..974bc49376 100644
|
||||
--- a/doc/guides/dmadevs/hisilicon.rst
|
||||
+++ b/doc/guides/dmadevs/hisilicon.rst
|
||||
@@ -13,7 +13,6 @@ Supported Kunpeng SoCs
|
||||
----------------------
|
||||
|
||||
* Kunpeng 920
|
||||
-* Kunpeng 930
|
||||
|
||||
|
||||
Device Setup
|
||||
diff --git a/drivers/dma/hisilicon/hisi_dmadev.c b/drivers/dma/hisilicon/hisi_dmadev.c
|
||||
index 9494b60779..9ea85c86a7 100644
|
||||
--- a/drivers/dma/hisilicon/hisi_dmadev.c
|
||||
+++ b/drivers/dma/hisilicon/hisi_dmadev.c
|
||||
@@ -39,8 +39,6 @@ hisi_dma_queue_base(struct hisi_dma_dev *hw)
|
||||
{
|
||||
if (hw->reg_layout == HISI_DMA_REG_LAYOUT_HIP08)
|
||||
return HISI_DMA_HIP08_QUEUE_BASE;
|
||||
- else if (hw->reg_layout == HISI_DMA_REG_LAYOUT_HIP09)
|
||||
- return HISI_DMA_HIP09_QUEUE_BASE;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
@@ -216,25 +214,6 @@ hisi_dma_init_hw(struct hisi_dma_dev *hw)
|
||||
HISI_DMA_HIP08_QUEUE_INT_MASK_M, true);
|
||||
hisi_dma_update_queue_mbit(hw, HISI_DMA_QUEUE_INT_MASK_REG,
|
||||
HISI_DMA_HIP08_QUEUE_INT_MASK_M, true);
|
||||
- } else if (hw->reg_layout == HISI_DMA_REG_LAYOUT_HIP09) {
|
||||
- hisi_dma_update_queue_mbit(hw, HISI_DMA_QUEUE_CTRL0_REG,
|
||||
- HISI_DMA_HIP09_QUEUE_CTRL0_ERR_ABORT_M, false);
|
||||
- hisi_dma_update_queue_mbit(hw, HISI_DMA_QUEUE_INT_STATUS_REG,
|
||||
- HISI_DMA_HIP09_QUEUE_INT_MASK_M, true);
|
||||
- hisi_dma_update_queue_mbit(hw, HISI_DMA_QUEUE_INT_MASK_REG,
|
||||
- HISI_DMA_HIP09_QUEUE_INT_MASK_M, true);
|
||||
- hisi_dma_update_queue_mbit(hw,
|
||||
- HISI_DMA_HIP09_QUEUE_ERR_INT_STATUS_REG,
|
||||
- HISI_DMA_HIP09_QUEUE_ERR_INT_MASK_M, true);
|
||||
- hisi_dma_update_queue_mbit(hw,
|
||||
- HISI_DMA_HIP09_QUEUE_ERR_INT_MASK_REG,
|
||||
- HISI_DMA_HIP09_QUEUE_ERR_INT_MASK_M, true);
|
||||
- hisi_dma_update_queue_bit(hw, HISI_DMA_QUEUE_CTRL1_REG,
|
||||
- HISI_DMA_HIP09_QUEUE_CTRL1_VA_ENABLE_B, true);
|
||||
- hisi_dma_update_bit(hw,
|
||||
- HISI_DMA_HIP09_QUEUE_CFG_REG(hw->queue_id),
|
||||
- HISI_DMA_HIP09_QUEUE_CFG_LINK_DOWN_MASK_B,
|
||||
- true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -256,8 +235,6 @@ hisi_dma_reg_layout(uint8_t revision)
|
||||
{
|
||||
if (revision == HISI_DMA_REVISION_HIP08B)
|
||||
return HISI_DMA_REG_LAYOUT_HIP08;
|
||||
- else if (revision >= HISI_DMA_REVISION_HIP09A)
|
||||
- return HISI_DMA_REG_LAYOUT_HIP09;
|
||||
else
|
||||
return HISI_DMA_REG_LAYOUT_INVALID;
|
||||
}
|
||||
@@ -328,14 +305,11 @@ hisi_dma_info_get(const struct rte_dma_dev *dev,
|
||||
struct rte_dma_info *dev_info,
|
||||
uint32_t info_sz)
|
||||
{
|
||||
- struct hisi_dma_dev *hw = dev->data->dev_private;
|
||||
+ RTE_SET_USED(dev);
|
||||
RTE_SET_USED(info_sz);
|
||||
|
||||
dev_info->dev_capa = RTE_DMA_CAPA_MEM_TO_MEM |
|
||||
RTE_DMA_CAPA_OPS_COPY;
|
||||
- if (hw->reg_layout == HISI_DMA_REG_LAYOUT_HIP09)
|
||||
- dev_info->dev_capa |= RTE_DMA_CAPA_HANDLES_ERRORS;
|
||||
-
|
||||
dev_info->max_vchans = 1;
|
||||
dev_info->max_desc = HISI_DMA_MAX_DESC_NUM;
|
||||
dev_info->min_desc = HISI_DMA_MIN_DESC_NUM;
|
||||
@@ -514,18 +488,6 @@ hisi_dma_dump_common(struct hisi_dma_dev *hw, FILE *f)
|
||||
{ HISI_DMA_REG_LAYOUT_HIP08,
|
||||
HISI_DMA_HIP08_DUMP_START_REG,
|
||||
HISI_DMA_HIP08_DUMP_END_REG },
|
||||
- { HISI_DMA_REG_LAYOUT_HIP09,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_A_START_REG,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_A_END_REG },
|
||||
- { HISI_DMA_REG_LAYOUT_HIP09,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_B_START_REG,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_B_END_REG },
|
||||
- { HISI_DMA_REG_LAYOUT_HIP09,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_C_START_REG,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_C_END_REG },
|
||||
- { HISI_DMA_REG_LAYOUT_HIP09,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_D_START_REG,
|
||||
- HISI_DMA_HIP09_DUMP_REGION_D_END_REG },
|
||||
};
|
||||
uint32_t i;
|
||||
|
||||
diff --git a/drivers/dma/hisilicon/hisi_dmadev.h b/drivers/dma/hisilicon/hisi_dmadev.h
|
||||
index deb1357eea..9638823b7b 100644
|
||||
--- a/drivers/dma/hisilicon/hisi_dmadev.h
|
||||
+++ b/drivers/dma/hisilicon/hisi_dmadev.h
|
||||
@@ -23,22 +23,14 @@
|
||||
#define HISI_DMA_DEVICE_ID 0xA122
|
||||
#define HISI_DMA_PCI_REVISION_ID_REG 0x08
|
||||
#define HISI_DMA_REVISION_HIP08B 0x21
|
||||
-#define HISI_DMA_REVISION_HIP09A 0x30
|
||||
|
||||
#define HISI_DMA_MAX_HW_QUEUES 4
|
||||
#define HISI_DMA_MAX_DESC_NUM 8192
|
||||
#define HISI_DMA_MIN_DESC_NUM 32
|
||||
|
||||
-/**
|
||||
- * The HIP08B(HiSilicon IP08) and HIP09B(HiSilicon IP09) are DMA iEPs, they
|
||||
- * have the same pci device id but different pci revision.
|
||||
- * Unfortunately, they have different register layouts, so two layout
|
||||
- * enumerations are defined.
|
||||
- */
|
||||
enum {
|
||||
HISI_DMA_REG_LAYOUT_INVALID = 0,
|
||||
- HISI_DMA_REG_LAYOUT_HIP08,
|
||||
- HISI_DMA_REG_LAYOUT_HIP09
|
||||
+ HISI_DMA_REG_LAYOUT_HIP08
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -67,9 +59,6 @@ enum {
|
||||
* length of queue-region. The global offset for a single queue register is
|
||||
* calculated by:
|
||||
* offset = queue-base + (queue-id * queue-region) + reg-offset-in-region.
|
||||
- *
|
||||
- * The first part of queue region is basically the same for HIP08 and HIP09
|
||||
- * register layouts, therefore, HISI_QUEUE_* registers are defined for it.
|
||||
*/
|
||||
#define HISI_DMA_QUEUE_SQ_BASE_L_REG 0x0
|
||||
#define HISI_DMA_QUEUE_SQ_BASE_H_REG 0x4
|
||||
@@ -108,28 +97,6 @@ enum {
|
||||
#define HISI_DMA_HIP08_DUMP_START_REG 0x2000
|
||||
#define HISI_DMA_HIP08_DUMP_END_REG 0x2280
|
||||
|
||||
-/**
|
||||
- * HiSilicon IP09 DMA register and field define:
|
||||
- */
|
||||
-#define HISI_DMA_HIP09_QUEUE_BASE 0x2000
|
||||
-#define HISI_DMA_HIP09_QUEUE_CTRL0_ERR_ABORT_M GENMASK(31, 28)
|
||||
-#define HISI_DMA_HIP09_QUEUE_CTRL1_VA_ENABLE_B 2
|
||||
-#define HISI_DMA_HIP09_QUEUE_INT_MASK_M 0x1
|
||||
-#define HISI_DMA_HIP09_QUEUE_ERR_INT_STATUS_REG 0x48
|
||||
-#define HISI_DMA_HIP09_QUEUE_ERR_INT_MASK_REG 0x4C
|
||||
-#define HISI_DMA_HIP09_QUEUE_ERR_INT_MASK_M GENMASK(18, 1)
|
||||
-#define HISI_DMA_HIP09_QUEUE_CFG_REG(queue_id) (0x800 + \
|
||||
- (queue_id) * 0x20)
|
||||
-#define HISI_DMA_HIP09_QUEUE_CFG_LINK_DOWN_MASK_B 16
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_A_START_REG 0x0
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_A_END_REG 0x368
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_B_START_REG 0x800
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_B_END_REG 0xA08
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_C_START_REG 0x1800
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_C_END_REG 0x1A4C
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_D_START_REG 0x1C00
|
||||
-#define HISI_DMA_HIP09_DUMP_REGION_D_END_REG 0x1CC4
|
||||
-
|
||||
/**
|
||||
* In fact, there are multiple states, but it need to pay attention to
|
||||
* the following three states for the driver:
|
||||
--
|
||||
2.33.0
|
||||
|
||||
80
0432-net-hns3-support-new-device.patch
Normal file
80
0432-net-hns3-support-new-device.patch
Normal file
@ -0,0 +1,80 @@
|
||||
From 14314efc4ecdaff54334303e21b73ef434726a1d Mon Sep 17 00:00:00 2001
|
||||
From: Jie Hai <haijie1@huawei.com>
|
||||
Date: Fri, 15 Mar 2024 10:54:48 +0800
|
||||
Subject: [PATCH 432/432] 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.
|
||||
|
||||
Cc: stable@dpdk.org
|
||||
|
||||
Signed-off-by: Jie Hai <haijie1@huawei.com>
|
||||
Signed-off-by: chenyi <chenyi211@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 5ac64495a6..ebe3f7f7dd 100644
|
||||
--- a/doc/guides/nics/hns3.rst
|
||||
+++ b/doc/guides/nics/hns3.rst
|
||||
@@ -6,7 +6,7 @@ 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 2c1664485b..001ff49b36 100644
|
||||
--- a/drivers/net/hns3/hns3_cmd.c
|
||||
+++ b/drivers/net/hns3/hns3_cmd.c
|
||||
@@ -545,7 +545,9 @@ 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_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 0e1ca1b314..325e745797 100644
|
||||
--- a/drivers/net/hns3/hns3_ethdev.c
|
||||
+++ b/drivers/net/hns3/hns3_ethdev.c
|
||||
@@ -6649,6 +6649,8 @@ 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 12d8299def..e70c5fff2a 100644
|
||||
--- a/drivers/net/hns3/hns3_ethdev.h
|
||||
+++ b/drivers/net/hns3/hns3_ethdev.h
|
||||
@@ -28,7 +28,9 @@
|
||||
#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
|
||||
|
||||
11
dpdk.spec
11
dpdk.spec
@ -1,6 +1,6 @@
|
||||
Name: dpdk
|
||||
Version: 21.11
|
||||
Release: 66
|
||||
Release: 67
|
||||
Packager: packaging@6wind.com
|
||||
URL: http://dpdk.org
|
||||
%global source_version 21.11
|
||||
@ -464,6 +464,9 @@ Patch6427: 0428-net-hns3-fix-read-Rx-timestamp-handle.patch
|
||||
Patch6428: 0429-net-hns3-fix-offload-flag-of-IEEE-1588.patch
|
||||
Patch6429: 0430-app-testpmd-fix-crash-in-multi-process-forwarding.patch
|
||||
|
||||
Patch6430: 0431-dma-hisilicon-remove-support-for-HIP09-platform.patch
|
||||
Patch6431: 0432-net-hns3-support-new-device.patch
|
||||
|
||||
Summary: Data Plane Development Kit core
|
||||
Group: System Environment/Libraries
|
||||
License: BSD and LGPLv2 and GPLv2
|
||||
@ -619,6 +622,12 @@ strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko
|
||||
/usr/sbin/depmod
|
||||
|
||||
%changelog
|
||||
* Mon Jun 3 2024 chenyi <chenyi211@huawei.com> - 21.11-67
|
||||
Sync some patches from upstream about bugfix, modifies
|
||||
are as follow:
|
||||
- net/hns3: support new device
|
||||
- dma/hisilicon: remove support for HIP09 platform
|
||||
|
||||
* Tue May 28 2024 chenyi <chenyi211@huawei.com> - 21.11-66
|
||||
Sync some patches from upstream about bugfix, modifies
|
||||
are as follow:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user