Commit 9e1545b4 authored by Yonglong Liu's avatar Yonglong Liu Committed by Jakub Kicinski
Browse files

net: hns3: use seq_file for files in common/ of hclge layer 



This patch use seq_file for the following nodes:
mng_tbl/loopback/interrupt_info/reset_info/imp_info/ncl_config/
mac_tnl_status/service_task_info/vlan_config/ptp_info

This patch is the last modification to debugfs file
of hclge layer. Unused functions and variables
are removed together.

Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20250714061037.2616413-10-shaojijie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3945d94c

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

+0 −4
Original line number Diff line number Diff line
@@ -587,8 +587,6 @@ typedef int (*read_func)(struct seq_file *s, void *data); 
 *   Delete clsflower rule

 * cls_flower_active

 *   Check if any cls flower rule exist

 * dbg_read_cmd

 *   Execute debugfs read command.

 * set_tx_hwts_info

 *   Save information for 1588 tx packet

 * get_rx_hwts
@@ -757,8 +755,6 @@ struct hnae3_ae_ops { 
	void (*enable_fd)(struct hnae3_handle *handle, bool enable);

	int (*add_arfs_entry)(struct hnae3_handle *handle, u16 queue_id,

			      u16 flow_id, struct flow_keys *fkeys);

	int (*dbg_read_cmd)(struct hnae3_handle *handle, enum hnae3_dbg_cmd cmd,

			    char *buf, int len);

	pci_ers_result_t (*handle_hw_ras_error)(struct hnae3_ae_dev *ae_dev);

	bool (*get_hw_reset_stat)(struct hnae3_handle *handle);

	bool (*ae_dev_resetting)(struct hnae3_handle *handle);

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

+12 −36
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static struct hns3_dbg_dentry_info hns3_dbg_dentry[] = { 
};



static int hns3_dbg_bd_file_init(struct hnae3_handle *handle, u32 cmd);

static int hns3_dbg_common_file_init(struct hnae3_handle *handle, u32 cmd);

static int hns3_dbg_common_init_t1(struct hnae3_handle *handle, u32 cmd);

static int hns3_dbg_common_init_t2(struct hnae3_handle *handle, u32 cmd);
@@ -163,49 +162,49 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = { 
		.cmd = HNAE3_DBG_CMD_MNG_TBL,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "loopback",

		.cmd = HNAE3_DBG_CMD_LOOPBACK,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "interrupt_info",

		.cmd = HNAE3_DBG_CMD_INTERRUPT_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "reset_info",

		.cmd = HNAE3_DBG_CMD_RESET_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "imp_info",

		.cmd = HNAE3_DBG_CMD_IMP_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "ncl_config",

		.cmd = HNAE3_DBG_CMD_NCL_CONFIG,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN_128KB,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "mac_tnl_status",

		.cmd = HNAE3_DBG_CMD_MAC_TNL_STATUS,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "bios_common",
@@ -317,21 +316,21 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = { 
		.cmd = HNAE3_DBG_CMD_SERV_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "vlan_config",

		.cmd = HNAE3_DBG_CMD_VLAN_CONFIG,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "ptp_info",

		.cmd = HNAE3_DBG_CMD_PTP_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "fd_counter",
@@ -345,7 +344,7 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = { 
		.cmd = HNAE3_DBG_CMD_UMV_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_init_t2,

	},

	{

		.name = "page_pool_info",
@@ -986,7 +985,6 @@ static const struct hns3_dbg_func hns3_dbg_cmd_func[] = { 
static int hns3_dbg_read_cmd(struct hns3_dbg_data *dbg_data,

			     enum hnae3_dbg_cmd cmd, char *buf, int len)

{

	const struct hnae3_ae_ops *ops = hns3_get_ops(dbg_data->handle);

	const struct hns3_dbg_func *cmd_func;

	u32 i;
@@ -1002,10 +1000,7 @@ static int hns3_dbg_read_cmd(struct hns3_dbg_data *dbg_data, 
		}

	}



	if (!ops->dbg_read_cmd)

	return -EOPNOTSUPP;



	return ops->dbg_read_cmd(dbg_data->handle, cmd, buf, len);

}



static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer,
@@ -1090,25 +1085,6 @@ static int hns3_dbg_bd_file_init(struct hnae3_handle *handle, u32 cmd) 
	return 0;

}



static int

hns3_dbg_common_file_init(struct hnae3_handle *handle, u32 cmd)

{

	struct hns3_dbg_data *data;

	struct dentry *entry_dir;



	data = devm_kzalloc(&handle->pdev->dev, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	data->handle = handle;

	data->cmd = hns3_dbg_cmd[cmd].cmd;

	entry_dir = hns3_dbg_dentry[hns3_dbg_cmd[cmd].dentry].dentry;

	debugfs_create_file(hns3_dbg_cmd[cmd].name, 0400, entry_dir,

			    data, &hns3_dbg_fops);



	return 0;

}



static int hns3_dbg_common_init_t1(struct hnae3_handle *handle, u32 cmd)

{

	struct device *dev = &handle->pdev->dev;

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

+188 −301

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −1
Original line number Diff line number Diff line
@@ -12864,7 +12864,6 @@ static const struct hnae3_ae_ops hclge_ops = { 
	.get_fd_all_rules = hclge_get_all_rules,

	.enable_fd = hclge_enable_fd,

	.add_arfs_entry = hclge_add_fd_entry_by_arfs,

	.dbg_read_cmd = hclge_dbg_read_cmd,

	.dbg_get_read_func = hclge_dbg_get_read_func,

	.handle_hw_ras_error = hclge_handle_hw_ras_error,

	.get_hw_reset_stat = hclge_get_hw_reset_stat,

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

+0 −2
Original line number Diff line number Diff line
@@ -1142,8 +1142,6 @@ int hclge_func_reset_cmd(struct hclge_dev *hdev, int func_id); 
int hclge_vport_start(struct hclge_vport *vport);

void hclge_vport_stop(struct hclge_vport *vport);

int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu);

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

		       char *buf, int len);

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

			    read_func *func);

u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, u16 queue_id);