From owner-svn-src-head@FreeBSD.ORG  Tue Jul 29 02:35:44 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BE7FA1C2;
 Tue, 29 Jul 2014 02:35:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AC4BE2605;
 Tue, 29 Jul 2014 02:35:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6T2Zi66074011;
 Tue, 29 Jul 2014 02:35:44 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6T2ZiO9074010;
 Tue, 29 Jul 2014 02:35:44 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201407290235.s6T2ZiO9074010@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 29 Jul 2014 02:35:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269208 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jul 2014 02:35:44 -0000

Author: ian
Date: Tue Jul 29 02:35:44 2014
New Revision: 269208
URL: http://svnweb.freebsd.org/changeset/base/269208

Log:
  Correct the comparison logic when looking for intersections between
  exclusion zones and phsyical memory.  The phys_avail[i] entries are the
  address of the first byte of ram in the region, and phys_avail[i+1]
  entries are the address of the first byte of ram in the next region
  (i.e., they're not included in the region that starts at phys_avail[i]).
  
  Reviewed by:	cognet

Modified:
  head/sys/arm/arm/busdma_machdep-v6.c

Modified: head/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v6.c	Tue Jul 29 02:34:32 2014	(r269207)
+++ head/sys/arm/arm/busdma_machdep-v6.c	Tue Jul 29 02:35:44 2014	(r269208)
@@ -252,9 +252,9 @@ exclusion_bounce_check(vm_offset_t lowad
 		return (0);
 
 	for (i = 0; phys_avail[i] && phys_avail[i + 1]; i += 2) {
-		if ((lowaddr >= phys_avail[i] && lowaddr <= phys_avail[i + 1])
+		if ((lowaddr >= phys_avail[i] && lowaddr < phys_avail[i + 1])
 		    || (lowaddr < phys_avail[i] &&
-		    highaddr > phys_avail[i]))
+		    highaddr >= phys_avail[i]))
 			return (1);
 	}
 	return (0);