ARM: 7982/1: introduce HWCAP2 feature bits for ARMv8 Crypto Extensions

This allocates feature bits 0-4 in HWCAP2 for the crypto and CRC
extensions introduced in ARMv8.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/uapi/asm/hwcap.h b/arch/arm/include/uapi/asm/hwcap.h
index 87768b5cffd130e52882a4c0824d41a206ea8f88..20d12f230a2f4d0939ec7e409961016658fb6199 100644 (file)
--- a/arch/arm/include/uapi/asm/hwcap.h
+++ b/arch/arm/include/uapi/asm/hwcap.h
@@ -31,5 +31,10 @@
 /*
  * HWCAP2 flags - for elf_hwcap2 (in kernel) and AT_HWCAP2
  */
+#define HWCAP2_AES     (1 << 0)
+#define HWCAP2_PMULL   (1 << 1)
+#define HWCAP2_SHA1    (1 << 2)
+#define HWCAP2_SHA2    (1 << 3)
+#define HWCAP2_CRC32   (1 << 4)
 
 #endif /* _UAPI__ASMARM_HWCAP_H */

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index dbb5449d6b79bad16042e0f3f72085c5185b37e5..0a6c70b0b0f9fc5cbe20c7f6ffff077737eef4fb 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1009,6 +1009,11 @@ static const char *hwcap_str[] = {
 };
 
 static const char *hwcap2_str[] = {
+       "aes",
+       "pmull",
+       "sha1",
+       "sha2",
+       "crc32",
        NULL
 };