From patchwork Mon Nov  9 22:44:47 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Matthew Garrett <mjg@redhat.com>
X-Patchwork-Id: 58871
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA9MjhdY005803
	for <patchwork-acpi@patchwork.kernel.org>;
	Mon, 9 Nov 2009 22:45:44 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755108AbZKIWpM (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Mon, 9 Nov 2009 17:45:12 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755082AbZKIWpL
	(ORCPT <rfc822; linux-acpi-outgoing>);
	Mon, 9 Nov 2009 17:45:11 -0500
Received: from cavan.codon.org.uk ([93.93.128.6]:49374 "EHLO
	cavan.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755079AbZKIWpG (ORCPT
	<rfc822; linux-acpi@vger.kernel.org>); Mon, 9 Nov 2009 17:45:06 -0500
Received: from lan-nat-pool-bos.redhat.com ([66.187.234.200]
	helo=localhost.localdomain) by cavan.codon.org.uk with esmtpsa
	(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69)
	(envelope-from <mjg@redhat.com>)
	id 1N7cyu-00014C-4x; Mon, 09 Nov 2009 22:45:04 +0000
From: Matthew Garrett <mjg@redhat.com>
To: linux-acpi@vger.kernel.org
Cc: rjw@sisk.pl, robert.moore@intel.com, Matthew Garrett <mjg@redhat.com>
Subject: [PATCH 3/3] pci: Override gpe 0xd on Dell machines
Date: Mon,  9 Nov 2009 17:44:47 -0500
Message-Id: <1257806687-6608-3-git-send-email-mjg@redhat.com>
X-Mailer: git-send-email 1.6.5.2
In-Reply-To: <1257806687-6608-2-git-send-email-mjg@redhat.com>
References: <1257806687-6608-1-git-send-email-mjg@redhat.com>
	<1257806687-6608-2-git-send-email-mjg@redhat.com>
X-SA-Do-Not-Run: Yes
X-SA-Exim-Connect-IP: 66.187.234.200
X-SA-Exim-Mail-From: mjg@redhat.com
X-SA-Exim-Scanned: No (on cavan.codon.org.uk);
	SAEximRunCond expanded to false
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org


diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 7fff59c..1606d06 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -14,6 +14,7 @@
 #include <linux/pci-aspm.h>
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
+#include <linux/dmi.h>
 
 #include <linux/pci-acpi.h>
 #include "pci.h"
@@ -970,12 +971,35 @@ static void __init acpi_pci_install_gpe(u32 gpe_number,
 	}
 }
 
+static int __init acpi_gpe_remove_0xd_method(const struct dmi_system_id *d)
+{
+	acpi_remove_gpe_method(NULL, 0xd);
+	return 0;
+}
+
+static struct dmi_system_id gpe_dmi_table[] __initdata = {
+	/*
+	 * Dells have a broken handler for GPE 0xd. Remove it rather than
+	 * trusting it
+	 */
+	{
+		.callback = acpi_gpe_remove_0xd_method,
+		.ident = "Dell",
+		.matches = {
+			DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),
+		},
+	},
+	{}
+};
+
 static int __init acpi_pci_gpe_fixups(void)
 {
 	struct pci_dev *lpc;
 	struct gpe_fixup *fixups;
 	int i;
 
+	dmi_check_system(gpe_dmi_table);
+
 	lpc = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
 
 	if (!lpc)