Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754026Ab3F0PCg (ORCPT ); Thu, 27 Jun 2013 11:02:36 -0400 Received: from smtp.citrix.com ([66.165.176.89]:64660 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753983Ab3F0PCf (ORCPT ); Thu, 27 Jun 2013 11:02:35 -0400 X-IronPort-AV: E=Sophos;i="4.87,952,1363132800"; d="scan'208";a="33832859" From: Ben Guthro To: Konrad Rzeszutek Wilk , Jan Beulich , "Rafaell J . Wysocki" , , , CC: Ben Guthro , , Gang Wei Subject: [PATCH v4 4/5] x86/tboot: Fail extended mode reduced hardware sleep Date: Thu, 27 Jun 2013 11:02:02 -0400 Message-ID: <1372345323-9266-5-git-send-email-benjamin.guthro@citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372345323-9266-1-git-send-email-benjamin.guthro@citrix.com> References: <1372345323-9266-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 Content-Length: 1490 Lines: 43 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index f84fe00..57383b2 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -273,7 +273,8 @@ static void tboot_copy_fadt(const struct acpi_table_fadt *fadt) offsetof(struct acpi_table_facs, firmware_waking_vector); } -static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) +static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control, + bool extended) { static u32 acpi_shutdown_map[ACPI_S_STATE_COUNT] = { /* S0,1,2: */ -1, -1, -1, @@ -284,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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/