diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-09-23 16:23:52 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-09-23 16:23:52 +0200 |
| commit | 6916c31d0ea7deeedbfe5e034202567c73b73a4e (patch) | |
| tree | b46528c435c01702f3339a32631aa2c5da5f5517 | |
| parent | 9e5a66bc88a0cf0ff0f3339381a2332f305d1a9c (diff) | |
| download | xen-6916c31d0ea7deeedbfe5e034202567c73b73a4e.tar.gz xen-6916c31d0ea7deeedbfe5e034202567c73b73a4e.tar.bz2 xen-6916c31d0ea7deeedbfe5e034202567c73b73a4e.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>
master commit: a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1
master date: 2013-09-13 14:27:34 +0200
| -rw-r--r-- | xen/arch/x86/shutdown.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 759319103e..be3da89981 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -115,8 +115,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. */ @@ -141,7 +139,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); |