From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 31 15:45:11 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A4D9106566B;
	Tue, 31 Jan 2012 15:45:11 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 398518FC17;
	Tue, 31 Jan 2012 15:45: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 q0VFjBpG042760;
	Tue, 31 Jan 2012 15:45:11 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0VFjB0f042758;
	Tue, 31 Jan 2012 15:45:11 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201311545.q0VFjB0f042758@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Tue, 31 Jan 2012 15:45:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230818 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jan 2012 15:45:11 -0000

Author: gber
Date: Tue Jan 31 15:45:10 2012
New Revision: 230818
URL: http://svn.freebsd.org/changeset/base/230818

Log:
  pj4b: Add memory barriers to cache operations
  
  Submitted by: Lukasz Plachno
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S

Modified: projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S
==============================================================================
--- projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S	Tue Jan 31 15:41:31 2012	(r230817)
+++ projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S	Tue Jan 31 15:45:10 2012	(r230818)
@@ -75,6 +75,8 @@ ENTRY(pj4b_dcache_inv_range)
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
+
+	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4413 */
 1:
 	mcr	p15, 0, r0, c7, c6, 1
 	add	r0, r0, ip
@@ -104,6 +106,8 @@ ENTRY(pj4b_idcache_wbinv_range)
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
+
+	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4611 */
 1:
 #ifdef SMP
 	/* Request for ownership */
@@ -126,6 +130,8 @@ ENTRY(pj4b_dcache_wbinv_range)
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
+
+	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4611 */
 1:
 #ifdef SMP
 	/* Request for ownership */
@@ -147,6 +153,8 @@ ENTRY(pj4b_dcache_wb_range)
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
+
+	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4611 */
 1:
 #ifdef SMP
 	/* Request for ownership */