| From 3d2a531804d16cd8df6dbbb0429c6f143e756049 Mon Sep 17 00:00:00 2001 |
| From: Rafael J. Wysocki <rjw@sisk.pl> |
| Date: Fri, 23 Jul 2010 22:19:55 +0200 |
| Subject: PCI: Do not run NVidia quirks related to MSI with MSI disabled |
| |
| From: Rafael J. Wysocki <rjw@sisk.pl> |
| |
| 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 <rjw@sisk.pl> |
| Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/pci/quirks.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/pci/quirks.c |
| +++ b/drivers/pci/quirks.c |
| @@ -2390,6 +2390,9 @@ static void __devinit __nv_msi_ht_cap_qu |
| 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); |
| |
