From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752420AbcAAWsN (ORCPT ); Fri, 1 Jan 2016 17:48:13 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38031 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752086AbcAAWsL (ORCPT ); Fri, 1 Jan 2016 17:48:11 -0500 Subject: Fwd: [PATCH] x86: Add iMac10,1 to pci_reboot_dmi_table References: <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com> To: LKML From: Mario Kleiner X-Forwarded-Message-Id: <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com> Message-ID: <56870227.3070302@gmail.com> Date: Fri, 1 Jan 2016 23:48:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1450466646-26663-1-git-send-email-mario.kleiner.de@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org -------- 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 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 Cc: --- 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