linux-kernel - [tip:x86/urgent] x86/reboot/quirks: Add iMac10, 1 to pci_reboot_dmi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-2f0c0b2d96b1205efb14347009748d786c2d9ba5@git.kernel.org>
Date:	Tue, 12 Jan 2016 04:05:17 -0800
From:	tip-bot for Mario Kleiner <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	hpa@...or.com, tglx@...utronix.de, davej@...emonkey.org.uk,
	stable@...r.kernel.org, torvalds@...ux-foundation.org,
	brgerst@...il.com, bp@...en8.de, linux-kernel@...r.kernel.org,
	luto@...capital.net, dvlasenk@...hat.com,
	mario.kleiner.de@...il.com, peterz@...radead.org, mingo@...nel.org
Subject: [tip:x86/urgent] x86/reboot/quirks: Add iMac10,
 1 to pci_reboot_dmi_table[]

Commit-ID:  2f0c0b2d96b1205efb14347009748d786c2d9ba5
Gitweb:     http://git.kernel.org/tip/2f0c0b2d96b1205efb14347009748d786c2d9ba5
Author:     Mario Kleiner <mario.kleiner.de@...il.com>
AuthorDate: Fri, 18 Dec 2015 20:24:06 +0100
Committer:  Ingo Molnar <mingo@...nel.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@...il.com>
Cc: <stable@...r.kernel.org>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Dave Jones <davej@...emonkey.org.uk>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.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 */