From owner-svn-src-head@FreeBSD.ORG  Sat Dec 11 20:29:53 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32019106566B;
	Sat, 11 Dec 2010 20:29:53 +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 205238FC16;
	Sat, 11 Dec 2010 20:29:53 +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 oBBKTr9n017097;
	Sat, 11 Dec 2010 20:29:53 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBBKTrxu017094;
	Sat, 11 Dec 2010 20:29:53 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201012112029.oBBKTrxu017094@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 11 Dec 2010 20:29:52 +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: r216383 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Dec 2010 20:29:53 -0000

Author: nwhitehorn
Date: Sat Dec 11 20:29:52 2010
New Revision: 216383
URL: http://svn.freebsd.org/changeset/base/216383

Log:
  Add some isync()s related to the 64-bit MMU scratch page to avoid race
  conditions on its invalidation.

Modified:
  head/sys/powerpc/aim/mmu_oea64.c
  head/sys/powerpc/aim/moea64_native.c

Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c	Sat Dec 11 20:12:42 2010	(r216382)
+++ head/sys/powerpc/aim/mmu_oea64.c	Sat Dec 11 20:29:52 2010	(r216383)
@@ -1114,6 +1114,7 @@ void moea64_set_scratchpage_pa(mmu_t mmu
 	MOEA64_PTE_CHANGE(mmup, moea64_scratchpage_pte[which],
 	    &moea64_scratchpage_pvo[which]->pvo_pte.lpte,
 	    moea64_scratchpage_pvo[which]->pvo_vpn);
+	isync();
 }
 
 void

Modified: head/sys/powerpc/aim/moea64_native.c
==============================================================================
--- head/sys/powerpc/aim/moea64_native.c	Sat Dec 11 20:12:42 2010	(r216382)
+++ head/sys/powerpc/aim/moea64_native.c	Sat Dec 11 20:29:52 2010	(r216383)
@@ -292,6 +292,9 @@ moea64_pte_unset_native(mmu_t mmu, uintp
 
 	pvo_pt->pte_hi &= ~LPTE_VALID;
 
+	/* Finish all pending operations */
+	isync();
+
 	/*
 	 * Force the reg & chg bits back into the PTEs.
 	 */