In version 3.4 acpi_os_prepare_sleep() got introduced in parallel with reduced hardware sleep support, and the two changes didn't get synchronized: The new code doesn't call the hook function (if so requested). Fix this, requiring a new callback to be added to acpica to be called back during this reduced hardware sleep.
This requires adjusting TXT, but the adjustments only go as far as failing the extended mode call (since, looking at the TXT interface, there doesn't even appear to be precautions to deal with that alternative interface). The xen hypervisor change underlying this is commit 62d1a69 ("ACPI: support v5 (reduced HW) sleep interface") on the master branch of git://xenbits.xen.org/xen.git. Signed-off-by: Jan Beulich <jbeul...@suse.com> Signed-off-by: Ben Guthro <benjamin.gut...@citrix.com> Cc: Richard L Maliszewski <richard.l.maliszew...@intel.com> Cc: Gang Wei <gang....@intel.com> Cc: Shane Wang <shane.w...@intel.com> Cc: Bob Moore <robert.mo...@intel.com> Cc: Rafael J. Wysocki <r...@sisk.pl> Cc: linux-a...@vger.kernel.org Cc: tboot-de...@lists.sourceforge.net v2: Extend description to include reference to hypervisor side change v3: Split into multiple patches, separating subsystems Remove bool parameters, in favor of u8 v4: Remove linux/acpi.h dependencies Further patch split to break out acpica from OSL More bool vs u8 fixes v5: Fix build of consumers of acpi_os_prepare_sleep() interface change, so intermediate builds of partial patch series will not fail. v6: Rebased to linux-pm linux-next branch Added warning in tboot early return code Added Reviewed-by lines v7: Add separate acpi_os_prepare_extended_sleep() interface Remove OSL acpica changes introduced in v4 v8: Return meaningful error code in tboot error path Ben Guthro (3): x86/acpi: Introduce acpi_os_prepare_extended_sleep callback for extended sleep path x86/tboot: Fail extended mode reduced hardware sleep xen/acpi: notify xen when reduced hardware sleep is available arch/x86/kernel/tboot.c | 12 +++++++++++ drivers/acpi/acpica/hwesleep.c | 9 +++++++++ drivers/acpi/osl.c | 24 ++++++++++++++++++++++ drivers/xen/acpi.c | 41 ++++++++++++++++++++++++++------------ include/linux/acpi.h | 7 +++++++ include/xen/acpi.h | 8 ++++++-- include/xen/interface/platform.h | 7 ++++--- 7 files changed, 90 insertions(+), 18 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/