diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 03:28:38 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 03:28:38 +0400 |
| commit | 4b319f290d3b9c756228a66f72095d0039ec1b50 (patch) | |
| tree | 2cda8d4ac3d1f2d9732a2b16feb15b14f91c83f7 /arch/x86/kernel | |
| parent | 0ad4c9a9848fdd46dc422160efd947489a98bbc1 (diff) | |
| parent | 01c6a6afd50f07dfd66b2891fd194c4b789fca48 (diff) | |
| download | linux-4b319f290d3b9c756228a66f72095d0039ec1b50.tar.xz | |
Merge branch 'acpi-sleep'
* acpi-sleep:
x86 / tboot / ACPI: Fail extended mode reduced hardware sleep
xen / ACPI: notify xen when reduced hardware sleep is available
ACPI / sleep: Introduce acpi_os_prepare_extended_sleep() for extended sleep path
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/tboot.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index addf7b58f4e8..91a4496db434 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -301,6 +301,15 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) return 0; } +static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b) +{ + if (!tboot_enabled()) + return 0; + + pr_warning("tboot is not able to suspend on platforms with reduced hardware sleep (ACPIv5)"); + return -ENODEV; +} + static atomic_t ap_wfs_count; static int tboot_wait_for_aps(int num_aps) @@ -422,6 +431,7 @@ static __init int tboot_late_init(void) #endif acpi_os_set_prepare_sleep(&tboot_sleep); + acpi_os_set_prepare_extended_sleep(&tboot_extended_sleep); return 0; } |