I have volunteered to take over the efforts of Jan Beulich in getting this patch series upstreamed. His original submission text is below, along with the v3 modifications.
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 boolean parameter to be added to the hook function to distinguish "extended" from "legacy" 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 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: Ben Guthro <benjamin.gut...@citrix.com> Signed-off-by: Jan Beulich <jbeul...@suse.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: Rafaell 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 Ben Guthro (3): acpi: Call acpi_os_prepare_sleep hook in reduced hardware 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 | 6 +++++- drivers/acpi/acpica/hwesleep.c | 8 ++++++++ drivers/acpi/acpica/hwsleep.c | 2 +- drivers/acpi/osl.c | 16 ++++++++-------- drivers/xen/acpi.c | 26 +++++++++++++------------- include/linux/acpi.h | 10 +++++----- include/xen/acpi.h | 4 ++-- include/xen/interface/platform.h | 7 ++++--- 8 files changed, 46 insertions(+), 33 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/