106 lines
4.1 KiB
Diff
106 lines
4.1 KiB
Diff
From 0d601a6e3b21b7c151ea7b58e02e13115983a0d0 Mon Sep 17 00:00:00 2001
|
|
From: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Date: Tue, 28 Sep 2021 11:52:04 +0800
|
|
Subject: [PATCH 112/283] net: hns3: refactor function
|
|
hclgevf_parse_capability()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc1
|
|
commit 81414ba71356b174d62370195a2bb99592e1b2a2
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMYT
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=81414ba71356b174d62370195a2bb99592e1b2a2
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
The function hclgevf_parse_capability() will add more if statement in the
|
|
future, to improve code readability, maintainability and simplicity,
|
|
refactor this function by using a bit mapping array of IMP capabilities
|
|
and driver capabilities.
|
|
|
|
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
|
|
---
|
|
.../hisilicon/hns3/hns3vf/hclgevf_cmd.c | 23 +++++++++++--------
|
|
.../hisilicon/hns3/hns3vf/hclgevf_cmd.h | 8 +++++++
|
|
2 files changed, 22 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
|
|
index 67d44d21814e..6e5d549f0adf 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
|
|
@@ -358,21 +358,26 @@ static void hclgevf_set_default_capability(struct hclgevf_dev *hdev)
|
|
set_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps);
|
|
}
|
|
|
|
+const struct hclgevf_caps_bit_map hclgevf_cmd_caps_bit_map0[] = {
|
|
+ {HCLGEVF_CAP_UDP_GSO_B, HNAE3_DEV_SUPPORT_UDP_GSO_B},
|
|
+ {HCLGEVF_CAP_INT_QL_B, HNAE3_DEV_SUPPORT_INT_QL_B},
|
|
+ {HCLGEVF_CAP_TQP_TXRX_INDEP_B, HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B},
|
|
+ {HCLGEVF_CAP_HW_TX_CSUM_B, HNAE3_DEV_SUPPORT_HW_TX_CSUM_B},
|
|
+ {HCLGEVF_CAP_UDP_TUNNEL_CSUM_B, HNAE3_DEV_SUPPORT_UDP_TUNNEL_CSUM_B},
|
|
+ {HCLGEVF_CAP_RXD_ADV_LAYOUT_B, HNAE3_DEV_SUPPORT_RXD_ADV_LAYOUT_B},
|
|
+};
|
|
+
|
|
static void hclgevf_parse_capability(struct hclgevf_dev *hdev,
|
|
struct hclgevf_query_version_cmd *cmd)
|
|
{
|
|
struct hnae3_ae_dev *ae_dev = pci_get_drvdata(hdev->pdev);
|
|
- u32 caps;
|
|
+ u32 caps, i;
|
|
|
|
caps = __le32_to_cpu(cmd->caps[0]);
|
|
- if (hnae3_get_bit(caps, HCLGEVF_CAP_UDP_GSO_B))
|
|
- set_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, ae_dev->caps);
|
|
- if (hnae3_get_bit(caps, HCLGEVF_CAP_INT_QL_B))
|
|
- set_bit(HNAE3_DEV_SUPPORT_INT_QL_B, ae_dev->caps);
|
|
- if (hnae3_get_bit(caps, HCLGEVF_CAP_TQP_TXRX_INDEP_B))
|
|
- set_bit(HNAE3_DEV_SUPPORT_TQP_TXRX_INDEP_B, ae_dev->caps);
|
|
- if (hnae3_get_bit(caps, HCLGEVF_CAP_HW_TX_CSUM_B))
|
|
- set_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps);
|
|
+ for (i = 0; i < ARRAY_SIZE(hclgevf_cmd_caps_bit_map0); i++)
|
|
+ if (hnae3_get_bit(caps, hclgevf_cmd_caps_bit_map0[i].imp_bit))
|
|
+ set_bit(hclgevf_cmd_caps_bit_map0[i].local_bit,
|
|
+ ae_dev->caps);
|
|
}
|
|
|
|
static int hclgevf_cmd_query_version_and_capability(struct hclgevf_dev *hdev)
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h
|
|
index 6a018a189097..824414e5fdf0 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h
|
|
@@ -156,6 +156,8 @@ enum HCLGEVF_CAP_BITS {
|
|
HCLGEVF_CAP_TQP_TXRX_INDEP_B,
|
|
HCLGEVF_CAP_HW_PAD_B,
|
|
HCLGEVF_CAP_STASH_B,
|
|
+ HCLGEVF_CAP_UDP_TUNNEL_CSUM_B,
|
|
+ HCLGEVF_CAP_RXD_ADV_LAYOUT_B = 15,
|
|
};
|
|
|
|
#define HCLGEVF_QUERY_CAP_LENGTH 3
|
|
@@ -285,6 +287,12 @@ struct hclgevf_dev_specs_1_cmd {
|
|
u8 rsv1[18];
|
|
};
|
|
|
|
+/* capabilities bits map between imp firmware and local driver */
|
|
+struct hclgevf_caps_bit_map {
|
|
+ u16 imp_bit;
|
|
+ u16 local_bit;
|
|
+};
|
|
+
|
|
static inline void hclgevf_write_reg(void __iomem *base, u32 reg, u32 value)
|
|
{
|
|
writel(value, base + reg);
|
|
--
|
|
2.34.1
|
|
|