代码拉取完成,页面将自动刷新
同步操作将从 src-openEuler/dpdk 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
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
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。