 @@ -1,14 +1,14 @@
-/*	$NetBSD: footbridge_io.c,v 1.21 2012/02/12 16:34:07 matt Exp $	*/
+/*	$NetBSD: footbridge_io.c,v 1.22 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 1997 Causality Limited
  * Copyright (c) 1997 Mark Brinicombe.
  * 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
 @@ -29,27 +29,27 @@
  * (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.
  */
 /*
  * bus_space I/O functions for footbridge
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.21 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.22 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <arm/footbridge/footbridge.h>
 #include <arm/footbridge/dc21285mem.h>
 #include <uvm/uvm_extern.h>
 /* Proto types for all the bus_space structure functions */
 bs_protos(footbridge);
 bs_protos(generic);
 bs_protos(generic_armv4);
 @@ -169,27 +169,28 @@ footbridge_bs_map(void *t, bus_addr_t bp
 	 * The whole 64K of PCI space is always completely mapped during
 	 * boot.
+	 *
 	 * Eventually this function will do the mapping check overlapping /
 	 * multiple mappings.
 	 */
 	/* The cookie is the base address for the I/O area */
 	*bshp = bpa + (bus_addr_t)t;
 	return(0);
+}
 int
-footbridge_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp)
+footbridge_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp)
+{
 	bus_addr_t startpa, endpa, pa;
 	vaddr_t va;
 	/* Round the allocation to page boundries */
 	startpa = trunc_page(bpa);
 	endpa = round_page(bpa + size);
 	/*
 	 * Check for mappings below 1MB as we have this space already
 	 * mapped. In practice it is only the VGA hole that takes
 	 * advantage of this.
 	 */
 @@ -204,35 +205,34 @@ footbridge_mem_bs_map(void *t, bus_addr_
 	 * multiple mappings
 	 */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return ENOMEM;
 	/* Store the bus space handle */
 	*bshp = va + (bpa & PGOFSET);
 	/* Now map the pages */
 	/* The cookie is the physical base address for the I/O area */
-	for (pa = startpa; pa < endpa; pa+=PAGE_SIZE, va += PAGE_SIZE) {
+	const int pmapflags =
-		pmap_enter(pmap_kernel(), va, (bus_addr_t)t + pa, VM_PROT_READ | VM_PROT_WRITE,
+	    (flags & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
-		    VM_PROT_READ | VM_PROT_WRITE| PMAP_WIRED);
+		? 0
-		if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
+		: PMAP_NOCACHE;
 			pt_entry_t *pte;
-			pte = vtopte(va);
+	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-			*pte &= ~L2_S_CACHE_MASK;
+		pmap_kenter_pa(va, (bus_addr_t)t + pa,
-			PTE_SYNC(pte);
+		    VM_PROT_READ | VM_PROT_WRITE, pmapflags);
+	}
 	pmap_update(pmap_kernel());
 /*	if (bpa >= DC21285_PCI_MEM_VSIZE && bpa != DC21285_ARMCSR_VBASE)
 		panic("footbridge_bs_map: Address out of range (%08lx)", bpa);
 */
 	return(0);
+}
 int
 footbridge_bs_alloc(
 	void *t,
 	bus_addr_t rstart,
 @@ -264,27 +264,27 @@ footbridge_mem_bs_unmap(void *t, bus_spa
 	/*
 	 * Check for mappings below 1MB as we have this space permenantly
 	 * mapped. In practice it is only the VGA hole that takes
 	 * advantage of this.
 	 */
 	if (bsh >= DC21285_PCI_ISA_MEM_VBASE
 	    && bsh < (DC21285_PCI_ISA_MEM_VBASE + DC21285_PCI_ISA_MEM_VSIZE)) {
 		return;
+	}
 	startva = trunc_page(bsh);
 	endva = round_page(bsh + size);
-	pmap_remove(pmap_kernel(), startva, endva);
+	pmap_kremove(startva, endva);
 	pmap_update(pmap_kernel());
 	uvm_km_free(kernel_map, startva, endva - startva, UVM_KMF_VAONLY);
+}
 void
 footbridge_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
 	panic("footbridge_free(): Help!");
 	/* footbridge_bs_unmap() does all that we need to do. */
 /*	footbridge_bs_unmap(t, bsh, size);*/
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gemini_space.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $	*/
+/*	$NetBSD: gemini_space.c,v 1.4 2014/02/22 20:33:00 matt Exp $	*/
 /* adapted from:
  *	NetBSD: pxa2x0_space.c,v 1.8 2005/11/24 13:08:32 yamt Exp
  */
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -69,27 +69,27 @@
  * (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.
  */
 /*
  * bus_space functions for Gemini processor.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.4 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(gemini);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(bs_notimpl);
 @@ -165,59 +165,52 @@ struct bus_space gemini_bs_tag = {
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	generic_armv4_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 int
 gemini_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
 	      int flag, bus_space_handle_t *bshp)
+{
-	u_long startpa, endpa, pa;
+	const struct pmap_devmap *pd;
 	vaddr_t va;
 	pt_entry_t *pte;
 	const struct pmap_devmap	*pd;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return 0;
+	}
-	startpa = trunc_page(bpa);
+	paddr_t startpa = trunc_page(bpa);
-	endpa = round_page(bpa + size);
+	paddr_t endpa = round_page(bpa + size);
 	/* XXX use extent manager to check duplicate mapping */
-	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
+	vaddr_t va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (! va)
 		return(ENOMEM);
 	*bshp = (bus_space_handle_t)(va + (bpa - startpa));
-	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
+	const int pmapflags =
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
-		if ((flag & BUS_SPACE_MAP_CACHEABLE) == 0) {
+		? 0
-			pte = vtopte(va);
+		: PMAP_NOCACHE;
-			*pte &= ~L2_S_CACHE_MASK;
+	for (paddr_t pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-			PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 			/* XXX: pmap_kenter_pa() also does PTE_SYNC(). a bit of
 			 *      waste.
 			 */
+	}
 	pmap_update(pmap_kernel());
 	return(0);
+}
 void
 gemini_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
 	vaddr_t	va;
 	vsize_t	sz;
 	if (pmap_devmap_find_va(bsh, size) != NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp12x0_io.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $ */
+/*	$NetBSD: ixp12x0_io.c,v 1.16 2014/02/22 20:33:00 matt Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * 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
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS HEAD 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: ixp12x0_io.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.16 2014/02/22 20:33:00 matt Exp $");
 /*
  * bus_space I/O functions for ixp12x0
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <uvm/uvm.h>
 #include <sys/bus.h>
 @@ -131,50 +131,50 @@ struct bus_space ixp12x0_bs_tag = {
 /* Common routines */
 int
 ixp12x0_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
 	       int flags, bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap	*pd;
 	paddr_t		startpa;
 	paddr_t		endpa;
 	paddr_t		pa;
 	paddr_t		offset;
 	vaddr_t		va;
 	pt_entry_t	*pte;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return 0;
+	}
 	endpa = round_page(bpa + size);
 	offset = bpa & PAGE_MASK;
 	startpa = trunc_page(bpa);
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va  == 0)
 		return ENOMEM;
 	*bshp = va + offset;
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		*pte &= ~L2_S_CACHE_MASK;
 		PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 void
 ixp12x0_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
 	vaddr_t	va;
 	vaddr_t	endva;
 	if (pmap_devmap_find_va(bsh, size) != NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus_io.c,v 1.22 2012/07/15 20:53:23 matt Exp $	*/
+/*	$NetBSD: mainbus_io.c,v 1.23 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 1997 Mark Brinicombe.
  * 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.
 @@ -27,27 +27,27 @@
  * (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.
  */
 /*
  * bus_space I/O functions for mainbus
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.22 2012/07/15 20:53:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.23 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <uvm/uvm.h>
 #include <sys/bus.h>
 #include <machine/pmap.h>
 /* Proto types for all the bus_space structure functions */
 bs_protos(mainbus);
 @@ -167,53 +167,51 @@ struct bus_space mainbus_bs_tag = {
 	bs_notimpl_bs_wr_2,
 	bs_notimpl_bs_wr_4,
 	bs_notimpl_bs_wr_8,
 #endif
 };
 /* bus space functions */
 int
 mainbus_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp)
+{
 	u_long startpa, endpa, pa;
 	vaddr_t va;
 	pt_entry_t *pte;
 	if ((u_long)bpa > (u_long)KERNEL_BASE) {
 		/* XXX This is a temporary hack to aid transition. */
 		*bshp = bpa;
 		return(0);
+	}
 	startpa = trunc_page(bpa);
 	endpa = round_page(bpa + size);
 	/* XXX use extent manager to check duplicate mapping */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (! va)
 		return(ENOMEM);
 	*bshp = (bus_space_handle_t)(va + (bpa - startpa));
-	for(pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
+	const int pmapflags =
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+	    (flags & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
-		if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
+		? 0
-			pte = vtopte(va);
+		: PMAP_NOCACHE;
-			*pte &= ~L2_S_CACHE_MASK;
+	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-			PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ|VM_PROT_WRITE, pmapflags);
+	}
 	pmap_update(pmap_kernel());
 	return(0);
+}
 int
 mainbus_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
     bus_size_t size, bus_size_t alignment, bus_size_t boundary,
     int cacheable,
     bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
 	panic("mainbus_bs_alloc(): Help!");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mvsoc_space.c,v 1.6 2013/05/29 20:47:14 rkujawa Exp $	*/
+/*	$NetBSD: mvsoc_space.c,v 1.7 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 2007 KIYOHARA Takashi
  * 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.
+ *
 @@ -16,27 +16,27 @@
  * 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 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: mvsoc_space.c,v 1.6 2013/05/29 20:47:14 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_space.c,v 1.7 2014/02/22 20:33:00 matt Exp $");
 #include "opt_mvsoc.h"
 #include "mvpex.h"
 #include "gtpci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <arm/marvell/mvsocreg.h>
 @@ -311,27 +311,26 @@ struct bus_space orion_pci_io_bs_tag = {
 	MVSOC_BUS_SPACE_NORMAL_FUNCS,
 #endif
 };
 #endif
 #endif
 int
 mvsoc_bs_map(void *space, bus_addr_t address, bus_size_t size, int flags,
 	     bus_space_handle_t *handlep)
+{
 	const struct pmap_devmap *pd;
 	paddr_t startpa, endpa, offset, pa;
 	pt_entry_t *pte;
 	vaddr_t va;
 /*
  * XXX: We are not configuring any decode windows for Armada XP
  * 	at the moment. We rely on those that have been set by u-boot.
  *	Hence we don't want to mess around with decode windows,
  *	till we get full controll over them.
  */
 	int tag = (int)space;
 	if (tag != 0) {
 		bus_addr_t remap;
 @@ -359,38 +358,34 @@ mvsoc_bs_map(void *space, bus_addr_t add
 	startpa = trunc_page(address);
 	endpa = round_page(address + size);
 	offset = address & PAGE_MASK;
 	/* XXX use extent manager to check duplicate mapping */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0x00000000)
 		return ENOMEM;
 	*handlep = va + offset;
 	const int pmapflags =
 	    (flags & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	/* Now map the pages */
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
 			pte = vtopte(va);
 			*pte &= ~L2_S_CACHE_MASK;
 			PTE_SYNC(pte);
 			/*
 			 * XXX: pmap_kenter_pa() also does PTE_SYNC(). a bit of
 			 *      waste.
 			 */
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 void
 mvsoc_bs_unmap(void *space, bus_space_handle_t handle, bus_size_t size)
+{
 	vaddr_t va, sz;
 	if (pmap_devmap_find_va(handle, size) != NULL)
 		/* Device was statically mapped; nothing to do. */

 @@ -1,14 +1,14 @@
-/* $NetBSD: mpcore_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
+/* $NetBSD: mpcore_space.c,v 1.3 2014/02/22 20:33:00 matt Exp $ */
 /* derived from: */
 /* NetBSD: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp */
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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:
 @@ -160,57 +160,52 @@ struct bus_space mpcore_bs_tag = {
 	/* copy */
 	bs_notimpl_bs_c_1,
 	generic_armv4_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 int
 mpcore_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
 	      int flag, bus_space_handle_t *bshp)
+{
 	u_long startpa, endpa, pa;
 	vaddr_t va;
 	pt_entry_t *pte;
 	const struct pmap_devmap	*pd;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return 0;
+	}
 	startpa = trunc_page(bpa);
 	endpa = round_page(bpa + size);
 	/* XXX use extent manager to check duplicate mapping */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (! va)
 		return(ENOMEM);
 	*bshp = (bus_space_handle_t)(va + (bpa - startpa));
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		if ((flag & BUS_SPACE_MAP_CACHEABLE) == 0) {
 			pte = vtopte(va);
 			*pte &= ~L2_S_CACHE_MASK;
 			PTE_SYNC(pte);
 			/* XXX: pmap_kenter_pa() also does PTE_SYNC(). a bit of
 			 *      waste.
 			 */
+	}
 	pmap_update(pmap_kernel());
 	return(0);
+}
 void
 mpcore_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
 	vaddr_t	va;
 	vsize_t	sz;
 	if (pmap_devmap_find_va(bsh, size) != NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sa11x0_io.c,v 1.19 2011/07/01 20:31:39 dyoung Exp $	*/
+/*	$NetBSD: sa11x0_io.c,v 1.20 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 1997 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ichiro FUKUHARA.
+ *
  * 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
 @@ -31,27 +31,27 @@
  * (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.
  */
 /*
  * bus_space I/O functions for sa11x0
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.19 2011/07/01 20:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.20 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <uvm/uvm.h>
 #include <sys/bus.h>
 #include <machine/pmap.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(sa11x0);
 @@ -129,59 +129,58 @@ struct bus_space sa11x0_bs_tag = {
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	sa11x0_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 /* bus space functions */
 int
-sa11x0_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int cacheable,
+sa11x0_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp)
+{
 	u_long startpa, endpa, pa;
 	vaddr_t va;
 	pt_entry_t *pte;
 	const struct pmap_devmap *pd;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
                 /* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return 0;
+	}
 	startpa = trunc_page(bpa);
 	endpa = round_page(bpa + size);
 	/* XXX use extent manager to check duplicate mapping */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (!va)
 		return ENOMEM;
 	*bshp = (bus_space_handle_t)(va + (bpa - startpa));
 	const int pmapflags =
 	    (flags & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		if (cacheable == 0) {
 			*pte &= ~L2_S_CACHE_MASK;
 			PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 int
 sa11x0_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
     bus_size_t alignment, bus_size_t boundary, int cacheable,
     bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
 	panic("sa11x0_bs_alloc(): Help!");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp425_pci_space.c,v 1.11 2012/11/12 18:00:38 skrll Exp $ */
+/*	$NetBSD: ixp425_pci_space.c,v 1.12 2014/02/22 20:33:00 matt Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * 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
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS HEAD 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: ixp425_pci_space.c,v 1.11 2012/11/12 18:00:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_space.c,v 1.12 2014/02/22 20:33:00 matt Exp $");
 /*
  * bus_space PCI functions for ixp425
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <uvm/uvm.h>
 #include <sys/bus.h>
 @@ -372,53 +372,54 @@ _pci_io_bs_w_4(void *v, bus_space_handle
 /* mem bs */
 int
 ixp425_pci_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
 	      int cacheable, bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap	*pd;
 	paddr_t		startpa;
 	paddr_t		endpa;
 	paddr_t		pa;
 	paddr_t		offset;
 	vaddr_t		va;
 	pt_entry_t	*pte;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return 0;
+	}
 	endpa = round_page(bpa + size);
 	offset = bpa & PAGE_MASK;
 	startpa = trunc_page(bpa);
 	/* Get some VM.  */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return ENOMEM;
 	/* Store the bus space handle */
 	*bshp = va + offset;
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	/* Now map the pages */
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		*pte &= ~L2_S_CACHE_MASK;
 		PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return(0);
+}
 void
 ixp425_pci_mem_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
 	vaddr_t	va;
 	vaddr_t	endva;
 	if (pmap_devmap_find_va(bsh, size) != NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pxa2x0_space.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $ */
+/*	$NetBSD: pxa2x0_space.c,v 1.11 2014/02/22 20:33:00 matt Exp $ */
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -66,27 +66,27 @@
  * 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.
  */
 /*
  * bus_space functions for Intel PXA2[51]0 application processor.
  * Derived from i80321_space.c.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_space.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_space.c,v 1.11 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(pxa2x0);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(bs_notimpl);
 @@ -185,36 +185,33 @@ pxa2x0_bs_map(void *t, bus_addr_t bpa, b
 	startpa = trunc_page(bpa);
 	endpa = round_page(bpa + size);
 	/* XXX use extent manager to check duplicate mapping */
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (! va)
 		return(ENOMEM);
 	*bshp = (bus_space_handle_t)(va + (bpa - startpa));
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		if ((flag & BUS_SPACE_MAP_CACHEABLE) == 0) {
 			pte = vtopte(va);
 			*pte &= ~L2_S_CACHE_MASK;
 			PTE_SYNC(pte);
 			/* XXX: pmap_kenter_pa() also does PTE_SYNC(). a bit of
 			 *      waste.
 			 */
+	}
 	pmap_update(pmap_kernel());
 	return(0);
+}
 void
 pxa2x0_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
 	vaddr_t	va;
 	vsize_t	sz;
 	if (pmap_devmap_find_va(bsh, size) != NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio_space.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.8 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * bus_space functions for ADI BRH on-board devices
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.8 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(bs_notimpl);
 @@ -127,56 +127,57 @@ struct bus_space obio_bs_tag = {
 	bs_notimpl_bs_sr_1,
 	bs_notimpl_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	bs_notimpl_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 int
-obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
+obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap *pd;
 	paddr_t startpa, endpa, pa, offset;
 	vaddr_t va;
 	pt_entry_t *pte;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return (0);
+	}
 	endpa = round_page(bpa + size);
 	offset = bpa & PAGE_MASK;
 	startpa = trunc_page(bpa);
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return ENOMEM;
 	*bshp = va + offset;
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		*pte &= ~L2_S_CACHE_MASK;
 		PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return (0);
+}
 int
 obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
     bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap,
     bus_space_handle_t *bshp)
+{
 	panic("obio_bs_alloc(): not implemented\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio_space.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.4 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * bus_space functions for IQ80321 on-board devices
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.4 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(bs_notimpl);
 @@ -127,56 +127,57 @@ struct bus_space obio_bs_tag = {
 	bs_notimpl_bs_sr_1,
 	bs_notimpl_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	bs_notimpl_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 int
-obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
+obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap *pd;
 	paddr_t startpa, endpa, pa, offset;
 	vaddr_t va;
 	pt_entry_t *pte;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return 0;
+	}
 	endpa = round_page(bpa + size);
 	offset = bpa & PAGE_MASK;
 	startpa = trunc_page(bpa);
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return ENOMEM;
 	*bshp = va + offset;
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		*pte &= ~L2_S_CACHE_MASK;
 		PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 int
 obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
     bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap,
     bus_space_handle_t *bshp)
+{
 	panic("obio_bs_alloc(): not implemented");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio_space.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.15 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * bus_space functions for IQ80310 on-board devices
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.15 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
 bs_protos(generic);
 bs_protos(bs_notimpl);
 @@ -126,56 +126,56 @@ struct bus_space obio_bs_tag = {
 	bs_notimpl_bs_sr_1,
 	bs_notimpl_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	bs_notimpl_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 int
-obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
+obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap *pd;
 	paddr_t startpa, endpa, pa, offset;
 	vaddr_t va;
 	pt_entry_t *pte;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return (0);
+	}
 	endpa = round_page(bpa + size);
 	offset = bpa & PAGE_MASK;
 	startpa = trunc_page(bpa);
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return(ENOMEM);
 	*bshp = va + offset;
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		*pte &= ~L2_S_CACHE_MASK;
 		PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return (0);
+}
 int
 obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
     bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap,
     bus_space_handle_t *bshp)
+{
 	panic("obio_bs_alloc(): not implemented");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio_space.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.12 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * bus_space functions for IQ80321 on-board devices
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.12 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(bs_notimpl);
 @@ -127,56 +127,57 @@ struct bus_space obio_bs_tag = {
 	bs_notimpl_bs_sr_1,
 	bs_notimpl_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	bs_notimpl_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 int
-obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
+obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap *pd;
 	paddr_t startpa, endpa, pa, offset;
 	vaddr_t va;
 	pt_entry_t *pte;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return (0);
+	}
 	endpa = round_page(bpa + size);
 	offset = bpa & PAGE_MASK;
 	startpa = trunc_page(bpa);
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return (ENOMEM);
 	*bshp = va + offset;
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		*pte &= ~L2_S_CACHE_MASK;
 		PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return (0);
+}
 int
 obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
     bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap,
     bus_space_handle_t *bshp)
+{
 	panic("obio_bs_alloc(): not implemented");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.6 2014/02/22 20:33:00 matt Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * bus_space functions for Tungsten on-board devices
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.6 2014/02/22 20:33:00 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(bs_notimpl);
 @@ -127,56 +127,57 @@ struct bus_space obio_bs_tag = {
 	bs_notimpl_bs_sr_1,
 	bs_notimpl_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	bs_notimpl_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 };
 int
-obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
+obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	const struct pmap_devmap *pd;
 	paddr_t startpa, endpa, pa, offset;
 	vaddr_t va;
 	pt_entry_t *pte;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
 		*bshp = pd->pd_va + (bpa - pd->pd_pa);
 		return (0);
+	}
 	endpa = round_page(bpa + size);
 	offset = bpa & PAGE_MASK;
 	startpa = trunc_page(bpa);
 	va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (va == 0)
 		return (ENOMEM);
 	*bshp = va + offset;
 	const int pmapflags =
 	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
 		? 0
 		: PMAP_NOCACHE;
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 		pte = vtopte(va);
 		*pte &= ~L2_S_CACHE_MASK;
 		PTE_SYNC(pte);
+	}
 	pmap_update(pmap_kernel());
 	return (0);
+}
 int
 obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
     bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap,
     bus_space_handle_t *bshp)
+{
 	panic("obio_bs_alloc(): not implemented");