103 lines
3.1 KiB
Diff
103 lines
3.1 KiB
Diff
From c01583344fb7e63df204849214c1a8da0c033e03 Mon Sep 17 00:00:00 2001
|
|
From: Peng Li <lipeng321@huawei.com>
|
|
Date: Sat, 24 Jul 2021 15:43:33 +0800
|
|
Subject: [PATCH 045/283] net: hns3: refactor out hclge_cmd_convert_err_code()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.12-rc1-dontuse
|
|
commit 1c9a98b0ba1f16490ea0d492a1cd606f3a4b1bee
|
|
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=1c9a98b0ba1f16490ea0d492a1cd606f3a4b1bee
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
To improve code readability and maintainability, refactor
|
|
hclge_cmd_convert_err_code() with an array of imp_errcode
|
|
and common_errno mapping, instead of a bloated switch/case.
|
|
|
|
Signed-off-by: Peng Li <lipeng321@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>
|
|
---
|
|
.../hisilicon/hns3/hns3pf/hclge_cmd.c | 55 +++++++++----------
|
|
1 file changed, 27 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
|
|
index 1b986185d145..5f0c645eb292 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
|
|
@@ -205,36 +205,35 @@ static bool hclge_is_special_opcode(u16 opcode)
|
|
return false;
|
|
}
|
|
|
|
+struct errcode {
|
|
+ u32 imp_errcode;
|
|
+ int common_errno;
|
|
+};
|
|
+
|
|
static int hclge_cmd_convert_err_code(u16 desc_ret)
|
|
{
|
|
- switch (desc_ret) {
|
|
- case HCLGE_CMD_EXEC_SUCCESS:
|
|
- return 0;
|
|
- case HCLGE_CMD_NO_AUTH:
|
|
- return -EPERM;
|
|
- case HCLGE_CMD_NOT_SUPPORTED:
|
|
- return -EOPNOTSUPP;
|
|
- case HCLGE_CMD_QUEUE_FULL:
|
|
- return -EXFULL;
|
|
- case HCLGE_CMD_NEXT_ERR:
|
|
- return -ENOSR;
|
|
- case HCLGE_CMD_UNEXE_ERR:
|
|
- return -ENOTBLK;
|
|
- case HCLGE_CMD_PARA_ERR:
|
|
- return -EINVAL;
|
|
- case HCLGE_CMD_RESULT_ERR:
|
|
- return -ERANGE;
|
|
- case HCLGE_CMD_TIMEOUT:
|
|
- return -ETIME;
|
|
- case HCLGE_CMD_HILINK_ERR:
|
|
- return -ENOLINK;
|
|
- case HCLGE_CMD_QUEUE_ILLEGAL:
|
|
- return -ENXIO;
|
|
- case HCLGE_CMD_INVALID:
|
|
- return -EBADR;
|
|
- default:
|
|
- return -EIO;
|
|
- }
|
|
+ struct errcode hclge_cmd_errcode[] = {
|
|
+ {HCLGE_CMD_EXEC_SUCCESS, 0},
|
|
+ {HCLGE_CMD_NO_AUTH, -EPERM},
|
|
+ {HCLGE_CMD_NOT_SUPPORTED, -EOPNOTSUPP},
|
|
+ {HCLGE_CMD_QUEUE_FULL, -EXFULL},
|
|
+ {HCLGE_CMD_NEXT_ERR, -ENOSR},
|
|
+ {HCLGE_CMD_UNEXE_ERR, -ENOTBLK},
|
|
+ {HCLGE_CMD_PARA_ERR, -EINVAL},
|
|
+ {HCLGE_CMD_RESULT_ERR, -ERANGE},
|
|
+ {HCLGE_CMD_TIMEOUT, -ETIME},
|
|
+ {HCLGE_CMD_HILINK_ERR, -ENOLINK},
|
|
+ {HCLGE_CMD_QUEUE_ILLEGAL, -ENXIO},
|
|
+ {HCLGE_CMD_INVALID, -EBADR},
|
|
+ };
|
|
+ u32 errcode_count = ARRAY_SIZE(hclge_cmd_errcode);
|
|
+ u32 i;
|
|
+
|
|
+ for (i = 0; i < errcode_count; i++)
|
|
+ if (hclge_cmd_errcode[i].imp_errcode == desc_ret)
|
|
+ return hclge_cmd_errcode[i].common_errno;
|
|
+
|
|
+ return -EIO;
|
|
}
|
|
|
|
static int hclge_cmd_check_retval(struct hclge_hw *hw, struct hclge_desc *desc,
|
|
--
|
|
2.34.1
|
|
|