3a8995b1ad
Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
98 lines
2.6 KiB
Diff
98 lines
2.6 KiB
Diff
From 17327e444434b1062063a03060d6cc5a1876aa3f Mon Sep 17 00:00:00 2001
|
|
From: Lijun Ou <oulijun@huawei.com>
|
|
Date: Fri, 22 Jan 2021 18:18:41 +0800
|
|
Subject: [PATCH 021/189] net/hns3: refactor converting descriptor error
|
|
|
|
Use errno array instead of switch-case for refactor
|
|
the hns3_cmd_convert_err_code function.
|
|
|
|
Besides, we add a type for ROH(RDMA Over HCCS) check
|
|
cmdq return error in Kunpeng930 NIC hardware.
|
|
|
|
Signed-off-by: Lijun Ou <oulijun@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_cmd.c | 54 ++++++++++++++++++++++-----------------------
|
|
drivers/net/hns3/hns3_cmd.h | 1 +
|
|
2 files changed, 27 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
|
|
index f58f4f7..4c301cb 100644
|
|
--- a/drivers/net/hns3/hns3_cmd.c
|
|
+++ b/drivers/net/hns3/hns3_cmd.c
|
|
@@ -247,34 +247,32 @@ hns3_is_special_opcode(uint16_t opcode)
|
|
static int
|
|
hns3_cmd_convert_err_code(uint16_t desc_ret)
|
|
{
|
|
- switch (desc_ret) {
|
|
- case HNS3_CMD_EXEC_SUCCESS:
|
|
- return 0;
|
|
- case HNS3_CMD_NO_AUTH:
|
|
- return -EPERM;
|
|
- case HNS3_CMD_NOT_SUPPORTED:
|
|
- return -EOPNOTSUPP;
|
|
- case HNS3_CMD_QUEUE_FULL:
|
|
- return -EXFULL;
|
|
- case HNS3_CMD_NEXT_ERR:
|
|
- return -ENOSR;
|
|
- case HNS3_CMD_UNEXE_ERR:
|
|
- return -ENOTBLK;
|
|
- case HNS3_CMD_PARA_ERR:
|
|
- return -EINVAL;
|
|
- case HNS3_CMD_RESULT_ERR:
|
|
- return -ERANGE;
|
|
- case HNS3_CMD_TIMEOUT:
|
|
- return -ETIME;
|
|
- case HNS3_CMD_HILINK_ERR:
|
|
- return -ENOLINK;
|
|
- case HNS3_CMD_QUEUE_ILLEGAL:
|
|
- return -ENXIO;
|
|
- case HNS3_CMD_INVALID:
|
|
- return -EBADR;
|
|
- default:
|
|
- return -EREMOTEIO;
|
|
- }
|
|
+ static const struct {
|
|
+ uint16_t imp_errcode;
|
|
+ int linux_errcode;
|
|
+ } hns3_cmdq_status[] = {
|
|
+ {HNS3_CMD_EXEC_SUCCESS, 0},
|
|
+ {HNS3_CMD_NO_AUTH, -EPERM},
|
|
+ {HNS3_CMD_NOT_SUPPORTED, -EOPNOTSUPP},
|
|
+ {HNS3_CMD_QUEUE_FULL, -EXFULL},
|
|
+ {HNS3_CMD_NEXT_ERR, -ENOSR},
|
|
+ {HNS3_CMD_UNEXE_ERR, -ENOTBLK},
|
|
+ {HNS3_CMD_PARA_ERR, -EINVAL},
|
|
+ {HNS3_CMD_RESULT_ERR, -ERANGE},
|
|
+ {HNS3_CMD_TIMEOUT, -ETIME},
|
|
+ {HNS3_CMD_HILINK_ERR, -ENOLINK},
|
|
+ {HNS3_CMD_QUEUE_ILLEGAL, -ENXIO},
|
|
+ {HNS3_CMD_INVALID, -EBADR},
|
|
+ {HNS3_CMD_ROH_CHECK_FAIL, -EINVAL}
|
|
+ };
|
|
+
|
|
+ uint32_t i;
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(hns3_cmdq_status); i++)
|
|
+ if (hns3_cmdq_status[i].imp_errcode == desc_ret)
|
|
+ return hns3_cmdq_status[i].linux_errcode;
|
|
+
|
|
+ return -EREMOTEIO;
|
|
}
|
|
|
|
static int
|
|
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
|
|
index e40293b..6152f6e 100644
|
|
--- a/drivers/net/hns3/hns3_cmd.h
|
|
+++ b/drivers/net/hns3/hns3_cmd.h
|
|
@@ -52,6 +52,7 @@ enum hns3_cmd_return_status {
|
|
HNS3_CMD_HILINK_ERR = 9,
|
|
HNS3_CMD_QUEUE_ILLEGAL = 10,
|
|
HNS3_CMD_INVALID = 11,
|
|
+ HNS3_CMD_ROH_CHECK_FAIL = 12
|
|
};
|
|
|
|
enum hns3_cmd_status {
|
|
--
|
|
2.7.4
|
|
|