From owner-p4-projects@FreeBSD.ORG  Wed Mar  7 08:59:35 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F0D861065674; Wed,  7 Mar 2012 08:59:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AA2441065672
	for <perforce@freebsd.org>; Wed,  7 Mar 2012 08:59:34 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 935CF8FC0A
	for <perforce@freebsd.org>; Wed,  7 Mar 2012 08:59:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q278xY8I061699
	for <perforce@freebsd.org>; Wed, 7 Mar 2012 08:59:34 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q278xYug061696
	for perforce@freebsd.org; Wed, 7 Mar 2012 08:59:34 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 7 Mar 2012 08:59:34 GMT
Message-Id: <201203070859.q278xYug061696@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 207575 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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 Mar 2012 08:59:35 -0000

http://p4web.freebsd.org/@@207575?ac=10

Change 207575 by jhb@jhb_kavik on 2012/03/07 08:59:01

	Now that boundaries are bus_addr_t, remove this PAE #ifdef.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci.c#34 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci.c#34 (text+ko) ====

@@ -70,17 +70,10 @@
 #include "pcib_if.h"
 #include "pci_if.h"
 
-/*
- * XXX: Due to a limitation of the bus_dma_tag_create() API, we cannot
- * specify a 4GB boundary on 32-bit targets.  Usually this does not
- * matter as it is ok to use a boundary of 0 on these systems.
- * However, in the case of PAE, DMA addresses can cross a 4GB
- * boundary, so as a workaround use a 2GB boundary.
- */
-#ifdef PAE
-#define	PCI_DMA_BOUNDARY	(1u << 31)
+#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF)
+#define	PCI_DMA_BOUNDARY	0x100000000
 #else
-#define	PCI_DMA_BOUNDARY	((bus_size_t)((uint64_t)1 << 32))
+#define	PCI_DMA_BOUNDARY	0
 #endif
 
 #define	PCIR_IS_BIOS(cfg, reg)						\