svn commit: r197120 - projects/ppc64/sys/powerpc/aim64

[Nathan Whitehorn]

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("\