net: hns3: optimize the code when update the tc info

When update the TC info for NIC, there are some differences
between PF and VF. Currently, four "vport->vport_id" are
used to distinguish PF or VF. So merge them into one to
improve readability and maintainability of code.

Signed-off-by: GuoJia Liao <liaoguojia@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 4b89f36e4d6dcc0f07f75548740673d5ebcc9de0..9e0d7e1bc9582bb488dceb694c8a1585d0c933cb 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -55,8 +55,6 @@
 
 #define HCLGE_LINK_STATUS_MS   10
 
-#define HCLGE_VF_VPORT_START_NUM       1
-
 static int hclge_set_mac_mtu(struct hclge_dev *hdev, int new_mps);
 static int hclge_init_vlan_config(struct hclge_dev *hdev);
 static void hclge_sync_vlan_filter(struct hclge_dev *hdev);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index a9c67e3891eb1cbb349a1acbd86afc92c435a59f..a10a17c4c7823af39b6ce39cd51716607d3e85ca 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -17,6 +17,8 @@
 
 #define HCLGE_MAX_PF_NUM               8
 
+#define HCLGE_VF_VPORT_START_NUM       1
+
 #define HCLGE_RD_FIRST_STATS_NUM        2
 #define HCLGE_RD_OTHER_STATS_NUM        4
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
index 216ab1e9272395df1f2691131803aa8c25a5c722..906d98e515aaa8774c1b61d6a9211326e64f023b 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
@@ -640,13 +640,18 @@ static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport)
        /* TC configuration is shared by PF/VF in one port, only allow
         * one tc for VF for simplicity. VF's vport_id is non zero.
         */
-       kinfo->tc_info.num_tc = vport->vport_id ? 1 :
+       if (vport->vport_id) {
+               kinfo->tc_info.num_tc = 1;
+               vport->qs_offset = HNAE3_MAX_TC +
+                                  vport->vport_id - HCLGE_VF_VPORT_START_NUM;
+               vport_max_rss_size = hdev->vf_rss_size_max;
+       } else {
+               kinfo->tc_info.num_tc =
                        min_t(u16, vport->alloc_tqps, hdev->tm_info.num_tc);
-       vport->qs_offset = (vport->vport_id ? HNAE3_MAX_TC : 0) +
-                               (vport->vport_id ? (vport->vport_id - 1) : 0);
+               vport->qs_offset = 0;
+               vport_max_rss_size = hdev->pf_rss_size_max;
+       }
 
-       vport_max_rss_size = vport->vport_id ? hdev->vf_rss_size_max :
-                               hdev->pf_rss_size_max;
        max_rss_size = min_t(u16, vport_max_rss_size,
                             hclge_vport_get_max_rss_size(vport));