mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
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>
This commit is contained in:
1 parent
11a63a1660
commit
a54dc5f4fe
1 file changed
+3
-2
@@ -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);
|
||||
|
||||
|
||||