| Message ID | 1372427184-6197-5-git-send-email-benjamin.guthro@citrix.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Fri, Jun 28, 2013 at 09:46:23AM -0400, Ben Guthro wrote: > As tboot currently does not support the reduced hardware sleep > interface, fail this extended call. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > Signed-off-by: Ben Guthro <benjamin.guthro@citrix.com> > Cc: tboot-devel@lists.sourceforge.net > Cc: Gang Wei <gang.wei@intel.com> > --- > arch/x86/kernel/tboot.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c > index d578c9c..57383b2 100644 > --- a/arch/x86/kernel/tboot.c > +++ b/arch/x86/kernel/tboot.c > @@ -285,6 +285,9 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control, > if (!tboot_enabled()) > return 0; > > + if (extended) > + return -1; I would add WARN_ON just so that the user is aware of. Perhaps if (WARN(extended,"tboot is not able to suspend on ACPI extended platforms. Contact tboot-something mailing list please.")) return -1 Otherwise Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > + > tboot_copy_fadt(&acpi_gbl_FADT); > tboot->acpi_sinfo.pm1a_cnt_val = pm1a_control; > tboot->acpi_sinfo.pm1b_cnt_val = pm1b_control; > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index d578c9c..57383b2 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -285,6 +285,9 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control, if (!tboot_enabled()) return 0; + if (extended) + return -1; + tboot_copy_fadt(&acpi_gbl_FADT); tboot->acpi_sinfo.pm1a_cnt_val = pm1a_control; tboot->acpi_sinfo.pm1b_cnt_val = pm1b_control;