[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-e6d36a653becc7bbc643c399a77882e02bf552cb@git.kernel.org>
Date: Mon, 30 Jan 2012 05:22:27 -0800
From: tip-bot for Michael D Labriola <michael.d.labriola@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, mjg@...hat.com, hpa@...or.com,
mingo@...hat.com, torvalds@...ux-foundation.org, mlabriol@...b.com,
kushalkoolwal@...il.com, michael.d.labriola@...il.com,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/urgent] x86/reboot: Remove VersaLogic Menlow reboot quirk
Commit-ID: e6d36a653becc7bbc643c399a77882e02bf552cb
Gitweb: http://git.kernel.org/tip/e6d36a653becc7bbc643c399a77882e02bf552cb
Author: Michael D Labriola <michael.d.labriola@...il.com>
AuthorDate: Sun, 29 Jan 2012 14:21:17 -0500
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 30 Jan 2012 10:52:33 +0100
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@...il.com>
Cc: Matthew Garrett <mjg@...hat.com>
Cc: Michael D Labriola <mlabriol@...b.com>
Cc: Kushal Koolwal <kushalkoolwal@...il.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Link: http://lkml.kernel.org/r/87vcnub9hu.fsf@gmail.com
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/reboot.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index b257f0e..d840e69 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[] = {
DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
},
},
- { /* Handle problems with rebooting on VersaLogic Menlow boards */
- .callback = set_bios_reboot,
- .ident = "VersaLogic Menlow based board",
- .matches = {
- DMI_MATCH(DMI_BOARD_VENDOR, "VersaLogic Corporation"),
- DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"),
- },
- },
{ /* Handle reboot issue on Acer Aspire one */
.callback = set_kbd_reboot,
.ident = "Acer Aspire One A110",
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists