From owner-svn-src-projects@FreeBSD.ORG  Sat Sep 12 16:13:20 2009
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 55215106566B;
	Sat, 12 Sep 2009 16:13:20 +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 441EC8FC14;
	Sat, 12 Sep 2009 16:13:20 +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 n8CGDKOb090946;
	Sat, 12 Sep 2009 16:13:20 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8CGDKgo090944;
	Sat, 12 Sep 2009 16:13:20 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200909121613.n8CGDKgo090944@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 12 Sep 2009 16:13:20 +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: r197120 - projects/ppc64/sys/powerpc/aim64
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, 12 Sep 2009 16:13:20 -0000

Author: nwhitehorn
Date: Sat Sep 12 16:13:19 2009
New Revision: 197120
URL: http://svn.freebsd.org/changeset/base/197120

Log:
  Decide that the way we compute the VPN in TLBIE works, and is the only way
  it can work when running in 64-bit mode, so delete the other case.

Modified:
  projects/ppc64/sys/powerpc/aim64/mmu_oea64.c

Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c	Sat Sep 12 15:50:08 2009	(r197119)
+++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c	Sat Sep 12 16:13:19 2009	(r197120)
@@ -189,18 +189,13 @@ TLBIE(pmap_t pmap, vm_offset_t va) {
 
 	uint64_t vpn;
 
-#if 1
 	/*
-	 * CPU documentation says that tlbie takes the VPN, not the
-	 * VA. I think the code below does this correctly. We will see.
+	 * Compute the virtual page number we wish to invalidate.
 	 */
 
 	vpn = (uint64_t)(va & ADDR_PIDX);
 	if (pmap != NULL)
 		vpn |= (va_to_vsid(pmap,va) << 28);
-#else
-	vpn = va;
-#endif
 
 #ifdef __powerpc64__
 	__asm __volatile("\