crypto: arm/sha256-neon - 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/sha256_neon_glue.c b/arch/arm/crypto/sha256_neon_glue.c
index ccdcfff71910d864d261d6ab6bb723821abd3017..76eb3cdc21c9636d4fa6113c63892613bf5dcde0 100644 (file)
--- a/arch/arm/crypto/sha256_neon_glue.c
+++ b/arch/arm/crypto/sha256_neon_glue.c
@@ -9,69 +9,51 @@
  *   Copyright © 2014 Jussi Kivilinna <jussi.kivilinna@iki.fi>
  */
 
+#include <asm/neon.h>
 #include <crypto/internal/hash.h>
-#include <crypto/internal/simd.h>
-#include <linux/types.h>
-#include <linux/string.h>
 #include <crypto/sha2.h>
 #include <crypto/sha256_base.h>
-#include <asm/byteorder.h>
-#include <asm/simd.h>
-#include <asm/neon.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 #include "sha256_glue.h"
 
-asmlinkage void sha256_block_data_order_neon(struct sha256_state *digest,
-                                            const u8 *data, int num_blks);
+asmlinkage void sha256_block_data_order_neon(
+       struct crypto_sha256_state *digest, const u8 *data, int num_blks);
 
 static int crypto_sha256_neon_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_data_order_neon);
+       remain = sha256_base_do_update_blocks(desc, data, len,
+                                             sha256_block_data_order_neon);
        kernel_neon_end();
-
-       return 0;
+       return remain;
 }
 
 static int crypto_sha256_neon_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_data_order_neon);
-       sha256_base_do_finalize(desc, sha256_block_data_order_neon);
+       sha256_base_do_finup(desc, data, len, sha256_block_data_order_neon);
        kernel_neon_end();
-
        return sha256_base_finish(desc, out);
 }
 
-static int crypto_sha256_neon_final(struct shash_desc *desc, u8 *out)
-{
-       return crypto_sha256_neon_finup(desc, NULL, 0, out);
-}
-
 struct shash_alg sha256_neon_algs[] = { {
        .digestsize     =       SHA256_DIGEST_SIZE,
        .init           =       sha256_base_init,
        .update         =       crypto_sha256_neon_update,
-       .final          =       crypto_sha256_neon_final,
        .finup          =       crypto_sha256_neon_finup,
-       .descsize       =       sizeof(struct sha256_state),
+       .descsize       =       sizeof(struct crypto_sha256_state),
        .base           =       {
                .cra_name       =       "sha256",
                .cra_driver_name =      "sha256-neon",
                .cra_priority   =       250,
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                       CRYPTO_AHASH_ALG_FINUP_MAX,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -79,13 +61,14 @@ struct shash_alg sha256_neon_algs[] = { {
        .digestsize     =       SHA224_DIGEST_SIZE,
        .init           =       sha224_base_init,
        .update         =       crypto_sha256_neon_update,
-       .final          =       crypto_sha256_neon_final,
        .finup          =       crypto_sha256_neon_finup,
-       .descsize       =       sizeof(struct sha256_state),
+       .descsize       =       sizeof(struct crypto_sha256_state),
        .base           =       {
                .cra_name       =       "sha224",
                .cra_driver_name =      "sha224-neon",
                .cra_priority   =       250,
+               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY |
+                                       CRYPTO_AHASH_ALG_FINUP_MAX,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }