summaryrefslogtreecommitdiff
path: root/sys/arch/arm/include/cpufunc.h
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2016-08-22 01:42:01 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2016-08-22 01:42:01 +0000
commit800e109073cddfb8c6689412a467d072b7d272d2 (patch)
treecaecb6d8a8c134a608ae7a811ec02ed29c435f4c /sys/arch/arm/include/cpufunc.h
parente6dbdd13b93200b4a3efd77f0b73e4e863a8722b (diff)
Before pmap7.c rev 1.35 and pmap.h rev 1.44 DMA'able memory with the
BUS_DMA_COHERENT flag was mapped as device memory which does not use the store buffer. It is now mapped as normal inner and outer non-cacheable which does. While we drain the cpu store buffer for this case, on cortex a9 systems we also need to explicitly drain the PL310 L2's store buffer. With PL310 revisions r3p2 and later this is done automatically after being present in the store buffer for 256 cycles. On i.MX6 PL310 is rev r3p1 which does not have this behaviour. This issue is i.MX6 errata ERR055199 and PL310 errata 769419. This change restores io performance with a usb flash drive attached to my cubox. Raw reads go from 3 MB/s to 19 MB/s for example. Based on code written by patrick@ some time ago. ok kettenis@ patrick@
Diffstat (limited to 'sys/arch/arm/include/cpufunc.h')
-rw-r--r--sys/arch/arm/include/cpufunc.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index 5e38d49e270..c8910187b78 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc.h,v 1.26 2016/08/14 11:30:54 jsg Exp $ */
+/* $OpenBSD: cpufunc.h,v 1.27 2016/08/22 01:42:00 jsg Exp $ */
/* $NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $ */
/*
@@ -140,6 +140,7 @@ struct cpu_functions {
void (*cf_sdcache_wbinv_range) (vaddr_t, paddr_t, vsize_t);
void (*cf_sdcache_inv_range) (vaddr_t, paddr_t, vsize_t);
void (*cf_sdcache_wb_range) (vaddr_t, paddr_t, vsize_t);
+ void (*cf_sdcache_drain_writebuf) (void);
/* Other functions */
@@ -191,6 +192,7 @@ extern u_int cputype;
#define cpu_sdcache_wbinv_range(va, pa, s) cpufuncs.cf_sdcache_wbinv_range((va), (pa), (s))
#define cpu_sdcache_inv_range(va, pa, s) cpufuncs.cf_sdcache_inv_range((va), (pa), (s))
#define cpu_sdcache_wb_range(va, pa, s) cpufuncs.cf_sdcache_wb_range((va), (pa), (s))
+#define cpu_sdcache_drain_writebuf() cpufuncs.cf_sdcache_drain_writebuf()
#define cpu_flush_prefetchbuf() cpufuncs.cf_flush_prefetchbuf()
#define cpu_drain_writebuf() cpufuncs.cf_drain_writebuf()