From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  3 01:17:14 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7627D106564A;
	Sat,  3 Mar 2012 01:17:14 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C2DD8FC13;
	Sat,  3 Mar 2012 01:17:14 +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 q231HEKi056103;
	Sat, 3 Mar 2012 01:17:14 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q231HEVq056101;
	Sat, 3 Mar 2012 01:17:14 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201203030117.q231HEVq056101@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 3 Mar 2012 01:17:14 +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: r232421 - 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: Sat, 03 Mar 2012 01:17:14 -0000

Author: cognet
Date: Sat Mar  3 01:17:13 2012
New Revision: 232421
URL: http://svn.freebsd.org/changeset/base/232421

Log:
  Implement workarounds for arm errata.
  Wait and sync the cache where we should.

Modified:
  projects/armv6/sys/arm/arm/pl310.c

Modified: projects/armv6/sys/arm/arm/pl310.c
==============================================================================
--- projects/armv6/sys/arm/arm/pl310.c	Sat Mar  3 01:06:54 2012	(r232420)
+++ projects/armv6/sys/arm/arm/pl310.c	Sat Mar  3 01:17:13 2012	(r232421)
@@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/rman.h>
 #include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <machine/intr.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -162,8 +164,16 @@ pl310_cache_sync(void)
 static void
 pl310_wbinv_all(void)
 {
+#if 1
+	pl310_write4(PL310_DEBUG_CTRL, 3);
+#endif
 	pl310_write4(PL310_CLEAN_INV_WAY, g_l2cache_way_mask);
 	pl310_wait_background_op(PL310_CLEAN_INV_WAY, g_l2cache_way_mask);
+	pl310_cache_sync();
+#if 1
+	pl310_write4(PL310_DEBUG_CTRL, 0);
+#endif
+		
 }
 
 static void
@@ -174,11 +184,33 @@ pl310_wbinv_range(vm_paddr_t start, vm_s
 		size &= ~g_l2cache_align_mask;
 		size += g_l2cache_line_size;
 	}
+#if 1
+
+	pl310_write4(PL310_DEBUG_CTRL, 3);
+#endif
 	while (size > 0) {
+#if 1
+		/* 
+		 * Errata 588369 says that clean + inv may keep the 
+		 * cache line if it was clean, the recommanded workaround
+		 * is to clean then invalidate the cache line, with
+		 * write-back and cache linefill disabled
+		 */
+		   
+		pl310_write4(PL310_CLEAN_LINE_PA, start);
+		pl310_write4(PL310_INV_LINE_PA, start);
+#else
 		pl310_write4(PL310_CLEAN_INV_LINE_PA, start);
+#endif
 		start += g_l2cache_line_size;
 		size -= g_l2cache_line_size;
 	}
+#if 1
+	pl310_write4(PL310_DEBUG_CTRL, 0);
+#endif
+	pl310_wait_background_op(PL310_CLEAN_INV_LINE_PA, 1);
+	pl310_cache_sync();
+		
 }
 
 static void
@@ -194,6 +226,8 @@ pl310_wb_range(vm_paddr_t start, vm_size
 		start += g_l2cache_line_size;
 		size -= g_l2cache_line_size;
 	}
+	pl310_cache_sync();
+	pl310_wait_background_op(PL310_CLEAN_LINE_PA, 1);
 
 }
 
@@ -210,6 +244,8 @@ pl310_inv_range(vm_paddr_t start, vm_siz
 		start += g_l2cache_line_size;
 		size -= g_l2cache_line_size;
 	}
+	pl310_cache_sync();
+	pl310_wait_background_op(PL310_INV_LINE_PA, 1);
 
 }