diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-07-23 22:19:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-13 13:30:42 -0700 |
| commit | 692f3d4ad794405d87b26ff008eb433b55409290 (patch) | |
| tree | c23de4e7659e27a6fbb500ffc668fa5ce6fbdb84 /drivers/pci | |
| parent | 855b9e05fb274406d11f5920b2b80e6f1eeefb49 (diff) | |
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 <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/quirks.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |