[src/netbsd-1-6]: src/sys/arch/arm/arm32 Pull up revision 1.100 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/311c9216cbfb
branches:  netbsd-1-6
changeset: 528656:311c9216cbfb
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Jul 31 00:23:17 2002 +0000

description:
Pull up revision 1.100 (requested by thorpej in ticket #587):
Don't use pmap_kenter_pa() in pmap_map(); doing so causes an assertion
failure in pmap_kenter_pa().

diffstat:

 sys/arch/arm/arm32/pmap.c |  17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r 7cc751bdddf4 -r 311c9216cbfb sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Wed Jul 31 00:12:02 2002 +0000
+++ b/sys/arch/arm/arm32/pmap.c Wed Jul 31 00:23:17 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.97 2002/05/14 19:22:34 chris Exp $  */
+/*     $NetBSD: pmap.c,v 1.97.4.1 2002/07/31 00:23:17 lukem Exp $      */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -143,7 +143,7 @@
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.97 2002/05/14 19:22:34 chris Exp $");        
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.97.4.1 2002/07/31 00:23:17 lukem Exp $");        
 #ifdef PMAP_DEBUG
 #define        PDEBUG(_lev_,_stat_) \
        if (pmap_debug_level >= (_lev_)) \
@@ -938,12 +938,21 @@
  *
  *     For now, VM is already on, we only need to map the
  *     specified memory.
+ *
+ *     XXX This routine should eventually go away; it's only used
+ *     XXX by machine-dependent crash dump code.
  */
 vaddr_t
 pmap_map(vaddr_t va, paddr_t spa, paddr_t epa, vm_prot_t prot)
 {
+       pt_entry_t *pte;
+
        while (spa < epa) {
-               pmap_kenter_pa(va, spa, prot);
+               pte = vtopte(va);
+
+               *pte = L2_S_PROTO | spa |
+                   L2_S_PROT(PTE_KERNEL, prot) | pte_l2_s_cache_mode;
+               cpu_tlb_flushID_SE(va);
                va += NBPG;
                spa += NBPG;
        }
@@ -988,7 +997,7 @@
        TAILQ_INIT(&(pmap_kernel()->pm_obj.memq));
        pmap_kernel()->pm_obj.uo_npages = 0;
        pmap_kernel()->pm_obj.uo_refs = 1;
-       
+
        /*
         * Initialize PAGE_SIZE-dependent variables.
         */