diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-06-10 01:04:40 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-06-11 02:31:20 -0400 |
commit | dd58a092c4202f2bd490adab7285b3ff77f8e467 (patch) | |
tree | 40bc4732fdc5b96a146cb7e2e2d6070f85ed7009 /arch | |
parent | dfb945473ae8528fd885607b6fa843c676745e0c (diff) |
powerpc: Add AT_HWCAP2 to indicate V.CRYPTO category support
The Vector Crypto category instructions are supported by current POWER8
chips, advertise them to userspace using a specific bit to properly
differentiate with chips of the same architecture level that might not
have them.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: <stable@vger.kernel.org> [v3.10+]
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/include/uapi/asm/cputable.h | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/uapi/asm/cputable.h b/arch/powerpc/include/uapi/asm/cputable.h index 5b7657959faa..de2c0e4ee1aa 100644 --- a/arch/powerpc/include/uapi/asm/cputable.h +++ b/arch/powerpc/include/uapi/asm/cputable.h | |||
@@ -41,5 +41,6 @@ | |||
41 | #define PPC_FEATURE2_EBB 0x10000000 | 41 | #define PPC_FEATURE2_EBB 0x10000000 |
42 | #define PPC_FEATURE2_ISEL 0x08000000 | 42 | #define PPC_FEATURE2_ISEL 0x08000000 |
43 | #define PPC_FEATURE2_TAR 0x04000000 | 43 | #define PPC_FEATURE2_TAR 0x04000000 |
44 | #define PPC_FEATURE2_VEC_CRYPTO 0x02000000 | ||
44 | 45 | ||
45 | #endif /* _UAPI__ASM_POWERPC_CPUTABLE_H */ | 46 | #endif /* _UAPI__ASM_POWERPC_CPUTABLE_H */ |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index c1faade6506d..11da04a4625a 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -109,7 +109,8 @@ extern void __restore_cpu_e6500(void); | |||
109 | PPC_FEATURE_PSERIES_PERFMON_COMPAT) | 109 | PPC_FEATURE_PSERIES_PERFMON_COMPAT) |
110 | #define COMMON_USER2_POWER8 (PPC_FEATURE2_ARCH_2_07 | \ | 110 | #define COMMON_USER2_POWER8 (PPC_FEATURE2_ARCH_2_07 | \ |
111 | PPC_FEATURE2_HTM_COMP | PPC_FEATURE2_DSCR | \ | 111 | PPC_FEATURE2_HTM_COMP | PPC_FEATURE2_DSCR | \ |
112 | PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR) | 112 | PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | \ |
113 | PPC_FEATURE2_VEC_CRYPTO) | ||
113 | #define COMMON_USER_PA6T (COMMON_USER_PPC64 | PPC_FEATURE_PA6T |\ | 114 | #define COMMON_USER_PA6T (COMMON_USER_PPC64 | PPC_FEATURE_PA6T |\ |
114 | PPC_FEATURE_TRUE_LE | \ | 115 | PPC_FEATURE_TRUE_LE | \ |
115 | PPC_FEATURE_HAS_ALTIVEC_COMP) | 116 | PPC_FEATURE_HAS_ALTIVEC_COMP) |