From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  3 12:27:53 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 CC9C1106566B;
	Sat,  3 Mar 2012 12:27:53 +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 BC6AA8FC08;
	Sat,  3 Mar 2012 12:27:53 +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 q23CRrbb081755;
	Sat, 3 Mar 2012 12:27:53 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q23CRrde081753;
	Sat, 3 Mar 2012 12:27:53 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201203031227.q23CRrde081753@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 3 Mar 2012 12:27:53 +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: r232457 - 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 12:27:53 -0000

Author: cognet
Date: Sat Mar  3 12:27:53 2012
New Revision: 232457
URL: http://svn.freebsd.org/changeset/base/232457

Log:
  Try to set the SMP and the TLB broadcasting bits in the aux register
  (largely a nop on the omap4 because both bits are already set, and we
   can't change it anyway because we're not running in secure mode)

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

Modified: projects/armv6/sys/arm/arm/cpufunc.c
==============================================================================
--- projects/armv6/sys/arm/arm/cpufunc.c	Sat Mar  3 12:23:07 2012	(r232456)
+++ projects/armv6/sys/arm/arm/cpufunc.c	Sat Mar  3 12:27:53 2012	(r232457)
@@ -2322,7 +2322,6 @@ cortexa_setup(char *args)
 	cpuctrl = CPU_CONTROL_MMU_ENABLE |
 	    CPU_CONTROL_IC_ENABLE |
 	    CPU_CONTROL_DC_ENABLE |
-	    CPU_CONTROL_V6_EXTPAGE |
 	    CPU_CONTROL_BPRD_ENABLE;
 	
 #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
@@ -2347,6 +2346,9 @@ cortexa_setup(char *args)
 	
 	/* And again. */
 	cpu_idcache_wbinv_all();
+#ifdef SMP
+	armv7_auxctrl((1 << 6) | (1 << 0), (1 << 6) | (1 << 0)); /* Enable SMP + TLB broadcasting  */
+#endif
 }
 #endif  /* CPU_CORTEXA */