[Xen-devel] [PATCH 2/2] xen/acpi/sleep: Register to the acpi_suspend_lowlevel a callback.

[Ben Guthro <benjamin.guthro@xxxxxxxxxx>]

From: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>

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 <liang.tang@xxxxxxxxxx>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Tested-by: Ben Guthro <benjamin.guthro@xxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
 include/xen/acpi.h |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/include/xen/acpi.h b/include/xen/acpi.h
index 68d73d0..46aa3d1 100644
--- a/include/xen/acpi.h
+++ b/include/xen/acpi.h
@@ -78,11 +78,25 @@ static inline int xen_acpi_get_pxm(acpi_handle h)
 int xen_acpi_notify_hypervisor_state(u8 sleep_state,
                                     u32 pm1a_cnt, u32 pm1b_cnd);
 
+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_os_set_prepare_sleep(
                        &xen_acpi_notify_hypervisor_state);
+
+               acpi_suspend_lowlevel = xen_acpi_suspend_lowlevel;
+       }
 }
 #else
 static inline void xen_acpi_sleep_register(void)
-- 
1.7.9.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel