diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-04-28 04:11:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-19 09:47:59 -0400 |
| commit | 534ff06e39292b66b46d6318191b552b5bb2d1e7 (patch) | |
| tree | 680dad77e1dd1c0803570a7719b6cbad35a4ebdf /arch/x86/crypto/serpent_avx2_glue.c | |
| parent | d1e509660c690597edb7e15efd22a5e78b8e2fd5 (diff) | |
x86/fpu, crypto x86/serpent_avx2: Simplify the init() xfeature checks
Use the new 'cpu_has_xfeatures()' function to query AVX CPU support.
This has the following advantages to the driver:
- Decouples the driver from FPU internals: it's now only using <asm/fpu/api.h>.
- Removes detection complexity from the driver, no more raw XGETBV instruction
- Shrinks the code a bit.
- Standardizes feature name error message printouts across drivers
There are also advantages to the x86 FPU code: once all drivers
are decoupled from internals we can move them out of common
headers and we'll also be able to remove xcr.h.
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/crypto/serpent_avx2_glue.c')
| -rw-r--r-- | arch/x86/crypto/serpent_avx2_glue.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/x86/crypto/serpent_avx2_glue.c b/arch/x86/crypto/serpent_avx2_glue.c index aa325fa5c7a6..f226ad41fde1 100644 --- a/arch/x86/crypto/serpent_avx2_glue.c +++ b/arch/x86/crypto/serpent_avx2_glue.c | |||
| @@ -20,8 +20,7 @@ | |||
| 20 | #include <crypto/lrw.h> | 20 | #include <crypto/lrw.h> |
| 21 | #include <crypto/xts.h> | 21 | #include <crypto/xts.h> |
| 22 | #include <crypto/serpent.h> | 22 | #include <crypto/serpent.h> |
| 23 | #include <asm/xcr.h> | 23 | #include <asm/fpu/api.h> |
| 24 | #include <asm/fpu/xstate.h> | ||
| 25 | #include <asm/crypto/serpent-avx.h> | 24 | #include <asm/crypto/serpent-avx.h> |
| 26 | #include <asm/crypto/glue_helper.h> | 25 | #include <asm/crypto/glue_helper.h> |
| 27 | 26 | ||
| @@ -537,16 +536,10 @@ static struct crypto_alg srp_algs[10] = { { | |||
| 537 | 536 | ||
| 538 | static int __init init(void) | 537 | static int __init init(void) |
| 539 | { | 538 | { |
| 540 | u64 xcr0; | 539 | const char *feature_name; |
| 541 | 540 | ||
| 542 | if (!cpu_has_avx2 || !cpu_has_osxsave) { | 541 | if (!cpu_has_xfeatures(XSTATE_SSE | XSTATE_YMM, &feature_name)) { |
| 543 | pr_info("AVX2 instructions are not detected.\n"); | 542 | pr_info("CPU feature '%s' is not supported.\n", feature_name); |
| 544 | return -ENODEV; | ||
| 545 | } | ||
| 546 | |||
| 547 | xcr0 = xgetbv(XCR_XFEATURE_ENABLED_MASK); | ||
| 548 | if ((xcr0 & (XSTATE_SSE | XSTATE_YMM)) != (XSTATE_SSE | XSTATE_YMM)) { | ||
| 549 | pr_info("AVX detected but unusable.\n"); | ||
| 550 | return -ENODEV; | 543 | return -ENODEV; |
| 551 | } | 544 | } |
| 552 | 545 | ||