]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
riscv: cache: Flush L2 cache before jump to linux
authorRick Chen <rick@andestech.com>
Wed, 28 Aug 2019 10:46:09 +0000 (18:46 +0800)
committerAndes <uboot@andestech.com>
Tue, 3 Sep 2019 01:31:03 +0000 (09:31 +0800)
Flush and disable L2 cache in dcache_disable()
which will be called in cleanup_before_linux()
before jump to linux.

The sequence will be preferred as below:
L1 flush -> L1 disable -> L2 flush -> L2 disable

Signed-off-by: Rick Chen <rick@andestech.com>
Cc: KC Lin <kclin@andestech.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
arch/riscv/cpu/ax25/cache.c

index cd95058d9d839c05113e55712dba95354477857c..8f5455e5195741a50d31a7db4369445f03f38d9d 100644 (file)
@@ -5,6 +5,9 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <dm/uclass-internal.h>
+#include <cache.h>
 
 void flush_dcache_all(void)
 {
@@ -59,11 +62,18 @@ void dcache_enable(void)
 {
 #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #ifdef CONFIG_RISCV_NDS_CACHE
+       struct udevice *dev = NULL;
+
        asm volatile (
                "csrr t1, mcache_ctl\n\t"
                "ori t0, t1, 0x2\n\t"
                "csrw mcache_ctl, t0\n\t"
        );
+
+       uclass_find_first_device(UCLASS_CACHE, &dev);
+
+       if (dev)
+               cache_enable(dev);
 #endif
 #endif
 }
@@ -72,12 +82,19 @@ void dcache_disable(void)
 {
 #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #ifdef CONFIG_RISCV_NDS_CACHE
+       struct udevice *dev = NULL;
+
        asm volatile (
                "fence\n\t"
                "csrr t1, mcache_ctl\n\t"
                "andi t0, t1, ~0x2\n\t"
                "csrw mcache_ctl, t0\n\t"
        );
+
+       uclass_find_first_device(UCLASS_CACHE, &dev);
+
+       if (dev)
+               cache_disable(dev);
 #endif
 #endif
 }