From cb2a4a449dfd50af309a333aa805835015fbc8c8 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 16 Apr 2018 14:08:30 +0200 Subject: [PATCH] x86: correct ordering of operations during S3 resume Microcode loading needs to happen before re-enabling interrupts, in case only updated microcode allows the use of e.g. the SPEC_{CTRL,CMD} MSRs. Otoh it doesn't need to happen at all when we didn't suspend in the first place. It needs to happen before spin_debug_enable() though, as it acquires a lock and hence would otherwise make common/spinlock.c:check_lock() unhappy. As micrcode loading can be pretty verbose, also make sure it only runs after console_end_sync(). cpufreq_add_cpu() doesn't need calling on the only "goto enable_cpu" path, which sits ahead of cpufreq_del_cpu(). Reported-by: Simon Gaiser Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-acked-by: Juergen Gross --- xen/arch/x86/acpi/power.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 1e4e5680a7..cb06f842cd 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -203,6 +203,7 @@ static int enter_state(u32 state) printk(XENLOG_ERR "Some devices failed to power down."); system_state = SYS_STATE_resume; device_power_up(error); + console_end_sync(); error = -EIO; goto done; } @@ -243,17 +244,19 @@ static int enter_state(u32 state) if ( (state == ACPI_STATE_S3) && error ) tboot_s3_error(error); + console_end_sync(); + + microcode_resume_cpu(0); + done: spin_debug_enable(); local_irq_restore(flags); - console_end_sync(); acpi_sleep_post(state); if ( hvm_cpu_up() ) BUG(); + cpufreq_add_cpu(0); enable_cpu: - cpufreq_add_cpu(0); - microcode_resume_cpu(0); rcu_barrier(); mtrr_aps_sync_begin(); enable_nonboot_cpus(); -- 2.39.5