Commit 4d8061a5 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu

crypto: arm/aes-ce - enable module autoloading based on CPU feature bits

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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6507c57b
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/internal/simd.h> #include <crypto/internal/simd.h>
#include <crypto/internal/skcipher.h> #include <crypto/internal/skcipher.h>
#include <linux/cpufeature.h>
#include <linux/module.h> #include <linux/module.h>
#include <crypto/xts.h> #include <crypto/xts.h>
...@@ -425,9 +426,6 @@ static int __init aes_init(void) ...@@ -425,9 +426,6 @@ static int __init aes_init(void)
int err; int err;
int i; int i;
if (!(elf_hwcap2 & HWCAP2_AES))
return -ENODEV;
err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs)); err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
if (err) if (err)
return err; return err;
...@@ -451,5 +449,5 @@ static int __init aes_init(void) ...@@ -451,5 +449,5 @@ static int __init aes_init(void)
return err; return err;
} }
module_init(aes_init); module_cpu_feature_match(AES, aes_init);
module_exit(aes_exit); module_exit(aes_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment