OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: change 'DISABLED' settings to 'ENABLED' 

In order to improve DX, 'DISABLED' style configurator settings are
changed to 'ENABLED' style. The meaning of the MACROs are reversed,
so in the hv code we have to change '#ifndef' -> '#ifdef' or
'#ifdef' -> '#ifndef'.

Including:
  - MCE_ON_PSC_DISABLED -> MCE_ON_PSC_ENABLED
  - ENFORCE_TURNOFF_AC -> SPLIT_LOCK_DETECTION_ENABLED
  - ENFORCE_TURNOFF_GP -> UC_LOCK_DETECTION_ENABLED

Tracked-On: #7661
Acked-by: Eddie Dong <eddie.dong@intel.com>
Signed-off-by: Wu Zhou <wu.zhou@intel.com>
This commit is contained in:
Wu Zhou 2022-08-04 00:40:24 -07:00 committed by acrnsi-robot
parent c7b00e134f
commit 8c5bb8b471
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)
{
#ifndef CONFIG_ENFORCE_TURNOFF_AC
#ifdef CONFIG_SPLIT_LOCK_DETECTION_ENABLED
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_ENFORCE_TURNOFF_AC*/
#endif /*CONFIG_SPLIT_LOCK_DETECTION_ENABLED*/
}
static void enable_gp_for_uclock(void)
{
#ifndef CONFIG_ENFORCE_TURNOFF_GP
#ifdef CONFIG_UC_LOCK_DETECTION_ENABLED
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_ENFORCE_TURNOFF_GP*/
#endif /*CONFIG_UC_LOCK_DETECTION_ENABLED*/
}
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
#ifdef CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED
#ifndef CONFIG_MCE_ON_PSC_WORKAROUND_ENABLED
bool is_ept_force_4k_ipage(void)
{
return false;