diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-12-08 04:32:23 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-05-07 15:33:18 -0400 |
commit | 211063dc159695bd6072c5393e9bc729481c6ede (patch) | |
tree | 913d21f96fd18746f480701ee45baafab5f114d2 /arch/x86/xen | |
parent | 1ff2b0c303698e486f1e0886b4d9876200ef8ca5 (diff) |
xen/acpi/sleep: Enable ACPI sleep via the __acpi_os_prepare_sleep
Provide the registration callback to call in the Xen's
ACPI sleep functionality. This means that during S3/S5
we make a hypercall XENPF_enter_acpi_sleep with the
proper PM1A/PM1B registers.
Based of Ke Yu's <ke.yu@intel.com> initial idea.
[ From http://xenbits.xensource.com/linux-2.6.18-xen.hg
change c68699484a65 ]
[v1: Added Copyright and license]
[v2: Added check if PM1A/B the 16-bits MSB contain something. The spec
only uses 16-bits but might have more in future]
Signed-off-by: Liang Tang <liang.tang@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/enlighten.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 1ed61c2bf633..eca90e5be1e7 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <xen/page.h> | 42 | #include <xen/page.h> |
43 | #include <xen/hvm.h> | 43 | #include <xen/hvm.h> |
44 | #include <xen/hvc-console.h> | 44 | #include <xen/hvc-console.h> |
45 | #include <xen/acpi.h> | ||
45 | 46 | ||
46 | #include <asm/paravirt.h> | 47 | #include <asm/paravirt.h> |
47 | #include <asm/apic.h> | 48 | #include <asm/apic.h> |
@@ -1373,6 +1374,8 @@ asmlinkage void __init xen_start_kernel(void) | |||
1373 | 1374 | ||
1374 | /* Make sure ACS will be enabled */ | 1375 | /* Make sure ACS will be enabled */ |
1375 | pci_request_acs(); | 1376 | pci_request_acs(); |
1377 | |||
1378 | xen_acpi_sleep_register(); | ||
1376 | } | 1379 | } |
1377 | 1380 | ||
1378 | 1381 | ||