1 files changed, 31 insertions, 13 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1d60bebea4b8..6c777e908a24 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -372,30 +372,48 @@ void __init early_print(const char *str, ...)
 
 static void __init cpuid_init_hwcaps(void)
 {
-        unsigned int divide_instrs, vmsa;
+        int block;
+        u32 isar5;
 
         if (cpu_architecture() < CPU_ARCH_ARMv7)
                 return;
 
-        divide_instrs = (read_cpuid_ext(CPUID_EXT_ISAR0) & 0x0f000000) >> 24;
-
-        switch (divide_instrs) {
-        case 2:
+        block = cpuid_feature_extract(CPUID_EXT_ISAR0, 24);
+        if (block >= 2)
                 elf_hwcap |= HWCAP_IDIVA;
-        case 1:
+        if (block >= 1)
                 elf_hwcap |= HWCAP_IDIVT;
-        }
 
         /* LPAE implies atomic ldrd/strd instructions */
-        vmsa = (read_cpuid_ext(CPUID_EXT_MMFR0) & 0xf) >> 0;
-        if (vmsa >= 5)
+        block = cpuid_feature_extract(CPUID_EXT_MMFR0, 0);
+        if (block >= 5)
                 elf_hwcap |= HWCAP_LPAE;
+
+        /* check for supported v8 Crypto instructions */
+        isar5 = read_cpuid_ext(CPUID_EXT_ISAR5);
+
+        block = cpuid_feature_extract_field(isar5, 4);
+        if (block >= 2)
+                elf_hwcap2 |= HWCAP2_PMULL;
+        if (block >= 1)
+                elf_hwcap2 |= HWCAP2_AES;
+
+        block = cpuid_feature_extract_field(isar5, 8);
+        if (block >= 1)
+                elf_hwcap2 |= HWCAP2_SHA1;
+
+        block = cpuid_feature_extract_field(isar5, 12);
+        if (block >= 1)
+                elf_hwcap2 |= HWCAP2_SHA2;
+
+        block = cpuid_feature_extract_field(isar5, 16);
+        if (block >= 1)
+                elf_hwcap2 |= HWCAP2_CRC32;
 }
 
 static void __init elf_hwcap_fixup(void)
 {
         unsigned id = read_cpuid_id();
-        unsigned sync_prim;
 
         /*
          * HWCAP_TLS is available only on 1136 r1p0 and later,
@@ -416,9 +434,9 @@ static void __init elf_hwcap_fixup(void)
          * avoid advertising SWP; it may not be atomic with
          * multiprocessing cores.
          */
-        sync_prim = ((read_cpuid_ext(CPUID_EXT_ISAR3) >> 8) & 0xf0) |
-                    ((read_cpuid_ext(CPUID_EXT_ISAR4) >> 20) & 0x0f);
-        if (sync_prim >= 0x13)
+        if (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) > 1 ||
+            (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) == 1 &&
+             cpuid_feature_extract(CPUID_EXT_ISAR3, 20) >= 3))
                 elf_hwcap &= ~HWCAP_SWP;
 }