From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754156Ab3G3NE4 (ORCPT ); Tue, 30 Jul 2013 09:04:56 -0400 Received: from hydra.sisk.pl ([212.160.235.94]:47364 "EHLO hydra.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752968Ab3G3NEy (ORCPT ); Tue, 30 Jul 2013 09:04:54 -0400 From: "Rafael J. Wysocki" To: Ben Guthro Cc: Konrad Rzeszutek Wilk , Jan Beulich , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, xen-devel@lists.xen.org, tboot-devel@lists.sourceforge.net, Gang Wei Subject: Re: [PATCH v8 2/3] x86/tboot: Fail extended mode reduced hardware sleep Date: Tue, 30 Jul 2013 15:14:53 +0200 Message-ID: <1411346.4e01ECe1J5@vostro.rjw.lan> User-Agent: KMail/4.9.5 (Linux/3.10.0+; KDE/4.9.5; x86_64; ; ) In-Reply-To: <1375187094-19357-3-git-send-email-benjamin.guthro@citrix.com> References: <1375187094-19357-1-git-send-email-benjamin.guthro@citrix.com> <1375187094-19357-3-git-send-email-benjamin.guthro@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday, July 30, 2013 08:24:53 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 > Signed-off-by: Ben Guthro > Cc: tboot-devel@lists.sourceforge.net > Cc: Gang Wei > Reviewed-by: Konrad Rzeszutek Wilk > --- > arch/x86/kernel/tboot.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c > index addf7b5..ade00c8 100644 > --- a/arch/x86/kernel/tboot.c > +++ b/arch/x86/kernel/tboot.c > @@ -301,6 +301,17 @@ 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). Please contact" > + " tboot-devel@lists.sourceforge.net mailing list."); I'm told that string literals should be continuous now even if they cross the 80 columns boundary, so let's make that happen here. Also please drop the "Please contact ..." part, it is unnecessary and unuseful (I forgot about this particular thing last time, sorry about that). > + return -ENODEV; > +} > + > static atomic_t ap_wfs_count; > > static int tboot_wait_for_aps(int num_aps) > @@ -422,6 +433,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; > } Thanks, Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.