From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
linux-crypto@vger.kernel.org, linux@arm.linux.org.uk,
herbert@gondor.apana.org.au
Cc: steve.capper@linaro.org, Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH 3/5] crypto: arm/ghash-ce - enable module autoloading based on CPU feature bits
Date: Tue, 18 Oct 2016 11:52:17 +0100 [thread overview]
Message-ID: <1476787939-21889-4-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1476787939-21889-1-git-send-email-ard.biesheuvel@linaro.org>
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>
---
arch/arm/crypto/ghash-ce-glue.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/crypto/ghash-ce-glue.c b/arch/arm/crypto/ghash-ce-glue.c
index 7546b3c02466..6bac8bea9f1e 100644
--- a/arch/arm/crypto/ghash-ce-glue.c
+++ b/arch/arm/crypto/ghash-ce-glue.c
@@ -15,6 +15,7 @@
#include <crypto/cryptd.h>
#include <crypto/internal/hash.h>
#include <crypto/gf128mul.h>
+#include <linux/cpufeature.h>
#include <linux/crypto.h>
#include <linux/module.h>
@@ -311,9 +312,6 @@ static int __init ghash_ce_mod_init(void)
{
int err;
- if (!(elf_hwcap2 & HWCAP2_PMULL))
- return -ENODEV;
-
err = crypto_register_shash(&ghash_alg);
if (err)
return err;
@@ -334,5 +332,5 @@ static void __exit ghash_ce_mod_exit(void)
crypto_unregister_shash(&ghash_alg);
}
-module_init(ghash_ce_mod_init);
+module_cpu_feature_match(PMULL, ghash_ce_mod_init);
module_exit(ghash_ce_mod_exit);
--
2.7.4
next prev parent reply other threads:[~2016-10-18 10:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 10:52 [PATCH 0/5] ARM: add module autoloading support for crypto modules Ard Biesheuvel
2016-10-18 10:52 ` [PATCH 1/5] ARM: wire up HWCAP2 feature bits to the CPU modalias Ard Biesheuvel
2016-10-29 10:08 ` Ard Biesheuvel
2016-10-31 16:13 ` Russell King - ARM Linux
2017-01-02 21:06 ` Ard Biesheuvel
2017-01-02 23:40 ` Russell King - ARM Linux
2017-01-04 16:42 ` Ard Biesheuvel
2016-10-18 10:52 ` [PATCH 2/5] crypto: arm/aes-ce - enable module autoloading based on CPU feature bits Ard Biesheuvel
2016-10-18 10:52 ` Ard Biesheuvel [this message]
2016-10-18 10:52 ` [PATCH 4/5] crypto: arm/sha1-ce " Ard Biesheuvel
2016-10-18 10:52 ` [PATCH 5/5] crypto: arm/sha2-ce " Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476787939-21889-4-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=steve.capper@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).