mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
crypto: sun4i-ss - fix big endian issues
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>
This commit is contained in:
parent
2edf86414b
commit
d1d787bceb
1 changed files with 11 additions and 10 deletions
|
@ -187,7 +187,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);
|
||||||
|
@ -196,6 +196,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),
|
||||||
|
@ -407,7 +408,7 @@ static int sun4i_hash(struct ahash_request *areq)
|
||||||
|
|
||||||
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;
|
||||||
|
@ -416,7 +417,7 @@ static int sun4i_hash(struct ahash_request *areq)
|
||||||
|
|
||||||
/* 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)
|
||||||
|
@ -435,13 +436,13 @@ static int sun4i_hash(struct ahash_request *areq)
|
||||||
|
|
||||||
/* 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);
|
||||||
|
|
||||||
|
@ -483,7 +484,7 @@ static int sun4i_hash(struct ahash_request *areq)
|
||||||
}
|
}
|
||||||
} 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue