[src/trunk]: src/sys/arch/news68k/news68k Pull code that maps the kernel segm...

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

details:   https://anonhg.NetBSD.org/src/rev/e02c23fb961f
branches:  trunk
changeset: 760272:e02c23fb961f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jan 02 05:01:57 2011 +0000

description:
Pull code that maps the kernel segment table cache invalidated for 040/060,
to reduce diffs from other m68k ports.
(though news68k doesn't have 040/060 models)

diffstat:

 sys/arch/news68k/news68k/pmap_bootstrap.c |  27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r 8e19420dc006 -r e02c23fb961f sys/arch/news68k/news68k/pmap_bootstrap.c
--- a/sys/arch/news68k/news68k/pmap_bootstrap.c Sun Jan 02 05:01:20 2011 +0000
+++ b/sys/arch/news68k/news68k/pmap_bootstrap.c Sun Jan 02 05:01:57 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_bootstrap.c,v 1.32 2010/06/06 04:50:07 mrg Exp $  */
+/*     $NetBSD: pmap_bootstrap.c,v 1.33 2011/01/02 05:01:57 tsutsui Exp $      */
 
 /* 
  * Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
 #include "opt_m68k_arch.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.32 2010/06/06 04:50:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.33 2011/01/02 05:01:57 tsutsui Exp $");
 
 #include <sys/param.h>
 
@@ -343,11 +343,11 @@
        }
        /*
         * Validate PTEs for kernel data/bss, dynamic data allocated
-        * by us so far (nextpa - firstpa bytes), and pages for lwp0
+        * by us so far (kstpa - firstpa bytes), and pages for lwp0
         * u-area and page table allocated below (RW).
         */
        epte = (pt_entry_t *)kptpa;
-       epte = &epte[m68k_btop(nextpa - firstpa)];
+       epte = &epte[m68k_btop(kstpa - firstpa)];
        protopte = (protopte & ~PG_PROT) | PG_RW;
        /*
         * Enable copy-back caching of data pages
@@ -361,6 +361,25 @@
                protopte += PAGE_SIZE;
        }
        /*
+        * map the kernel segment table cache invalidated for
+        * these machines (for the 68040 not strictly necessary, but
+        * recommended by Motorola; for the 68060 mandatory)
+        */
+       epte = (pt_entry_t *)kptpa;
+       epte = &epte[m68k_btop(nextpa - firstpa)];
+       protopte = (protopte & ~PG_PROT) | PG_RW;
+#ifdef M68040
+       if (RELOC(mmutype, int) == MMU_68040) {
+               protopte &= ~PG_CCB;
+               protopte |= PG_CIN;
+       }
+#endif
+       while (pte < epte) {
+               *pte++ = protopte;
+               protopte += PAGE_SIZE;
+       }
+
+       /*
         * Finally, validate the internal IO space PTEs (RW+CI).
         */