github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-15 02:07:51 +00:00
Code Issues Projects Releases Wiki Activity

Revert "hv: change 'DISABLED' settings to 'ENABLED'"

Browse Source 
This reverts commit 8c5bb8b471.
This commit is contained in:
szhen11 2022-08-18 16:20:41 +08:00
parent 61f6ec6c88
commit c29e9e9d4c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/arch/x86/cpu.c
View File

@ -110,7 +110,7 @@ uint64_t get_active_pcpu_bitmap(void)
static void enable_ac_for_splitlock(void) static void enable_ac_for_splitlock(void)
{ {
#ifdef CONFIG_SPLIT_LOCK_DETECTION_ENABLED #ifndef CONFIG_ENFORCE_TURNOFF_AC
uint64_t test_ctl; uint64_t test_ctl;
if (has_core_cap(CORE_CAP_SPLIT_LOCK)) { 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; test_ctl |= MSR_TEST_CTL_AC_SPLITLOCK;
msr_write(MSR_TEST_CTL, test_ctl); 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) static void enable_gp_for_uclock(void)
{ {
#ifdef CONFIG_UC_LOCK_DETECTION_ENABLED #ifndef CONFIG_ENFORCE_TURNOFF_GP
uint64_t test_ctl; uint64_t test_ctl;
if (has_core_cap(CORE_CAP_UC_LOCK)) { 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; test_ctl |= MSR_TEST_CTL_GP_UCLOCK;
msr_write(MSR_TEST_CTL, test_ctl); 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) void init_pcpu_pre(bool is_bsp)

2
hypervisor/arch/x86/security.c
View File

@ -221,7 +221,7 @@ void set_fs_base(void)
} }
#endif #endif
#ifndef CONFIG_MCE_ON_PSC_WORKAROUND_ENABLED #ifdef CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED
bool is_ept_force_4k_ipage(void) bool is_ept_force_4k_ipage(void)
{ {
return false; return false;