Skip to content

Commit 6639a7b

Browse files
Peiyang WangPaolo Abeni
authored andcommitted
net: hns3: change type of numa_node_mask as nodemask_t
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: 38caee9 ("net: hns3: Add support of the HNAE3 framework") Signed-off-by: Peiyang Wang <[email protected]> Signed-off-by: Jijie Shao <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 669554c commit 6639a7b

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ struct hnae3_handle {
897897
struct hnae3_roce_private_info rinfo;
898898
};
899899

900-
u32 numa_node_mask; /* for multi-chip support */
900+
nodemask_t numa_node_mask; /* for multi-chip support */
901901

902902
enum hnae3_port_base_vlan_state port_base_vlan_state;
903903

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1769,7 +1769,8 @@ static int hclge_vport_setup(struct hclge_vport *vport, u16 num_tqps)
17691769

17701770
nic->pdev = hdev->pdev;
17711771
nic->ae_algo = &ae_algo;
1772-
nic->numa_node_mask = hdev->numa_node_mask;
1772+
bitmap_copy(nic->numa_node_mask.bits, hdev->numa_node_mask.bits,
1773+
MAX_NUMNODES);
17731774
nic->kinfo.io_base = hdev->hw.hw.io_base;
17741775

17751776
ret = hclge_knic_setup(vport, num_tqps,
@@ -2461,7 +2462,8 @@ static int hclge_init_roce_base_info(struct hclge_vport *vport)
24612462

24622463
roce->pdev = nic->pdev;
24632464
roce->ae_algo = nic->ae_algo;
2464-
roce->numa_node_mask = nic->numa_node_mask;
2465+
bitmap_copy(roce->numa_node_mask.bits, nic->numa_node_mask.bits,
2466+
MAX_NUMNODES);
24652467

24662468
return 0;
24672469
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ struct hclge_dev {
894894

895895
u16 fdir_pf_filter_count; /* Num of guaranteed filters for this PF */
896896
u16 num_alloc_vport; /* Num vports this driver supports */
897-
u32 numa_node_mask;
897+
nodemask_t numa_node_mask;
898898
u16 rx_buf_len;
899899
u16 num_tx_desc; /* desc num of per tx queue */
900900
u16 num_rx_desc; /* desc num of per rx queue */

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,8 @@ static int hclgevf_set_handle_info(struct hclgevf_dev *hdev)
412412

413413
nic->ae_algo = &ae_algovf;
414414
nic->pdev = hdev->pdev;
415-
nic->numa_node_mask = hdev->numa_node_mask;
415+
bitmap_copy(nic->numa_node_mask.bits, hdev->numa_node_mask.bits,
416+
MAX_NUMNODES);
416417
nic->flags |= HNAE3_SUPPORT_VF;
417418
nic->kinfo.io_base = hdev->hw.hw.io_base;
418419

@@ -2082,8 +2083,8 @@ static int hclgevf_init_roce_base_info(struct hclgevf_dev *hdev)
20822083

20832084
roce->pdev = nic->pdev;
20842085
roce->ae_algo = nic->ae_algo;
2085-
roce->numa_node_mask = nic->numa_node_mask;
2086-
2086+
bitmap_copy(roce->numa_node_mask.bits, nic->numa_node_mask.bits,
2087+
MAX_NUMNODES);
20872088
return 0;
20882089
}
20892090

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ struct hclgevf_dev {
236236
u16 rss_size_max; /* HW defined max RSS task queue */
237237

238238
u16 num_alloc_vport; /* num vports this driver supports */
239-
u32 numa_node_mask;
239+
nodemask_t numa_node_mask;
240240
u16 rx_buf_len;
241241
u16 num_tx_desc; /* desc num of per tx queue */
242242
u16 num_rx_desc; /* desc num of per rx queue */

0 commit comments

Comments
 (0)