Commit 22f24bb3 authored by Peiyang Wang's avatar Peiyang Wang Committed by Hao Chen
Browse files

net: hns3: change type of numa_node_mask as nodemask_t 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9NZTZ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=6639a7b953212ac51aa4baa7d7fb855bf736cf56



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

It provides nodemask_t to describe the numa node mask in kernel. To
improve transportability, change the type of numa_node_mask as nodemask_t.

Fixes: 38caee9d ("net: hns3: Add support of the HNAE3 framework")
Signed-off-by: default avatarPeiyang Wang <wangpeiyang1@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 6cca64db

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

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ struct hnae3_handle { 
		struct hnae3_roh_private_info rohinfo;

	};



	u32 numa_node_mask;	/* for multi-chip support */

	nodemask_t numa_node_mask; /* for multi-chip support */



	enum hnae3_port_base_vlan_state port_base_vlan_state;

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

+4 −2
Original line number Diff line number Diff line
@@ -1837,7 +1837,8 @@ static int hclge_vport_setup(struct hclge_vport *vport, u16 num_tqps) 


	nic->pdev = hdev->pdev;

	nic->ae_algo = &ae_algo;

	nic->numa_node_mask = hdev->numa_node_mask;

	bitmap_copy(nic->numa_node_mask.bits, hdev->numa_node_mask.bits,

		    MAX_NUMNODES);

	nic->kinfo.io_base = hdev->hw.hw.io_base;



	ret = hclge_knic_setup(vport, num_tqps,
@@ -2529,7 +2530,8 @@ static int hclge_init_roce_base_info(struct hclge_vport *vport) 


	roce->pdev = nic->pdev;

	roce->ae_algo = nic->ae_algo;

	roce->numa_node_mask = nic->numa_node_mask;

	bitmap_copy(roce->numa_node_mask.bits, nic->numa_node_mask.bits,

		    MAX_NUMNODES);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ struct hclge_dev { 


	u16 fdir_pf_filter_count; /* Num of guaranteed filters for this PF */

	u16 num_alloc_vport;		/* Num vports this driver supports */

	u32 numa_node_mask;

	nodemask_t numa_node_mask;

	u16 rx_buf_len;

	u16 num_tx_desc;		/* desc num of per tx queue */

	u16 num_rx_desc;		/* desc num of per rx queue */

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+4 −3
Original line number Diff line number Diff line
@@ -517,7 +517,8 @@ static int hclgevf_set_handle_info(struct hclgevf_dev *hdev) 


	nic->ae_algo = &ae_algovf;

	nic->pdev = hdev->pdev;

	nic->numa_node_mask = hdev->numa_node_mask;

	bitmap_copy(nic->numa_node_mask.bits, hdev->numa_node_mask.bits,

		    MAX_NUMNODES);

	nic->flags |= HNAE3_SUPPORT_VF;

	nic->kinfo.io_base = hdev->hw.hw.io_base;
@@ -2189,8 +2190,8 @@ static int hclgevf_init_roce_base_info(struct hclgevf_dev *hdev) 


	roce->pdev = nic->pdev;

	roce->ae_algo = nic->ae_algo;

	roce->numa_node_mask = nic->numa_node_mask;



	bitmap_copy(roce->numa_node_mask.bits, nic->numa_node_mask.bits,

		    MAX_NUMNODES);

	return 0;

}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ struct hclgevf_dev { 
	u16 rss_size_max;	/* HW defined max RSS task queue */



	u16 num_alloc_vport;	/* num vports this driver supports */

	u32 numa_node_mask;

	nodemask_t numa_node_mask;

	u16 rx_buf_len;

	u16 num_tx_desc;	/* desc num of per tx queue */

	u16 num_rx_desc;	/* desc num of per rx queue */