diff options
author | Masoud Sharbiani <msharbiani@twitter.com> | 2013-09-20 18:59:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 10:13:09 -0400 |
commit | fdc43786ed80ac4d85fb82ed3e37a5143721b50b (patch) | |
tree | d0b711f87032af2b4c0a70a2b52a6c3debf17774 /arch | |
parent | 30d0e7953b17462b8e42ad374ace70c76e31d410 (diff) |
x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
commit 4f0acd31c31f03ba42494c8baf6c0465150e2621 upstream.
Dell PowerEdge C6100 machines fail to completely reboot about 20% of the time.
Signed-off-by: Masoud Sharbiani <msharbiani@twitter.com>
Signed-off-by: Vinson Lee <vlee@twitter.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Link: http://lkml.kernel.org/r/1379717947-18042-1-git-send-email-vlee@freedesktop.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/reboot.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 76fa1e9a2b39..90fd1195f276 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -447,6 +447,22 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
447 | DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"), | 447 | DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"), |
448 | }, | 448 | }, |
449 | }, | 449 | }, |
450 | { /* Handle problems with rebooting on the Dell PowerEdge C6100. */ | ||
451 | .callback = set_pci_reboot, | ||
452 | .ident = "Dell PowerEdge C6100", | ||
453 | .matches = { | ||
454 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
455 | DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), | ||
456 | }, | ||
457 | }, | ||
458 | { /* Some C6100 machines were shipped with vendor being 'Dell'. */ | ||
459 | .callback = set_pci_reboot, | ||
460 | .ident = "Dell PowerEdge C6100", | ||
461 | .matches = { | ||
462 | DMI_MATCH(DMI_SYS_VENDOR, "Dell"), | ||
463 | DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), | ||
464 | }, | ||
465 | }, | ||
450 | { } | 466 | { } |
451 | }; | 467 | }; |
452 | 468 | ||