crypto: sun4i-ss - fix big endian issues

commit d1d787bcebfe122a5bd443ae565696661e2e9656 upstream.

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

Fixes: 6298e948215f ("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>

diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
index 1a72426..2d178e0 100644 (file)
--- a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
@@ -179,7 +179,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 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 crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun4i_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
@@ -188,6 +188,7 @@ static int sun4i_hash(struct ahash_request *areq)
        struct sg_mapping_iter mi;
        int in_r, err = 0;
        size_t copied = 0;
+       __le32 wb = 0;
 
        dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x",
                __func__, crypto_tfm_alg_name(areq->base.tfm),
@@ -399,7 +400,7 @@ hash_final:
 
                nbw = op->len - 4 * nwait;
                if (nbw) {
-                       wb = *(u32 *)(op->buf + nwait * 4);
+                       wb = cpu_to_le32(*(u32 *)(op->buf + nwait * 4));
                        wb &= GENMASK((nbw * 8) - 1, 0);
 
                        op->byte_count += nbw;
@@ -408,7 +409,7 @@ hash_final:
 
        /* write the remaining bytes of the nbw buffer */
        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)
@@ -427,13 +428,13 @@ hash_final:
 
        /* write the length of data */
        if (op->mode == SS_OP_SHA1) {
-               __be64 bits = cpu_to_be64(op->byte_count << 3);
-               bf[j++] = lower_32_bits(bits);
-               bf[j++] = upper_32_bits(bits);
+               __be64 *bits = (__be64 *)&bf[j];
+               *bits = cpu_to_be64(op->byte_count << 3);
+               j += 2;
        } else {
-               __le64 bits = op->byte_count << 3;
-               bf[j++] = lower_32_bits(bits);
-               bf[j++] = upper_32_bits(bits);
+               __le64 *bits = (__le64 *)&bf[j];
+               *bits = cpu_to_le64(op->byte_count << 3);
+               j += 2;
        }
        writesl(ss->base + SS_RXFIFO, bf, j);
 
@@ -475,7 +476,7 @@ hash_final:
                }
        } else {
                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);
                }
        }