On Mon, Jul 1, 2013 at 7:48 AM, Ben Guthro <benjamin.guthro@xxxxxxxxxx> wrote: > 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: Jan Beulich <jbeulich@xxxxxxxx> > Signed-off-by: Ben Guthro <benjamin.guthro@xxxxxxxxxx> > Cc: Richard L Maliszewski <richard.l.maliszewski@xxxxxxxxx> > Cc: Gang Wei <gang.wei@xxxxxxxxx> > Cc: Shane Wang <shane.wang@xxxxxxxxx> > Cc: Bob Moore <robert.moore@xxxxxxxxx> > Cc: Rafael J. Wysocki <rjw@xxxxxxx> > Cc: linux-acpi@xxxxxxxxxxxxxxx > Cc: tboot-devel@xxxxxxxxxxxxxxxxxxxxx > > 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 > > Ben Guthro (5): > acpi: Remove need to include linux/acpi.h in common acpica code > acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path > acpi/xen/tboot: Adjust linux acpi OS functions to new extended > parameter > x86/tboot: Fail extended mode reduced hardware sleep > xen/acpi: notify xen when reduced hardware sleep is available Rafael, Bob - Is this version of the series something that you may consider taking? If not - is there something specific you would like to see addressed? Thanks for your time. Ben > > arch/x86/kernel/tboot.c | 9 ++++++++- > drivers/acpi/acpica/hwesleep.c | 7 +++++++ > drivers/acpi/acpica/hwsleep.c | 3 +-- > drivers/acpi/osl.c | 16 ++++++++-------- > drivers/xen/acpi.c | 26 +++++++++++++------------- > include/acpi/acpiosxf.h | 6 ++++++ > include/linux/acpi.h | 9 +++------ > include/xen/acpi.h | 4 ++-- > include/xen/interface/platform.h | 7 ++++--- > 9 files changed, 52 insertions(+), 35 deletions(-) > > -- > 1.7.9.5 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@xxxxxxxxxxxxx > http://lists.xen.org/xen-devel -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html