Skip to contentSkip to conversation

x86: Add iMac10,1 to pci_reboot_dmi_table

PATCH New Mario Kleiner 2 participants 3 messages Dec 18, 2015 – Jan 12, 2016

Subsystems (2)
Stable branch x86
lore
Share & tools
lore

Mario Kleiner

author
#0 lore raw

PATCH 1/1 x86: 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 <[email protected]>
Cc <[email protected]>
---
 arch/x86/kernel/reboot.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/x86/kernel/reboot.c +8 -0
index 02693dd..f660d63 100644
@@ -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 */
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 x86: Add iMac10,1 to pci_reboot_dmi_table

-------- 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 <[email protected]>
To: [email protected]
CC: [email protected], [email protected], [email protected], [email protected]

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 <[email protected]>
Cc <[email protected]>
---
 arch/x86/kernel/reboot.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/x86/kernel/reboot.c +8 -0
index 02693dd..f660d63 100644
@@ -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 */
Signature · 1 line
1.9.1
merge bot
#2 lore raw

[tip:x86/urgent] x86/reboot/quirks: Add iMac10, 1 to pci_reboot_dmi_table[]

In reply to Mario Kleiner
x86/reboot/quirks: Add iMac10,1 to pci_reboot_dmi_table[]
Commit-ID:  2f0c0b2d96b1205efb14347009748d786c2d9ba5
Gitweb:     http://git.kernel.org/tip/2f0c0b2d96b1205efb14347009748d786c2d9ba5
Author:     Mario Kleiner <[email protected]>
AuthorDate: Fri, 18 Dec 2015 20:24:06 +0100
Committer:  Ingo Molnar <[email protected]>
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 <[email protected]>
Cc <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Dave Jones <[email protected]>
Cc Denys Vlasenko <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/kernel/reboot.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/x86/kernel/reboot.c +8 -0
index d64889a..ab0adc0 100644
@@ -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 */