On Tue, Jul 30, 2013 at 9:34 AM, Rafael J. Wysocki <r...@sisk.pl> wrote:
> On Tuesday, July 30, 2013 09:22:37 AM Ben Guthro wrote:
> > Register for the extended sleep callback from acpi.
> > As tboot currently does not support the reduced hardware sleep
> > interface, fail this extended call.
> >
> > Signed-off-by: Jan Beulich <jbeul...@suse.com>
> > Signed-off-by: Ben Guthro <benjamin.gut...@citrix.com>
> > Cc: tboot-devel@lists.sourceforge.net
> > Cc: Gang Wei <gang....@intel.com>
> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
>
> Looks OK, thanks!
>
> I'll queue up the patchset for 3.12.
>
Great!
Thanks for your patience on so many rounds of this.
Ben
>
> Thanks,
> Rafael
>
>
> > ---
> > arch/x86/kernel/tboot.c | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
> > index addf7b5..91a4496 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;
> > }
> >
> >
> --
> I speak only for myself.
> Rafael J. Wysocki, Intel Open Source Technology Center.
> --
> 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/
>
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
tboot-devel mailing list
tboot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tboot-devel
