95 lines
3.3 KiB
Diff
95 lines
3.3 KiB
Diff
From 90511556722f51dcd6a6a4172943ee32e52db267 Mon Sep 17 00:00:00 2001
|
|
From: Qi Tao <taoqi10@huawei.com>
|
|
Date: Thu, 30 Nov 2023 17:12:17 +0800
|
|
Subject: [PATCH 094/114] uadk: code cleanup for error codes and variable type
|
|
|
|
Unify the use of error return name. Modify the variable
|
|
type in hisi_sec to reduce variable conversion.
|
|
|
|
Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com>
|
|
---
|
|
drv/hisi_sec.c | 12 ++++++------
|
|
wd.c | 4 ++--
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c
|
|
index 9bf7e68..2f03d1f 100644
|
|
--- a/drv/hisi_sec.c
|
|
+++ b/drv/hisi_sec.c
|
|
@@ -517,12 +517,12 @@ struct hisi_sec_sqe3 {
|
|
__le32 counter;
|
|
} __attribute__((packed, aligned(4)));
|
|
|
|
-static int g_digest_a_alg[WD_DIGEST_TYPE_MAX] = {
|
|
+static __u32 g_digest_a_alg[WD_DIGEST_TYPE_MAX] = {
|
|
A_ALG_SM3, A_ALG_MD5, A_ALG_SHA1, A_ALG_SHA256, A_ALG_SHA224,
|
|
A_ALG_SHA384, A_ALG_SHA512, A_ALG_SHA512_224, A_ALG_SHA512_256
|
|
};
|
|
|
|
-static int g_hmac_a_alg[WD_DIGEST_TYPE_MAX] = {
|
|
+static __u32 g_hmac_a_alg[WD_DIGEST_TYPE_MAX] = {
|
|
A_ALG_HMAC_SM3, A_ALG_HMAC_MD5, A_ALG_HMAC_SHA1,
|
|
A_ALG_HMAC_SHA256, A_ALG_HMAC_SHA224, A_ALG_HMAC_SHA384,
|
|
A_ALG_HMAC_SHA512, A_ALG_HMAC_SHA512_224, A_ALG_HMAC_SHA512_256,
|
|
@@ -1518,7 +1518,7 @@ static int fill_digest_bd2_alg(struct wd_digest_msg *msg,
|
|
|
|
if (msg->mode == WD_DIGEST_NORMAL)
|
|
sqe->type2.mac_key_alg |=
|
|
- (__u32)g_digest_a_alg[msg->alg] << AUTH_ALG_OFFSET;
|
|
+ g_digest_a_alg[msg->alg] << AUTH_ALG_OFFSET;
|
|
else if (msg->mode == WD_DIGEST_HMAC) {
|
|
if (msg->key_bytes & WORD_ALIGNMENT_MASK) {
|
|
WD_ERR("failed to check digest key_bytes, size = %u\n",
|
|
@@ -1530,7 +1530,7 @@ static int fill_digest_bd2_alg(struct wd_digest_msg *msg,
|
|
sqe->type2.a_key_addr = (__u64)(uintptr_t)msg->key;
|
|
|
|
sqe->type2.mac_key_alg |=
|
|
- (__u32)g_hmac_a_alg[msg->alg] << AUTH_ALG_OFFSET;
|
|
+ g_hmac_a_alg[msg->alg] << AUTH_ALG_OFFSET;
|
|
} else {
|
|
WD_ERR("failed to check digest mode, mode = %u\n", msg->mode);
|
|
return -WD_EINVAL;
|
|
@@ -1887,7 +1887,7 @@ static int fill_digest_bd3_alg(struct wd_digest_msg *msg,
|
|
|
|
if (msg->mode == WD_DIGEST_NORMAL) {
|
|
sqe->auth_mac_key |=
|
|
- (__u32)g_digest_a_alg[msg->alg] << SEC_AUTH_ALG_OFFSET_V3;
|
|
+ g_digest_a_alg[msg->alg] << SEC_AUTH_ALG_OFFSET_V3;
|
|
} else if (msg->mode == WD_DIGEST_HMAC) {
|
|
ret = hmac_key_len_check(msg);
|
|
if (ret)
|
|
@@ -1897,7 +1897,7 @@ static int fill_digest_bd3_alg(struct wd_digest_msg *msg,
|
|
WORD_BYTES) << SEC_AKEY_OFFSET_V3;
|
|
sqe->a_key_addr = (__u64)(uintptr_t)msg->key;
|
|
sqe->auth_mac_key |=
|
|
- (__u32)g_hmac_a_alg[msg->alg] << SEC_AUTH_ALG_OFFSET_V3;
|
|
+ g_hmac_a_alg[msg->alg] << SEC_AUTH_ALG_OFFSET_V3;
|
|
|
|
if (msg->alg == WD_DIGEST_AES_GMAC) {
|
|
sqe->auth_mac_key |= AI_GEN_IVIN_ADDR << SEC_AI_GEN_OFFSET_V3;
|
|
diff --git a/wd.c b/wd.c
|
|
index a6e207d..be374f5 100644
|
|
--- a/wd.c
|
|
+++ b/wd.c
|
|
@@ -228,7 +228,7 @@ static int get_dev_info(struct uacce_dev *dev)
|
|
return ret;
|
|
else if (value == 1) {
|
|
WD_ERR("skip isolated uacce device!\n");
|
|
- return -ENODEV;
|
|
+ return -WD_ENODEV;
|
|
}
|
|
}
|
|
|
|
@@ -237,7 +237,7 @@ static int get_dev_info(struct uacce_dev *dev)
|
|
return ret;
|
|
else if (!((unsigned int)dev->flags & UACCE_DEV_SVA)) {
|
|
WD_ERR("skip none sva uacce device!\n");
|
|
- return -ENODEV;
|
|
+ return -WD_ENODEV;
|
|
}
|
|
|
|
ret = get_int_attr(dev, "region_mmio_size", &value);
|
|
--
|
|
2.25.1
|
|
|