From owner-svn-src-all@FreeBSD.ORG  Wed Nov 21 01:38:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 06651B5A;
 Wed, 21 Nov 2012 01:38:41 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E09B38FC0C;
 Wed, 21 Nov 2012 01:38:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAL1cerD038074;
 Wed, 21 Nov 2012 01:38:40 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAL1ceeu038073;
 Wed, 21 Nov 2012 01:38:40 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201211210138.qAL1ceeu038073@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Wed, 21 Nov 2012 01:38:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243359 - 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.14
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: Wed, 21 Nov 2012 01:38:41 -0000

Author: cognet
Date: Wed Nov 21 01:38:40 2012
New Revision: 243359
URL: http://svnweb.freebsd.org/changeset/base/243359

Log:
  Make sure the address starts on a cache line boundary.

Modified:
  head/sys/arm/arm/pl310.c

Modified: head/sys/arm/arm/pl310.c
==============================================================================
--- head/sys/arm/arm/pl310.c	Wed Nov 21 01:01:19 2012	(r243358)
+++ head/sys/arm/arm/pl310.c	Wed Nov 21 01:38:40 2012	(r243359)
@@ -180,9 +180,13 @@ static void
 pl310_wbinv_range(vm_paddr_t start, vm_size_t size)
 {
 	
+	if (start & g_l2cache_align_mask) {
+		size += start & g_l2cache_align_mask;
+		start &= ~g_l2cache_align_mask;
+	}
 	if (size & g_l2cache_align_mask) {
 		size &= ~g_l2cache_align_mask;
-		size += g_l2cache_line_size;
+	   	size += g_l2cache_line_size;
 	}
 #if 1
 
@@ -217,6 +221,10 @@ static void
 pl310_wb_range(vm_paddr_t start, vm_size_t size)
 {
 	
+	if (start & g_l2cache_align_mask) {
+		size += start & g_l2cache_align_mask;
+		start &= ~g_l2cache_align_mask;
+	}
 	if (size & g_l2cache_align_mask) {
 		size &= ~g_l2cache_align_mask;
 		size += g_l2cache_line_size;
@@ -235,6 +243,10 @@ static void
 pl310_inv_range(vm_paddr_t start, vm_size_t size)
 {
 
+	if (start & g_l2cache_align_mask) {
+		size += start & g_l2cache_align_mask;
+		start &= ~g_l2cache_align_mask;
+	}
 	if (size & g_l2cache_align_mask) {
 		size &= ~g_l2cache_align_mask;
 		size += g_l2cache_line_size;