Module Name: src
Committed By: matt
Date: Wed Jan 9 17:45:13 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcmgen_space.c
Log Message:
Handle BUS_SPACE_MAP_PREFETCHABLE like BUS_SPACE_MAP_CACHEABLE.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcmgen_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcmgen_space.c
diff -u src/sys/arch/arm/broadcom/bcmgen_space.c:1.1 src/sys/arch/arm/broadcom/bcmgen_space.c:1.2
--- src/sys/arch/arm/broadcom/bcmgen_space.c:1.1 Sat Sep 1 00:04:44 2012
+++ src/sys/arch/arm/broadcom/bcmgen_space.c Wed Jan 9 17:45:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgen_space.c,v 1.1 2012/09/01 00:04:44 matt Exp $ */
+/* $NetBSD: bcmgen_space.c,v 1.2 2013/01/09 17:45:13 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcmgen_space.c,v 1.1 2012/09/01 00:04:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgen_space.c,v 1.2 2013/01/09 17:45:13 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -181,13 +181,16 @@ bcmgen_bs_map(void *t, bus_addr_t bpa, b
/* XXX use extent manager to check duplicate mapping */
va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
- UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
+ UVM_KMF_VAONLY | UVM_KMF_NOWAIT | UVM_KMF_COLORMATCH);
if (!va)
return ENOMEM;
*bshp = (bus_space_handle_t)(va + (bpa - startpa));
- const int pmapflags = (flag & BUS_SPACE_MAP_CACHEABLE) ? 0 : PMAP_NOCACHE;
+ 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, pmapflags);
}
