iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: sun4i-ss - fix big endian issues

Browse Source 
commit d1d787bceb upstream.

When testing BigEndian kernel, the sun4i-ss was failling all crypto
tests.
This patch fix endian issues with it.

Fixes: 6298e94821 ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator")
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Corentin Labbe
2019-11-14 13:58:49 +01:00
committed by Greg Kroah-Hartman
parent 36148a8fdc
commit e1763c9456
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/crypto/sunxi-ss/sun4i-ss-hash.c
View File

@ -175,7 +175,7 @@ static int sun4i_hash(struct ahash_request *areq)
*/ */
unsigned int i = 0, end, fill, min_fill, nwait, nbw = 0, j = 0, todo; unsigned int i = 0, end, fill, min_fill, nwait, nbw = 0, j = 0, todo;
unsigned int in_i = 0; unsigned int in_i = 0;
u32 spaces, rx_cnt = SS_RX_DEFAULT, bf[32] = {0}, wb = 0, v, ivmode = 0; u32 spaces, rx_cnt = SS_RX_DEFAULT, bf[32] = {0}, v, ivmode = 0;
struct sun4i_req_ctx *op = ahash_request_ctx(areq); struct sun4i_req_ctx *op = ahash_request_ctx(areq);
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct sun4i_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); struct sun4i_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
@ -184,6 +184,7 @@ static int sun4i_hash(struct ahash_request *areq)
struct sg_mapping_iter mi; struct sg_mapping_iter mi;
int in_r, err = 0; int in_r, err = 0;
size_t copied = 0; size_t copied = 0;
__le32 wb = 0;
dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x", dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x",
__func__, crypto_tfm_alg_name(areq->base.tfm), __func__, crypto_tfm_alg_name(areq->base.tfm),
@ -395,7 +396,7 @@ hash_final:
nbw = op->len - 4 * nwait; nbw = op->len - 4 * nwait;
if (nbw) { if (nbw) {
wb = *(u32 *)(op->buf + nwait * 4); wb = cpu_to_le32(*(u32 *)(op->buf + nwait * 4));
wb &= GENMASK((nbw * 8) - 1, 0); wb &= GENMASK((nbw * 8) - 1, 0);
op->byte_count += nbw; op->byte_count += nbw;
@ -404,7 +405,7 @@ hash_final:
/* write the remaining bytes of the nbw buffer */ /* write the remaining bytes of the nbw buffer */
wb |= ((1 << 7) << (nbw * 8)); wb |= ((1 << 7) << (nbw * 8));
bf[j++] = wb; bf[j++] = le32_to_cpu(wb);
/* /*
* number of space to pad to obtain 64o minus 8(size) minus 4 (final 1) * number of space to pad to obtain 64o minus 8(size) minus 4 (final 1)
@ -423,13 +424,13 @@ hash_final:
/* write the length of data */ /* write the length of data */
if (op->mode == SS_OP_SHA1) { if (op->mode == SS_OP_SHA1) {
__be64 bits = cpu_to_be64(op->byte_count << 3); __be64 *bits = (__be64 *)&bf[j];
bf[j++] = lower_32_bits(bits); *bits = cpu_to_be64(op->byte_count << 3);
bf[j++] = upper_32_bits(bits); j += 2;
} else { } else {
__le64 bits = op->byte_count << 3; __le64 *bits = (__le64 *)&bf[j];
bf[j++] = lower_32_bits(bits); *bits = cpu_to_le64(op->byte_count << 3);
bf[j++] = upper_32_bits(bits); j += 2;
} }
writesl(ss->base + SS_RXFIFO, bf, j); writesl(ss->base + SS_RXFIFO, bf, j);
@ -471,7 +472,7 @@ hash_final:
} }
} else { } else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
v = readl(ss->base + SS_MD0 + i * 4); v = cpu_to_le32(readl(ss->base + SS_MD0 + i * 4));
memcpy(areq->result + i * 4, &v, 4); memcpy(areq->result + i * 4, &v, 4);
} }
} }