summaryrefslogtreecommitdiff
path: root/lib_blackfin/string.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-06 03:35:44 -0400
committerMike Frysinger <vapier@gentoo.org>2009-01-28 13:26:12 -0500
commit05b75e48832fc4afeecf8e76d704349557dffa35 (patch)
tree94fdae6bb39256105205cf8823f86b82e49aedd4 /lib_blackfin/string.c
parent68e5632494168095d75f120af70043b68afd2476 (diff)
downloadu-boot-imx-05b75e48832fc4afeecf8e76d704349557dffa35.zip
u-boot-imx-05b75e48832fc4afeecf8e76d704349557dffa35.tar.gz
u-boot-imx-05b75e48832fc4afeecf8e76d704349557dffa35.tar.bz2
Blackfin: fix dcache handling when doing dma memcpy's
Our dcache invalidate function doesn't just invalidate, it also flushes. So rename the function accordingly and fix the dma_memcpy() function so it doesn't inadvertently corrupt the data destination. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'lib_blackfin/string.c')
-rw-r--r--lib_blackfin/string.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib_blackfin/string.c b/lib_blackfin/string.c
index 2a56910..36eecdf 100644
--- a/lib_blackfin/string.c
+++ b/lib_blackfin/string.c
@@ -175,19 +175,22 @@ void dma_memcpy_nocache(void *dst, const void *src, size_t count)
bfin_write_MDMA_D0_CONFIG(0);
bfin_write_MDMA_S0_CONFIG(0);
}
+/* We should do a dcache invalidate on the destination after the dma, but since
+ * we lack such hardware capability, we'll flush/invalidate the destination
+ * before the dma and bank on the idea that u-boot is single threaded.
+ */
void *dma_memcpy(void *dst, const void *src, size_t count)
{
- if (dcache_status())
+ if (dcache_status()) {
blackfin_dcache_flush_range(src, src + count);
+ blackfin_dcache_flush_invalidate_range(dst, dst + count);
+ }
dma_memcpy_nocache(dst, src, count);
if (icache_status())
blackfin_icache_flush_range(dst, dst + count);
- if (dcache_status())
- blackfin_dcache_invalidate_range(dst, dst + count);
-
return dst;
}