* Fwd: [PATCH] x86: Add iMac10,1 to pci_reboot_dmi_table
[not found] <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com>
@ 2016-01-01 22:48 ` Mario Kleiner
2016-01-12 12:05 ` [tip:x86/urgent] x86/reboot/quirks: Add iMac10, 1 to pci_reboot_dmi_table[] tip-bot for Mario Kleiner
1 sibling, 0 replies; 2+ messages in thread
From: Mario Kleiner @ 2016-01-01 22:48 UTC (permalink / raw)
To: LKML
-------- Forwarded Message --------
Subject: [PATCH] x86: Add iMac10,1 to pci_reboot_dmi_table
Date: Fri, 18 Dec 2015 20:24:06 +0100
From: Mario Kleiner <mario.kleiner.de@gmail.com>
To: x86@kernel.org
CC: mingo@redhat.com, hpa@zytor.com, mario.kleiner.de@gmail.com,
stable@vger.kernel.org
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: <stable@vger.kernel.org>
---
arch/x86/kernel/reboot.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 02693dd..f660d63 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -182,6 +182,14 @@ static struct dmi_system_id __initdata
reboot_dmi_table[] = {
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 */
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* [tip:x86/urgent] x86/reboot/quirks: Add iMac10, 1 to pci_reboot_dmi_table[]
[not found] <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com>
2016-01-01 22:48 ` Fwd: [PATCH] x86: Add iMac10,1 to pci_reboot_dmi_table Mario Kleiner
@ 2016-01-12 12:05 ` tip-bot for Mario Kleiner
1 sibling, 0 replies; 2+ messages in thread
From: tip-bot for Mario Kleiner @ 2016-01-12 12:05 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, tglx, davej, stable, torvalds, brgerst, bp, linux-kernel,
luto, dvlasenk, mario.kleiner.de, peterz, mingo
Commit-ID: 2f0c0b2d96b1205efb14347009748d786c2d9ba5
Gitweb: http://git.kernel.org/tip/2f0c0b2d96b1205efb14347009748d786c2d9ba5
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
AuthorDate: Fri, 18 Dec 2015 20:24:06 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 12 Jan 2016 12:27:36 +0100
x86/reboot/quirks: Add iMac10,1 to pci_reboot_dmi_table[]
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: <stable@vger.kernel.org>
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>
---
arch/x86/kernel/reboot.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index d64889a..ab0adc0 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -182,6 +182,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread