microblaze: Consolidate cache code

Merge cpu and lib cache code.
Flush cache before disabling.

Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
index 3b7c4d4f7f9a61b79a0dc1cde5b778e5aab12b3d..d258a6938228e499c508845d3a985e0ed6e2f99e 100644 (file)
--- a/arch/microblaze/cpu/cache.c
+++ b/arch/microblaze/cpu/cache.c
@@ -50,6 +50,8 @@ void  icache_enable (void) {
 }
 
 void   icache_disable(void) {
 }
 
 void   icache_disable(void) {

+       /* we are not generate ICACHE size -> flush whole cache */
+       flush_cache(0, 32768);

        MSRCLR(0x20);
 }
 
        MSRCLR(0x20);
 }
 


@@ -58,5 +60,31 @@ void dcache_enable (void) {
 }
 
 void   dcache_disable(void) {
 }
 
 void   dcache_disable(void) {

+#ifdef XILINX_USE_DCACHE
+#ifdef XILINX_DCACHE_BYTE_SIZE
+       flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
+#else
+#warning please rebuild BSPs and update configuration
+       flush_cache(0, 32768);
+#endif
+#endif

        MSRCLR(0x80);
 }
        MSRCLR(0x80);
 }

+
+void flush_cache (ulong addr, ulong size)
+{
+       int i;
+       for (i = 0; i < size; i += 4)
+               asm volatile (
+#ifdef CONFIG_ICACHE
+                               "wic    %0, r0;"
+#endif
+                               "nop;"
+#ifdef CONFIG_DCACHE
+                               "wdc.flush      %0, r0;"
+#endif
+                               "nop;"
+                               :
+                               : "r" (addr + i)
+                               : "memory");
+}

diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index 9b0f296e3fda0f2adf2b5d99a924298aa5e9e023..817643795e49af55e117dd2a33b9a5dbb0784715 100644 (file)
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -29,7 +29,6 @@ SOBJS-y       +=
 
 COBJS-y        += board.o
 COBJS-y        += bootm.o
 
 COBJS-y        += board.o
 COBJS-y        += bootm.o

-COBJS-y        += cache.o

 COBJS-y        += time.o
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 COBJS-y        += time.o
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)

diff --git a/arch/microblaze/lib/cache.c b/arch/microblaze/lib/cache.c
deleted file mode 100644 (file)
index 9b6b60f..0000000
--- a/arch/microblaze/lib/cache.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * (C) Copyright 2004 Atmark Techno, Inc.
- *
- * Yasushi SHOJI <yashi@atmark-techno.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-
-void flush_cache (ulong addr, ulong size)
-{
-       int i;
-       for (i = 0; i < size; i += 4)
-               asm volatile (
-#ifdef CONFIG_ICACHE
-                               "wic    %0, r0;"
-#endif
-                               "nop;"
-#ifdef CONFIG_DCACHE
-                               "wdc.flush      %0, r0;"
-#endif
-                               "nop;"
-                               :
-                               : "r" (addr + i)
-                               : "memory");
-}