Unverified Commit 4e08cc07 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5256 net: hns3: some bugfix for the HNS3 ethernet driver 

Merge Pull Request from: @svishen 
 
This pr backport some bugfix for the HNS3 ethernet driver from kernel 6.8 rc1.

Hao Lan (2):
  net: hns3: add new 200G link modes for hisilicon device
  net: hns3: Disable SerDes serial loopback for HiLink H60

Jian Shen (1):
  net: hns3: add checking for vf id of mailbox

Jie Wang (1):
  net: hns3: fix port duplex configure error in IMP reset

Jijie Shao (2):
  net: hns3: fix wrong judgment condition issue
  net: hns3: fix delete tc fail issue

Peiyang Wang (1):
  net: hns3: fix reset timeout under full functions and queues

Yonglong Liu (1):
  net: hns3: fix kernel crash when 1588 is received on HIP08 devices

issue:
https://gitee.com/openeuler/kernel/issues/I98TUP 
 
Link:https://gitee.com/openeuler/kernel/pulls/5256

 

Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 23534451 a6b38ca3

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+2 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ struct hnae3_dev_specs { 
	u16 mc_mac_size;

	u32 mac_stats_num;

	u8 tnl_num;

	u8 hilink_version;

};



struct hnae3_client_ops {
@@ -826,6 +827,7 @@ struct hnae3_tc_info { 
	u8 max_tc; /* Total number of TCs */

	u8 num_tc; /* Total number of enabled TCs */

	bool mqprio_active;

	bool mqprio_destroy;

	bool dcb_ets_active;

};

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 */

drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int hns3_dcbnl_ieee_delapp(struct net_device *ndev, struct dcb_app *app) 
	if (hns3_nic_resetting(ndev))

		return -EBUSY;



	if (h->kinfo.dcb_ops->ieee_setapp)

	if (h->kinfo.dcb_ops->ieee_delapp)

		return h->kinfo.dcb_ops->ieee_delapp(h, app);



	return -EOPNOTSUPP;

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,8 @@ hns3_dbg_dev_specs(struct hnae3_handle *h, char *buf, int len, int *pos) 
	*pos += scnprintf(buf + *pos, len - *pos,

			  "TX timeout threshold: %d seconds\n",

			  dev->watchdog_timeo / HZ);

	*pos += scnprintf(buf + *pos, len - *pos, "Hilink Version: %u\n",

			  dev_specs->hilink_version);

}



static int hns3_dbg_dev_info(struct hnae3_handle *h, char *buf, int len)