[src/trunk]: src/sys/arch/powerpc/booke Don't assume 1:1 PA:VA mapping

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3da3e43c8728
branches:  trunk
changeset: 780265:3da3e43c8728
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jul 18 18:50:46 2012 +0000

description:
Don't assume 1:1 PA:VA mapping

diffstat:

 sys/arch/powerpc/booke/e500_tlb.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 410be7c80ed2 -r 3da3e43c8728 sys/arch/powerpc/booke/e500_tlb.c
--- a/sys/arch/powerpc/booke/e500_tlb.c Wed Jul 18 18:29:22 2012 +0000
+++ b/sys/arch/powerpc/booke/e500_tlb.c Wed Jul 18 18:50:46 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: e500_tlb.c,v 1.9 2012/07/18 18:29:22 matt Exp $        */
+/*     $NetBSD: e500_tlb.c,v 1.10 2012/07/18 18:50:46 matt Exp $       */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.9 2012/07/18 18:29:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.10 2012/07/18 18:50:46 matt Exp $");
 
 #include <sys/param.h>
 
@@ -722,7 +722,8 @@
            && (prefetchable
                || (xtlb->e_tlb.tlb_pte & PTE_WIG) == (PTE_I|PTE_G))) {
                xtlb->e_refcnt++;
-               return (void *) pa;
+               return (void *) (xtlb->e_tlb.tlb_va
+                   + pa - (xtlb->e_tlb.tlb_pte & PTE_RPN_MASK));
        }
        return NULL;
 }