From c29e9e9d4c664060d4cade744f9cda08057d89f0 Mon Sep 17 00:00:00 2001
From: szhen11 <shuang.zheng@intel.com>
Date: Thu, 18 Aug 2022 16:20:41 +0800
Subject: [PATCH] Revert "hv: change 'DISABLED' settings to 'ENABLED'"

This reverts commit 8c5bb8b4714e88e8405f1f3d89a56b7bea91862d.
---
 hypervisor/arch/x86/cpu.c      | 8 ++++----
 hypervisor/arch/x86/security.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index 0b51fb9c8..13ffb3f59 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -110,7 +110,7 @@ uint64_t get_active_pcpu_bitmap(void)
 
 static void enable_ac_for_splitlock(void)
 {
-#ifdef CONFIG_SPLIT_LOCK_DETECTION_ENABLED
+#ifndef CONFIG_ENFORCE_TURNOFF_AC
 	uint64_t test_ctl;
 
 	if (has_core_cap(CORE_CAP_SPLIT_LOCK)) {
@@ -118,12 +118,12 @@ static void enable_ac_for_splitlock(void)
 		test_ctl |= MSR_TEST_CTL_AC_SPLITLOCK;
 		msr_write(MSR_TEST_CTL, test_ctl);
 	}
-#endif /*CONFIG_SPLIT_LOCK_DETECTION_ENABLED*/
+#endif /*CONFIG_ENFORCE_TURNOFF_AC*/
 }
 
 static void enable_gp_for_uclock(void)
 {
-#ifdef CONFIG_UC_LOCK_DETECTION_ENABLED
+#ifndef CONFIG_ENFORCE_TURNOFF_GP
 	uint64_t test_ctl;
 
 	if (has_core_cap(CORE_CAP_UC_LOCK)) {
@@ -131,7 +131,7 @@ static void enable_gp_for_uclock(void)
 		test_ctl |= MSR_TEST_CTL_GP_UCLOCK;
 		msr_write(MSR_TEST_CTL, test_ctl);
 	}
-#endif /*CONFIG_UC_LOCK_DETECTION_ENABLED*/
+#endif /*CONFIG_ENFORCE_TURNOFF_GP*/
 }
 
 void init_pcpu_pre(bool is_bsp)
diff --git a/hypervisor/arch/x86/security.c b/hypervisor/arch/x86/security.c
index 93d7ac1a9..f4032b040 100644
--- a/hypervisor/arch/x86/security.c
+++ b/hypervisor/arch/x86/security.c
@@ -221,7 +221,7 @@ void set_fs_base(void)
 }
 #endif
 
-#ifndef CONFIG_MCE_ON_PSC_WORKAROUND_ENABLED
+#ifdef CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED
 bool is_ept_force_4k_ipage(void)
 {
 	return false;