[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1372255575-29567-3-git-send-email-benjamin.guthro@citrix.com>
Date: Wed, 26 Jun 2013 10:06:14 -0400
From: Ben Guthro <benjamin.guthro@...rix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
Jan Beulich <jbeulich@...e.com>,
"Rafaell J . Wysocki" <rjw@...k.pl>,
<linux-kernel@...r.kernel.org>, <linux-acpi@...r.kernel.org>,
<xen-devel@...ts.xen.org>
CC: Ben Guthro <benjamin.guthro@...rix.com>,
<tboot-devel@...ts.sourceforge.net>, Gang Wei <gang.wei@...el.com>
Subject: [PATCH v3 2/3] x86/tboot: Fail extended mode reduced hardware sleep
As tboot currently does not support the reduced hardware sleep
interface, fail this extended call.
Signed-off-by: Ben Guthro <benjamin.guthro@...rix.com>
Signed-off-by: Jan Beulich <jbeulich@...e.com>
Cc: tboot-devel@...ts.sourceforge.net
Cc: Gang Wei <gang.wei@...el.com>
---
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..016fbb8 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,
+ u8 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists