From bfd54457005920b29f342a7d27d0c28fb206d04e Mon Sep 17 00:00:00 2001 From: hangliu1 Date: Thu, 20 Oct 2022 04:58:12 -0400 Subject: [PATCH] HV: remove rewrite of PMU guest flag in acrn dm Exclude "GUEST_FLAG_PMU_PASSTHROUGH" from DM_OWNED_GUEST_FLAG_MASK in case device model rewrite the value in release mode, reserve it in debug mode. Signed-off-by: hangliu1 Acked-by: Eddie Dong Tracked-On:#6690 --- hypervisor/include/arch/x86/asm/vm_config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hypervisor/include/arch/x86/asm/vm_config.h b/hypervisor/include/arch/x86/asm/vm_config.h index 7e58a88b5..4fb937575 100644 --- a/hypervisor/include/arch/x86/asm/vm_config.h +++ b/hypervisor/include/arch/x86/asm/vm_config.h @@ -56,6 +56,9 @@ /* Bitmask of guest flags that can be programmed by device model. Other bits are set by hypervisor only. */ #if (SERVICE_VM_NUM == 0) #define DM_OWNED_GUEST_FLAG_MASK 0UL +#elif defined(CONFIG_RELEASE) +#define DM_OWNED_GUEST_FLAG_MASK (GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH \ + | GUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING) #else #define DM_OWNED_GUEST_FLAG_MASK (GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH \ | GUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING | GUEST_FLAG_PMU_PASSTHROUGH)