summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2016-08-19 14:05:24 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2016-08-19 14:05:24 +0000
commit5085505ebf5f7ed0b63d2a75d337320c867b4a7c (patch)
tree8c7b1337bc669e9e918f20dbb6a7184efee15794
parentc2d1b86c09f9a87602cef7ac6a84a25daafed07f (diff)
Adjust the definitions of L1_S_COHERENT_v7, L2_L_COHERENT_v7 and
L2_S_COHERENT_v7 such that bus_dmamap_sync(9) avoids unnecessary cache flushes again for DMA'able memory mapped with the BUS_DMA_COHERENT flag. I broke this in pmap7.c rev 1.35. ok tom@
-rw-r--r--sys/arch/arm/include/pmap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index 718e1bc61b5..045aa4accbb 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.43 2016/08/19 13:56:08 kettenis Exp $ */
+/* $OpenBSD: pmap.h,v 1.44 2016/08/19 14:05:23 kettenis Exp $ */
/* $NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $ */
/*
@@ -482,7 +482,7 @@ extern void (*pmap_zero_page_func)(struct vm_page *);
#define L1_S_COHERENT_generic (L1_S_B|L1_S_C)
#define L1_S_COHERENT_xscale (L1_S_B|L1_S_C|L1_S_XSCALE_TEX(TEX_XSCALE_X))
-#define L1_S_COHERENT_v7 (L1_S_C|L1_S_V7_TEX_MASK)
+#define L1_S_COHERENT_v7 (L1_S_C)
#define L2_L_PROT_KR_generic (L2_AP(0))
#define L2_L_PROT_UR_generic (L2_AP(AP_U))
@@ -508,7 +508,7 @@ extern void (*pmap_zero_page_func)(struct vm_page *);
#define L2_L_COHERENT_generic (L2_B|L2_C)
#define L2_L_COHERENT_xscale (L2_B|L2_C|L2_XSCALE_L_TEX(TEX_XSCALE_X))
-#define L2_L_COHERENT_v7 (L2_C|L2_V7_L_TEX_MASK)
+#define L2_L_COHERENT_v7 (L2_C)
#define L2_S_PROT_UR_generic (L2_AP(AP_U))
#define L2_S_PROT_UW_generic (L2_AP(AP_U|AP_W))
@@ -534,7 +534,7 @@ extern void (*pmap_zero_page_func)(struct vm_page *);
#define L2_S_COHERENT_generic (L2_B|L2_C)
#define L2_S_COHERENT_xscale (L2_B|L2_C|L2_XSCALE_T_TEX(TEX_XSCALE_X))
-#define L2_S_COHERENT_v7 (L2_C|L2_V7_S_TEX_MASK)
+#define L2_S_COHERENT_v7 (L2_C)
#define L1_S_PROTO_generic (L1_TYPE_S | L1_S_IMP)
#define L1_S_PROTO_xscale (L1_TYPE_S)