From 658636f4de23c591e81f393a758ad0c04cde0122 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 29 Sep 2011 10:16:50 +0800 Subject: [PATCH] xen/acpi/sleep: Register to the acpi_suspend_lowlevel a callback. We piggyback on "x86/acpi: Provide registration for acpi_suspend_lowlevel." to register a Xen version of the callback. The callback does not do anything special - except it omits the x86_acpi_suspend_lowlevel. It does that b/c during suspend it tries to save cr8 values (which the hypervisor does not support), and then on resume path the cr3, cr8, idt, and gdt are all resumed which clashes with what the hypervisor has set up for the guest. Signed-off-by: Liang Tang Signed-off-by: Konrad Rzeszutek Wilk --- include/xen/acpi.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/xen/acpi.h b/include/xen/acpi.h index c98188718b47..18025e0942a1 100644 --- a/include/xen/acpi.h +++ b/include/xen/acpi.h @@ -44,10 +44,22 @@ int xen_acpi_notify_hypervisor_state(u8 sleep_state, u32 pm1a_cnt, u32 pm1b_cnd, bool *skip_rest); +static inline int xen_acpi_suspend_lowlevel(void) +{ + /* + * Xen will save and restore CPU context, so + * we can skip that and just go straight to + * the suspend. + */ + acpi_enter_sleep_state(ACPI_STATE_S3); + return 0; +} static inline void xen_acpi_sleep_register(void) { - if (xen_initial_domain()) + if (xen_initial_domain()) { + acpi_suspend_lowlevel = xen_acpi_suspend_lowlevel; __acpi_override_sleep = xen_acpi_notify_hypervisor_state; + } } #else static inline void xen_acpi_sleep_register(void) -- 2.50.1