From owner-svn-src-all@FreeBSD.ORG  Tue Aug 31 18:48:09 2010
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 68D9E10656B3;
	Tue, 31 Aug 2010 18:48:09 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 586478FC18;
	Tue, 31 Aug 2010 18:48:09 +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 o7VIm9l0038602;
	Tue, 31 Aug 2010 18:48:09 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7VIm9SV038599;
	Tue, 31 Aug 2010 18:48:09 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201008311848.o7VIm9SV038599@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Tue, 31 Aug 2010 18:48:09 +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: r212065 - 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: Tue, 31 Aug 2010 18:48:09 -0000

Author: yongari
Date: Tue Aug 31 18:48:09 2010
New Revision: 212065
URL: http://svn.freebsd.org/changeset/base/212065

Log:
  Handle PAE case correctly. You cannot effectively specify a 4GB
  boundary in PAE case so use a 2GB boundary for PAE as suggested by
  jhb.
  
  Pointed out by:	jhb
  Reviewed by:	jhb

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	Tue Aug 31 18:11:50 2010	(r212064)
+++ head/sys/dev/bge/if_bge.c	Tue Aug 31 18:48:09 2010	(r212065)
@@ -2272,7 +2272,7 @@ bge_dma_alloc(struct bge_softc *sc)
 	/* Create parent tag for buffers. */
 	boundary = 0;
 	if ((sc->bge_flags & BGE_FLAG_4G_BNDRY_BUG) != 0)
-		boundary = BGE_DMA_4G_BNDRY;
+		boundary = BGE_DMA_BNDRY;
 	error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev),
 	    1, boundary, lowaddr, BUS_SPACE_MAXADDR, NULL,
 	    NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT,

Modified: head/sys/dev/bge/if_bgereg.h
==============================================================================
--- head/sys/dev/bge/if_bgereg.h	Tue Aug 31 18:11:50 2010	(r212064)
+++ head/sys/dev/bge/if_bgereg.h	Tue Aug 31 18:48:09 2010	(r212065)
@@ -2487,10 +2487,14 @@ struct bge_gib {
 #define	BGE_DMA_MAXADDR		0xFFFFFFFFFF
 #endif
 
+#ifdef PAE
+#define	BGE_DMA_BNDRY		0x80000000
+#else
 #if (BUS_SPACE_MAXADDR > 0xFFFFFFFF)
-#define	BGE_DMA_4G_BNDRY	0x100000000
+#define	BGE_DMA_BNDRY		0x100000000
 #else
-#define	BGE_DMA_4G_BNDRY	0
+#define	BGE_DMA_BNDRY		0
+#endif
 #endif
 
 /*