From: Ingo Molnar Date: Sun, 1 Nov 2015 10:24:12 +0000 (+0100) Subject: manual merge of x86/fpu X-Git-Tag: KARO-TX6UL-2015-11-03~56^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=563628da536cb08825b88c84dbaa58148db0f634;p=karo-tx-linux.git manual merge of x86/fpu Signed-off-by: Ingo Molnar --- 563628da536cb08825b88c84dbaa58148db0f634 diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c index bacaa13acac5,12e729bfe71b..6ce3b7fc770b --- a/arch/x86/crypto/camellia_aesni_avx_glue.c +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c @@@ -554,12 -554,8 +554,12 @@@ static int __init camellia_aesni_init(v { const char *feature_name; - if (!cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, - &feature_name)) { + if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) { + pr_info("AVX or AES-NI instructions are not detected.\n"); + return -ENODEV; + } + - if (!cpu_has_xfeatures(XSTATE_SSE | XSTATE_YMM, &feature_name)) { ++ if (!cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, &feature_name)) { pr_info("CPU feature '%s' is not supported.\n", feature_name); return -ENODEV; } diff --cc tools/testing/selftests/x86/Makefile index 389701f59940,7145b3d9030c..eabcff411984 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@@ -4,8 -4,9 +4,9 @@@ include ../lib.m .PHONY: all all_32 all_64 warn_32bit_failure clean -TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs ldt_gdt syscall_nt -TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault sigreturn \ +TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs ldt_gdt syscall_nt ptrace_syscall - TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault sigreturn test_syscall_vdso unwind_vdso ++TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault sigreturn test_syscall_vdso unwind_vdso \ + test_FCMOV test_FCOMI test_FISTTP TARGETS_C_32BIT_ALL := $(TARGETS_C_BOTHBITS) $(TARGETS_C_32BIT_ONLY) BINARIES_32 := $(TARGETS_C_32BIT_ALL:%=%_32)