diff options
| -rw-r--r-- | arch/x86/crypto/camellia_aesni_avx2_glue.c | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/chacha20_glue.c | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/poly1305_glue.c | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/serpent_avx2_glue.c | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/cpufeature.h | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c b/arch/x86/crypto/camellia_aesni_avx2_glue.c index c37f7028c85a..39389662e29b 100644 --- a/arch/x86/crypto/camellia_aesni_avx2_glue.c +++ b/arch/x86/crypto/camellia_aesni_avx2_glue.c | |||
| @@ -562,7 +562,7 @@ static int __init camellia_aesni_init(void) | |||
| 562 | { | 562 | { |
| 563 | const char *feature_name; | 563 | const char *feature_name; |
| 564 | 564 | ||
| 565 | if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes || | 565 | if (!boot_cpu_has(X86_FEATURE_AVX2) || !cpu_has_avx || !cpu_has_aes || |
| 566 | !boot_cpu_has(X86_FEATURE_OSXSAVE)) { | 566 | !boot_cpu_has(X86_FEATURE_OSXSAVE)) { |
| 567 | pr_info("AVX2 or AES-NI instructions are not detected.\n"); | 567 | pr_info("AVX2 or AES-NI instructions are not detected.\n"); |
| 568 | return -ENODEV; | 568 | return -ENODEV; |
diff --git a/arch/x86/crypto/chacha20_glue.c b/arch/x86/crypto/chacha20_glue.c index 8baaff5af0b5..cea061e137da 100644 --- a/arch/x86/crypto/chacha20_glue.c +++ b/arch/x86/crypto/chacha20_glue.c | |||
| @@ -129,7 +129,7 @@ static int __init chacha20_simd_mod_init(void) | |||
| 129 | return -ENODEV; | 129 | return -ENODEV; |
| 130 | 130 | ||
| 131 | #ifdef CONFIG_AS_AVX2 | 131 | #ifdef CONFIG_AS_AVX2 |
| 132 | chacha20_use_avx2 = cpu_has_avx && cpu_has_avx2 && | 132 | chacha20_use_avx2 = cpu_has_avx && boot_cpu_has(X86_FEATURE_AVX2) && |
| 133 | cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL); | 133 | cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL); |
| 134 | #endif | 134 | #endif |
| 135 | return crypto_register_alg(&alg); | 135 | return crypto_register_alg(&alg); |
diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c index b283868acdf8..ea21d2e440f7 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c | |||
| @@ -183,7 +183,7 @@ static int __init poly1305_simd_mod_init(void) | |||
| 183 | return -ENODEV; | 183 | return -ENODEV; |
| 184 | 184 | ||
| 185 | #ifdef CONFIG_AS_AVX2 | 185 | #ifdef CONFIG_AS_AVX2 |
| 186 | poly1305_use_avx2 = cpu_has_avx && cpu_has_avx2 && | 186 | poly1305_use_avx2 = cpu_has_avx && boot_cpu_has(X86_FEATURE_AVX2) && |
| 187 | cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL); | 187 | cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL); |
| 188 | alg.descsize = sizeof(struct poly1305_simd_desc_ctx); | 188 | alg.descsize = sizeof(struct poly1305_simd_desc_ctx); |
| 189 | if (poly1305_use_avx2) | 189 | if (poly1305_use_avx2) |
diff --git a/arch/x86/crypto/serpent_avx2_glue.c b/arch/x86/crypto/serpent_avx2_glue.c index 408cae2b3543..870f6d812a2d 100644 --- a/arch/x86/crypto/serpent_avx2_glue.c +++ b/arch/x86/crypto/serpent_avx2_glue.c | |||
| @@ -538,7 +538,7 @@ static int __init init(void) | |||
| 538 | { | 538 | { |
| 539 | const char *feature_name; | 539 | const char *feature_name; |
| 540 | 540 | ||
| 541 | if (!cpu_has_avx2 || !boot_cpu_has(X86_FEATURE_OSXSAVE)) { | 541 | if (!boot_cpu_has(X86_FEATURE_AVX2) || !boot_cpu_has(X86_FEATURE_OSXSAVE)) { |
| 542 | pr_info("AVX2 instructions are not detected.\n"); | 542 | pr_info("AVX2 instructions are not detected.\n"); |
| 543 | return -ENODEV; | 543 | return -ENODEV; |
| 544 | } | 544 | } |
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index c594e04bf529..810166530cbf 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h | |||
| @@ -125,7 +125,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; | |||
| 125 | #define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM) | 125 | #define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM) |
| 126 | #define cpu_has_aes boot_cpu_has(X86_FEATURE_AES) | 126 | #define cpu_has_aes boot_cpu_has(X86_FEATURE_AES) |
| 127 | #define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX) | 127 | #define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX) |
| 128 | #define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2) | ||
| 129 | #define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE) | 128 | #define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE) |
| 130 | #define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) | 129 | #define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) |
| 131 | /* | 130 | /* |