svn commit: r195679 - in stable/7/sys: . contrib/pf dev/pci
John Baldwin
jhb at FreeBSD.org
Tue Jul 14 14:56:02 UTC 2009
Author: jhb
Date: Tue Jul 14 14:56:01 2009
New Revision: 195679
URL: http://svn.freebsd.org/changeset/base/195679
Log:
MFC: Enable MSI in the MSI capability registers any time that the first
message in an MSI group is enabled, not just if the address/data pair are
not initialized.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/pci/pci.c
Modified: stable/7/sys/dev/pci/pci.c
==============================================================================
--- stable/7/sys/dev/pci/pci.c Tue Jul 14 14:41:48 2009 (r195678)
+++ stable/7/sys/dev/pci/pci.c Tue Jul 14 14:56:01 2009 (r195679)
@@ -2869,8 +2869,10 @@ pci_setup_intr(device_t dev, device_t ch
goto bad;
dinfo->cfg.msi.msi_addr = addr;
dinfo->cfg.msi.msi_data = data;
- pci_enable_msi(child, addr, data);
}
+ if (dinfo->cfg.msi.msi_handlers == 0)
+ pci_enable_msi(child, dinfo->cfg.msi.msi_addr,
+ dinfo->cfg.msi.msi_data);
dinfo->cfg.msi.msi_handlers++;
} else {
KASSERT(dinfo->cfg.msix.msix_alloc > 0,
More information about the svn-src-stable-7
mailing list