From owner-svn-src-projects@FreeBSD.ORG  Tue Mar 16 15:52:38 2010
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 C35EE106566B;
	Tue, 16 Mar 2010 15:52:38 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B34FE8FC12;
	Tue, 16 Mar 2010 15:52:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2GFqcO3026515;
	Tue, 16 Mar 2010 15:52:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2GFqcIu026513;
	Tue, 16 Mar 2010 15:52:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201003161552.o2GFqcIu026513@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 16 Mar 2010 15:52:38 +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: r205212 - projects/ppc64/sys/powerpc/aim
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, 16 Mar 2010 15:52:38 -0000

Author: nwhitehorn
Date: Tue Mar 16 15:52:38 2010
New Revision: 205212
URL: http://svn.freebsd.org/changeset/base/205212

Log:
  Explicitly set the CPU to 64-bit mode on reset. This makes SMP come
  up a little further on Apple hardware.
  
  Submitted by:	Andreas Tobler

Modified:
  projects/ppc64/sys/powerpc/aim/trap_subr64.S

Modified: projects/ppc64/sys/powerpc/aim/trap_subr64.S
==============================================================================
--- projects/ppc64/sys/powerpc/aim/trap_subr64.S	Tue Mar 16 15:50:31 2010	(r205211)
+++ projects/ppc64/sys/powerpc/aim/trap_subr64.S	Tue Mar 16 15:52:38 2010	(r205212)
@@ -263,6 +263,13 @@ nslb:
  */
 	.globl	CNAME(rstcode), CNAME(rstsize)
 CNAME(rstcode):
+	/* Explicitly set MSR[SF] */
+	mfmsr	%r9
+	li	%r8,1
+	insrdi	%r9,%r8,1,0
+	mtsmrd	%r9
+	isync
+
 	ba	cpu_reset
 CNAME(rstsize) = . - CNAME(rstcode)