From owner-p4-projects@FreeBSD.ORG  Wed Oct  7 14:34:09 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0138B1065694; Wed,  7 Oct 2009 14:34:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A18191065692
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:34:08 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F47E8FC1A
	for <perforce@freebsd.org>; Wed,  7 Oct 2009 14:34:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n97EY8kL078040
	for <perforce@freebsd.org>; Wed, 7 Oct 2009 14:34:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n97EY8gG078038
	for perforce@freebsd.org; Wed, 7 Oct 2009 14:34:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 7 Oct 2009 14:34:08 GMT
Message-Id: <200910071434.n97EY8gG078038@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169295 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 14:34:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=169295

Change 169295 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:33:39

	Integrate TrustedBSD capabilities branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.228 2009/10/07 13:12:43 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.229 2009/10/07 14:29:48 stas Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1789,7 +1789,7 @@
 
 	/* Enable host coalescing bug fix. */
 	if (BGE_IS_5755_PLUS(sc))
-		val |= 1 << 29;
+		val |= BGE_WDMAMODE_STATUS_TAG_FIX;
 
 	/* Turn on write DMA state machine */
 	CSR_WRITE_4(sc, BGE_WDMA_MODE, val);

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 (text+ko) ====

@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.84 2009/10/07 13:12:43 stas Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.85 2009/10/07 14:29:48 stas Exp $
  */
 
 /*
@@ -1431,6 +1431,7 @@
 #define	BGE_WDMAMODE_PCI_FIFOOREAD_ATTN	0x00000100
 #define	BGE_WDMAMODE_LOCREAD_TOOBIG	0x00000200
 #define	BGE_WDMAMODE_ALL_ATTNS		0x000003FC
+#define	BGE_WDMAMODE_STATUS_TAG_FIX	0x20000000
 
 /* Write DMA status register */
 #define	BGE_WDMASTAT_PCI_TGT_ABRT_ATTN	0x00000004