From owner-svn-src-all@FreeBSD.ORG  Mon May  4 14:55:22 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6B03A41F;
 Mon,  4 May 2015 14:55:22 +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 59A2218CD;
 Mon,  4 May 2015 14:55:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t44EtMxB055655;
 Mon, 4 May 2015 14:55:22 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t44EtMUc055654;
 Mon, 4 May 2015 14:55:22 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201505041455.t44EtMUc055654@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 4 May 2015 14:55:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282418 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Mon, 04 May 2015 14:55:22 -0000

Author: ian
Date: Mon May  4 14:55:21 2015
New Revision: 282418
URL: https://svnweb.freebsd.org/changeset/base/282418

Log:
  On an icache sync by address/len, round the length up if the operation spans
  a cacheline boundary.
  
  PR:		199740
  Submitted by:	Juergen Weiss <weiss@uni-mainz.de>

Modified:
  head/sys/arm/arm/cpufunc_asm_armv7.S

Modified: head/sys/arm/arm/cpufunc_asm_armv7.S
==============================================================================
--- head/sys/arm/arm/cpufunc_asm_armv7.S	Mon May  4 14:47:00 2015	(r282417)
+++ head/sys/arm/arm/cpufunc_asm_armv7.S	Mon May  4 14:55:21 2015	(r282418)
@@ -266,6 +266,9 @@ END(armv7_icache_sync_all)
 ENTRY_NP(armv7_icache_sync_range)
 	ldr	ip, .Larmv7_icache_line_size
 	ldr	ip, [ip]
+	sub	r3, ip, #1		/* Address need not be aligned, but */
+	and	r2, r0, r3		/* round length up if op spans line */
+	add	r1, r1, r2		/* boundary: len += addr & linemask; */
 .Larmv7_sync_next:
 	mcr	CP15_DCCMVAC(r0)
 	mcr	CP15_ICIMVAU(r0)