aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorJoseph Cihula <joseph.cihula@intel.com>2009-06-30 22:31:07 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-07-21 14:50:04 -0400
commit86886e55b273f565935491816c7c96b82469d4f8 (patch)
tree0045d68e4720f545f546e216c71104ab31d9d80c /drivers/acpi
parent840c2baf2d4cdf35ecc3b7fcbba7740f97de30a4 (diff)
x86, intel_txt: Intel TXT Sx shutdown support
Support for graceful handling of sleep states (S3/S4/S5) after an Intel(R) TXT launch. Without this patch, attempting to place the system in one of the ACPI sleep states (S3/S4/S5) will cause the TXT hardware to treat this as an attack and will cause a system reset, with memory locked. Not only may the subsequent memory scrub take some time, but the platform will be unable to enter the requested power state. This patch calls back into the tboot so that it may properly and securely clean up system state and clear the secrets-in-memory flag, after which it will place the system into the requested sleep state using ACPI information passed by the kernel. arch/x86/kernel/smpboot.c | 2 ++ drivers/acpi/acpica/hwsleep.c | 3 +++ kernel/cpu.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) Signed-off-by: Joseph Cihula <joseph.cihula@intel.com> Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/hwsleep.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index db307a356f0..8c01dd3724e 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -45,6 +45,7 @@
45#include <acpi/acpi.h> 45#include <acpi/acpi.h>
46#include "accommon.h" 46#include "accommon.h"
47#include "actables.h" 47#include "actables.h"
48#include <asm/tboot.h>
48 49
49#define _COMPONENT ACPI_HARDWARE 50#define _COMPONENT ACPI_HARDWARE
50ACPI_MODULE_NAME("hwsleep") 51ACPI_MODULE_NAME("hwsleep")
@@ -342,6 +343,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
342 343
343 ACPI_FLUSH_CPU_CACHE(); 344 ACPI_FLUSH_CPU_CACHE();
344 345
346 tboot_sleep(sleep_state, pm1a_control, pm1b_control);
347
345 /* Write #2: Write both SLP_TYP + SLP_EN */ 348 /* Write #2: Write both SLP_TYP + SLP_EN */
346 349
347 status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control); 350 status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control);