Sat Feb 22 20:33:00 2014 UTC ()
Don't manipulate the pte to get uncached memory, use PMAP_NOCACHE instead.
Convert footbring to kenter_pa/kremove


(matt)
diff -r1.21 -r1.22 src/sys/arch/arm/footbridge/footbridge_io.c
diff -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_space.c
diff -r1.15 -r1.16 src/sys/arch/arm/ixp12x0/ixp12x0_io.c
diff -r1.22 -r1.23 src/sys/arch/arm/mainbus/mainbus_io.c
diff -r1.6 -r1.7 src/sys/arch/arm/marvell/mvsoc_space.c
diff -r1.2 -r1.3 src/sys/arch/arm/mpcore/mpcore_space.c
diff -r1.19 -r1.20 src/sys/arch/arm/sa11x0/sa11x0_io.c
diff -r1.11 -r1.12 src/sys/arch/arm/xscale/ixp425_pci_space.c
diff -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_space.c
diff -r1.7 -r1.8 src/sys/arch/evbarm/adi_brh/obio_space.c
diff -r1.3 -r1.4 src/sys/arch/evbarm/hdl_g/obio_space.c
diff -r1.14 -r1.15 src/sys/arch/evbarm/iq80310/obio_space.c
diff -r1.11 -r1.12 src/sys/arch/evbarm/iq80321/obio_space.c
diff -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/obio_space.c
cvs diff -r1.21 -r1.22 src/sys/arch/arm/footbridge/footbridge_io.c (expand / switch to context diff)
--- src/sys/arch/arm/footbridge/footbridge_io.c 2012/02/12 16:34:07 1.21
+++ src/sys/arch/arm/footbridge/footbridge_io.c 2014/02/22 20:33:00 1.22
@@ -1,4 +1,4 @@
-/*	$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
@@ -39,7 +39,7 @@
  */
 
 #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>
@@ -179,7 +179,8 @@
 }
 
 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;
@@ -214,15 +215,14 @@
 
 	/* 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) {
-		pmap_enter(pmap_kernel(), va, (bus_addr_t)t + pa, VM_PROT_READ | VM_PROT_WRITE,
-		    VM_PROT_READ | VM_PROT_WRITE| PMAP_WIRED);
-		if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
-			pt_entry_t *pte;	
-			pte = vtopte(va);
-			*pte &= ~L2_S_CACHE_MASK;
-			PTE_SYNC(pte);
-		}
+	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, (bus_addr_t)t + pa,
+		    VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
 
@@ -274,7 +274,7 @@
 	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);
 }
cvs diff -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_space.c (expand / switch to context diff)
--- src/sys/arch/arm/gemini/gemini_space.c 2011/07/01 19:32:28 1.3
+++ src/sys/arch/arm/gemini/gemini_space.c 2014/02/22 20:33:00 1.4
@@ -1,4 +1,4 @@
-/*	$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
@@ -79,7 +79,7 @@
  */
 
 #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>
@@ -175,10 +175,7 @@
 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;
-	vaddr_t va;
-	pt_entry_t *pte;
-	const struct pmap_devmap	*pd;
+	const struct pmap_devmap *pd;
 
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
 		/* Device was statically mapped. */
@@ -186,28 +183,24 @@
 		return 0;
 	}
 
-	startpa = trunc_page(bpa);
-	endpa = round_page(bpa + size);
+	paddr_t startpa = trunc_page(bpa);
+	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) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
-		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.
-			 */
-		}
+	const int pmapflags =
+	    (flag & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE))
+		? 0
+		: PMAP_NOCACHE;
+	for (paddr_t pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.15 -r1.16 src/sys/arch/arm/ixp12x0/ixp12x0_io.c (expand / switch to context diff)
--- src/sys/arch/arm/ixp12x0/ixp12x0_io.c 2011/07/01 20:27:50 1.15
+++ src/sys/arch/arm/ixp12x0/ixp12x0_io.c 2014/02/22 20:33:00 1.16
@@ -1,4 +1,4 @@
-/*	$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
@@ -28,7 +28,7 @@
  */
 
 #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
@@ -141,7 +141,6 @@
 	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. */
@@ -160,11 +159,12 @@
 
 	*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);
-		pte = vtopte(va);
-		*pte &= ~L2_S_CACHE_MASK;
-		PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.22 -r1.23 src/sys/arch/arm/mainbus/mainbus_io.c (expand / switch to context diff)
--- src/sys/arch/arm/mainbus/mainbus_io.c 2012/07/15 20:53:23 1.22
+++ src/sys/arch/arm/mainbus/mainbus_io.c 2014/02/22 20:33:00 1.23
@@ -1,4 +1,4 @@
-/*	$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.
@@ -37,7 +37,7 @@
  */
 
 #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>
@@ -177,7 +177,6 @@
 {
 	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. */
@@ -197,13 +196,12 @@
 
 	*bshp = (bus_space_handle_t)(va + (bpa - startpa));
 
-	for(pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
-		if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
-			pte = vtopte(va);
-			*pte &= ~L2_S_CACHE_MASK;
-			PTE_SYNC(pte);
-		}
+	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, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.6 -r1.7 src/sys/arch/arm/marvell/mvsoc_space.c (expand / switch to context diff)
--- src/sys/arch/arm/marvell/mvsoc_space.c 2013/05/29 20:47:14 1.6
+++ src/sys/arch/arm/marvell/mvsoc_space.c 2014/02/22 20:33:00 1.7
@@ -1,4 +1,4 @@
-/*	$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.
@@ -26,7 +26,7 @@
  */
 
 #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"
@@ -321,7 +321,6 @@
 {
 	const struct pmap_devmap *pd;
 	paddr_t startpa, endpa, offset, pa;
-	pt_entry_t *pte;
 	vaddr_t va;
 
 /*
@@ -369,18 +368,14 @@
 
 	*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);
-		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_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.2 -r1.3 src/sys/arch/arm/mpcore/Attic/mpcore_space.c (expand / switch to context diff)
--- src/sys/arch/arm/mpcore/Attic/mpcore_space.c 2011/07/01 20:30:21 1.2
+++ src/sys/arch/arm/mpcore/Attic/mpcore_space.c 2014/02/22 20:33:00 1.3
@@ -1,4 +1,4 @@
-/* $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 */
@@ -170,7 +170,6 @@
 {
 	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) {
@@ -191,16 +190,12 @@
 
 	*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);
-		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_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.19 -r1.20 src/sys/arch/arm/sa11x0/sa11x0_io.c (expand / switch to context diff)
--- src/sys/arch/arm/sa11x0/sa11x0_io.c 2011/07/01 20:31:39 1.19
+++ src/sys/arch/arm/sa11x0/sa11x0_io.c 2014/02/22 20:33:00 1.20
@@ -1,4 +1,4 @@
-/*	$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.
@@ -41,7 +41,7 @@
  */
 
 #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>
@@ -139,12 +139,11 @@
 /* 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) {
@@ -165,13 +164,13 @@
 
 	*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);
-		pte = vtopte(va);
-		if (cacheable == 0) {
-			*pte &= ~L2_S_CACHE_MASK;
-			PTE_SYNC(pte);
-		}
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.11 -r1.12 src/sys/arch/arm/xscale/ixp425_pci_space.c (expand / switch to context diff)
--- src/sys/arch/arm/xscale/ixp425_pci_space.c 2012/11/12 18:00:38 1.11
+++ src/sys/arch/arm/xscale/ixp425_pci_space.c 2014/02/22 20:33:00 1.12
@@ -1,4 +1,4 @@
-/*	$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
@@ -28,7 +28,7 @@
  */
 
 #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
@@ -382,7 +382,6 @@
 	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. */
@@ -403,12 +402,14 @@
 	/* 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);
-		pte = vtopte(va);
-		*pte &= ~L2_S_CACHE_MASK;
-		PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_space.c (expand / switch to context diff)
--- src/sys/arch/arm/xscale/pxa2x0_space.c 2011/07/01 20:32:51 1.10
+++ src/sys/arch/arm/xscale/pxa2x0_space.c 2014/02/22 20:33:00 1.11
@@ -1,4 +1,4 @@
-/*	$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.
@@ -76,7 +76,7 @@
  */
 
 #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>
@@ -195,16 +195,13 @@
 
 	*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);
-		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_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.7 -r1.8 src/sys/arch/evbarm/adi_brh/obio_space.c (expand / switch to context diff)
--- src/sys/arch/evbarm/adi_brh/obio_space.c 2011/07/01 20:38:16 1.7
+++ src/sys/arch/evbarm/adi_brh/obio_space.c 2014/02/22 20:33:00 1.8
@@ -1,4 +1,4 @@
-/*	$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.
@@ -40,7 +40,7 @@
  */
 
 #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>
@@ -137,13 +137,12 @@
 };
 
 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. */
@@ -162,11 +161,13 @@
 
 	*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);
-		pte = vtopte(va);
-		*pte &= ~L2_S_CACHE_MASK;
-		PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.3 -r1.4 src/sys/arch/evbarm/hdl_g/obio_space.c (expand / switch to context diff)
--- src/sys/arch/evbarm/hdl_g/obio_space.c 2011/07/01 20:39:34 1.3
+++ src/sys/arch/evbarm/hdl_g/obio_space.c 2014/02/22 20:33:00 1.4
@@ -1,4 +1,4 @@
-/*	$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.
@@ -40,7 +40,7 @@
  */
 
 #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>
@@ -137,13 +137,12 @@
 };
 
 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. */
@@ -162,11 +161,13 @@
 
 	*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);
-		pte = vtopte(va);
-		*pte &= ~L2_S_CACHE_MASK;
-		PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.14 -r1.15 src/sys/arch/evbarm/iq80310/obio_space.c (expand / switch to context diff)
--- src/sys/arch/evbarm/iq80310/obio_space.c 2011/07/01 20:41:16 1.14
+++ src/sys/arch/evbarm/iq80310/obio_space.c 2014/02/22 20:33:00 1.15
@@ -1,4 +1,4 @@
-/*	$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.
@@ -40,7 +40,7 @@
  */
 
 #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>
@@ -136,13 +136,12 @@
 };
 
 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. */
@@ -161,11 +160,12 @@
 
 	*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);
-		pte = vtopte(va);
-		*pte &= ~L2_S_CACHE_MASK;
-		PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.11 -r1.12 src/sys/arch/evbarm/iq80321/obio_space.c (expand / switch to context diff)
--- src/sys/arch/evbarm/iq80321/obio_space.c 2011/07/01 20:41:16 1.11
+++ src/sys/arch/evbarm/iq80321/obio_space.c 2014/02/22 20:33:00 1.12
@@ -1,4 +1,4 @@
-/*	$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.
@@ -40,7 +40,7 @@
  */
 
 #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>
@@ -137,13 +137,12 @@
 };
 
 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. */
@@ -162,11 +161,13 @@
 
 	*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);
-		pte = vtopte(va);
-		*pte &= ~L2_S_CACHE_MASK;
-		PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());
cvs diff -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/obio_space.c (expand / switch to context diff)
--- src/sys/arch/iyonix/iyonix/obio_space.c 2011/07/01 20:48:23 1.5
+++ src/sys/arch/iyonix/iyonix/obio_space.c 2014/02/22 20:33:00 1.6
@@ -1,4 +1,4 @@
-/*	$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.
@@ -40,7 +40,7 @@
  */
 
 #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>
@@ -137,13 +137,12 @@
 };
 
 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. */
@@ -162,11 +161,13 @@
 
 	*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);
-		pte = vtopte(va);
-		*pte &= ~L2_S_CACHE_MASK;
-		PTE_SYNC(pte);
+		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
 	}
 	pmap_update(pmap_kernel());