crypto: arm/sha256-ce - Use API partial block handling

Use the Crypto API partial block handling.

Also remove the unnecessary SIMD fallback path.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/sha2-ce-glue.c b/arch/arm/crypto/sha2-ce-glue.c
index aeac45bfbf9f1f624174dba8fd20c9f8a1b5a8e1..1e9d16f79678754697076c7b1d755ab3ef9aaab8 100644 (file)
--- a/arch/arm/crypto/sha2-ce-glue.c
+++ b/arch/arm/crypto/sha2-ce-glue.c
@@ -5,91 +5,69 @@
  * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
  */
 
+#include <asm/neon.h>
 #include <crypto/internal/hash.h>
-#include <crypto/internal/simd.h>
 #include <crypto/sha2.h>
 #include <crypto/sha256_base.h>
 #include <linux/cpufeature.h>
-#include <linux/crypto.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
 
-#include <asm/hwcap.h>
-#include <asm/simd.h>
-#include <asm/neon.h>
-#include <linux/unaligned.h>
-
-#include "sha256_glue.h"
-
 MODULE_DESCRIPTION("SHA-224/SHA-256 secure hash using ARMv8 Crypto Extensions");
 MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
 MODULE_LICENSE("GPL v2");
 
-asmlinkage void sha2_ce_transform(struct sha256_state *sst, u8 const *src,
-                                 int blocks);
+asmlinkage void sha2_ce_transform(struct crypto_sha256_state *sst,
+                                 u8 const *src, int blocks);
 
 static int sha2_ce_update(struct shash_desc *desc, const u8 *data,
                          unsigned int len)
 {
-       struct sha256_state *sctx = shash_desc_ctx(desc);
-
-       if (!crypto_simd_usable() ||
-           (sctx->count % SHA256_BLOCK_SIZE) + len < SHA256_BLOCK_SIZE)
-               return crypto_sha256_arm_update(desc, data, len);
+       int remain;
 
        kernel_neon_begin();
-       sha256_base_do_update(desc, data, len,
-                             (sha256_block_fn *)sha2_ce_transform);
+       remain = sha256_base_do_update_blocks(desc, data, len,
+                                             sha2_ce_transform);
        kernel_neon_end();
-
-       return 0;
+       return remain;
 }
 
 static int sha2_ce_finup(struct shash_desc *desc, const u8 *data,
                         unsigned int len, u8 *out)
 {
-       if (!crypto_simd_usable())
-               return crypto_sha256_arm_finup(desc, data, len, out);
-
        kernel_neon_begin();
-       if (len)
-               sha256_base_do_update(desc, data, len,
-                                     (sha256_block_fn *)sha2_ce_transform);
-       sha256_base_do_finalize(desc, (sha256_block_fn *)sha2_ce_transform);
+       sha256_base_do_finup(desc, data, len, sha2_ce_transform);
        kernel_neon_end();
-
        return sha256_base_finish(desc, out);
 }
 
-static int sha2_ce_final(struct shash_desc *desc, u8 *out)
-{
-       return sha2_ce_finup(desc, NULL, 0, out);
-}
-
 static struct shash_alg algs[] = { {
        .init                   = sha224_base_init,
        .update                 = sha2_ce_update,
-       .final                  = sha2_ce_final,
        .finup                  = sha2_ce_finup,
-       .descsize               = sizeof(struct sha256_state),
+       .descsize               = sizeof(struct crypto_sha256_state),
        .digestsize             = SHA224_DIGEST_SIZE,
        .base                   = {
                .cra_name               = "sha224",
                .cra_driver_name        = "sha224-ce",
                .cra_priority           = 300,
+               .cra_flags              = CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                         CRYPTO_AHASH_ALG_FINUP_MAX,
                .cra_blocksize          = SHA256_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }
 }, {
        .init                   = sha256_base_init,
        .update                 = sha2_ce_update,
-       .final                  = sha2_ce_final,
        .finup                  = sha2_ce_finup,
-       .descsize               = sizeof(struct sha256_state),
+       .descsize               = sizeof(struct crypto_sha256_state),
        .digestsize             = SHA256_DIGEST_SIZE,
        .base                   = {
                .cra_name               = "sha256",
                .cra_driver_name        = "sha256-ce",
                .cra_priority           = 300,
+               .cra_flags              = CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                         CRYPTO_AHASH_ALG_FINUP_MAX,
                .cra_blocksize          = SHA256_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }