41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
# Commit a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1
|
||
|
|
# Date 2013-09-13 14:27:34 +0200
|
||
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
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>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/shutdown.c
|
||
|
|
+++ b/xen/arch/x86/shutdown.c
|
||
|
|
@@ -115,8 +115,6 @@ void machine_restart(unsigned int delay_
|
||
|
|
console_start_sync();
|
||
|
|
spin_debug_disable();
|
||
|
|
|
||
|
|
- acpi_dmar_reinstate();
|
||
|
|
-
|
||
|
|
local_irq_enable();
|
||
|
|
|
||
|
|
/* Ensure we are the boot CPU. */
|
||
|
|
@@ -141,7 +139,10 @@ void machine_restart(unsigned int delay_
|
||
|
|
mdelay(delay_millisecs);
|
||
|
|
|
||
|
|
if ( tboot_in_measured_env() )
|
||
|
|
+ {
|
||
|
|
+ acpi_dmar_reinstate();
|
||
|
|
tboot_shutdown(TB_SHUTDOWN_REBOOT);
|
||
|
|
+ }
|
||
|
|
|
||
|
|
efi_reset_system(reboot_mode != 0);
|
||
|
|
|