 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.122 2017/02/02 08:57:04 maxv Exp $	*/
+/*	$NetBSD: cpu.c,v 1.123 2017/02/11 14:11:24 maxv Exp $	*/
 /*-
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld of RedBack Networks Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,27 +52,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.122 2017/02/02 08:57:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.123 2017/02/11 14:11:24 maxv Exp $");
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_multiprocessor.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 @@ -276,26 +276,29 @@ cpu_vm_init(struct cpu_info *ci)
+			}
 			ncolors = picked;
+		}
+	}
 	/*
 	 * Knowing the size of the largest cache on this CPU, potentially
 	 * re-color our pages.
 	 */
 	aprint_debug_dev(ci->ci_dev, "%d page colors\n", ncolors);
 	uvm_page_recolor(ncolors);
 	pmap_tlb_cpu_init(ci);
 #ifndef __HAVE_DIRECT_MAP
 	pmap_vpage_cpu_init(ci);
 #endif
+}
 static void
 cpu_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_softc *sc = device_private(self);
 	struct cpu_attach_args *caa = aux;
 	struct cpu_info *ci;
 	uintptr_t ptr;
 #if NLAPIC > 0
 	int cpunum = caa->cpu_number;
 #endif
 	static bool again;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.239 2017/02/02 17:37:49 maxv Exp $	*/
+/*	$NetBSD: pmap.c,v 1.240 2017/02/11 14:11:24 maxv Exp $	*/
 /*-
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -161,27 +161,27 @@
  *     Hibler/Jolitz pmap, as modified for FreeBSD by John S. Dyson
  *     and David Greenman.
+ *
  * [3] the Mach pmap.   this pmap, from CMU, seems to have migrated
  *     between several processors.   the VAX version was done by
  *     Avadis Tevanian, Jr., and Michael Wayne Young.    the i386
  *     version was done by Lance Berc, Mike Kupfer, Bob Baron,
  *     David Golub, and Richard Draves.    the alpha version was
  *     done by Alessandro Forin (CMU/Mach) and Chris Demetriou
  *     (NetBSD/alpha).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.239 2017/02/02 17:37:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.240 2017/02/11 14:11:24 maxv Exp $");
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 @@ -486,49 +486,35 @@ paddr_t local_apic_pa __read_mostly;
 /*
  * pool that pmap structures are allocated from
  */
 static struct pool_cache pmap_cache;
 /*
  * pv_entry cache
  */
 static struct pool_cache pmap_pv_cache;
 #ifndef __HAVE_DIRECT_MAP
 /*
  * MULTIPROCESSOR: special VAs and PTEs are actually allocated inside a
  * (maxcpus * NPTECL) array of PTE, to avoid cache line thrashing due to
  * false sharing.
  */
 #ifdef MULTIPROCESSOR
 #define PTESLEW(pte, id) ((pte)+(id)*NPTECL)
 #define VASLEW(va,id) ((va)+(id)*NPTECL*PAGE_SIZE)
 #else
 #define PTESLEW(pte, id) ((void)id, pte)
 #define VASLEW(va,id) ((void)id, va)
 #endif
 /*
  * Special VAs and the PTEs that map them
  */
-static pt_entry_t *csrc_pte, *cdst_pte, *zero_pte, *ptp_pte, *early_zero_pte;
+static pt_entry_t *early_zero_pte;
-static char *csrcp, *cdstp, *zerop, *ptpp;
+static void pmap_vpage_cpualloc(struct cpu_info *);
 #ifdef XEN
 char *early_zerop; /* also referenced from xen_locore() */
 #else
 static char *early_zerop;
 #endif
 #endif
 int pmap_enter_default(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int);
 /* PDP pool_cache(9) and its callbacks */
 struct pool_cache pmap_pdp_cache;
 static int  pmap_pdp_ctor(void *, void *, int);
 static void pmap_pdp_dtor(void *, void *);
 #ifdef PAE
 /* need to allocate items of 4 pages */
 static void *pmap_pdp_alloc(struct pool *, int);
 static void pmap_pdp_free(struct pool *, void *);
 static struct pool_allocator pmap_pdp_allocator = {
 @@ -1318,80 +1304,49 @@ pmap_bootstrap(vaddr_t kva_start)
 		/*
 		 * The TLB must be flushed after enabling large pages on Pentium
 		 * CPUs, according to section 3.6.2.2 of "Intel Architecture
 		 * Software Developer's Manual, Volume 3: System Programming".
 		 */
 		tlbflushg();
 		/* Remap the kernel. */
 		pmap_remap_largepages();
+	}
 	pmap_init_lapic();
 #endif /* !XEN */
 #ifdef __HAVE_DIRECT_MAP
 	pmap_init_directmap(kpm);
 #else
-	if (VM_MIN_KERNEL_ADDRESS != KERNBASE) {
+	pmap_vpage_cpualloc(&cpu_info_primary);
 	if (VM_MIN_KERNEL_ADDRESS == KERNBASE) { /* i386 */
 		early_zerop = (void *)cpu_info_primary.vpage[VPAGE_ZER];
 		early_zero_pte = cpu_info_primary.vpage_pte[VPAGE_ZER];
 	} else { /* amd64 */
 		/*
 		 * zero_pte is stuck at the end of mapped space for the kernel
 		 * image (disjunct from kva space). This is done so that it
 		 * can safely be used in pmap_growkernel (pmap_get_physpage),
 		 * when it's called for the first time.
 		 * XXXfvdl fix this for MULTIPROCESSOR later.
 		 */
 #ifdef XEN
 		/* early_zerop initialized in xen_locore() */
 #else
 		early_zerop = (void *)(KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2);
 #endif
 		early_zero_pte = PTE_BASE + pl1_i((vaddr_t)early_zerop);
+	}
 	/*
 	 * Now we allocate the "special" VAs which are used for tmp mappings
 	 * by pmap. We allocate the VAs, and find the PTE that maps them via
 	 * the linear PTE mapping.
 	 */
 	vaddr_t cpuva_base;
 	pt_entry_t *pte;
 #ifdef MULTIPROCESSOR
 	/*
 	 * Waste some VA space to avoid false sharing of cache lines for page
 	 * table pages: give each possible CPU a cache line of 8 PTEs to play
 	 * with, though we only need 4.
 	 */
 	cpuva_base = pmap_bootstrap_valloc(maxcpus * NPTECL);
 #else
 	cpuva_base = pmap_bootstrap_valloc(4);
 #endif
 	pte = PTE_BASE + pl1_i(cpuva_base);
 	/* Values used to index the array */
 	csrcp = (char *)cpuva_base;
 	csrc_pte = pte;
 	cdstp = (char *)cpuva_base + PAGE_SIZE;
 	cdst_pte = pte + 1;
 	zerop = (char *)cpuva_base + PAGE_SIZE * 2;
 	zero_pte = pte + 2;
 	ptpp = (char *)cpuva_base + PAGE_SIZE * 3;
 	ptp_pte = pte + 3;
 	if (VM_MIN_KERNEL_ADDRESS == KERNBASE) {
 		early_zerop = zerop;
 		early_zero_pte = zero_pte;
 #endif
 #if defined(XEN) && defined(__x86_64__)
 	extern vaddr_t xen_dummy_page;
 	paddr_t xen_dummy_user_pgd;
 	/*
 	 * We want a dummy page directory for Xen: when deactivating a pmap,
 	 * Xen will still consider it active. So we set user PGD to this one
 	 * to lift all protection on the now inactive page tables set.
 	 */
 	xen_dummy_user_pgd = xen_dummy_page - KERNBASE;
 @@ -1705,26 +1660,77 @@ pmap_cpu_init_late(struct cpu_info *ci)
 	/*
 	 * The BP has already its own PD page allocated during early
 	 * MD startup.
 	 */
 	if (ci == &cpu_info_primary)
 		return;
 #ifdef PAE
 	cpu_alloc_l3_page(ci);
 #endif
+}
 #endif
 #ifndef __HAVE_DIRECT_MAP
 CTASSERT(CACHE_LINE_SIZE > sizeof(pt_entry_t));
 CTASSERT(CACHE_LINE_SIZE % sizeof(pt_entry_t) == 0);
 static void
 pmap_vpage_cpualloc(struct cpu_info *ci)
+{
 	bool primary = (ci == &cpu_info_primary);
 	size_t i, npages;
 	vaddr_t vabase;
 	vsize_t vrange;
 	npages = (CACHE_LINE_SIZE / sizeof(pt_entry_t));
 	KASSERT(npages >= VPAGE_MAX);
 	vrange = npages * PAGE_SIZE;
 	if (primary) {
 		while ((vabase = pmap_bootstrap_valloc(1)) % vrange != 0) {
 			/* Waste some pages to align properly */
+		}
 		/* The base is aligned, allocate the rest (contiguous) */
 		pmap_bootstrap_valloc(npages - 1);
 	} else {
 		vabase = uvm_km_alloc(kernel_map, vrange, vrange,
 		    UVM_KMF_VAONLY);
 		if (vabase == 0) {
 			panic("%s: failed to allocate tmp VA for CPU %d\n",
 			    __func__, cpu_index(ci));
+		}
+	}
 	KASSERT((vaddr_t)&PTE_BASE[pl1_i(vabase)] % CACHE_LINE_SIZE == 0);
 	for (i = 0; i < VPAGE_MAX; i++) {
 		ci->vpage[i] = vabase + i * PAGE_SIZE;
 		ci->vpage_pte[i] = PTE_BASE + pl1_i(ci->vpage[i]);
+	}
+}
 void
 pmap_vpage_cpu_init(struct cpu_info *ci)
+{
 	if (ci == &cpu_info_primary) {
 		/* cpu0 already taken care of in pmap_bootstrap */
 		return;
+	}
 	pmap_vpage_cpualloc(ci);
+}
 #endif
 /*
  * p v _ e n t r y   f u n c t i o n s
  */
 /*
  * pmap_free_pvs: free a list of pv_entrys
  */
 static void
 pmap_free_pvs(struct pv_entry *pve)
+{
 	struct pv_entry *next;
 @@ -3029,91 +3035,92 @@ pmap_virtual_space(vaddr_t *startp, vadd
  * pmap_zero_page: zero a page
  */
 void
 pmap_zero_page(paddr_t pa)
+{
 #if defined(__HAVE_DIRECT_MAP)
 	pagezero(PMAP_DIRECT_MAP(pa));
 #else
 #if defined(XEN)
 	if (XEN_VERSION_SUPPORTED(3, 4))
 		xen_pagezero(pa);
 #endif
 	struct cpu_info *ci;
 	pt_entry_t *zpte;
-	void *zerova;
+	vaddr_t zerova;
 	int id;
 	const pd_entry_t pteflags = PG_V | PG_RW | pmap_pg_nx | PG_M | PG_U |
 	    PG_k;
 	kpreempt_disable();
 	id = cpu_number();
-	zpte = PTESLEW(zero_pte, id);
+	ci = curcpu();
-	zerova = VASLEW(zerop, id);
+	zerova = ci->vpage[VPAGE_ZER];
 	zpte = ci->vpage_pte[VPAGE_ZER];
 #ifdef DIAGNOSTIC
 	if (*zpte)
 		panic("pmap_zero_page: lock botch");
 #endif
 	pmap_pte_set(zpte, pmap_pa2pte(pa) | pteflags);
 	pmap_pte_flush();
-	pmap_update_pg((vaddr_t)zerova);		/* flush TLB */
+	pmap_update_pg(zerova);		/* flush TLB */
-	memset(zerova, 0, PAGE_SIZE);
+	memset((void *)zerova, 0, PAGE_SIZE);
 #if defined(DIAGNOSTIC) || defined(XEN)
 	pmap_pte_set(zpte, 0);				/* zap ! */
 	pmap_pte_flush();
 #endif
 	kpreempt_enable();
 #endif /* defined(__HAVE_DIRECT_MAP) */
+}
 /*
  * pmap_pagezeroidle: the same, for the idle loop page zero'er.
  * Returns true if the page was zero'd, false if we aborted for
  * some reason.
  */
 bool
 pmap_pageidlezero(paddr_t pa)
+{
 #ifdef __HAVE_DIRECT_MAP
 	KASSERT(cpu_feature[0] & CPUID_SSE2);
 	return sse2_idlezero_page((void *)PMAP_DIRECT_MAP(pa));
 #else
 	struct cpu_info *ci;
 	pt_entry_t *zpte;
-	void *zerova;
+	vaddr_t zerova;
 	bool rv;
 	int id;
 	const pd_entry_t pteflags = PG_V | PG_RW | pmap_pg_nx | PG_M | PG_U |
 	    PG_k;
-	id = cpu_number();
+	ci = curcpu();
-	zpte = PTESLEW(zero_pte, id);
+	zerova = ci->vpage[VPAGE_ZER];
-	zerova = VASLEW(zerop, id);
+	zpte = ci->vpage_pte[VPAGE_ZER];
 	KASSERT(cpu_feature[0] & CPUID_SSE2);
 	KASSERT(*zpte == 0);
 	pmap_pte_set(zpte, pmap_pa2pte(pa) | pteflags);
 	pmap_pte_flush();
-	pmap_update_pg((vaddr_t)zerova);		/* flush TLB */
+	pmap_update_pg(zerova);		/* flush TLB */
-	rv = sse2_idlezero_page(zerova);
+	rv = sse2_idlezero_page((void *)zerova);
 #if defined(DIAGNOSTIC) || defined(XEN)
 	pmap_pte_set(zpte, 0);				/* zap ! */
 	pmap_pte_flush();
 #endif
 	return rv;
 #endif
+}
 /*
  * pmap_copy_page: copy a page
  */
 @@ -3123,101 +3130,104 @@ pmap_copy_page(paddr_t srcpa, paddr_t ds
+{
 #if defined(__HAVE_DIRECT_MAP)
 	vaddr_t srcva = PMAP_DIRECT_MAP(srcpa);
 	vaddr_t dstva = PMAP_DIRECT_MAP(dstpa);
 	memcpy((void *)dstva, (void *)srcva, PAGE_SIZE);
 #else
 #if defined(XEN)
 	if (XEN_VERSION_SUPPORTED(3, 4)) {
 		xen_copy_page(srcpa, dstpa);
 		return;
+	}
 #endif
-	pt_entry_t *spte;
+	struct cpu_info *ci;
-	pt_entry_t *dpte;
+	pt_entry_t *srcpte, *dstpte;
-	void *csrcva;
+	vaddr_t srcva, dstva;
 	void *cdstva;
 	int id;
 	const pd_entry_t pteflags = PG_V | PG_RW | pmap_pg_nx | PG_U | PG_k;
 	kpreempt_disable();
 	id = cpu_number();
 	spte = PTESLEW(csrc_pte, id);
 	dpte = PTESLEW(cdst_pte, id);
 	csrcva = VASLEW(csrcp, id);
 	cdstva = VASLEW(cdstp, id);
-	KASSERT(*spte == 0 && *dpte == 0);
+	ci = curcpu();
 	srcva = ci->vpage[VPAGE_SRC];
 	dstva = ci->vpage[VPAGE_DST];
 	srcpte = ci->vpage_pte[VPAGE_SRC];
 	dstpte = ci->vpage_pte[VPAGE_DST];
 	KASSERT(*srcpte == 0 && *dstpte == 0);
-	pmap_pte_set(spte, pmap_pa2pte(srcpa) | pteflags);
+	pmap_pte_set(srcpte, pmap_pa2pte(srcpa) | pteflags);
-	pmap_pte_set(dpte, pmap_pa2pte(dstpa) | pteflags | PG_M);
+	pmap_pte_set(dstpte, pmap_pa2pte(dstpa) | pteflags | PG_M);
 	pmap_pte_flush();
-	pmap_update_2pg((vaddr_t)csrcva, (vaddr_t)cdstva);
+	pmap_update_2pg(srcva, dstva);
-	memcpy(cdstva, csrcva, PAGE_SIZE);
+	memcpy((void *)dstva, (void *)srcva, PAGE_SIZE);
 #if defined(DIAGNOSTIC) || defined(XEN)
-	pmap_pte_set(spte, 0);
+	pmap_pte_set(srcpte, 0);
-	pmap_pte_set(dpte, 0);
+	pmap_pte_set(dstpte, 0);
 	pmap_pte_flush();
 #endif
 	kpreempt_enable();
 #endif /* defined(__HAVE_DIRECT_MAP) */
+}
 static pt_entry_t *
 pmap_map_ptp(struct vm_page *ptp)
+{
 #ifdef __HAVE_DIRECT_MAP
 	return (void *)PMAP_DIRECT_MAP(VM_PAGE_TO_PHYS(ptp));
 #else
 	struct cpu_info *ci;
 	pt_entry_t *ptppte;
-	void *ptpva;
+	vaddr_t ptpva;
 	int id;
 	KASSERT(kpreempt_disabled());
 #ifndef XEN
 	const pd_entry_t pteflags = PG_V | PG_RW | pmap_pg_nx | PG_U | PG_M |
 	    PG_k;
 #else
 	const pd_entry_t pteflags = PG_V | pmap_pg_nx | PG_U | PG_M | PG_k;
 #endif
-	id = cpu_number();
+	ci = curcpu();
-	ptppte = PTESLEW(ptp_pte, id);
+	ptpva = ci->vpage[VPAGE_PTP];
-	ptpva = VASLEW(ptpp, id);
+	ptppte = ci->vpage_pte[VPAGE_PTP];
 	pmap_pte_set(ptppte, pmap_pa2pte(VM_PAGE_TO_PHYS(ptp)) | pteflags);
 	pmap_pte_flush();
-	pmap_update_pg((vaddr_t)ptpva);
+	pmap_update_pg(ptpva);
 	return (pt_entry_t *)ptpva;
 #endif
+}
 static void
 pmap_unmap_ptp(void)
+{
 #ifndef __HAVE_DIRECT_MAP
 #if defined(DIAGNOSTIC) || defined(XEN)
 	struct cpu_info *ci;
 	pt_entry_t *pte;
 	KASSERT(kpreempt_disabled());
-	pte = PTESLEW(ptp_pte, cpu_number());
+	ci = curcpu();
 	pte = ci->vpage_pte[VPAGE_PTP];
 	if (*pte != 0) {
 		pmap_pte_set(pte, 0);
 		pmap_pte_flush();
+	}
 #endif
 #endif
+}
 static pt_entry_t *
 pmap_map_pte(struct pmap *pmap, struct vm_page *ptp, vaddr_t va)
+{
 	KASSERT(kpreempt_disabled());

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.108 2017/02/05 10:42:21 maxv Exp $	*/
+/*	$NetBSD: cpu.c,v 1.109 2017/02/11 14:11:24 maxv Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -55,27 +55,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.108 2017/02/05 10:42:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.109 2017/02/11 14:11:24 maxv Exp $");
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_xen.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -349,26 +349,29 @@ cpu_vm_init(struct cpu_info *ci)
 		default:
 			tcolors /= cai->cai_associativity;
+		}
 		ncolors = max(ncolors, tcolors);
+	}
 	/*
 	 * Knowing the size of the largest cache on this CPU, potentially
 	 * re-color our pages.
 	 */
 	aprint_debug_dev(ci->ci_dev, "%d page colors\n", ncolors);
 	uvm_page_recolor(ncolors);
 	pmap_tlb_cpu_init(ci);
 #ifndef __HAVE_DIRECT_MAP
 	pmap_vpage_cpu_init(ci);
 #endif
+}
 static void
 cpu_attach_common(device_t parent, device_t self, void *aux)
+{
 	struct cpu_softc *sc = device_private(self);
 	struct cpu_attach_args *caa = aux;
 	struct cpu_info *ci;
 	uintptr_t ptr;
 	int cpunum = caa->cpu_number;
 	static bool again = false;
 	sc->sc_dev = self;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.67 2015/12/13 15:02:19 maxv Exp $	*/
+/*	$NetBSD: cpu.h,v 1.68 2017/02/11 14:11:24 maxv Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -123,26 +123,36 @@ struct cpu_info {
 	int ci_nintrhand;	/* number of H/W interrupt handlers */
 	uint64_t ci_scratch;
 	uintptr_t ci_pmap_data[128 / sizeof(uintptr_t)];
 #ifdef XEN
 	struct iplsource  *ci_isources[NIPL];
 	u_long ci_evtmask[NR_EVENT_CHANNELS]; /* events allowed on this CPU */
 #else
 	struct intrsource *ci_isources[MAX_INTR_SOURCES];
 #endif
 	volatile int	ci_mtx_count;	/* Negative count of spin mutexes */
 	volatile int	ci_mtx_oldspl;	/* Old SPL at this ci_idepth */
 #ifndef __HAVE_DIRECT_MAP
 #define VPAGE_SRC 0
 #define VPAGE_DST 1
 #define VPAGE_ZER 2
 #define VPAGE_PTP 3
 #define VPAGE_MAX 4
 	vaddr_t		vpage[VPAGE_MAX];
 	pt_entry_t	*vpage_pte[VPAGE_MAX];
 #endif
 	/* The following must be aligned for cmpxchg8b. */
 	struct {
 		uint32_t	ipending;
 		int		ilevel;
 	} ci_istate __aligned(8);
 #define ci_ipending	ci_istate.ipending
 #define	ci_ilevel	ci_istate.ilevel
 	int		ci_idepth;
 	void *		ci_intrstack;
 	uint32_t	ci_imask[NIPL];
 	uint32_t	ci_iunmask[NIPL];

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.61 2016/11/08 03:05:36 christos Exp $	*/
+/*	$NetBSD: pmap.h,v 1.62 2017/02/11 14:11:24 maxv Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -268,26 +268,30 @@ void		pmap_pv_init(void);
 void		pmap_pv_track(paddr_t, psize_t);
 void		pmap_pv_untrack(paddr_t, psize_t);
 void		pmap_map_ptes(struct pmap *, struct pmap **, pd_entry_t **,
 		    pd_entry_t * const **);
 void		pmap_unmap_ptes(struct pmap *, struct pmap *);
 int		pmap_pdes_invalid(vaddr_t, pd_entry_t * const *, pd_entry_t *);
 u_int		x86_mmap_flags(paddr_t);
 bool		pmap_is_curpmap(struct pmap *);
 #ifndef __HAVE_DIRECT_MAP
 void		pmap_vpage_cpu_init(struct cpu_info *);
 #endif
 vaddr_t reserve_dumppages(vaddr_t); /* XXX: not a pmap fn */
 typedef enum tlbwhy {
 	TLBSHOOT_APTE,
 	TLBSHOOT_KENTER,
 	TLBSHOOT_KREMOVE,
 	TLBSHOOT_FREE_PTP1,
 	TLBSHOOT_FREE_PTP2,
 	TLBSHOOT_REMOVE_PTE,
 	TLBSHOOT_REMOVE_PTES,
 	TLBSHOOT_SYNC_PV1,
 	TLBSHOOT_SYNC_PV2,
 	TLBSHOOT_WRITE_PROTECT,