From owner-svn-src-all@FreeBSD.ORG  Wed Oct  7 14:29:50 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0374E1065672;
	Wed,  7 Oct 2009 14:29:50 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CCD808FC1B;
	Wed,  7 Oct 2009 14:29:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n97ETm9b086925;
	Wed, 7 Oct 2009 14:29:48 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n97ETmS3086922;
	Wed, 7 Oct 2009 14:29:48 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200910071429.n97ETmS3086922@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Wed, 7 Oct 2009 14:29:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197837 - head/sys/dev/bge
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2009 14:29:50 -0000

Author: stas
Date: Wed Oct  7 14:29:48 2009
New Revision: 197837
URL: http://svn.freebsd.org/changeset/base/197837

Log:
  - Give a name to the host coalescing bug fix WDMA mode register bit instead
    of using hardcoded value in the code.
  Obtained from:	OpenBSD

Modified:
  head/sys/dev/bge/if_bge.c
  head/sys/dev/bge/if_bgereg.h

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Wed Oct  7 14:14:05 2009	(r197836)
+++ head/sys/dev/bge/if_bge.c	Wed Oct  7 14:29:48 2009	(r197837)
@@ -1789,7 +1789,7 @@ bge_blockinit(struct bge_softc *sc)
 
 	/* 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);

Modified: head/sys/dev/bge/if_bgereg.h
==============================================================================
--- head/sys/dev/bge/if_bgereg.h	Wed Oct  7 14:14:05 2009	(r197836)
+++ head/sys/dev/bge/if_bgereg.h	Wed Oct  7 14:29:48 2009	(r197837)
@@ -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