54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From 4ee2e9ca379a23b990b6e46bcc68b94eb6fd09c6 Mon Sep 17 00:00:00 2001
|
|
From: Jiaran Zhang <zhangjiaran@huawei.com>
|
|
Date: Sat, 24 Jul 2021 15:44:01 +0800
|
|
Subject: [PATCH 063/283] net: hns3: remove redundant query in
|
|
hclge_config_tm_hw_err_int()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.13-rc1
|
|
commit d914971df022e7abdb5f8fdfd901a655c9786c05
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMQV
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d914971df022e7abdb5f8fdfd901a655c9786c05
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
According to the HW manual, the query operation is unnecessary
|
|
when the TM QCN error event is enabled, so remove it.
|
|
|
|
Signed-off-by: Jiaran Zhang <zhangjiaran@huawei.com>
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@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>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 8 +-------
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
|
|
index 7d72e30d0d16..494498629317 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
|
|
@@ -866,13 +866,7 @@ static int hclge_config_tm_hw_err_int(struct hclge_dev *hdev, bool en)
|
|
}
|
|
|
|
/* configure TM QCN hw errors */
|
|
- ret = hclge_cmd_query_error(hdev, &desc, HCLGE_TM_QCN_MEM_INT_CFG, 0);
|
|
- if (ret) {
|
|
- dev_err(dev, "fail(%d) to read TM QCN CFG status\n", ret);
|
|
- return ret;
|
|
- }
|
|
-
|
|
- hclge_cmd_reuse_desc(&desc, false);
|
|
+ hclge_cmd_setup_basic_desc(&desc, HCLGE_TM_QCN_MEM_INT_CFG, false);
|
|
if (en)
|
|
desc.data[1] = cpu_to_le32(HCLGE_TM_QCN_MEM_ERR_INT_EN);
|
|
|
|
--
|
|
2.34.1
|
|
|