2013-09-20 22:59:10

by Vinson Lee

Subject: [PATCH] x86: Add quirk to make Dell C6100 use reboot=pci.

From: Masoud Sharbiani <[email protected]>

Dell PowerEdge C6100 machines fail to completely reboot about 20% of the
time.

Signed-off-by: Masoud Sharbiani <[email protected]>
Cc: [email protected]
Signed-off-by: Vinson Lee <[email protected]>
---
arch/x86/kernel/reboot.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index df1b604..d139208 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -479,6 +479,22 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
},
},
+ { /* Handle problems with rebooting on the Dell PowerEdge C6100. */
+ .callback = set_pci_reboot,
+ .ident = "Dell PowerEdge C6100",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+ },
+ },
+ { /* Some C6100 machines were shipped with vendor being 'Dell'. */
+ .callback = set_pci_reboot,
+ .ident = "Dell PowerEdge C6100",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+ },
+ },
{ }
};

--
1.8.1.2

2013-09-23 13:38:30

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/urgent] x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically

Commit-ID: 4f0acd31c31f03ba42494c8baf6c0465150e2621
Gitweb: http://git.kernel.org/tip/4f0acd31c31f03ba42494c8baf6c0465150e2621
Author: Masoud Sharbiani <[email protected]>
AuthorDate: Fri, 20 Sep 2013 15:59:07 -0700
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 23 Sep 2013 10:26:08 +0200

x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically

Dell PowerEdge C6100 machines fail to completely reboot about 20% of the time.

Signed-off-by: Masoud Sharbiani <[email protected]>
Signed-off-by: Vinson Lee <[email protected]>
Cc: Robin Holt <[email protected]>
Cc: Russell King <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/reboot.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 563ed91..5f4ad27 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -358,6 +358,22 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
},
},
+ { /* Handle problems with rebooting on the Dell PowerEdge C6100. */
+ .callback = set_pci_reboot,
+ .ident = "Dell PowerEdge C6100",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+ },
+ },
+ { /* Some C6100 machines were shipped with vendor being 'Dell'. */
+ .callback = set_pci_reboot,
+ .ident = "Dell PowerEdge C6100",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+ },
+ },
{ }
};

2013-09-24 22:56:16

by H. Peter Anvin

Subject: Re: [tip:x86/urgent] x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically

On 09/23/2013 06:37 AM, tip-bot for Masoud Sharbiani wrote:
>
> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
> index 563ed91..5f4ad27 100644
> --- a/arch/x86/kernel/reboot.c
> +++ b/arch/x86/kernel/reboot.c
> @@ -358,6 +358,22 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
> },
> },
> + { /* Handle problems with rebooting on the Dell PowerEdge C6100. */
> + .callback = set_pci_reboot,
> + .ident = "Dell PowerEdge C6100",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
> + },
> + },
> + { /* Some C6100 machines were shipped with vendor being 'Dell'. */
> + .callback = set_pci_reboot,
> + .ident = "Dell PowerEdge C6100",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
> + },

Aren't these substring matches anyway? If so, the first entry is redundant.

-hpa