From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Guthro Subject: [PATCH v5 4/5] x86/tboot: Fail extended mode reduced hardware sleep Date: Fri, 28 Jun 2013 09:46:23 -0400 Message-ID: <1372427184-6197-5-git-send-email-benjamin.guthro@citrix.com> References: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tboot-devel-bounces@lists.sourceforge.net To: Konrad Rzeszutek Wilk , Jan Beulich , "Rafael J . Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, xen-devel@lists.xen.org Cc: tboot-devel@lists.sourceforge.net, Ben Guthro List-Id: linux-acpi@vger.kernel.org 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 --- 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; + 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 ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754654Ab3F1NrC (ORCPT ); Fri, 28 Jun 2013 09:47:02 -0400 Received: from smtp.citrix.com ([66.165.176.89]:6000 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754759Ab3F1Nqm (ORCPT ); Fri, 28 Jun 2013 09:46:42 -0400 X-IronPort-AV: E=Sophos;i="4.87,958,1363132800"; d="scan'208";a="34084481" From: Ben Guthro To: Konrad Rzeszutek Wilk , Jan Beulich , "Rafael J . Wysocki" , , , CC: Ben Guthro , , Gang Wei Subject: [PATCH v5 4/5] x86/tboot: Fail extended mode reduced hardware sleep Date: Fri, 28 Jun 2013 09:46:23 -0400 Message-ID: <1372427184-6197-5-git-send-email-benjamin.guthro@citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> References: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.204.241.11] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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; + 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