diff options
| author | Masoud Sharbiani <msharbiani@twitter.com> | 2013-09-20 15:59:07 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:33 +0100 |
| commit | a9e953186d9be387937cf01feaa44175bc49b1c8 (patch) | |
| tree | dc10d660ef735dbfb0020f55b90a4c210f656353 /arch | |
| parent | 94cbfb03d7d7ce602ec143c6e0144a99bfc583f9 (diff) | |
| download | kernel_samsung_smdk4412-a9e953186d9be387937cf01feaa44175bc49b1c8.zip kernel_samsung_smdk4412-a9e953186d9be387937cf01feaa44175bc49b1c8.tar.gz kernel_samsung_smdk4412-a9e953186d9be387937cf01feaa44175bc49b1c8.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
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 e528a48..763eebb 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -476,6 +476,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"), + }, + }, { } }; |