Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964972AbXA2XxR (ORCPT ); Mon, 29 Jan 2007 18:53:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964937AbXA2XxR (ORCPT ); Mon, 29 Jan 2007 18:53:17 -0500 Received: from smtp.osdl.org ([65.172.181.24]:34320 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964934AbXA2XxQ (ORCPT ); Mon, 29 Jan 2007 18:53:16 -0500 Date: Mon, 29 Jan 2007 15:50:43 -0800 From: Stephen Hemminger Cc: =?UTF-8?B?RnLDqWTDqXJpYw==?= Riss , Linus Torvalds , Linux Kernel Mailing List , Jeff Garzik , netdev@vger.kernel.org Subject: [PATCH] block MSI on Sony Message-ID: <20070129155043.56a1c577@freekitty> In-Reply-To: <1170113879.29240.79.camel@localhost.localdomain> References: <1169931333.17469.125.camel@localhost.localdomain> <20070129113159.7ad22e4c@freekitty> <1170101430.29240.34.camel@localhost.localdomain> <20070129133849.1b523226@freekitty> <1170109401.29240.49.camel@localhost.localdomain> <1170110318.21603.25.camel@funkylaptop> <1170110732.29240.59.camel@localhost.localdomain> <1170111056.21603.30.camel@funkylaptop> <1170111464.29240.63.camel@localhost.localdomain> <1170113200.21603.41.camel@funkylaptop> <1170113879.29240.79.camel@localhost.localdomain> Organization: Linux Foundation X-Mailer: Sylpheed-Claws 2.5.0-rc3 (GTK+ 2.10.6; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2004 Lines: 70 The Sony VAIO BIOS resets to INTx on resume. This happens after device resume, so device irq's get misrouted. This hack turns off MSI on this laptop, until power management initialization order is fixed. Signed-off-by: Stephen Hemminger --- drivers/pci/quirks.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index ef882a8..9a64179 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -21,6 +21,7 @@ #include #include #include #include +#include #include "pci.h" /* The Mellanox Tavor device gives false positive parity errors @@ -1779,6 +1780,37 @@ static void __devinit quirk_nvidia_ck804 } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE, quirk_nvidia_ck804_msi_ht_cap); + +/* On Sony VAIO laptop, BIOS resets MSI during resume. */ +static __initdata struct dmi_system_id sony_dmi_table[] = { + { + .ident = "Sony Vaio", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "PCG-"), + }, + }, + { + .ident = "Sony Vaio", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-"), + }, + }, + { } +}; + +static void __init quirk_sony_msi(struct pci_dev *dev) +{ + if (!dmi_check_system(sony_dmi_table)) + return; + + pci_msi_quirk = 1; + printk(KERN_WARNING "PCI: MSI sony quirk detected. pci_msi_quirk set.\n"); +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_6, + quirk_sony_msi); + #endif /* CONFIG_PCI_MSI */ EXPORT_SYMBOL(pcie_mch_quirk); -- 1.4.1 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/