Commit 96debf1b authored by shaojijie's avatar shaojijie Committed by Jiantao Xiao
Browse files

net: hns3: add support query port ext information 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I97T47


CVE: NA

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

The patch supports the query of port ext information.

Signed-off-by: default avatarshaojijie <shaojijie@huawei.com>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 434e657f

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

+14 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ enum hnae3_ext_opcode { 
	HNAE3_EXT_OPC_SET_TORUS_PARAM,

	HNAE3_EXT_OPC_GET_TORUS_PARAM,

	HNAE3_EXT_OPC_CLEAN_STATS64,

	HNAE3_EXT_OPC_GET_PORT_EXT_ID_INFO,

	HNAE3_EXT_OPC_GET_PORT_EXT_NUM_INFO,

	HNAE3_EXT_OPC_GET_PORT_NUM,

};



struct hnae3_pfc_storm_para {
@@ -59,4 +62,15 @@ struct hnae3_torus_param { 
	u32 mac_id;       /* export mac id of port */

	u8 is_node0;      /* if current node is node0 */

};



struct hane3_port_ext_id_info {

	u32 chip_id;

	u32 mac_id;

	u32 io_die_id;

};



struct hane3_port_ext_num_info {

	u32 chip_num;

	u32 io_die_num;

};

#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -316,6 +316,9 @@ enum hclge_opcode_type { 
	HCLGE_OPC_CONFIG_VLAN_FILTER = 0x1100,

	HCLGE_OPC_SET_NOTIFY_PKT = 0x180A,

	HCLGE_OPC_CONFIG_1D_TORUS = 0x2300,

	HCLGE_OPC_CHIP_ID_GET = 0x7003,

	HCLGE_OPC_GET_CHIP_NUM = 0x7005,

	HCLGE_OPC_GET_PORT_NUM = 0x7006,

	HCLGE_OPC_CFG_PAUSE_STORM_PARA = 0x7019,

};

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

+112 −0
Original line number Diff line number Diff line
@@ -277,3 +277,115 @@ int nic_set_cpu_affinity(struct net_device *ndev, cpumask_t *affinity_mask) 
	return ret;

}

EXPORT_SYMBOL(nic_set_cpu_affinity);



static int nic_get_ext_id_info(struct net_device *ndev,

			       struct hane3_port_ext_id_info *id_info)

{

	return nic_invoke_pri_ops(ndev, HNAE3_EXT_OPC_GET_PORT_EXT_ID_INFO,

				  id_info, sizeof(*id_info));

}



int nic_get_chipid(struct net_device *ndev, u32 *chip_id)

{

	struct hane3_port_ext_id_info info;

	int ret;



	if (!chip_id)

		return -EINVAL;



	ret = nic_get_ext_id_info(ndev, &info);

	if (ret)

		return ret;



	*chip_id = info.chip_id;

	return 0;

}

EXPORT_SYMBOL(nic_get_chipid);



int nic_get_mac_id(struct net_device *ndev, u32 *mac_id)

{

	struct hane3_port_ext_id_info info;

	int ret;



	if (!mac_id)

		return -EINVAL;



	ret = nic_get_ext_id_info(ndev, &info);

	if (ret)

		return ret;



	*mac_id = info.mac_id;

	return 0;

}

EXPORT_SYMBOL(nic_get_mac_id);



int nic_get_io_die_id(struct net_device *ndev, u32 *io_die_id)

{

	struct hane3_port_ext_id_info info;

	int ret;



	if (!io_die_id)

		return -EINVAL;



	ret = nic_get_ext_id_info(ndev, &info);

	if (ret)

		return ret;



	*io_die_id = info.io_die_id;

	return 0;

}

EXPORT_SYMBOL(nic_get_io_die_id);



static int nic_get_ext_num_info(struct net_device *ndev,

				struct hane3_port_ext_num_info *num_info)

{

	return nic_invoke_pri_ops(ndev, HNAE3_EXT_OPC_GET_PORT_EXT_NUM_INFO,

				  num_info, sizeof(*num_info));

}



int nic_get_chip_num(struct net_device *ndev, u32 *chip_num)

{

	struct hane3_port_ext_num_info info;

	int ret;



	if (!chip_num)

		return -EINVAL;



	ret = nic_get_ext_num_info(ndev, &info);

	if (ret)

		return ret;



	*chip_num = info.chip_num;

	return 0;

}

EXPORT_SYMBOL(nic_get_chip_num);



int nic_get_io_die_num(struct net_device *ndev, u32 *io_die_num)

{

	struct hane3_port_ext_num_info info;

	int ret;



	if (!io_die_num)

		return -EINVAL;



	ret = nic_get_ext_num_info(ndev, &info);

	if (ret)

		return ret;



	*io_die_num = info.io_die_num;

	return 0;

}

EXPORT_SYMBOL(nic_get_io_die_num);



int nic_get_port_num_of_die(struct net_device *ndev, u32 *port_num)

{

	return nic_invoke_pri_ops(ndev, HNAE3_EXT_OPC_GET_PORT_NUM,

				  port_num, sizeof(*port_num));

}

EXPORT_SYMBOL(nic_get_port_num_of_die);



int nic_get_port_num_per_chip(struct net_device *ndev, u32 *port_num)

{

	return nic_get_port_num_of_die(ndev, port_num);

}

EXPORT_SYMBOL(nic_get_port_num_per_chip);

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

+7 −0
Original line number Diff line number Diff line
@@ -28,4 +28,11 @@ int nic_set_torus_param(struct net_device *ndev, struct hnae3_torus_param *param 
int nic_get_torus_param(struct net_device *ndev, struct hnae3_torus_param *param);

int nic_clean_stats64(struct net_device *ndev, struct rtnl_link_stats64 *stats);

int nic_set_cpu_affinity(struct net_device *ndev, cpumask_t *affinity_mask);

int nic_get_chipid(struct net_device *ndev, u32 *chip_id);

int nic_get_mac_id(struct net_device *ndev, u32 *mac_id);

int nic_get_io_die_id(struct net_device *ndev, u32 *io_die_id);

int nic_get_chip_num(struct net_device *ndev, u32 *chip_num);

int nic_get_io_die_num(struct net_device *ndev, u32 *io_die_num);

int nic_get_port_num_of_die(struct net_device *ndev, u32 *port_num);

int nic_get_port_num_per_chip(struct net_device *ndev, u32 *port_num);

#endif

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

+91 −0
Original line number Diff line number Diff line
@@ -358,6 +358,94 @@ static int hclge_clean_stats64(struct hclge_dev *hdev, void *data, 
	return 0;

}



static int hclge_get_info_from_cmd(struct hclge_dev *hdev,

				   struct hclge_desc *desc, u32 num, int opcode)

{

	u32 i;



	for (i = 0; i < num; i++) {

		hclge_cmd_setup_basic_desc(desc + i, opcode, true);

		if (i != num - 1)

			desc[i].flag |= cpu_to_le16(HCLGE_COMM_CMD_FLAG_NEXT);

	}



	return hclge_cmd_send(&hdev->hw, desc, num);

}



static int hclge_get_extend_port_id_info(struct hclge_dev *hdev,

					 void *data, size_t length)

{

	struct hane3_port_ext_id_info *info;

	struct hclge_id_info_cmd *info_cmd;

	struct hclge_desc desc;

	int ret;



	if (length != sizeof(struct hane3_port_ext_id_info))

		return -EINVAL;



	ret = hclge_get_info_from_cmd(hdev, &desc, 1, HCLGE_OPC_CHIP_ID_GET);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to get extend port id info, ret = %d\n",

			ret);

		return ret;

	}



	info_cmd = (struct hclge_id_info_cmd *)desc.data;

	info = (struct hane3_port_ext_id_info *)data;

	info->chip_id = le32_to_cpu(info_cmd->chip_id);

	info->mac_id = le32_to_cpu(info_cmd->mac_id);

	info->io_die_id = le32_to_cpu(info_cmd->io_die_id);

	return 0;

}



static int hclge_get_extend_port_num_info(struct hclge_dev *hdev,

					  void *data, size_t length)

{

	struct hane3_port_ext_num_info *num_info;

	struct hclge_num_info_cmd *resp;

	struct hclge_desc desc;

	int ret;



	if (length != sizeof(struct hane3_port_ext_num_info))

		return -EINVAL;



	ret = hclge_get_info_from_cmd(hdev, &desc, 1, HCLGE_OPC_GET_CHIP_NUM);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to get extend port number info, ret = %d\n", ret);

		return ret;

	}



	resp = (struct hclge_num_info_cmd *)(desc.data);

	num_info = (struct hane3_port_ext_num_info *)data;

	num_info->chip_num = le32_to_cpu(resp->chip_num);

	num_info->io_die_num = le32_to_cpu(resp->io_die_num);

	return 0;

}



static int hclge_get_port_num(struct hclge_dev *hdev, void *data,

			      size_t length)

{

	struct hclge_port_num_info_cmd *resp;

	struct hclge_desc desc;

	int ret;



	if (length != sizeof(u32))

		return -EINVAL;



	ret = hclge_get_info_from_cmd(hdev, &desc, 1, HCLGE_OPC_GET_PORT_NUM);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to get port number, ret = %d\n", ret);

		return ret;

	}



	resp = (struct hclge_port_num_info_cmd *)(desc.data);

	*(u32 *)data = le32_to_cpu(resp->port_num);

	return 0;

}



static void hclge_ext_resotre_config(struct hclge_dev *hdev)

{

	if (hdev->reset_type != HNAE3_IMP_RESET &&
@@ -517,6 +605,9 @@ static const hclge_priv_ops_fn hclge_ext_func_arr[] = { 
	[HNAE3_EXT_OPC_SET_TORUS_PARAM] = hclge_set_torus_param,

	[HNAE3_EXT_OPC_GET_TORUS_PARAM] = hclge_get_torus_param,

	[HNAE3_EXT_OPC_CLEAN_STATS64] = hclge_clean_stats64,

	[HNAE3_EXT_OPC_GET_PORT_EXT_ID_INFO] = hclge_get_extend_port_id_info,

	[HNAE3_EXT_OPC_GET_PORT_EXT_NUM_INFO] = hclge_get_extend_port_num_info,

	[HNAE3_EXT_OPC_GET_PORT_NUM] = hclge_get_port_num,

};



int hclge_ext_ops_handle(struct hnae3_handle *handle, int opcode,