[PATCH] x86: add Dell OptiPlex 760 reboot quirk

[PATCH] x86: add Dell OptiPlex 760 reboot quirk

[Leann Ogasawara]

Hi All,

A bug reporter noted their Dell OptiPlex 760 hangs on reboot unless
reboot=bios is specified.  They have confirmed the following reboot
quirk resolves the issue.  Please consider applying for 2.6.33.

Thanks,
Leann

>From 1e25ca7ec6c1894032a0174e42c537c9b7d849fd Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Wed, 27 Jan 2010 15:02:02 -0800
Subject: [PATCH] x86: add Dell OptiPlex 760 reboot quirk

BugLink: https://bugs.launchpad.net/bugs/488319

Dell OptiPlex 760 hangs on reboot unless reboot=bios is used.  Add quirk
to reboot through the BIOS.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Cc: <stable@kernel.org>
---
 arch/x86/kernel/reboot.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 1545bc0..704bddc 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -203,6 +203,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 			DMI_MATCH(DMI_BOARD_NAME, "0T656F"),
 		},
 	},
+	{	/* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G*/
+		.callback = set_bios_reboot,
+		.ident = "Dell OptiPlex 760",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"),
+			DMI_MATCH(DMI_BOARD_NAME, "0G919G"),
+		},
+	},
 	{	/* Handle problems with rebooting on Dell 2400's */
 		.callback = set_bios_reboot,
 		.ident = "Dell PowerEdge 2400",
-- 
1.6.3.3

Re: [PATCH] x86: add Dell OptiPlex 760 reboot quirk

[H. Peter Anvin]

On 01/27/2010 03:29 PM, Leann Ogasawara wrote:
> Hi All,
> 
> A bug reporter noted their Dell OptiPlex 760 hangs on reboot unless
> reboot=bios is specified.  They have confirmed the following reboot
> quirk resolves the issue.  Please consider applying for 2.6.33.
> 

Could we find out if reboot=acpi works on this machine?

	-hpa

Re: [PATCH] x86: add Dell OptiPlex 760 reboot quirk

[Leann Ogasawara]

On Wed, 2010-01-27 at 16:27 -0800, H. Peter Anvin wrote:
> On 01/27/2010 03:29 PM, Leann Ogasawara wrote:
> > Hi All,
> > 
> > A bug reporter noted their Dell OptiPlex 760 hangs on reboot unless
> > reboot=bios is specified.  They have confirmed the following reboot
> > quirk resolves the issue.  Please consider applying for 2.6.33.
> > 
> 
> Could we find out if reboot=acpi works on this machine?

Sure, I'll ask the reporter to confirm.

Leann

[tip:x86/urgent] x86: Add Dell OptiPlex 760 reboot quirk

[tip-bot for Leann Ogasawara]

Commit-ID:  35ea63d70f827a26c150993b4b940925bb02b03f
Gitweb:     http://git.kernel.org/tip/35ea63d70f827a26c150993b4b940925bb02b03f
Author:     Leann Ogasawara <leann.ogasawara@canonical.com>
AuthorDate: Wed, 27 Jan 2010 15:29:18 -0800
Committer:  H. Peter Anvin <hpa@zytor.com>
CommitDate: Wed, 27 Jan 2010 16:28:51 -0800

x86: Add Dell OptiPlex 760 reboot quirk

Dell OptiPlex 760 hangs on reboot unless reboot=bios is used.  Add quirk
to reboot through the BIOS.

BugLink: https://bugs.launchpad.net/bugs/488319

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
LKML-Reference: <1264634958.27335.1091.camel@emiko>
Cc: <stable@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 arch/x86/kernel/reboot.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 1545bc0..704bddc 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -203,6 +203,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 			DMI_MATCH(DMI_BOARD_NAME, "0T656F"),
 		},
 	},
+	{	/* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G*/
+		.callback = set_bios_reboot,
+		.ident = "Dell OptiPlex 760",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"),
+			DMI_MATCH(DMI_BOARD_NAME, "0G919G"),
+		},
+	},
 	{	/* Handle problems with rebooting on Dell 2400's */
 		.callback = set_bios_reboot,
 		.ident = "Dell PowerEdge 2400",

Re: [PATCH] x86: add Dell OptiPlex 760 reboot quirk

[Leann Ogasawara]

On Wed, 2010-01-27 at 16:27 -0800, H. Peter Anvin wrote:
> On 01/27/2010 03:29 PM, Leann Ogasawara wrote:
> > Hi All,
> > 
> > A bug reporter noted their Dell OptiPlex 760 hangs on reboot unless
> > reboot=bios is specified.  They have confirmed the following reboot
> > quirk resolves the issue.  Please consider applying for 2.6.33.
> > 
> 
> Could we find out if reboot=acpi works on this machine?

https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/488319/comments/13

>From the bug reporter:

"It seems that reboot=acpi does not work.

I installed 2.6.33-rc6 (from today) and rebooted successfully 4 times
after booting with reboot=bios, like before. I then changed the boot
parameter to reboot=acpi. After booting with this the first time, the
computer came back up successfully after a reboot. The next time,
however, the computer didn't come back up.

Since I have moved to Norway and the two affected computers are located
in Canada I had to do this via ssh and playing with /etc/default/grub
and update-grub. I can't hit the power button or verify that it wasn't
something else that went wrong. I hope this testing is sufficient. If
necessary, I can try without any reboot option with 2.6.33-rc6 once
someone comes to work after the weekend and gives it a power cycle."