From: Rafael J. Wysocki Date: Fri, 23 Jul 2010 20:19:55 +0000 (+0200) Subject: PCI: Do not run NVidia quirks related to MSI with MSI disabled X-Git-Tag: v2.6.35.2~57 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=692f3d4ad794405d87b26ff008eb433b55409290;p=unionfs-2.6.39.y.git PCI: Do not run NVidia quirks related to MSI with MSI disabled commit 3d2a531804d16cd8df6dbbb0429c6f143e756049 upstream. There is no reason to run NVidia-specific quirks related to HT MSI mappings with MSI disabled via pci=nomsi, so make __nv_msi_ht_cap_quirk() return immediately in that case. This allows at least one machine to boot 100% of the time with pci=nomsi (it still doesn't boot reliably without that). Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16443 . Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 477345d4164..9286ed3c6b3 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2390,6 +2390,9 @@ static void __devinit __nv_msi_ht_cap_quirk(struct pci_dev *dev, int all) int pos; int found; + if (!pci_msi_enabled()) + return; + /* check if there is HT MSI cap or enabled on this device */ found = ht_check_msi_mapping(dev);