svn commit: r187309 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/bge dev/cxgb

[Marius Strobl]

Author: marius
Date: Thu Jan 15 20:23:38 2009
New Revision: 187309
URL: http://svn.freebsd.org/changeset/base/187309

Log:
  MFC: r184380
  
  Do as the Linux tg3 driver does and enable MSI support also
  for the BCM5714 revision A0 when in a multi-port configuration
  and unconditionally for the remainder of the class of BCM575X
  and beyond chips.

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/bge/if_bge.c
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/bge/if_bge.c
==============================================================================
--- stable/7/sys/dev/bge/if_bge.c	Thu Jan 15 20:19:53 2009	(r187308)
+++ stable/7/sys/dev/bge/if_bge.c	Thu Jan 15 20:23:38 2009	(r187309)
@@ -2338,10 +2338,11 @@ bge_can_use_msi(struct bge_softc *sc)
 	int can_use_msi = 0;
 
 	switch (sc->bge_asicrev) {
+	case BGE_ASICREV_BCM5714_A0:
 	case BGE_ASICREV_BCM5714:
 		/*
-		 * Apparently, MSI doesn't work when this chip is configured
-		 * in single-port mode.
+		 * Apparently, MSI doesn't work when these chips are
+		 * configured in single-port mode.
 		 */
 		if (bge_has_multiple_ports(sc))
 			can_use_msi = 1;
@@ -2351,10 +2352,9 @@ bge_can_use_msi(struct bge_softc *sc)
 		    sc->bge_chiprev != BGE_CHIPREV_5750_BX)
 			can_use_msi = 1;
 		break;
-	case BGE_ASICREV_BCM5752:
-	case BGE_ASICREV_BCM5780:
-		can_use_msi = 1;
-		break;
+	default:
+		if (BGE_IS_575X_PLUS(sc))
+			can_use_msi = 1;
 	}
 	return (can_use_msi);
 }