Merge branch 'master' of git://git.denx.de/u-boot-usb
[oweals/u-boot.git] / arch / mips / lib / cache.c
index db81953f86c5486bd1730fed99ac72a5b52f7401..1a8c87d09437258f7f2ce649646cdfe8be213694 100644 (file)
@@ -1,40 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003
  * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <asm/cacheops.h>
+#ifdef CONFIG_MIPS_L2_CACHE
+#include <asm/cm.h>
+#endif
+#include <asm/io.h>
 #include <asm/mipsregs.h>
+#include <asm/system.h>
 
-static inline unsigned long icache_line_size(void)
+DECLARE_GLOBAL_DATA_PTR;
+
+static void probe_l2(void)
 {
-       unsigned long conf1, il;
+#ifdef CONFIG_MIPS_L2_CACHE
+       unsigned long conf2, sl;
+       bool l2c = false;
+
+       if (!(read_c0_config1() & MIPS_CONF_M))
+               return;
+
+       conf2 = read_c0_config2();
 
-       if (!config_enabled(CONFIG_SYS_CACHE_SIZE_AUTO))
-               return CONFIG_SYS_ICACHE_LINE_SIZE;
+       if (__mips_isa_rev >= 6) {
+               l2c = conf2 & MIPS_CONF_M;
+               if (l2c)
+                       l2c = read_c0_config3() & MIPS_CONF_M;
+               if (l2c)
+                       l2c = read_c0_config4() & MIPS_CONF_M;
+               if (l2c)
+                       l2c = read_c0_config5() & MIPS_CONF5_L2C;
+       }
+
+       if (l2c && config_enabled(CONFIG_MIPS_CM)) {
+               gd->arch.l2_line_size = mips_cm_l2_line_size();
+       } else if (l2c) {
+               /* We don't know how to retrieve L2 config on this system */
+               BUG();
+       } else {
+               sl = (conf2 & MIPS_CONF2_SL) >> MIPS_CONF2_SL_SHF;
+               gd->arch.l2_line_size = sl ? (2 << sl) : 0;
+       }
+#endif
+}
+
+void mips_cache_probe(void)
+{
+#ifdef CONFIG_SYS_CACHE_SIZE_AUTO
+       unsigned long conf1, il, dl;
 
        conf1 = read_c0_config1();
+
        il = (conf1 & MIPS_CONF1_IL) >> MIPS_CONF1_IL_SHF;
-       if (!il)
-               return 0;
-       return 2 << il;
+       dl = (conf1 & MIPS_CONF1_DL) >> MIPS_CONF1_DL_SHF;
+
+       gd->arch.l1i_line_size = il ? (2 << il) : 0;
+       gd->arch.l1d_line_size = dl ? (2 << dl) : 0;
+#endif
+       probe_l2();
 }
 
-static inline unsigned long dcache_line_size(void)
+static inline unsigned long icache_line_size(void)
 {
-       unsigned long conf1, dl;
+#ifdef CONFIG_SYS_CACHE_SIZE_AUTO
+       return gd->arch.l1i_line_size;
+#else
+       return CONFIG_SYS_ICACHE_LINE_SIZE;
+#endif
+}
 
-       if (!config_enabled(CONFIG_SYS_CACHE_SIZE_AUTO))
-               return CONFIG_SYS_DCACHE_LINE_SIZE;
+static inline unsigned long dcache_line_size(void)
+{
+#ifdef CONFIG_SYS_CACHE_SIZE_AUTO
+       return gd->arch.l1d_line_size;
+#else
+       return CONFIG_SYS_DCACHE_LINE_SIZE;
+#endif
+}
 
-       conf1 = read_c0_config1();
-       dl = (conf1 & MIPS_CONF1_DL) >> MIPS_CONF1_DL_SHF;
-       if (!dl)
-               return 0;
-       return 2 << dl;
+static inline unsigned long scache_line_size(void)
+{
+#ifdef CONFIG_MIPS_L2_CACHE
+       return gd->arch.l2_line_size;
+#else
+       return CONFIG_SYS_SCACHE_LINE_SIZE;
+#endif
 }
 
 #define cache_loop(start, end, lsize, ops...) do {                     \
@@ -43,6 +98,9 @@ static inline unsigned long dcache_line_size(void)
        const unsigned int cache_ops[] = { ops };                       \
        unsigned int i;                                                 \
                                                                        \
+       if (!lsize)                                                     \
+               break;                                                  \
+                                                                       \
        for (; addr <= aend; addr += lsize) {                           \
                for (i = 0; i < ARRAY_SIZE(cache_ops); i++)             \
                        mips_cache(cache_ops[i], addr);                 \
@@ -53,43 +111,88 @@ void flush_cache(ulong start_addr, ulong size)
 {
        unsigned long ilsize = icache_line_size();
        unsigned long dlsize = dcache_line_size();
+       unsigned long slsize = scache_line_size();
 
        /* aend will be miscalculated when size is zero, so we return here */
        if (size == 0)
                return;
 
-       if (ilsize == dlsize) {
+       if ((ilsize == dlsize) && !slsize) {
                /* flush I-cache & D-cache simultaneously */
                cache_loop(start_addr, start_addr + size, ilsize,
                           HIT_WRITEBACK_INV_D, HIT_INVALIDATE_I);
-               return;
+               goto ops_done;
        }
 
        /* flush D-cache */
        cache_loop(start_addr, start_addr + size, dlsize, HIT_WRITEBACK_INV_D);
 
+       /* flush L2 cache */
+       cache_loop(start_addr, start_addr + size, slsize, HIT_WRITEBACK_INV_SD);
+
        /* flush I-cache */
        cache_loop(start_addr, start_addr + size, ilsize, HIT_INVALIDATE_I);
+
+ops_done:
+       /* ensure cache ops complete before any further memory accesses */
+       sync();
+
+       /* ensure the pipeline doesn't contain now-invalid instructions */
+       instruction_hazard_barrier();
 }
 
-void flush_dcache_range(ulong start_addr, ulong stop)
+void __weak flush_dcache_range(ulong start_addr, ulong stop)
 {
        unsigned long lsize = dcache_line_size();
+       unsigned long slsize = scache_line_size();
 
        /* aend will be miscalculated when size is zero, so we return here */
        if (start_addr == stop)
                return;
 
        cache_loop(start_addr, stop, lsize, HIT_WRITEBACK_INV_D);
+
+       /* flush L2 cache */
+       cache_loop(start_addr, stop, slsize, HIT_WRITEBACK_INV_SD);
+
+       /* ensure cache ops complete before any further memory accesses */
+       sync();
 }
 
 void invalidate_dcache_range(ulong start_addr, ulong stop)
 {
        unsigned long lsize = dcache_line_size();
+       unsigned long slsize = scache_line_size();
 
        /* aend will be miscalculated when size is zero, so we return here */
        if (start_addr == stop)
                return;
 
+       /* invalidate L2 cache */
+       cache_loop(start_addr, stop, slsize, HIT_INVALIDATE_SD);
+
        cache_loop(start_addr, stop, lsize, HIT_INVALIDATE_D);
+
+       /* ensure cache ops complete before any further memory accesses */
+       sync();
+}
+
+int dcache_status(void)
+{
+       unsigned int cca = read_c0_config() & CONF_CM_CMASK;
+       return cca != CONF_CM_UNCACHED;
+}
+
+void dcache_enable(void)
+{
+       puts("Not supported!\n");
+}
+
+void dcache_disable(void)
+{
+       /* change CCA to uncached */
+       change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
+
+       /* ensure the pipeline doesn't contain now-invalid instructions */
+       instruction_hazard_barrier();
 }