 @@ -1,14 +1,14 @@
-/*	$NetBSD: arm32_kvminit.c,v 1.35 2015/06/01 19:16:44 matt Exp $	*/
+/*	$NetBSD: arm32_kvminit.c,v 1.36 2015/11/25 08:32:33 skrll Exp $	*/
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * 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.
 @@ -114,27 +114,27 @@
  * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTERS 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 "opt_multiprocessor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.35 2015/06/01 19:16:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.36 2015/11/25 08:32:33 skrll Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/bus.h>
 #include <dev/cons.h>
 #include <uvm/uvm_extern.h>
 #include <arm/locore.h>
 #include <arm/db_machdep.h>
 @@ -230,27 +230,27 @@ arm32_bootmem_init(paddr_t memstart, psi
 		pv->pv_pa = bmi->bmi_start;
 		pv->pv_va = KERN_PHYSTOV(bmi, pv->pv_pa);
 		pv->pv_size = bmi->bmi_kernelstart - pv->pv_pa;
 		bmi->bmi_freepages += pv->pv_size / PAGE_SIZE;
 #ifdef VERBOSE_INIT_ARM
 		printf("%s: adding %lu free pages: [%#lx..%#lx] (VA %#lx)\n",
 		    __func__, pv->pv_size / PAGE_SIZE, pv->pv_pa,
 		    pv->pv_pa + pv->pv_size - 1, pv->pv_va);
 #endif
 		pv++;
+	}
 	bmi->bmi_nfreeblocks = pv - bmi->bmi_freeblocks;
 	SLIST_INIT(&bmi->bmi_freechunks);
 	SLIST_INIT(&bmi->bmi_chunks);
+}
 static bool
 concat_pvaddr(pv_addr_t *acc_pv, pv_addr_t *pv)
+{
 	if (acc_pv->pv_pa + acc_pv->pv_size == pv->pv_pa
 	    && acc_pv->pv_va + acc_pv->pv_size == pv->pv_va
 	    && acc_pv->pv_prot == pv->pv_prot
 	    && acc_pv->pv_cache == pv->pv_cache) {
 #ifdef VERBOSE_INIT_ARMX
 		printf("%s: appending pv %p (%#lx..%#lx) to %#lx..%#lx\n",
 @@ -586,27 +586,27 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
 		 */
 		valloc_pages(bmi, &systempage, 1, VM_PROT_READ|VM_PROT_WRITE,
 		    PTE_CACHE, true);
+	}
 	systempage.pv_va = vectors;
 	/*
 	 * If the caller needed a few extra pages for some reason, allocate
 	 * them now.
 	 */
 #if ARM_MMU_XSCALE == 1
 #if (ARM_NMMUS > 1)
 	if (xscale_use_minidata)
 #endif
 		valloc_pages(bmi, &minidataclean, 1,
 		    VM_PROT_READ|VM_PROT_WRITE, 0, true);
 #endif
 	/*
 	 * Ok we have allocated physical pages for the primary kernel
 	 * page tables and stacks.  Let's just confirm that.
 	 */
 	if (kernel_l1pt.pv_va == 0
 	    && (!kernel_l1pt.pv_pa || (kernel_l1pt.pv_pa & (L1_TABLE_SIZE - 1)) != 0))
 		panic("%s: Failed to allocate or align the kernel "
 		    "page directory", __func__);
 @@ -835,33 +835,33 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
 #endif
 	pmap_map_chunk(l1pt_va, cur_pv.pv_va, cur_pv.pv_pa,
 	    cur_pv.pv_size, cur_pv.pv_prot, cur_pv.pv_cache);
 	/*
 	 * Now we map the stuff that isn't directly after the kernel
 	 */
 	if (map_vectors_p) {
 		/* Map the vector page. */
 		pmap_map_entry(l1pt_va, systempage.pv_va, systempage.pv_pa,
 		    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
+	}
 	/* Map the Mini-Data cache clean area. */
 #if ARM_MMU_XSCALE == 1
 #if (ARM_NMMUS > 1)
 	if (xscale_use_minidata)
 #endif
 		xscale_setup_minidata(l1pt_va, minidataclean.pv_va,
 		    minidataclean.pv_pa);
 #endif
 	/*
 	 * Map integrated peripherals at same address in first level page
 	 * table so that we can continue to use console.
 	 */
 	if (devmap)
 		pmap_devmap_bootstrap(l1pt_va, devmap);
 #ifdef VERBOSE_INIT_ARM
 	/* Tell the user about where all the bits and pieces live. */
 	printf("%22s       Physical              Virtual        Num\n", " ");
 	printf("%22s Starting    Ending    Starting    Ending   Pages\n", " ");