Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757627AbZFWAma (ORCPT ); Mon, 22 Jun 2009 20:42:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753543AbZFWAlh (ORCPT ); Mon, 22 Jun 2009 20:41:37 -0400 Received: from mga03.intel.com ([143.182.124.21]:35750 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756011AbZFWAlf (ORCPT ); Mon, 22 Jun 2009 20:41:35 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.42,272,1243839600"; d="scan'208";a="157341069" Message-ID: <4A4024C2.3050107@intel.com> Date: Mon, 22 Jun 2009 17:41:38 -0700 From: Joseph Cihula Reply-To: joseph.cihula@intel.com User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: linux-kernel@vger.kernel.org, mingo@elte.hu, arjan@linux.intel.com, hpa@zytor.com, andi@firstfloor.org CC: chrisw@sous-sol.org, jmorris@namei.org, jbeulich@novell.com, peterm@redhat.com, joseph.cihula@intel.com, gang.wei@intel.com, shane.wang@intel.com Subject: [RFC v5][PATCH 3/4] intel_txt: Intel(R) TXT Sx shutdown support Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4202 Lines: 119 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 | 6 +++++- drivers/acpi/acpica/hwsleep.c | 13 +++++++++++++ kernel/cpu.c | 6 +++++- 3 files changed, 23 insertions(+), 2 deletions(-) Signed-off-by: Joseph Cihula Signed-off-by: Shane Wang --- diff -uprN -X linus-2.6.git/Documentation/dontdiff linus-2.6.git/arch/x86/kernel/smpboot.c linus-2.6.git-txt/arch/x86/kernel/smpboot.c --- linus-2.6.git/arch/x86/kernel/smpboot.c 2009-06-19 13:32:12.000000000 -0700 +++ linus-2.6.git-txt/arch/x86/kernel/smpboot.c 2009-06-19 18:41:22.000000000 -0700 @@ -62,6 +62,7 @@ #include #include #include +#include #include #include @@ -1317,7 +1318,10 @@ void play_dead_common(void) void native_play_dead(void) { play_dead_common(); - wbinvd_halt(); + if (tboot_in_measured_env()) + tboot_shutdown(TB_SHUTDOWN_WFS); + else + wbinvd_halt(); } #else /* ... !CONFIG_HOTPLUG_CPU */ diff -uprN -X linus-2.6.git/Documentation/dontdiff linus-2.6.git/drivers/acpi/acpica/hwsleep.c linus-2.6.git-txt/drivers/acpi/acpica/hwsleep.c --- linus-2.6.git/drivers/acpi/acpica/hwsleep.c 2009-06-19 13:32:12.000000000 -0700 +++ linus-2.6.git-txt/drivers/acpi/acpica/hwsleep.c 2009-06-22 01:51:38.000000000 -0700 @@ -45,6 +45,7 @@ #include #include "accommon.h" #include "actables.h" +#include #define _COMPONENT ACPI_HARDWARE ACPI_MODULE_NAME("hwsleep") @@ -342,6 +343,18 @@ acpi_status asmlinkage acpi_enter_sleep_ ACPI_FLUSH_CPU_CACHE(); + if (tboot_in_measured_env()) { + tboot_copy_fadt(&acpi_gbl_FADT); + tboot_shared->acpi_sinfo.pm1a_cnt_val = pm1a_control; + tboot_shared->acpi_sinfo.pm1b_cnt_val = pm1b_control; + /* we always use the 32b wakeup vector */ + tboot_shared->acpi_sinfo.vector_width = 32; + tboot_shared->acpi_sinfo.kernel_s3_resume_vector = + acpi_wakeup_address; + + tboot_sleep(sleep_state); + } + /* Write #2: Write both SLP_TYP + SLP_EN */ status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control); diff -uprN -X linus-2.6.git/Documentation/dontdiff linus-2.6.git/kernel/cpu.c linus-2.6.git-txt/kernel/cpu.c --- linus-2.6.git/kernel/cpu.c 2009-06-19 13:32:20.000000000 -0700 +++ linus-2.6.git-txt/kernel/cpu.c 2009-06-19 18:41:22.000000000 -0700 @@ -14,6 +14,7 @@ #include #include #include +#include #ifdef CONFIG_SMP /* Serializes the updates to cpu_online_mask, cpu_present_mask */ @@ -379,7 +380,7 @@ static cpumask_var_t frozen_cpus; int disable_nonboot_cpus(void) { - int cpu, first_cpu, error; + int cpu, first_cpu, error, num_cpus = 0; error = stop_machine_create(); if (error) @@ -394,6 +395,7 @@ int disable_nonboot_cpus(void) for_each_online_cpu(cpu) { if (cpu == first_cpu) continue; + num_cpus++; error = _cpu_down(cpu, 1); if (!error) { cpumask_set_cpu(cpu, frozen_cpus); @@ -404,6 +406,8 @@ int disable_nonboot_cpus(void) break; } } + /* ensure all CPUs have gone into wait-for-SIPI */ + tboot_wait_for_aps(num_cpus); if (!error) { BUG_ON(num_online_cpus() > 1); /* Make sure the CPUs won't be enabled by someone else */ -- 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/