ARM (ARM11): add data cache support, test on Qong board

Add data cache support for arm1136 systems.

Enable "cache" command on Qong board and test performance.

    Test 1: Loading 127 MB of data from NAND flash into RAM:

    Instr. Cache	off	on	on
      Data Cache	off	off	on
    --------------------------------------------------
    QONG (ARM11)	177s	95s	43s	= x 4.1

    Test 2: uncompressing a gzipped image from RAM to RAM
            (size compressed: 6.5 MiB, uncompressed: 35 MiB):

    Instr. Cache	off	on	on
      Data Cache	off	off	on
    --------------------------------------------------
    QONG (ARM11)	1.54s	0.95s	0.18s	= x 8.6

Portions of this work were supported by funding from
the CE Linux Forum.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index 41eb82dae246b9509545f051daac605a02b7db05..1c58abdcd05dcc4ba0426180fd88f7e16d0962ad 100644 (file)
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -439,6 +439,11 @@ fiq:
        .align 5
 .global arm1136_cache_flush
 arm1136_cache_flush:
+#if !defined(CONFIG_SYS_NO_ICACHE)
                mcr     p15, 0, r1, c7, c5, 0   @ invalidate I cache
+#endif
+#if !defined(CONFIG_SYS_NO_DCACHE)
+               mcr     p15, 0, r1, c7, c14, 0  @ invalidate D cache
+#endif
                mov     pc, lr                  @ back to caller
 #endif /* CONFIG_PRELOADER */

diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 3684cad16aaf0bbf8042d57d5651dc90768ebfe5..55b633ee0013c9a7a4220057eb8c93d7075e01c6 100644 (file)
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -27,7 +27,7 @@
 
 void  flush_cache (unsigned long dummy1, unsigned long dummy2)
 {
-#ifdef CONFIG_OMAP2420
+#if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
        void arm1136_cache_flush(void);
 
        arm1136_cache_flush();

diff --git a/include/configs/qong.h b/include/configs/qong.h
index 100fa3f8aca4d781a421efb1005cd32d7f6ccc11..4735b5eb8824e5fb38848e247c2547e7ceff1025 100644 (file)
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -104,6 +104,7 @@
 
 #include <config_cmd_default.h>
 
+#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NET