From 9c139681f2b153e1446599d3f79719c61e75a905 Mon Sep 17 00:00:00 2001 From: Haiwei Li Date: Thu, 7 Sep 2023 06:24:03 +0800 Subject: [PATCH] hv: s3: hwp: enable hwp after resume from s3 After Service OS resume from s3, an error occurs: [3649827us][cpu=1][idle1][sev=2][seq=1749]:= Unhandled exception: 13 (General Protection) [3658622us][cpu=1][idle1][sev=2][seq=1750]: Host Registers: [3664881us][cpu=1][idle1][sev=2][seq=1751]:= Vector=0x000000000000000D RIP=0x000000000040F9F0 [3674213us][cpu=1][idle1][sev=2][seq=1752]:= RAX=0x0000000080003801 RBX=0x0000000001800800 RCX=0x0000000000000774 [3685787us][cpu=1][idle1][sev=2][seq=1753]:= RDX=0x0000000000000000 RDI=0x0000000000000080 RSI=0x0000000000000000 [3697371us][cpu=1][idle1][sev=2][seq=1754]:= RSP=0x0000000000616C18 RBP=0x0000000000616C38 RBX=0x0000000001800800 [3708947us][cpu=1][idle1][sev=2][seq=1755]:= R8=0x0000000000000038 R9=0x0000000000000001 R10=0x00000000000003F8 [3720539us][cpu=1][idle1][sev=2][seq=1756]:= R11=0x000000000000000D R12=0x0000000000458245 R13=0x0000000000000000 [3732114us][cpu=1][idle1][sev=2][seq=1757]:= RFLAGS=0x0000000000010202 R14=0x0000000000000000 R15=0x0000000000000000 [3743699us][cpu=1][idle1][sev=2][seq=1758]:= ERRCODE=0x0000000000000000 CS=0x0000000000000008 SS=0x0000000000000010 [3755305us][cpu=1][idle1][sev=2][seq=1759]:= CR2=0x0000000000000000 The error occurs in `msr_write(MSR_IA32_HWP_REQUEST, reg)`, when HWP is not available. This patch is to initialize HWP after resume. Tracked-On: #8623 Signed-off-by: Haiwei Li --- hypervisor/arch/x86/pm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hypervisor/arch/x86/pm.c b/hypervisor/arch/x86/pm.c index d29cc2cfe..fe0bcbc9c 100644 --- a/hypervisor/arch/x86/pm.c +++ b/hypervisor/arch/x86/pm.c @@ -216,6 +216,7 @@ void host_enter_s3(const struct pm_s_state_data *sstate_data, uint32_t pm1a_cnt_ resume_lapic(); resume_iommu(); resume_ioapic(); + init_frequency_policy(); vmx_on(); CPU_IRQ_ENABLE_ON_CONFIG();