linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] x86, reboot: remove VersaLogic Menlow reboot quirk
@ 2012-01-29 19:21 Michael D Labriola
  2012-01-30 13:22 ` [tip:x86/urgent] x86/reboot: Remove " tip-bot for Michael D Labriola
  0 siblings, 1 reply; 3+ messages in thread
From: Michael D Labriola @ 2012-01-29 19:21 UTC (permalink / raw)
  To: Ingo Molnar, Matthew Garrett, Michael D Labriola, Kushal Koolwal,
	linux-kernel

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 result 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>
---
 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",
-- 
1.7.1.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH] x86, reboot: remove VersaLogic Menlow reboot quirk
@ 2012-01-17 15:16 Michael D Labriola
  0 siblings, 0 replies; 3+ messages in thread
From: Michael D Labriola @ 2012-01-17 15:16 UTC (permalink / raw)
  To: Ingo Molnar, Matthew Garrett
  Cc: Michael D Labriola, H. Peter Anvin, Kushal Koolwal, linux-kernel,
	michael.d.labriola, support, Thomas Gleixner, x86

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 result 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 <mlabriol@gdeb.com>
---
 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 4240d58..c584291 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -301,14 +301,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",
-- 
1.6.0.3




 

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

end of thread, other threads:[~2012-01-30 13:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-29 19:21 [PATCH] x86, reboot: remove VersaLogic Menlow reboot quirk Michael D Labriola
2012-01-30 13:22 ` [tip:x86/urgent] x86/reboot: Remove " tip-bot for Michael D Labriola
  -- strict thread matches above, loose matches on Subject: below --
2012-01-17 15:16 [PATCH] x86, reboot: remove " Michael D Labriola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).