net: hns3: refactor PF/VF RSS hash key configuration

In order to make it more readable, this patch modifies PF/VF's
RSS hash key configuring function.

Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Weihang Li <liweihang@hisilicon.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index dd8405d841e3b92e3436ec5297f5d92c2239728b..9d9d6193b360ef208c372ed867eb5aafcb7eb6aa 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -3609,28 +3609,27 @@ static int hclge_set_rss_algo_key(struct hclge_dev *hdev,
 {
        struct hclge_rss_config_cmd *req;
        struct hclge_desc desc;
-       int key_offset;
+       int key_offset = 0;
+       int key_counts;
        int key_size;
        int ret;
 
+       key_counts = HCLGE_RSS_KEY_SIZE;
        req = (struct hclge_rss_config_cmd *)desc.data;
 
-       for (key_offset = 0; key_offset < 3; key_offset++) {
+       while (key_counts) {
                hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RSS_GENERIC_CONFIG,
                                           false);
 
                req->hash_config |= (hfunc & HCLGE_RSS_HASH_ALGO_MASK);
                req->hash_config |= (key_offset << HCLGE_RSS_HASH_KEY_OFFSET_B);
 
-               if (key_offset == 2)
-                       key_size =
-                       HCLGE_RSS_KEY_SIZE - HCLGE_RSS_HASH_KEY_NUM * 2;
-               else
-                       key_size = HCLGE_RSS_HASH_KEY_NUM;
-
+               key_size = min(HCLGE_RSS_HASH_KEY_NUM, key_counts);
                memcpy(req->hash_key,
                       key + key_offset * HCLGE_RSS_HASH_KEY_NUM, key_size);
 
+               key_counts -= key_size;
+               key_offset++;
                ret = hclge_cmd_send(&hdev->hw, &desc, 1);
                if (ret) {
                        dev_err(&hdev->pdev->dev,

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 7fd25abbd57ce76024a53bae05ef9fa9eec78114..c44877443022b5e4aa829d97d66760c014c34c68 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -539,13 +539,15 @@ static int hclgevf_set_rss_algo_key(struct hclgevf_dev *hdev,
 {
        struct hclgevf_rss_config_cmd *req;
        struct hclgevf_desc desc;
-       int key_offset;
+       int key_offset = 0;
+       int key_counts;
        int key_size;
        int ret;
 
+       key_counts = HCLGEVF_RSS_KEY_SIZE;
        req = (struct hclgevf_rss_config_cmd *)desc.data;
 
-       for (key_offset = 0; key_offset < 3; key_offset++) {
+       while (key_counts) {
                hclgevf_cmd_setup_basic_desc(&desc,
                                             HCLGEVF_OPC_RSS_GENERIC_CONFIG,
                                             false);
@@ -554,15 +556,12 @@ static int hclgevf_set_rss_algo_key(struct hclgevf_dev *hdev,
                req->hash_config |=
                        (key_offset << HCLGEVF_RSS_HASH_KEY_OFFSET_B);
 
-               if (key_offset == 2)
-                       key_size =
-                       HCLGEVF_RSS_KEY_SIZE - HCLGEVF_RSS_HASH_KEY_NUM * 2;
-               else
-                       key_size = HCLGEVF_RSS_HASH_KEY_NUM;
-
+               key_size = min(HCLGEVF_RSS_HASH_KEY_NUM, key_counts);
                memcpy(req->hash_key,
                       key + key_offset * HCLGEVF_RSS_HASH_KEY_NUM, key_size);
 
+               key_counts -= key_size;
+               key_offset++;
                ret = hclgevf_cmd_send(&hdev->hw, &desc, 1);
                if (ret) {
                        dev_err(&hdev->pdev->dev,