public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86: default to reboot via ACPI
@ 2008-08-25 10:11 Avi Kivity
  2008-08-25 10:32 ` Ingo Molnar
  2008-08-26  9:50 ` Pavel Machek
  0 siblings, 2 replies; 22+ messages in thread
From: Avi Kivity @ 2008-08-25 10:11 UTC (permalink / raw)
  To: Ingo Molnar, Eric W. Biederman; +Cc: linux-kernel, kvm

Triple-fault and keyboard reset may assert INIT instead of RESET; however
INIT is blocked when Intel VT is enabled.  This leads to a partially reset
machine when invoking emergency_restart via sysrq-b: the processor is still
working but other parts of the system are dead.

Default to rebooting via ACPI, which correctly asserts RESET and reboots the
machine.

This is safe since we will fall back to keyboard reset and triple fault if
acpi is not enabled or if the reset is not successful.

Signed-off-by: Avi Kivity <avi@qumranet.com>
---
 arch/x86/kernel/reboot.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 724adfc..f4c93f1 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -29,7 +29,11 @@ EXPORT_SYMBOL(pm_power_off);
 
 static const struct desc_ptr no_idt = {};
 static int reboot_mode;
-enum reboot_type reboot_type = BOOT_KBD;
+/*
+ * Keyboard reset and triple fault may result in INIT, not RESET, which
+ * doesn't work when we're in vmx root mode.  Try ACPI first.
+ */
+enum reboot_type reboot_type = BOOT_ACPI;
 int reboot_force;
 
 #if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
-- 
1.6.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2008-08-27 13:13 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-25 10:11 [PATCH] x86: default to reboot via ACPI Avi Kivity
2008-08-25 10:32 ` Ingo Molnar
2008-08-26  9:50 ` Pavel Machek
2008-08-26 10:05   ` Avi Kivity
2008-08-26 10:33     ` Alan Cox
2008-08-26 12:14       ` Avi Kivity
2008-08-26 12:31         ` Andi Kleen
2008-08-26 13:24         ` Maciej W. Rozycki
2008-08-26 13:33           ` Avi Kivity
2008-08-26 14:12             ` Pavel Machek
2008-08-26 14:50               ` Maciej W. Rozycki
2008-08-26 14:24             ` Maciej W. Rozycki
2008-08-26 16:10             ` Alan Cox
2008-08-26 16:16           ` Andi Kleen
2008-08-27  9:18             ` Pavel Machek
2008-08-27 10:51               ` Avi Kivity
2008-08-27 13:13                 ` Pavel Machek
2008-08-26 11:03     ` Frans Meulenbroeks
2008-08-26 10:52       ` Alan Cox
2008-08-26 11:07       ` Ingo Molnar
2008-08-26 10:36   ` Ingo Molnar
2008-08-26 11:26   ` Andi Kleen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox