| From 2f0c0b2d96b1205efb14347009748d786c2d9ba5 Mon Sep 17 00:00:00 2001 |
| From: Mario Kleiner <mario.kleiner.de@gmail.com> |
| Date: Fri, 18 Dec 2015 20:24:06 +0100 |
| Subject: x86/reboot/quirks: Add iMac10,1 to pci_reboot_dmi_table[] |
| |
| From: Mario Kleiner <mario.kleiner.de@gmail.com> |
| |
| commit 2f0c0b2d96b1205efb14347009748d786c2d9ba5 upstream. |
| |
| Without the reboot=pci method, the iMac 10,1 simply |
| hangs after printing "Restarting system" at the point |
| when it should reboot. This fixes it. |
| |
| Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> |
| Cc: Andy Lutomirski <luto@amacapital.net> |
| Cc: Borislav Petkov <bp@alien8.de> |
| Cc: Brian Gerst <brgerst@gmail.com> |
| Cc: Dave Jones <davej@codemonkey.org.uk> |
| Cc: Denys Vlasenko <dvlasenk@redhat.com> |
| Cc: H. Peter Anvin <hpa@zytor.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Link: http://lkml.kernel.org/r/1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kernel/reboot.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| --- a/arch/x86/kernel/reboot.c |
| +++ b/arch/x86/kernel/reboot.c |
| @@ -182,6 +182,14 @@ static struct dmi_system_id __initdata r |
| DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), |
| }, |
| }, |
| + { /* Handle problems with rebooting on the iMac10,1. */ |
| + .callback = set_pci_reboot, |
| + .ident = "Apple iMac10,1", |
| + .matches = { |
| + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), |
| + DMI_MATCH(DMI_PRODUCT_NAME, "iMac10,1"), |
| + }, |
| + }, |
| |
| /* ASRock */ |
| { /* Handle problems with rebooting on ASRock Q1900DC-ITX */ |
