Commit 0cdfd723 authored by Peiyang Wang's avatar Peiyang Wang Committed by Jiantao Xiao
Browse files

net: hns3: fix reset timeout under full functions and queues 

mainline inclusion
from mainline-v6.9-rc1
commit 216bc415d6631e769e2bd2266e2017f89a8b78f9
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I98TUP
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=216bc415d6631e769e2bd2266e2017f89a8b78f9



----------------------------------------------------------------------

The cmdq reset command times out when all VFs are enabled and the queue is
full. The hardware processing time exceeds the timeout set by the driver.
In order to avoid the above extreme situations, the driver extends the
reset timeout to 1 second.

Signed-off-by: default avatarPeiyang Wang <wangpeiyang1@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Reviewed-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 644f55e6

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int hclge_comm_cmd_csq_done(struct hclge_comm_hw *hw) 
static u32 hclge_get_cmdq_tx_timeout(u16 opcode, u32 tx_timeout)

{

	static const struct hclge_cmdq_tx_timeout_map cmdq_tx_timeout_map[] = {

		{HCLGE_OPC_CFG_RST_TRIGGER, HCLGE_COMM_CMDQ_TX_TIMEOUT_500MS},

		{HCLGE_OPC_CFG_RST_TRIGGER, HCLGE_COMM_CMDQ_CFG_RST_TIMEOUT},

	};

	u32 i;

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#define HCLGE_COMM_NIC_CMQ_DESC_NUM_S		3

#define HCLGE_COMM_NIC_CMQ_DESC_NUM		1024

#define HCLGE_COMM_CMDQ_TX_TIMEOUT_DEFAULT	30000

#define HCLGE_COMM_CMDQ_TX_TIMEOUT_500MS	500000

#define HCLGE_COMM_CMDQ_CFG_RST_TIMEOUT		1000000



enum hclge_opcode_type {

	/* Generic commands */