aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-09-13 14:27:34 +0200
committerJan Beulich <jbeulich@suse.com>2013-09-13 14:27:34 +0200
commita54dc5f4fe1eae6b1beb21326ef0338cd3969cd1 (patch)
tree71f7dd6efa7790887a0f4a052d782140ceff2162 /xen
parent11a63a1660453269ddd1893c15d0a98133b33ca7 (diff)
downloadxen-a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1.tar.gz
xen-a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1.tar.bz2
xen-a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1.zip
x86: machine_restart() must not call acpi_dmar_reinstate() twice
.. as that function is not idempotent (it always alters the table checksum). The (generally) duplicate call was a result from it being made before machine_restart() re-invoking itself on the boot CPU. Considering that no problem arose so far from the table corruption I doubt that we need to restore the correct table signature on the reboot path in general. The only case I can see this as potentially necessary is the tboot one, hence do the call just in that case. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen')
-rw-r--r--xen/arch/x86/shutdown.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 167905a575..6eba2715ad 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -466,8 +466,6 @@ void machine_restart(unsigned int delay_millisecs)
console_start_sync();
spin_debug_disable();
- acpi_dmar_reinstate();
-
local_irq_enable();
/* Ensure we are the boot CPU. */
@@ -492,7 +490,10 @@ void machine_restart(unsigned int delay_millisecs)
mdelay(delay_millisecs);
if ( tboot_in_measured_env() )
+ {
+ acpi_dmar_reinstate();
tboot_shutdown(TB_SHUTDOWN_REBOOT);
+ }
efi_reset_system(reboot_mode != 0);