From: Jan Beulich Date: Fri, 13 Sep 2013 12:27:34 +0000 (+0200) Subject: x86: machine_restart() must not call acpi_dmar_reinstate() twice X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6371 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1;p=xen.git 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 Acked-by: Keir Fraser --- 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);