From faf3f0df06f7a994d58eb48cff7a6ccaa0b847a6 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sat, 5 Sep 2015 00:33:57 +0200 Subject: zynq: fix cache flush bug for emmc driver (have to invalidate cache *before* read) --- sys/src/9/zynq/emmc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/src/9/zynq/emmc.c b/sys/src/9/zynq/emmc.c index f13d68ac3..8308d11f8 100644 --- a/sys/src/9/zynq/emmc.c +++ b/sys/src/9/zynq/emmc.c @@ -351,8 +351,13 @@ emmciosetup(int write, void *buf, int bsize, int bcount) 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); } r = emmc.regs; @@ -362,7 +367,7 @@ emmciosetup(int write, void *buf, int bsize, int bcount) } static void -emmcio(int write, uchar *buf, int len) +emmcio(int write, uchar *, int) { u32int *r; int i; @@ -387,12 +392,6 @@ emmcio(int write, uchar *buf, int len) } 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