Commit aeb528f9 authored by Jiantao Xiao's avatar Jiantao Xiao
Browse files

Revert "net: hns3: support debugfs for wake on lan" 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7ON9Y


CVE: NA

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

This reverts commit 7fbc48aa.

Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 8ffe4326

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

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ enum hnae3_dbg_cmd { 
	HNAE3_DBG_CMD_UMV_INFO,

	HNAE3_DBG_CMD_PAGE_POOL_INFO,

	HNAE3_DBG_CMD_COAL_INFO,

	HNAE3_DBG_CMD_WOL_INFO,

	HNAE3_DBG_CMD_UNKNOWN,

};

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

+0 −10
Original line number Diff line number Diff line
@@ -357,13 +357,6 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = { 
		.buf_len = HNS3_DBG_READ_LEN_1MB,

		.init = hns3_dbg_common_file_init,

	},

	{

		.name = "wol_info",

		.cmd = HNAE3_DBG_CMD_WOL_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

	},

};



static struct hns3_dbg_cap_info hns3_dbg_cap[] = {
@@ -409,9 +402,6 @@ static struct hns3_dbg_cap_info hns3_dbg_cap[] = { 
	}, {

		.name = "support modify vlan filter state",

		.cap_bit = HNAE3_DEV_SUPPORT_VLAN_FLTR_MDF_B,

	}, {

		.name = "support wake on lan",

		.cap_bit = HNAE3_DEV_SUPPORT_WOL_B,

	}, {

		.name = "support vf fault detect",

		.cap_bit = HNAE3_DEV_SUPPORT_VF_FAULT_B,

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

+0 −62
Original line number Diff line number Diff line
@@ -2513,64 +2513,6 @@ static int hclge_dbg_dump_mac_mc(struct hclge_dev *hdev, char *buf, int len) 
	return 0;

}



static void hclge_dump_wol_mode(u32 mode, char *buf, int len, int *pos)

{

	if (mode & HCLGE_WOL_PHY)

		*pos += scnprintf(buf + *pos, len - *pos, "  [p]phy\n");



	if (mode & HCLGE_WOL_UNICAST)

		*pos += scnprintf(buf + *pos, len - *pos, "  [u]unicast\n");



	if (mode & HCLGE_WOL_MULTICAST)

		*pos += scnprintf(buf + *pos, len - *pos, "  [m]multicast\n");



	if (mode & HCLGE_WOL_BROADCAST)

		*pos += scnprintf(buf + *pos, len - *pos, "  [b]broadcast\n");



	if (mode & HCLGE_WOL_ARP)

		*pos += scnprintf(buf + *pos, len - *pos, "  [a]arp\n");



	if (mode & HCLGE_WOL_MAGIC)

		*pos += scnprintf(buf + *pos, len - *pos, "  [g]magic\n");



	if (mode & HCLGE_WOL_MAGICSECURED)

		*pos += scnprintf(buf + *pos, len - *pos,

				 "  [s]magic secured\n");



	if (mode & HCLGE_WOL_FILTER)

		*pos += scnprintf(buf + *pos, len - *pos, "  [f]filter\n");

}



static int hclge_dbg_dump_wol_info(struct hclge_dev *hdev, char *buf, int len)

{

	u32 wol_supported;

	int pos = 0;

	u32 mode;



	if (!hnae3_ae_dev_wol_supported(hdev->ae_dev)) {

		pos += scnprintf(buf + pos, len - pos,

				 "wake-on-lan is unsupported\n");

		return 0;

	}



	pos += scnprintf(buf + pos, len - pos, "wake-on-lan mode:\n");

	pos += scnprintf(buf + pos, len - pos, " supported:\n");

	if (hclge_get_wol_supported_mode(hdev, &wol_supported))

		return -EINVAL;



	hclge_dump_wol_mode(wol_supported, buf, len, &pos);



	pos += scnprintf(buf + pos, len - pos, " current:\n");

	if (hclge_get_wol_cfg(hdev, &mode))

		return -EINVAL;

	if (mode)

		hclge_dump_wol_mode(mode, buf, len, &pos);

	else

		pos += scnprintf(buf + pos, len - pos, "  [d]disabled\n");



	return 0;

}



static const struct hclge_dbg_func hclge_dbg_cmd_func[] = {

	{

		.cmd = HNAE3_DBG_CMD_TM_NODES,
@@ -2720,10 +2662,6 @@ static const struct hclge_dbg_func hclge_dbg_cmd_func[] = { 
		.cmd = HNAE3_DBG_CMD_UMV_INFO,

		.dbg_dump = hclge_dbg_dump_umv_info,

	},

	{

		.cmd = HNAE3_DBG_CMD_WOL_INFO,

		.dbg_dump = hclge_dbg_dump_wol_info,

	},

};



int hclge_dbg_read_cmd(struct hnae3_handle *handle, enum hnae3_dbg_cmd cmd,