From: Ben Guthro <benjamin.guthro@citrix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Jan Beulich <jbeulich@suse.com>,
"Rafaell J . Wysocki" <rjw@sisk.pl>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
xen-devel@lists.xen.org
Cc: Ben Guthro <benjamin.guthro@citrix.com>,
tboot-devel@lists.sourceforge.net, Gang Wei <gang.wei@intel.com>
Subject: [PATCH v4 4/5] x86/tboot: Fail extended mode reduced hardware sleep
Date: Thu, 27 Jun 2013 11:02:02 -0400 [thread overview]
Message-ID: <1372345323-9266-5-git-send-email-benjamin.guthro@citrix.com> (raw)
In-Reply-To: <1372345323-9266-1-git-send-email-benjamin.guthro@citrix.com>
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 | 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
next prev parent reply other threads:[~2013-06-27 15:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-27 15:01 [PATCH v4 0/5] Xen/ACPI: support sleep state entering on hardware reduced systems Ben Guthro
2013-06-27 15:01 ` [PATCH v4 1/5] acpi: Remove need to include linux/acpi.h in common acpica code Ben Guthro
2013-06-27 15:02 ` [PATCH v4 2/5] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Ben Guthro
2013-06-27 15:02 ` [PATCH v4 3/5] acpi: Adjust linux acpi OS functions to new extended parameter Ben Guthro
2013-06-27 15:11 ` Jan Beulich
2013-06-27 15:59 ` Moore, Robert
2013-06-27 16:12 ` Ben Guthro
2013-06-27 20:19 ` Moore, Robert
2013-06-27 20:35 ` Ben Guthro
2013-06-27 15:02 ` Ben Guthro [this message]
2013-06-27 15:02 ` [PATCH v4 5/5] xen/acpi: notify xen when reduced hardware sleep is available Ben Guthro
2013-07-27 14:01 ` [PATCH v4 0/5] Xen/ACPI: support sleep state entering on hardware reduced systems Rafael J. Wysocki
2013-07-27 15:33 ` Ben Guthro
2013-07-27 23:31 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372345323-9266-5-git-send-email-benjamin.guthro@citrix.com \
--to=benjamin.guthro@citrix.com \
--cc=gang.wei@intel.com \
--cc=jbeulich@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=tboot-devel@lists.sourceforge.net \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).