public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: aspeed - Fix sparse warnings

Browse source 
This patch fixes a bunch of bit endianness warnings and two missing
static modifiers.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Neal Liu <neal_liu@aspeedtech.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2022-09-06 13:05:35 +08:00
parent aa450316c6
commit efc96d43ec
2 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
drivers/crypto/aspeed/aspeed-hace-crypto.c
View file

@ -258,21 +258,20 @@ static int aspeed_sk_start_sg(struct aspeed_hace_dev *hace_dev)
total = req->cryptlen; total = req->cryptlen;
for_each_sg(req->src, s, src_sg_len, i) { for_each_sg(req->src, s, src_sg_len, i) {
src_list[i].phy_addr = sg_dma_address(s); u32 phy_addr = sg_dma_address(s);
u32 len = sg_dma_len(s);
if (total > sg_dma_len(s)) { if (total > len)
src_list[i].len = sg_dma_len(s); total -= len;
total -= src_list[i].len; else {
} else {
/* last sg list */ /* last sg list */
src_list[i].len = total; len = total;
src_list[i].len |= BIT(31); len |= BIT(31);
total = 0; total = 0;
} }
src_list[i].phy_addr = cpu_to_le32(src_list[i].phy_addr); src_list[i].phy_addr = cpu_to_le32(phy_addr);
src_list[i].len = cpu_to_le32(src_list[i].len); src_list[i].len = cpu_to_le32(len);
} }
if (total != 0) { if (total != 0) {
@ -290,21 +289,20 @@ static int aspeed_sk_start_sg(struct aspeed_hace_dev *hace_dev)
total = req->cryptlen; total = req->cryptlen;
for_each_sg(req->dst, s, dst_sg_len, i) { for_each_sg(req->dst, s, dst_sg_len, i) {
dst_list[i].phy_addr = sg_dma_address(s); u32 phy_addr = sg_dma_address(s);
u32 len = sg_dma_len(s);
if (total > sg_dma_len(s)) { if (total > len)
dst_list[i].len = sg_dma_len(s); total -= len;
total -= dst_list[i].len; else {
} else {
/* last sg list */ /* last sg list */
dst_list[i].len = total; len = total;
dst_list[i].len |= BIT(31); len |= BIT(31);
total = 0; total = 0;
} }
dst_list[i].phy_addr = cpu_to_le32(dst_list[i].phy_addr); dst_list[i].phy_addr = cpu_to_le32(phy_addr);
dst_list[i].len = cpu_to_le32(dst_list[i].len); dst_list[i].len = cpu_to_le32(len);
} }
@ -731,7 +729,7 @@ static void aspeed_crypto_cra_exit(struct crypto_skcipher *tfm)
crypto_free_skcipher(ctx->fallback_tfm); crypto_free_skcipher(ctx->fallback_tfm);
} }
struct aspeed_hace_alg aspeed_crypto_algs[] = { static struct aspeed_hace_alg aspeed_crypto_algs[] = {
{ {
.alg.skcipher = { .alg.skcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
@ -1019,7 +1017,7 @@ struct aspeed_hace_alg aspeed_crypto_algs[] = {
}, },
}; };
struct aspeed_hace_alg aspeed_crypto_algs_g6[] = { static struct aspeed_hace_alg aspeed_crypto_algs_g6[] = {
{ {
.alg.skcipher = { .alg.skcipher = {
.ivsize = AES_BLOCK_SIZE, .ivsize = AES_BLOCK_SIZE,

38
drivers/crypto/aspeed/aspeed-hace-hash.c
View file

@ -208,6 +208,9 @@ static int aspeed_ahash_dma_prepare_sg(struct aspeed_hace_dev *hace_dev)
} }
if (rctx->bufcnt != 0) { if (rctx->bufcnt != 0) {
u32 phy_addr;
u32 len;
rctx->buffer_dma_addr = dma_map_single(hace_dev->dev, rctx->buffer_dma_addr = dma_map_single(hace_dev->dev,
rctx->buffer, rctx->buffer,
rctx->block_size * 2, rctx->block_size * 2,
@ -218,36 +221,35 @@ static int aspeed_ahash_dma_prepare_sg(struct aspeed_hace_dev *hace_dev)
goto free_rctx_digest; goto free_rctx_digest;
} }
src_list[0].phy_addr = rctx->buffer_dma_addr; phy_addr = rctx->buffer_dma_addr;
src_list[0].len = rctx->bufcnt; len = rctx->bufcnt;
length -= src_list[0].len; length -= len;
/* Last sg list */ /* Last sg list */
if (length == 0) if (length == 0)
src_list[0].len |= HASH_SG_LAST_LIST; len |= HASH_SG_LAST_LIST;
src_list[0].phy_addr = cpu_to_le32(src_list[0].phy_addr); src_list[0].phy_addr = cpu_to_le32(phy_addr);
src_list[0].len = cpu_to_le32(src_list[0].len); src_list[0].len = cpu_to_le32(len);
src_list++; src_list++;
} }
if (length != 0) { if (length != 0) {
for_each_sg(rctx->src_sg, s, sg_len, i) { for_each_sg(rctx->src_sg, s, sg_len, i) {
src_list[i].phy_addr = sg_dma_address(s); u32 phy_addr = sg_dma_address(s);
u32 len = sg_dma_len(s);
if (length > sg_dma_len(s)) { if (length > len)
src_list[i].len = sg_dma_len(s); length -= len;
length -= sg_dma_len(s); else {
} else {
/* Last sg list */ /* Last sg list */
src_list[i].len = length; len = length;
src_list[i].len |= HASH_SG_LAST_LIST; len |= HASH_SG_LAST_LIST;
length = 0; length = 0;
} }
src_list[i].phy_addr = cpu_to_le32(src_list[i].phy_addr); src_list[i].phy_addr = cpu_to_le32(phy_addr);
src_list[i].len = cpu_to_le32(src_list[i].len); src_list[i].len = cpu_to_le32(len);
} }
} }
@ -913,7 +915,7 @@ static int aspeed_sham_import(struct ahash_request *req, const void *in)
return 0; return 0;
} }
struct aspeed_hace_alg aspeed_ahash_algs[] = { static struct aspeed_hace_alg aspeed_ahash_algs[] = {
{ {
.alg.ahash = { .alg.ahash = {
.init = aspeed_sham_init, .init = aspeed_sham_init,
@ -1099,7 +1101,7 @@ struct aspeed_hace_alg aspeed_ahash_algs[] = {
}, },
}; };
struct aspeed_hace_alg aspeed_ahash_algs_g6[] = { static struct aspeed_hace_alg aspeed_ahash_algs_g6[] = {
{ {
.alg.ahash = { .alg.ahash = {
.init = aspeed_sham_init, .init = aspeed_sham_init,