From fdfd856d1d2ba158f25a18706571616aad472877 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sat, 5 Sep 2015 10:36:53 +0200
Subject: zynq: clean cache unconditionally *before* dma, invalidate cache
 *after* dma for read case

processor might bring data speculatively into the cache,
before the dma completes.
---
 sys/src/9/zynq/emmc.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'sys/src/9/zynq')

diff --git a/sys/src/9/zynq/emmc.c b/sys/src/9/zynq/emmc.c
index 8308d11f8..cdd1e5e8a 100644
--- a/sys/src/9/zynq/emmc.c
+++ b/sys/src/9/zynq/emmc.c
@@ -339,7 +339,7 @@ emmccmd(u32int cmd, u32int arg, u32int *resp)
 }
 
 static void
-emmciosetup(int write, void *buf, int bsize, int bcount)
+emmciosetup(int, void *buf, int bsize, int bcount)
 {
 	u32int *r;
 	uintptr pa;
@@ -350,15 +350,8 @@ emmciosetup(int write, void *buf, int bsize, int bcount)
 		error(Etoobig);
 
 	pa = PADDR(buf);
-	if(write){
-		/* flush cache before write */
-		cleandse((uchar*)buf, (uchar*)buf+len);
-		clean2pa(pa, pa+len);
-	} else {
-		/* invalidate cache before read */
-		invaldse((uchar*)buf, (uchar*)buf+len);
-		inval2pa(pa, pa+len);
-	}
+	cleandse((uchar*)buf, (uchar*)buf+len);
+	clean2pa(pa, pa+len);
 
 	r = emmc.regs;
 	r[Sysaddr] = pa;
@@ -367,7 +360,7 @@ emmciosetup(int write, void *buf, int bsize, int bcount)
 }
 
 static void
-emmcio(int write, uchar *, int)
+emmcio(int write, uchar *buf, int len)
 {
 	u32int *r;
 	int i;
@@ -392,6 +385,12 @@ emmcio(int write, uchar *, int)
 	}
 	if(i)
 		r[Interrupt] = i;
+
+	if(!write){
+		uintptr pa = PADDR(buf);
+		invaldse((uchar*)buf, (uchar*)buf+len);
+		inval2pa(pa, pa+len);
+	}
 }
 
 SDio sdio = {
-- 
cgit v1.2.3