From patchwork Sat Jun 30 05:07:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 1133921 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 66524DF22D for ; Sat, 30 Jun 2012 05:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751437Ab2F3FPE (ORCPT ); Sat, 30 Jun 2012 01:15:04 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:64540 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434Ab2F3FPC (ORCPT ); Sat, 30 Jun 2012 01:15:02 -0400 Received: by mail-qa0-f46.google.com with SMTP id b17so1064210qad.19 for ; Fri, 29 Jun 2012 22:15:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:reply-to:organization; bh=W96xLu8OO/52YYJU52sdQHV9aILicWBJ/39e9D+Ig4Y=; b=Qt46tMqYFiSPwGI4nmcTUZGzzJkBoJwkPCngt/IBAY6nK2J03fdO7CJ0GuC4TpK0vJ iUy9pPH2MzUJdyOKj/PllxnCQnKkDG0yT7CXsHrUR0yuOs+htgKtnrzz8LpGBPttBedY NEhq42Uqc9EyWnPwZJaipCktqs5zi606DDgroI5vpBAAgl/WWdrzDPInjfp0tClcHWSj OU78bweYD7HeeDLqGQ7Nle7xJXdsvu7gqydyeSFh0ToHF74mBmM9tiWfGBLySpTyhnO4 aaDIFX4Z9/09y/VtcCF36Im/O6ax9S+opAKUp+R82xIC3JxfaOtmVSriGFRK7wcQsf3M IYIA== Received: by 10.229.137.74 with SMTP id v10mr2346907qct.67.1341032874979; Fri, 29 Jun 2012 22:07:54 -0700 (PDT) Received: from x980.domain_not_set.invalid (h184-61-124-30.altnnh.dsl.dynamic.tds.net. [184.61.124.30]) by mx.google.com with ESMTPS id fx5sm15104964qab.14.2012.06.29.22.07.53 (version=SSLv3 cipher=OTHER); Fri, 29 Jun 2012 22:07:54 -0700 (PDT) From: Len Brown To: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Zhang Rui , x86@kernel.org, Len Brown Subject: [PATCH 2/8] ACPI, x86: fix Dell M6600 ACPI reboot regression via DMI Date: Sat, 30 Jun 2012 01:07:29 -0400 Message-Id: <76eb9a30db4bc8fd172f9155247264b5f2686d7b.1341032550.git.len.brown@intel.com> X-Mailer: git-send-email 1.7.11.1.104.ge7b44f1 In-Reply-To: <1341032855-27139-1-git-send-email-lenb@kernel.org> References: <1341032855-27139-1-git-send-email-lenb@kernel.org> In-Reply-To: <9f132652d94c96476b0b0a8caf0c10e96ab10fa8.1341032550.git.len.brown@intel.com> References: <9f132652d94c96476b0b0a8caf0c10e96ab10fa8.1341032550.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Zhang Rui Dell Precision M6600 is known to require PCI reboot, so add it to the reboot blacklist in pci_reboot_dmi_table[]. https://bugzilla.kernel.org/show_bug.cgi?id=42749 cc: x86@kernel.org Signed-off-by: Zhang Rui Signed-off-by: Len Brown Acked-by: Ingo Molnar --- 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 79c45af..412db57 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -451,6 +451,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"), }, }, + { /* Handle problems with rebooting on the Precision M6600. */ + .callback = set_pci_reboot, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"), + }, + }, { } };