svn commit: r195680 - in stable/6/sys: . contrib/pf dev/cxgb dev/pci

[John Baldwin]

Author: jhb
Date: Tue Jul 14 15:06:58 2009
New Revision: 195680
URL: http://svn.freebsd.org/changeset/base/195680

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/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)
  stable/6/sys/dev/pci/pci.c

Modified: stable/6/sys/dev/pci/pci.c
==============================================================================
--- stable/6/sys/dev/pci/pci.c	Tue Jul 14 14:56:01 2009	(r195679)
+++ stable/6/sys/dev/pci/pci.c	Tue Jul 14 15:06:58 2009	(r195680)
@@ -2221,8 +2221,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,