c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
118 lines
4.1 KiB
Diff
118 lines
4.1 KiB
Diff
From 7d9521cad6474d45e9056176982e6da54d40bc19 Mon Sep 17 00:00:00 2001
|
|
From: Eric Biggers <ebiggers@google.com>
|
|
Date: Sun, 22 Oct 2023 01:10:42 -0700
|
|
Subject: [PATCH 008/116] crypto: starfive - remove unnecessary alignmask for
|
|
ahashes
|
|
|
|
The crypto API's support for alignmasks for ahash algorithms is nearly
|
|
useless, as its only effect is to cause the API to align the key and
|
|
result buffers. The drivers that happen to be specifying an alignmask
|
|
for ahash rarely actually need it. When they do, it's easily fixable,
|
|
especially considering that these buffers cannot be used for DMA.
|
|
|
|
In preparation for removing alignmask support from ahash, this patch
|
|
makes the starfive driver no longer use it. This driver did actually
|
|
rely on it, but only for storing to the result buffer using int stores
|
|
in starfive_hash_copy_hash(). This patch makes
|
|
starfive_hash_copy_hash() use put_unaligned() instead. (It really
|
|
should use a specific endianness, but that's an existing bug.)
|
|
|
|
Signed-off-by: Eric Biggers <ebiggers@google.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/starfive/jh7110-hash.c | 13 ++-----------
|
|
1 file changed, 2 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/crypto/starfive/jh7110-hash.c
|
|
+++ b/drivers/crypto/starfive/jh7110-hash.c
|
|
@@ -209,7 +209,8 @@ static int starfive_hash_copy_hash(struc
|
|
data = (u32 *)req->result;
|
|
|
|
for (count = 0; count < mlen; count++)
|
|
- data[count] = readl(ctx->cryp->base + STARFIVE_HASH_SHARDR);
|
|
+ put_unaligned(readl(ctx->cryp->base + STARFIVE_HASH_SHARDR),
|
|
+ &data[count]);
|
|
|
|
return 0;
|
|
}
|
|
@@ -628,7 +629,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA224_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -658,7 +658,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA224_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -687,7 +686,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA256_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -717,7 +715,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA256_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -746,7 +743,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA384_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -776,7 +772,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA384_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -805,7 +800,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA512_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -835,7 +829,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SHA512_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -864,7 +857,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SM3_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|
|
@@ -894,7 +886,6 @@ static struct ahash_engine_alg algs_sha2
|
|
CRYPTO_ALG_NEED_FALLBACK,
|
|
.cra_blocksize = SM3_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 3,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
},
|