net: hns3: change type of numa_node_mask as nodemask_t

[ Upstream commit 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: 38caee9d3ee8 ("net: hns3: Add support of the HNAE3 framework")
Signed-off-by: Peiyang Wang <wangpeiyang1@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index d7e175a9cb49b5495b1cc995e238a519a2594251..2f7195ba4902b4995991b9a9e885b6486541fe43 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -895,7 +895,7 @@ struct hnae3_handle {
                struct hnae3_roce_private_info rinfo;
        };
 
-       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;
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 895e07f5c4fc85e786da43252c6338285fcce2f2..6b84c1313f9bd84e67b4e7491ce0ce13e8f06829 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -1756,7 +1756,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,
@@ -2448,7 +2449,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;
 }

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index 0f06e94d6c180b8e6f6052019a60c1878b4fed04..d4a146c53c5e961f52f1a500c8a538c9b914fbb8 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -885,7 +885,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 */

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 0aa9beefd1c7ee6c53d9f2623069bae00848e77f..b57111252d07106a739ebaff98874f75ef48637b 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -412,7 +412,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;
 
@@ -2082,8 +2083,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;
 }
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
index a73f2bf3a56a6426704c64a20e74403c715ac09f..cccef32284616bd62885ca130e19dcbe5e5cfc8a 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
@@ -236,7 +236,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 */