aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorMichael D Labriola <michael.d.labriola@gmail.com>2012-01-29 14:21:17 -0500
committerIngo Molnar <mingo@elte.hu>2012-01-30 04:52:33 -0500
commite6d36a653becc7bbc643c399a77882e02bf552cb (patch)
tree4675b4c6abb1b077aa78580d2e5aea87cc7445a7 /arch/x86
parent5955633e91bfc5cd0a41d8d82259e1d8b32980ef (diff)
x86/reboot: Remove VersaLogic Menlow reboot quirk
This commit removes the reboot quirk originally added by commit e19e074 ("x86: Fix reboot problem on VersaLogic Menlow boards"). Testing with a VersaLogic Ocelot (VL-EPMs-21a rev 1.00 w/ BIOS 6.5.102) revealed the following regarding the reboot hang problem: - v2.6.37 reboot=bios was needed. - v2.6.38-rc1: behavior changed, reboot=acpi is needed, reboot=kbd and reboot=bios results in system hang. - v2.6.38: VersaLogic patch (e19e074 "x86: Fix reboot problem on VersaLogic Menlow boards") was applied prior to v2.6.38-rc7. This patch sets a quirk for VersaLogic Menlow boards that forces the use of reboot=bios, which doesn't work anymore. - v3.2: It seems that commit 660e34c ("x86: Reorder reboot method preferences") changed the default reboot method to acpi prior to v3.0-rc1, which means the default behavior is appropriate for the Ocelot. No VersaLogic quirk is required. The Ocelot board used for testing can successfully reboot w/out having to pass any reboot= arguments for all 3 current versions of the BIOS. Signed-off-by: Michael D Labriola <michael.d.labriola@gmail.com> Cc: Matthew Garrett <mjg@redhat.com> Cc: Michael D Labriola <mlabriol@gdeb.com> Cc: Kushal Koolwal <kushalkoolwal@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/87vcnub9hu.fsf@gmail.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/reboot.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index b257f0e28824..d840e69a853c 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -309,14 +309,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
309 DMI_MATCH(DMI_BOARD_NAME, "P4S800"), 309 DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
310 }, 310 },
311 }, 311 },
312 { /* Handle problems with rebooting on VersaLogic Menlow boards */
313 .callback = set_bios_reboot,
314 .ident = "VersaLogic Menlow based board",
315 .matches = {
316 DMI_MATCH(DMI_BOARD_VENDOR, "VersaLogic Corporation"),
317 DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"),
318 },
319 },
320 { /* Handle reboot issue on Acer Aspire one */ 312 { /* Handle reboot issue on Acer Aspire one */
321 .callback = set_kbd_reboot, 313 .callback = set_kbd_reboot,
322 .ident = "Acer Aspire One A110", 314 .ident = "Acer Aspire One A110",