[for_v25,1/3] x86/msr: Fixup "Add Intel SGX hardware bits"
diff mbox series

Message ID 20200201174940.20984-2-sean.j.christopherson@intel.com
State New
Headers show
Series
  • x86/sgx: Fix feature control rebase
Related show

Commit Message

Sean Christopherson Feb. 1, 2020, 5:49 p.m. UTC
Fix the Feature Control MSR bit definition for SGX that got borked
during the rebase to the latest upstream.

Fixes: 8813e054c085 ("x86/cpufeatures: x86/msr: Add Intel SGX hardware bits")
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 arch/x86/include/asm/msr-index.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Patch
diff mbox series

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 75f41095f9b9..3ddc6336aaa2 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -564,6 +564,7 @@ 
 #define FEAT_CTL_LOCKED				BIT(0)
 #define FEAT_CTL_VMX_ENABLED_INSIDE_SMX		BIT(1)
 #define FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX	BIT(2)
+#define FEAT_CTL_SGX_ENABLED			BIT(18)
 #define FEAT_CTL_LMCE_ENABLED			BIT(20)
 
 #define MSR_IA32_TSC_ADJUST             0x0000003b
@@ -573,13 +574,6 @@ 
 
 #define MSR_IA32_XSS			0x00000da0
 
-#define FEATURE_CONTROL_LOCKED				(1<<0)
-#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX	(1<<1)
-#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX	(1<<2)
-#define FEATURE_CONTROL_SGX_LE_WR			(1<<17)
-#define FEATURE_CONTROL_SGX_ENABLE			(1<<18)
-#define FEATURE_CONTROL_LMCE				(1<<20)
-
 #define MSR_IA32_APICBASE		0x0000001b
 #define MSR_IA32_APICBASE_BSP		(1<<8)
 #define MSR_IA32_APICBASE_ENABLE	(1<<11)