microblaze: cache: introduce flush_cache_all()

All flush_cache() calls in microblaze code are supposed to flush the
entire instruction and data caches, so introduce flush_cache_all()
helper to handle this.

Also, provide implementations for flush_dcache_all() and
invalidate_icache_all() so that icache and dcache u-boot commands can
work.

Signed-off-by: Ovidiu Panait <ovpanait@gmail.com>
Link: https://lore.kernel.org/r/20220531181435.3473549-9-ovpanait@gmail.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
index d5c0afd9355d1d8539e6a82cb11fa3401a8371a2..b99b8c170669496e942b6752586fdb7a2267d56e 100644 (file)
--- a/arch/microblaze/cpu/cache.c
+++ b/arch/microblaze/cpu/cache.c
@@ -24,6 +24,11 @@ static void __invalidate_icache(ulong addr, ulong size)
        }
 }
 
+void invalidate_icache_all(void)
+{
+       __invalidate_icache(0, CONFIG_XILINX_MICROBLAZE0_ICACHE_SIZE);
+}
+
 static void __flush_dcache(ulong addr, ulong size)
 {
        if (CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USE_WDC)) {
@@ -38,6 +43,11 @@ static void __flush_dcache(ulong addr, ulong size)
        }
 }
 
+void flush_dcache_all(void)
+{
+       __flush_dcache(0, CONFIG_XILINX_MICROBLAZE0_DCACHE_SIZE);
+}
+
 int dcache_status(void)
 {
        int i = 0;
@@ -65,7 +75,7 @@ void icache_enable(void)
 
 void icache_disable(void)
 {
-       __invalidate_icache(0, CONFIG_XILINX_MICROBLAZE0_ICACHE_SIZE);
+       invalidate_icache_all();
 
        MSRCLR(0x20);
 }
@@ -77,7 +87,7 @@ void dcache_enable(void)
 
 void dcache_disable(void)
 {
-       __flush_dcache(0, CONFIG_XILINX_MICROBLAZE0_DCACHE_SIZE);
+       flush_dcache_all();
 
        MSRCLR(0x80);
 }
@@ -87,3 +97,9 @@ void flush_cache(ulong addr, ulong size)
        __invalidate_icache(addr, size);
        __flush_dcache(addr, size);
 }
+
+void flush_cache_all(void)
+{
+       invalidate_icache_all();
+       flush_dcache_all();
+}

diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index 6e3ffafa5fd3f583f249cad3e82797f0fe23a746..e6a30e8e002bac5172047bf720d6166032018298 100644 (file)
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -98,9 +98,7 @@ uboot_sym_start:
 #endif
 
        /* Flush cache before enable cache */
-       addik   r5, r0, 0
-       addik   r6, r0, CONFIG_XILINX_MICROBLAZE0_DCACHE_SIZE
-       brlid   r15, flush_cache
+       brlid   r15, flush_cache_all
        nop
 
        /* enable instruction and data cache */
@@ -349,9 +347,7 @@ relocate_code:
 #endif
 
        /* Flush caches to ensure consistency */
-       addik   r5, r0, 0
-       addik   r6, r0, CONFIG_XILINX_MICROBLAZE0_DCACHE_SIZE
-       brlid   r15, flush_cache
+       brlid   r15, flush_cache_all
        nop
 
 2:     addi    r5, r31, 0 /* gd is initialized in board_r.c */

diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
index baee01a0e2814ede877b5fcf468da33e28d1529c..c39b66dd7da633352d6ef0e8fd81d6520814d714 100644 (file)
--- a/arch/microblaze/include/asm/cache.h
+++ b/arch/microblaze/include/asm/cache.h
@@ -18,4 +18,9 @@
 #define ARCH_DMA_MINALIGN      16
 #endif
 
+/**
+ * flush_cache_all - flush the entire instruction/data caches
+ */
+void flush_cache_all(void);
+
 #endif /* __MICROBLAZE_CACHE_H__ */

diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 48e05333a67653c29050e3eefb5f0aaba1682415..af946b864282b582c92f91ccbcf2ba326c8de440 100644 (file)
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -57,7 +57,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
               "(fake run for tracing)" : "");
        bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
 
-       flush_cache(0, CONFIG_XILINX_MICROBLAZE0_DCACHE_SIZE);
+       flush_cache_all();
 
        if (!fake) {
                /*