76 lines
3.1 KiB
Diff
76 lines
3.1 KiB
Diff
From 3ebad05eeddf64eb84b546b2f2ac937947c650f4 Mon Sep 17 00:00:00 2001
|
|
From: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Date: Thu, 18 Nov 2021 20:45:00 +0800
|
|
Subject: [PATCH 156/283] net: hns3: fix some mac statistics is always 0 in
|
|
device version V2
|
|
|
|
mainline inclusion
|
|
from mainline-v5.16-rc1
|
|
commit 1122eac19476c5ccf200009d4e4dc9b11458019c
|
|
category: bugfix
|
|
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=1122eac19476c5ccf200009d4e4dc9b11458019c
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
When driver queries the register number of mac statistics from firmware,
|
|
the old firmware runs in device version V2 only returns number of valid
|
|
registers, not include number of three reserved registers among of them.
|
|
It cause driver doesn't record the last three data when query mac
|
|
statistics.
|
|
|
|
To fix this problem, driver never query register number in device version
|
|
V2 and set it to a fixed value which include three reserved registers.
|
|
|
|
Fixes: c8af2887c941 ("net: hns3: add support pause/pfc durations for mac statistics")
|
|
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>
|
|
---
|
|
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 10 ++++++++++
|
|
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 +-
|
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index e0ef00440f79..3ff2eb9fcf5f 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -538,6 +538,16 @@ static int hclge_mac_query_reg_num(struct hclge_dev *hdev, u32 *reg_num)
|
|
struct hclge_desc desc;
|
|
int ret;
|
|
|
|
+ /* Driver needs total register number of both valid registers and
|
|
+ * reserved registers, but the old firmware only returns number
|
|
+ * of valid registers in device V2. To be compatible with these
|
|
+ * devices, driver uses a fixed value.
|
|
+ */
|
|
+ if (hdev->ae_dev->dev_version == HNAE3_DEVICE_VERSION_V2) {
|
|
+ *reg_num = HCLGE_MAC_STATS_MAX_NUM_V1;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_QUERY_MAC_REG_NUM, true);
|
|
ret = hclge_cmd_send(&hdev->hw, &desc, 1);
|
|
if (ret) {
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
|
|
index 51f46d68c05f..7ba42bbcf370 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
|
|
@@ -406,7 +406,7 @@ struct hclge_tm_info {
|
|
};
|
|
|
|
/* max number of mac statistics on each version */
|
|
-#define HCLGE_MAC_STATS_MAX_NUM_V1 84
|
|
+#define HCLGE_MAC_STATS_MAX_NUM_V1 87
|
|
#define HCLGE_MAC_STATS_MAX_NUM_V2 105
|
|
|
|
struct hclge_comm_stats_str {
|
|
--
|
|
2.34.1
|
|
|