Module Name: src
Committed By: snj
Date: Sat Jun 10 06:18:52 UTC 2017
Modified Files:
src/sys/arch/mips/mips [netbsd-8]: mips_machdep.c pmap_machdep.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.277.2.1 src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/sys/arch/mips/mips/pmap_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.277 src/sys/arch/mips/mips/mips_machdep.c:1.277.2.1
--- src/sys/arch/mips/mips/mips_machdep.c:1.277 Sun May 7 05:45:07 2017
+++ src/sys/arch/mips/mips/mips_machdep.c Sat Jun 10 06:18:52 2017
@@ -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 @@ mips_page_physload(vaddr_t vkernstart, v
#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
}
Index: src/sys/arch/mips/mips/pmap_machdep.c
diff -u src/sys/arch/mips/mips/pmap_machdep.c:1.19.2.1 src/sys/arch/mips/mips/pmap_machdep.c:1.19.2.2
--- src/sys/arch/mips/mips/pmap_machdep.c:1.19.2.1 Tue Jun 6 09:25:49 2017
+++ src/sys/arch/mips/mips/pmap_machdep.c Sat Jun 10 06:18:52 2017
@@ -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 @@ vaddr_t
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);
-#endif
return MIPS_PHYS_TO_KSEG0(pa);
+#endif
}
