]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
crypto: arm/sha2-ce - enable module autoloading based on CPU feature bits
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Sun, 21 May 2017 10:23:39 +0000 (10:23 +0000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 1 Jun 2017 04:55:41 +0000 (12:55 +0800)
Make the module autoloadable by tying it to the CPU feature bit that
describes whether the optional instructions it relies on are implemented
by the current CPU.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/arm/crypto/sha2-ce-glue.c

index 0755b2d657f347847cc48eab55d5ce01c38bb76f..df4dcef054aea4e237a1713f5523f88b3ea0de09 100644 (file)
@@ -11,6 +11,7 @@
 #include <crypto/internal/hash.h>
 #include <crypto/sha.h>
 #include <crypto/sha256_base.h>
+#include <linux/cpufeature.h>
 #include <linux/crypto.h>
 #include <linux/module.h>
 
@@ -100,8 +101,6 @@ static struct shash_alg algs[] = { {
 
 static int __init sha2_ce_mod_init(void)
 {
-       if (!(elf_hwcap2 & HWCAP2_SHA2))
-               return -ENODEV;
        return crypto_register_shashes(algs, ARRAY_SIZE(algs));
 }
 
@@ -110,5 +109,5 @@ static void __exit sha2_ce_mod_fini(void)
        crypto_unregister_shashes(algs, ARRAY_SIZE(algs));
 }
 
-module_init(sha2_ce_mod_init);
+module_cpu_feature_match(SHA2, sha2_ce_mod_init);
 module_exit(sha2_ce_mod_fini);