 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.60.2.3 2010/04/30 14:39:42 uebayasi Exp $	*/
+/*	$NetBSD: pmap.c,v 1.60.2.4 2010/08/11 13:46:28 uebayasi Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -57,27 +57,29 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY 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 TOOLS GMBH 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: pmap.c,v 1.60.2.3 2010/04/30 14:39:42 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.60.2.4 2010/08/11 13:46:28 uebayasi Exp $");
 #include "opt_xip.h"
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/pool.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 @@ -182,41 +184,51 @@ static inline volatile u_int *pte_find(s
 static inline int pte_enter(struct pmap *, vaddr_t, u_int);
 static inline int pmap_enter_pv(struct pmap *, vaddr_t, paddr_t, int);
 static void pmap_remove_pv(struct pmap *, vaddr_t, paddr_t);
 static int ppc4xx_tlb_size_mask(size_t, int *, int *);
 inline struct pv_entry *
 pa_to_pv(paddr_t pa)
+{
 	int bank, pg;
 #ifdef XIP
 	bank = vm_physseg_find_device(atop(pa), &pg);
 	if (bank != -1)
 		return &VM_PHYSDEV_PTR(bank)->pmseg.pvent[pg];
 #endif
 	bank = vm_physseg_find(atop(pa), &pg);
-	if (bank == -1)
+	if (bank != -1)
-		return NULL;
+		return &VM_PHYSMEM_PTR(bank)->pmseg.pvent[pg];
-	return &VM_PHYSMEM_PTR(bank)->pmseg.pvent[pg];
+	return NULL;
+}
 static inline char *
 pa_to_attr(paddr_t pa)
+{
 	int bank, pg;
 #ifdef XIP
 	bank = vm_physseg_find_device(atop(pa), &pg);
 	if (bank != -1)
 		return &VM_PHYSDEV_PTR(bank)->pmseg.attrs[pg];
 #endif
 	bank = vm_physseg_find(atop(pa), &pg);
-	if (bank == -1)
+	if (bank != -1)
-		return NULL;
+		return &VM_PHYSMEM_PTR(bank)->pmseg.attrs[pg];
-	return &VM_PHYSMEM_PTR(bank)->pmseg.attrs[pg];
+	return NULL;
+}
 /*
  * Insert PTE into page table.
  */
 int
 pte_enter(struct pmap *pm, vaddr_t va, u_int pte)
+{
 	int seg = STIDX(va);
 	int ptn = PTIDX(va);
 	u_int oldpte;
 	if (!pm->pm_ptbl[seg]) {
 @@ -477,26 +489,56 @@ pmap_init(void)
 		VM_PHYSMEM_PTR(bank)->pmseg.attrs = attr;
 		pv += sz;
 		attr += sz;
+	}
 	pmap_initialized = 1;
 	splx(s);
 	/* Setup a pool for additional pvlist structures */
 	pool_init(&pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pv_entry", NULL,
 	    IPL_VM);
+}
 void
 pmap_physseg_init(struct vm_physseg *seg)
+{
 	size_t npages;
 	vsize_t sz;
 	struct pv_entry *pv;
 	char *attr;
 	npages = seg->end - seg->start + 1;
 	sz = (vsize_t)((sizeof(struct pv_entry) + 1) * npages);
 	sz = round_page(sz);
 	pv = (void *)uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_WIRED | UVM_KMF_ZERO);
 	attr = (void *)(pv + npages);
 	seg->pmseg.pvent = pv;
 	seg->pmseg.attrs = attr;
+}
 void
 pmap_physseg_fini(struct vm_physseg *seg)
+{
 	size_t npages;
 	vsize_t sz;
 	npages = seg->end - seg->start + 1;
 	sz = (vsize_t)((sizeof(struct pv_entry) + 1) * npages);
 	sz = round_page(sz);
 	uvm_km_free(kernel_map, (vaddr_t)seg->pmseg.pvent, sz, UVM_KMF_WIRED);
+}
 /*
  * How much virtual space is available to the kernel?
  */
 void
 pmap_virtual_space(vaddr_t *start, vaddr_t *end)
+{
 #if 0
 	/*
 	 * Reserve one segment for kernel virtual memory
 	 */
 	*start = (vaddr_t)(KERNEL_SR << ADDR_SR_SHFT);
 	*end = *start + SEGMENT_LENGTH;