On Fri, 23 Jul 2010 22:19:55 +0200 "Rafael J. Wysocki" <rjw@xxxxxxx> wrote: > From: Rafael J. Wysocki <rjw@xxxxxxx> > > 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@xxxxxxx> > --- > drivers/pci/quirks.c | 3 +++ > 1 file changed, 3 insertions(+) > > Index: linux-2.6/drivers/pci/quirks.c > =================================================================== > --- linux-2.6.orig/drivers/pci/quirks.c > +++ linux-2.6/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); applied to linux-next with a cc: stable. Thanks. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
