bc76778e92
Sync some patchs from upstreaming and modifies are as follow: - net/hns3: fix mailbox sync - net/hns3: report maximum buffer size - ethdev: add maximum Rx buffer size - app/procinfo: show RSS hash algorithm - ethdev: get RSS algorithm names - app/procinfo: adjust format of RSS info - app/procinfo: fix RSS info - net/hns3: support setting and querying RSS hash function - net/hns3: report RSS hash algorithms capability - ethdev: set and query RSS hash algorithm - ethdev: clarify RSS related fields usage - net/hns3: fix uninitialized hash algo value - net/hns3: keep set/get algo key functions local - net/hns3: fix some error logs - net/hns3: fix some return values - net/hns3: fix LRO offload to report - net/hns3: fix setting DCB capability - app/testpmd: ease configuring all offloads - net/hns3: refactor interrupt state query - net/hns3: fix IMP or global reset - net/hns3: fix multiple reset detected log - net/hns3: remove reset log in secondary - net/hns3: fix double stats for IMP and global reset - net/hns3: fix crash for NEON and SVE - net/hns3: fix unchecked Rx free threshold - net/hns3: fix typo in function name - net/hns3: fix build warning - telemetry: fix repeat display when callback don't init dict Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
From 0593fced9d1946d55c95c8dea448217f0867faff Mon Sep 17 00:00:00 2001
|
|
From: Dengdui Huang <huangdengdui@huawei.com>
|
|
Date: Fri, 27 Oct 2023 14:09:43 +0800
|
|
Subject: [PATCH 373/394] net/hns3: remove reset log in secondary
|
|
|
|
[ upstream commit 5394df455749f60614a19d791d1d73c26b74dea1 ]
|
|
|
|
The reset event is checked and done in primary. And the secondary
|
|
doesn't check and display reset log. There is a patch to remove the
|
|
check code for secondary. please see commit a8f1f7cf1b42 ("net/hns3:
|
|
fix crash when secondary process access FW")
|
|
|
|
This patch removes the redundant log print of reset.
|
|
|
|
Fixes: a8f1f7cf1b42 ("net/hns3: fix crash when secondary process access FW")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_ethdev.c | 11 +++++------
|
|
drivers/net/hns3/hns3_ethdev_vf.c | 11 +++++------
|
|
2 files changed, 10 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
|
|
index ad595478a7..185f211591 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -5512,14 +5512,13 @@ hns3_is_reset_pending(struct hns3_adapter *hns)
|
|
enum hns3_reset_level reset;
|
|
|
|
/*
|
|
- * Check the registers to confirm whether there is reset pending.
|
|
- * Note: This check may lead to schedule reset task, but only primary
|
|
- * process can process the reset event. Therefore, limit the
|
|
- * checking under only primary process.
|
|
+ * Only primary can process can process the reset event,
|
|
+ * so don't check reset event in secondary.
|
|
*/
|
|
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
|
|
- hns3_check_event_cause(hns, NULL);
|
|
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
|
|
+ return false;
|
|
|
|
+ hns3_check_event_cause(hns, NULL);
|
|
reset = hns3_get_reset_level(hns, &hw->reset.pending);
|
|
if (reset != HNS3_NONE_RESET && hw->reset.level != HNS3_NONE_RESET &&
|
|
hw->reset.level < reset) {
|
|
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
index 02fb4a84cf..003071c6ff 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev_vf.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
@@ -1796,14 +1796,13 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns)
|
|
return false;
|
|
|
|
/*
|
|
- * Check the registers to confirm whether there is reset pending.
|
|
- * Note: This check may lead to schedule reset task, but only primary
|
|
- * process can process the reset event. Therefore, limit the
|
|
- * checking under only primary process.
|
|
+ * Only primary can process can process the reset event,
|
|
+ * so don't check reset event in secondary.
|
|
*/
|
|
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
|
|
- hns3vf_check_event_cause(hns, NULL);
|
|
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
|
|
+ return false;
|
|
|
|
+ hns3vf_check_event_cause(hns, NULL);
|
|
reset = hns3vf_get_reset_level(hw, &hw->reset.pending);
|
|
if (hw->reset.level != HNS3_NONE_RESET && reset != HNS3_NONE_RESET &&
|
|
hw->reset.level < reset) {
|
|
--
|
|
2.23.0
|
|
|