Commit 606a039b authored by Hao Lan's avatar Hao Lan Committed by Jiantao Xiao
Browse files

net: hns3: Disable SerDes serial loopback for HiLink H60 

mainline inclusion
from mainline-v6.9-rc1
commit 0448825b8992fef07aa08f53db21cd68103dbecf
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=0448825b8992fef07aa08f53db21cd68103dbecf



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

When the hilink version is H60, the serdes serial loopback test is not
supported. This patch add hilink version detection. When the version
is H60, the serdes serial loopback test will be disable.

Signed-off-by: default avatarHao Lan <lanhao@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent cc828c1b

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

+1 −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 {

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)

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+2 −1
Original line number Diff line number Diff line
@@ -834,7 +834,8 @@ struct hclge_dev_specs_1_cmd { 
	__le16 mc_mac_size;

	u8 rsv1[6];

	u8 tnl_num;

	u8 rsv2[5];

	u8 hilink_version;

	u8 rsv2[4];

};



/* mac speed type defined in firmware command */

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+7 −2
Original line number Diff line number Diff line
@@ -646,8 +646,12 @@ static int hclge_get_sset_count(struct hnae3_handle *handle, int stringset) 
			handle->flags |= HNAE3_SUPPORT_APP_LOOPBACK;

		}



		if (hdev->ae_dev->dev_specs.hilink_version !=

		    HCLGE_HILINK_H60) {

			count += 1;

			handle->flags |= HNAE3_SUPPORT_SERDES_SERIAL_LOOPBACK;

		}



		count += 1;

		handle->flags |= HNAE3_SUPPORT_SERDES_PARALLEL_LOOPBACK;

		count += 1;
@@ -1359,6 +1363,7 @@ static void hclge_parse_dev_specs(struct hclge_dev *hdev, 
	ae_dev->dev_specs.umv_size = le16_to_cpu(req1->umv_size);

	ae_dev->dev_specs.mc_mac_size = le16_to_cpu(req1->mc_mac_size);

	ae_dev->dev_specs.tnl_num = req1->tnl_num;

	ae_dev->dev_specs.hilink_version = req1->hilink_version;

}



static void hclge_check_dev_specs(struct hclge_dev *hdev)

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h

+6 −0
Original line number Diff line number Diff line
@@ -258,6 +258,12 @@ enum HCLGE_MAC_DUPLEX { 
	HCLGE_MAC_FULL

};



/* hilink version */

enum hclge_hilink_version {

	HCLGE_HILINK_H32 = 0,

	HCLGE_HILINK_H60 = 1,

};



#define QUERY_SFP_SPEED		0

#define QUERY_ACTIVE_SPEED	1