From: Dengdui Huang <huangdengdui@huawei.com>
To: <dev@dpdk.org>
Cc: <ferruh.yigit@amd.com>, <stephen@networkplumber.org>,
<haijie1@huawei.com>, <lihuisong@huawei.com>,
<liuyonglong@huawei.com>, <fengchengwen@huawei.com>
Subject: [PATCH 3/3] net/hns3: fix the VF reset interrupted possibly
Date: Mon, 27 Nov 2023 21:39:03 +0800 [thread overview]
Message-ID: <20231127133903.1138657-4-huangdengdui@huawei.com> (raw)
In-Reply-To: <20231127133903.1138657-1-huangdengdui@huawei.com>
Currently, the VF reset interrupt is enabled before the reset
process is completed. If the VF reset is triggered by an IMP
reset, the initialization of IMP is may not completed, and the
VF reset interrupt may continue to be reported. In this scenario,
the VF reset being performed by the driver does not need to be
interrupted. Therefore, for VF reset, the driver has to enable
the interrupt after the end of reset.
Fixes: a5475d61fa3 ("net/hns3: support VF")
Cc: stable@dpdk.org
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
---
drivers/net/hns3/hns3_ethdev.h | 12 ++++++++++++
drivers/net/hns3/hns3_ethdev_vf.c | 19 +++++++++++++++++--
drivers/net/hns3/hns3_intr.c | 6 ++----
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 668f141e32..12d8299def 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -1035,6 +1035,7 @@ void hns3vf_update_link_status(struct hns3_hw *hw, uint8_t link_status,
uint32_t link_speed, uint8_t link_duplex);
void hns3vf_update_push_lsc_cap(struct hns3_hw *hw, bool supported);
void hns3_clear_reset_event(struct hns3_hw *hw);
+void hns3vf_clear_reset_event(struct hns3_hw *hw);
const char *hns3_get_media_type_name(uint8_t media_type);
@@ -1049,4 +1050,15 @@ is_reset_pending(struct hns3_adapter *hns)
return ret;
}
+static inline void
+hns3_clear_reset_status(struct hns3_hw *hw)
+{
+ struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
+
+ if (hns->is_vf)
+ hns3vf_clear_reset_event(hw);
+ else
+ hns3_clear_reset_event(hw);
+}
+
#endif /* HNS3_ETHDEV_H */
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 156fb905f9..53bcc44161 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -531,6 +531,19 @@ hns3vf_enable_irq0(struct hns3_hw *hw)
hns3_write_dev(hw, HNS3_MISC_VECTOR_REG_BASE, 1);
}
+void
+hns3vf_clear_reset_event(struct hns3_hw *hw)
+{
+ uint32_t clearval;
+ uint32_t cmdq_stat_reg;
+
+ cmdq_stat_reg = hns3_read_dev(hw, HNS3_VECTOR0_CMDQ_STAT_REG);
+ clearval = cmdq_stat_reg & ~BIT(HNS3_VECTOR0_RST_INT_B);
+ hns3_write_dev(hw, HNS3_VECTOR0_CMDQ_SRC_REG, clearval);
+
+ hns3vf_enable_irq0(hw);
+}
+
static enum hns3vf_evt_cause
hns3vf_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval)
{
@@ -605,8 +618,10 @@ hns3vf_interrupt_handler(void *param)
break;
}
- /* Enable interrupt */
- hns3vf_enable_irq0(hw);
+ /* Enable interrupt if it is not cause by reset */
+ if (event_cause == HNS3VF_VECTOR0_EVENT_MBX ||
+ event_cause == HNS3VF_VECTOR0_EVENT_OTHER)
+ hns3vf_enable_irq0(hw);
}
void
diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c
index 52b5435a23..916bf30dcb 100644
--- a/drivers/net/hns3/hns3_intr.c
+++ b/drivers/net/hns3/hns3_intr.c
@@ -2749,8 +2749,7 @@ hns3_reset_post(struct hns3_adapter *hns)
/* IMP will wait ready flag before reset */
hns3_notify_reset_ready(hw, false);
hns3_clear_reset_level(hw, &hw->reset.pending);
- if (!hns->is_vf)
- hns3_clear_reset_event(hw);
+ hns3_clear_reset_status(hw);
__atomic_store_n(&hns->hw.reset.resetting, 0, __ATOMIC_RELAXED);
hw->reset.attempts = 0;
hw->reset.stats.success_cnt++;
@@ -2800,8 +2799,7 @@ hns3_reset_fail_handle(struct hns3_adapter *hns)
struct timeval tv;
hns3_clear_reset_level(hw, &hw->reset.pending);
- if (!hns->is_vf)
- hns3_clear_reset_event(hw);
+ hns3_clear_reset_status(hw);
if (hns3_reset_err_handle(hns)) {
hw->reset.stage = RESET_STAGE_PREWAIT;
hns3_schedule_reset(hns);
--
2.33.0
next prev parent reply other threads:[~2023-11-27 13:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 13:39 [PATCH 0/3] fix some bug for hns3 Dengdui Huang
2023-11-27 13:39 ` [PATCH 1/3] net/hns3: fix reset detect be ignored Dengdui Huang
2023-11-27 13:39 ` [PATCH 2/3] net/hns3: fix VF wrong clear reset status Dengdui Huang
2023-11-27 13:39 ` Dengdui Huang [this message]
2023-11-27 13:55 ` [PATCH 0/3] fix some bug for hns3 Jie Hai
2023-11-27 18:33 ` Ferruh Yigit
2023-11-28 3:33 ` Jie Hai
2023-11-28 10:31 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231127133903.1138657-4-huangdengdui@huawei.com \
--to=huangdengdui@huawei.com \
--cc=dev@dpdk.org \
--cc=fengchengwen@huawei.com \
--cc=ferruh.yigit@amd.com \
--cc=haijie1@huawei.com \
--cc=lihuisong@huawei.com \
--cc=liuyonglong@huawei.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).