[src/netbsd-8]: src/sys/arch/mips/mips Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/0a1247f7a7d2
branches:  netbsd-8
changeset: 433992:0a1247f7a7d2
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Jun 10 06:18:52 2017 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #22):
        sys/arch/mips/mips/mips_machdep.c: revision 1.278
        sys/arch/mips/mips/pmap_machdep.c: revision 1.21
Always use XKPHYS for pool pages on _LP64; otherwise use KSEG0
--
Maintain the split of physical memory into the defined freelists, but
only force pool pages to VM_FREELIST_FIRST512M for non _LP64

diffstat:

 sys/arch/mips/mips/mips_machdep.c |   7 ++++---
 sys/arch/mips/mips/pmap_machdep.c |  12 +++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diffs (68 lines):

diff -r d68ac4d14749 -r 0a1247f7a7d2 sys/arch/mips/mips/mips_machdep.c
--- a/sys/arch/mips/mips/mips_machdep.c Sat Jun 10 06:17:01 2017 +0000
+++ b/sys/arch/mips/mips/mips_machdep.c Sat Jun 10 06:18:52 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_machdep.c,v 1.277 2017/05/07 05:45:07 skrll Exp $ */
+/*     $NetBSD: mips_machdep.c,v 1.277.2.1 2017/06/10 06:18:52 snj Exp $       */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -111,7 +111,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.277 2017/05/07 05:45:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.277.2.1 2017/06/10 06:18:52 snj Exp $");
 
 #define __INTR_PRIVATE
 #include "opt_cputype.h"
@@ -2104,13 +2104,14 @@
 #ifdef VM_FREELIST_FIRST4G
                if (round_page(segs[i].start + segs[i].size) > FOURGIG) {
                        need4g = true;
-                       mips_poolpage_vmfreelist = VM_FREELIST_FIRST4G;
                }
 #endif
 #ifdef VM_FREELIST_FIRST512M
                if (round_page(segs[i].start + segs[i].size) > HALFGIG) {
                        need512m = true;
+#if !defined(_LP64)
                        mips_poolpage_vmfreelist = VM_FREELIST_FIRST512M;
+#endif
                }
 #endif
        }
diff -r d68ac4d14749 -r 0a1247f7a7d2 sys/arch/mips/mips/pmap_machdep.c
--- a/sys/arch/mips/mips/pmap_machdep.c Sat Jun 10 06:17:01 2017 +0000
+++ b/sys/arch/mips/mips/pmap_machdep.c Sat Jun 10 06:18:52 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_machdep.c,v 1.19.2.1 2017/06/06 09:25:49 martin Exp $     */
+/*     $NetBSD: pmap_machdep.c,v 1.19.2.2 2017/06/10 06:18:52 snj Exp $        */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.19.2.1 2017/06/06 09:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.19.2.2 2017/06/10 06:18:52 snj Exp $");
 
 /*
  *     Manages physical address maps.
@@ -1065,12 +1065,10 @@
 pmap_md_pool_phystov(paddr_t pa)
 {
 #ifdef _LP64
-       if ((pa & ~MIPS_PHYS_MASK) != 0) {
-               KASSERT(mips_options.mips3_xkphys_cached);
-               return MIPS_PHYS_TO_XKPHYS_CACHED(pa);
-       }
+       KASSERT(mips_options.mips3_xkphys_cached);
+       return MIPS_PHYS_TO_XKPHYS_CACHED(pa);
 #else
        KASSERT((pa & ~MIPS_PHYS_MASK) == 0);
+       return MIPS_PHYS_TO_KSEG0(pa);
 #endif
-       return MIPS_PHYS_TO_KSEG0(pa);
 }