37c95ab89b
- net/hns3: fix unrelease some resources on reset case - net/hns3: fix divide by zero - net/hns3: fix incorrect failed rollback - net/hns3: fix memory leakage for indirect action - net/hns3: fix extra waiting for link up - net/hns3: fix variable overflow - net/hns3: fix memory leakage in failure path - devtools: fix symbol listing - net/hns3: remove weak symbols - net/hns3: fix reset timeout - net/hns3: fix copper port inialization - net/hns3: rename RAS module - net/hns3: remove PVID info dump for VF - net/hns3: fix mbuf freeing in simple Tx path Signed-off-by: Dengdui Huang <huangdengdui@huawei.com> (cherry picked from commit 4f2a5e819346fb5bf12b9de68352782319e4a2a6)
98 lines
3.1 KiB
Diff
98 lines
3.1 KiB
Diff
From 1bdb3d84bb0cd4be7cacd456becb3ff2bcda63be Mon Sep 17 00:00:00 2001
|
|
From: Dengdui Huang <huangdengdui@huawei.com>
|
|
Date: Mon, 10 Feb 2025 11:01:13 +0800
|
|
Subject: [PATCH] net/hns3: fix reset timeout
|
|
|
|
[ upstream commit 9f7c28c5e98062576dfbf555cd5ede7e33d6624b ]
|
|
|
|
There is low probability that the driver reset timeout, the root cause is
|
|
that the firmware processing take a litter long than normal when process
|
|
reset command. This patch fix it by changing the timeout of the reset
|
|
command to 100 ms.
|
|
|
|
Fixes: 737f30e1c3ab ("net/hns3: support command interface with firmware")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_cmd.c | 18 ++++++++++++------
|
|
drivers/net/hns3/hns3_cmd.h | 4 ++--
|
|
2 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
|
|
index 2c16644..62da6dd 100644
|
|
--- a/drivers/net/hns3/hns3_cmd.c
|
|
+++ b/drivers/net/hns3/hns3_cmd.c
|
|
@@ -304,8 +304,17 @@ hns3_cmd_get_hardware_reply(struct hns3_hw *hw,
|
|
return hns3_cmd_convert_err_code(desc_ret);
|
|
}
|
|
|
|
-static int hns3_cmd_poll_reply(struct hns3_hw *hw)
|
|
+static uint32_t hns3_get_cmd_tx_timeout(uint16_t opcode)
|
|
{
|
|
+ if (opcode == HNS3_OPC_CFG_RST_TRIGGER)
|
|
+ return HNS3_COMQ_CFG_RST_TIMEOUT;
|
|
+
|
|
+ return HNS3_CMDQ_TX_TIMEOUT_DEFAULT;
|
|
+}
|
|
+
|
|
+static int hns3_cmd_poll_reply(struct hns3_hw *hw, uint16_t opcode)
|
|
+{
|
|
+ uint32_t cmdq_tx_timeout = hns3_get_cmd_tx_timeout(opcode);
|
|
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
|
|
uint32_t timeout = 0;
|
|
|
|
@@ -326,7 +335,7 @@ static int hns3_cmd_poll_reply(struct hns3_hw *hw)
|
|
|
|
rte_delay_us(1);
|
|
timeout++;
|
|
- } while (timeout < hw->cmq.tx_timeout);
|
|
+ } while (timeout < cmdq_tx_timeout);
|
|
hns3_err(hw, "Wait for reply timeout");
|
|
return -ETIME;
|
|
}
|
|
@@ -400,7 +409,7 @@ hns3_cmd_send(struct hns3_hw *hw, struct hns3_cmd_desc *desc, int num)
|
|
* if multi descriptors to be sent, use the first one to check.
|
|
*/
|
|
if (HNS3_CMD_SEND_SYNC(rte_le_to_cpu_16(desc->flag))) {
|
|
- retval = hns3_cmd_poll_reply(hw);
|
|
+ retval = hns3_cmd_poll_reply(hw, desc->opcode);
|
|
if (!retval)
|
|
retval = hns3_cmd_get_hardware_reply(hw, desc, num,
|
|
ntc);
|
|
@@ -611,9 +620,6 @@ hns3_cmd_init_queue(struct hns3_hw *hw)
|
|
hw->cmq.csq.desc_num = HNS3_NIC_CMQ_DESC_NUM;
|
|
hw->cmq.crq.desc_num = HNS3_NIC_CMQ_DESC_NUM;
|
|
|
|
- /* Setup Tx write back timeout */
|
|
- hw->cmq.tx_timeout = HNS3_CMDQ_TX_TIMEOUT;
|
|
-
|
|
/* Setup queue rings */
|
|
ret = hns3_alloc_cmd_queue(hw, HNS3_TYPE_CSQ);
|
|
if (ret) {
|
|
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
|
|
index 79a8c1e..4d707c1 100644
|
|
--- a/drivers/net/hns3/hns3_cmd.h
|
|
+++ b/drivers/net/hns3/hns3_cmd.h
|
|
@@ -10,7 +10,8 @@
|
|
#include <rte_byteorder.h>
|
|
#include <rte_spinlock.h>
|
|
|
|
-#define HNS3_CMDQ_TX_TIMEOUT 30000
|
|
+#define HNS3_CMDQ_TX_TIMEOUT_DEFAULT 30000
|
|
+#define HNS3_COMQ_CFG_RST_TIMEOUT 100000
|
|
#define HNS3_CMDQ_CLEAR_WAIT_TIME 200
|
|
#define HNS3_CMDQ_RX_INVLD_B 0
|
|
#define HNS3_CMDQ_RX_OUTVLD_B 1
|
|
@@ -62,7 +63,6 @@ enum hns3_cmd_return_status {
|
|
struct hns3_cmq {
|
|
struct hns3_cmq_ring csq;
|
|
struct hns3_cmq_ring crq;
|
|
- uint16_t tx_timeout;
|
|
enum hns3_cmd_return_status last_status;
|
|
};
|
|
|
|
--
|
|
2.25.1
|
|
|