From owner-svn-src-all@FreeBSD.ORG  Fri Mar 16 16:12:11 2012
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 96D3E106566B;
	Fri, 16 Mar 2012 16:12:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 82AE88FC08;
	Fri, 16 Mar 2012 16:12:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2GGCBW1025112;
	Fri, 16 Mar 2012 16:12:11 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2GGCBtA025110;
	Fri, 16 Mar 2012 16:12:11 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201203161612.q2GGCBtA025110@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 16 Mar 2012 16:12:11 +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: r233036 - head/sys/x86/x86
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: Fri, 16 Mar 2012 16:12:11 -0000

Author: jhb
Date: Fri Mar 16 16:12:10 2012
New Revision: 233036
URL: http://svn.freebsd.org/changeset/base/233036

Log:
  Revert the PCIe 4GB boundary issue workaround now that the proper fix is
  in HEAD.
  
  Ok'd by:	scottl

Modified:
  head/sys/x86/x86/busdma_machdep.c

Modified: head/sys/x86/x86/busdma_machdep.c
==============================================================================
--- head/sys/x86/x86/busdma_machdep.c	Fri Mar 16 15:46:44 2012	(r233035)
+++ head/sys/x86/x86/busdma_machdep.c	Fri Mar 16 16:12:10 2012	(r233036)
@@ -227,14 +227,6 @@ bus_dma_tag_create(bus_dma_tag_t parent,
 	bus_dma_tag_t newtag;
 	int error = 0;
 
-	/* Always enforce at least a 4GB (2GB for PAE) boundary. */
-#if defined(__amd64__)
-	if (boundary == 0 || boundary > ((bus_addr_t)1 << 32))
-		boundary = (bus_size_t)1 << 32;
-#elif defined(PAE)
-	if (boundary == 0 || boundary > ((bus_addr_t)1 << 31))
-		boundary = (bus_size_t)1 << 31;
-#endif
 	/* Basic sanity checking */
 	if (boundary != 0 && boundary < maxsegsz)
 		maxsegsz = boundary;