diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-04-17 08:29:47 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-04-17 08:29:47 -0400 |
| commit | d9bd0082e2e2f38c4a15fa53f06ef0817102b4a6 (patch) | |
| tree | aa78afa667ff31be0aabd0b949559f97aa14a4e5 /arch/x86/include/asm/cpufeatures.h | |
| parent | 387cb8e89d7fb731337120cce04931f0f06113ea (diff) | |
| parent | 523caed9efbb049339706b124185c9358c1b6477 (diff) | |
| download | linux-stable-d9bd0082e2e2f38c4a15fa53f06ef0817102b4a6.tar.gz linux-stable-d9bd0082e2e2f38c4a15fa53f06ef0817102b4a6.tar.bz2 linux-stable-d9bd0082e2e2f38c4a15fa53f06ef0817102b4a6.zip | |
Merge remote-tracking branch 'tip/x86/sgx' into kvm-next
Pull generic x86 SGX changes needed to support SGX in virtual machines.
Diffstat (limited to 'arch/x86/include/asm/cpufeatures.h')
| -rw-r--r-- | arch/x86/include/asm/cpufeatures.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 12c4a13b22d8..dddc746b5455 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -290,6 +290,8 @@ #define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */ #define X86_FEATURE_SPLIT_LOCK_DETECT (11*32+ 6) /* #AC for split lock */ #define X86_FEATURE_PER_THREAD_MBA (11*32+ 7) /* "" Per-thread Memory Bandwidth Allocation */ +#define X86_FEATURE_SGX1 (11*32+ 8) /* "" Basic SGX */ +#define X86_FEATURE_SGX2 (11*32+ 9) /* "" SGX Enclave Dynamic Memory Management (EDMM) */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */ |