From owner-svn-src-all@FreeBSD.ORG  Sun Jan 15 16:58:45 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F321106566B;
	Sun, 15 Jan 2012 16:58:45 +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 F215B8FC15;
	Sun, 15 Jan 2012 16:58:44 +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 q0FGwirZ091736;
	Sun, 15 Jan 2012 16:58:44 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0FGwirM091734;
	Sun, 15 Jan 2012 16:58:44 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201201151658.q0FGwirM091734@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 15 Jan 2012 16:58:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230140 - head/sys/boot/powerpc/ps3
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 15 Jan 2012 16:58:45 -0000

Author: nwhitehorn
Date: Sun Jan 15 16:58:44 2012
New Revision: 230140
URL: http://svn.freebsd.org/changeset/base/230140

Log:
  Fix some unreliability problems related to MSR bits inherited from kboot by
  setting an absolute MSR when during on the MMU. This prevents delay(), in
  particular, from intermittently malfunctioning.

Modified:
  head/sys/boot/powerpc/ps3/ps3mmu.c

Modified: head/sys/boot/powerpc/ps3/ps3mmu.c
==============================================================================
--- head/sys/boot/powerpc/ps3/ps3mmu.c	Sun Jan 15 16:57:18 2012	(r230139)
+++ head/sys/boot/powerpc/ps3/ps3mmu.c	Sun Jan 15 16:58:44 2012	(r230140)
@@ -113,7 +113,7 @@ ps3mmu_init(int maxmem)
 	    "r"(1 << SLBV_VSID_SHIFT),
 	    "r"((1 << SLBE_ESID_SHIFT) | SLBE_VALID | 1));
 
-	mtmsr(mfmsr() | PSL_IR | PSL_DR | PSL_RI | PSL_ME);
+	mtmsr(PSL_IR | PSL_DR | PSL_RI | PSL_ME);
 
 	return (0);
 }