From: Junxin Chen chenjunxin1@huawei.com
driver inclusion category: cleanup bugzilla: NA CVE: NA
----------------------------------
This patch clears devil numbers for hns3_cae_dfx, and change version to 1.9.37.0.
Signed-off-by: Junxin Chen chenjunxin1@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.c | 6 +++--- drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.h | 3 +++ drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index eea9d59..42d3795 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -30,7 +30,7 @@ #include <linux/pci.h> #include <linux/types.h>
-#define HNAE3_MOD_VERSION "1.9.36.0" +#define HNAE3_MOD_VERSION "1.9.37.0"
#define HNAE3_MIN_VECTOR_NUM 2 /* one for msi-x, another for IO */
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.c b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.c index 253972b..23c3607 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.c @@ -115,7 +115,7 @@ int hns3_cae_get_dfx_info(const struct hns3_nic_priv *net_priv, out_info->func_id = (u8)hdev->pdev->devfn; out_info->is_cs_board = (handle->pdev->revision > 0x20) ? true : false; reg_info.addr = HNS3_CAE_MAC_MODE_ADDR; - reg_info.bit_width = 32; + reg_info.bit_width = HNS3_CAE_BITWIDTH_32BIT; reg_info.is_read = true; ret = hns3_cae_operate_nic_regs(hdev, ®_info); if (ret) { @@ -125,7 +125,7 @@ int hns3_cae_get_dfx_info(const struct hns3_nic_priv *net_priv, } out_info->work_mode = reg_info.value; reg_info.addr = HNS3_CAE_MAC_MAP_ADDR; - reg_info.bit_width = 64; + reg_info.bit_width = HNS3_CAE_BITWIDTH_64BIT; reg_info.is_read = true; ret = hns3_cae_operate_nic_regs(hdev, ®_info); if (ret) { @@ -204,7 +204,7 @@ int hns3_cae_event_injection(const struct hns3_nic_priv *net_priv, hdev = vport->back;
reg_info.addr = in_info->addr; - reg_info.bit_width = 32; + reg_info.bit_width = HNS3_CAE_BITWIDTH_32BIT; reg_info.is_read = false; reg_info.value = in_info->value; dev_info(&hdev->pdev->dev, diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.h b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.h index 8d8edb8..d39b5da 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_dfx.h @@ -35,6 +35,9 @@ struct hns3_cae_event_param {
#define HNS3_CAE_MAX_MAC_NUMBER 0x8
+#define HNS3_CAE_BITWIDTH_32BIT 32 +#define HNS3_CAE_BITWIDTH_64BIT 64 + int hns3_cae_get_dfx_info(const struct hns3_nic_priv *net_priv, void *buf_in, u32 in_size, void *buf_out, u32 out_size); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h index a3eb1b1..d85a27d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h @@ -4,7 +4,7 @@ #ifndef __HNS3_CAE_VERSION_H__ #define __HNS3_CAE_VERSION_H__
-#define HNS3_CAE_MOD_VERSION "1.9.36.0" +#define HNS3_CAE_MOD_VERSION "1.9.37.0"
#define CMT_ID_LEN 8 #define RESV_LEN 3 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h index 6e21df8..87ab2fa 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h @@ -8,7 +8,7 @@
#include "hnae3.h"
-#define HNS3_MOD_VERSION "1.9.36.0" +#define HNS3_MOD_VERSION "1.9.37.0"
extern char hns3_driver_version[];
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h index 44e0713..0daef61 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -12,7 +12,7 @@ #include "hclge_cmd.h" #include "hnae3.h"
-#define HCLGE_MOD_VERSION "1.9.36.0" +#define HCLGE_MOD_VERSION "1.9.37.0" #define HCLGE_DRIVER_NAME "hclge"
#define HCLGE_MAX_PF_NUM 8 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h index 3423d40..574b36b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h @@ -10,7 +10,7 @@ #include "hclgevf_cmd.h" #include "hnae3.h"
-#define HCLGEVF_MOD_VERSION "1.9.36.0" +#define HCLGEVF_MOD_VERSION "1.9.37.0" #define HCLGEVF_DRIVER_NAME "hclgevf"
#define HCLGEVF_MAX_VLAN_ID 4095