svn commit: r189946 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/re pci

[Pyun YongHyeon]

Author: yongari
Date: Wed Mar 18 02:10:01 2009
New Revision: 189946
URL: http://svn.freebsd.org/changeset/base/189946

Log:
  MFC r188474:
    Allocating 2 MSI messages do not seem to work on certain controllers
    so use just 1 MSI message. This fixes regression introduced in
    r188381.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/re/if_re.c
  stable/7/sys/pci/if_rlreg.h

Modified: stable/7/sys/dev/re/if_re.c
==============================================================================
--- stable/7/sys/dev/re/if_re.c	Wed Mar 18 02:07:07 2009	(r189945)
+++ stable/7/sys/dev/re/if_re.c	Wed Mar 18 02:10:01 2009	(r189946)
@@ -1149,7 +1149,8 @@ re_attach(device_t dev)
 		if (bootverbose)
 			device_printf(dev, "MSI count : %d\n", msic);
 	}
-	if (msic == RL_MSI_MESSAGES  && msi_disable == 0) {
+	if (msic > 0 && msi_disable == 0) {
+		msic = 1;
 		if (pci_alloc_msi(dev, &msic) == 0) {
 			if (msic == RL_MSI_MESSAGES) {
 				device_printf(dev, "Using %d MSI messages\n",

Modified: stable/7/sys/pci/if_rlreg.h
==============================================================================
--- stable/7/sys/pci/if_rlreg.h	Wed Mar 18 02:07:07 2009	(r189945)
+++ stable/7/sys/pci/if_rlreg.h	Wed Mar 18 02:10:01 2009	(r189946)
@@ -758,7 +758,7 @@ struct rl_stats {
 #define RE_RX_DESC_BUFLEN	MCLBYTES
 #endif
 
-#define	RL_MSI_MESSAGES	2
+#define	RL_MSI_MESSAGES	1
 
 #define RL_ADDR_LO(y)		((uint64_t) (y) & 0xFFFFFFFF)
 #define RL_ADDR_HI(y)		((uint64_t) (y) >> 32)