[PATCH 05/10] microblaze: cache: split flush_cache() function
Ovidiu Panait
ovpanait at gmail.com
Mon Apr 11 18:26:29 CEST 2022
Factor out icache/dcache components from flush_cache() function. Call the
newly added __flush_icache()/__flush_dcache() functions inside
icache_disable() and dcache_disable(), respectively. There is no need to
flush both caches when disabling a particular cache type.
Signed-off-by: Ovidiu Panait <ovpanait at gmail.com>
---
arch/microblaze/cpu/cache.c | 55 ++++++++++++++++++++++---------------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
index b6bbc215b3..e362a34a79 100644
--- a/arch/microblaze/cpu/cache.c
+++ b/arch/microblaze/cpu/cache.c
@@ -10,6 +10,34 @@
#include <asm/asm.h>
#include <asm/cache.h>
+static void __invalidate_icache(ulong addr, ulong size)
+{
+ if (CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USE_WIC)) {
+ for (int i = 0; i < size; i += 4) {
+ asm volatile (
+ "wic %0, r0;"
+ "nop;"
+ :
+ : "r" (addr + i)
+ : "memory");
+ }
+ }
+}
+
+static void __flush_dcache(ulong addr, ulong size)
+{
+ if (CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USE_WDC)) {
+ for (int i = 0; i < size; i += 4) {
+ asm volatile (
+ "wdc.flush %0, r0;"
+ "nop;"
+ :
+ : "r" (addr + i)
+ : "memory");
+ }
+ }
+}
+
int dcache_status(void)
{
int i = 0;
@@ -38,7 +66,8 @@ void icache_enable(void)
void icache_disable(void)
{
/* we are not generate ICACHE size -> flush whole cache */
- flush_cache(0, 32768);
+ __invalidate_icache(0, 32768);
+
MSRCLR(0x20);
}
@@ -49,31 +78,13 @@ void dcache_enable(void)
void dcache_disable(void)
{
- flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
+ __flush_dcache(0, XILINX_DCACHE_BYTE_SIZE);
MSRCLR(0x80);
}
void flush_cache(ulong addr, ulong size)
{
- int i;
- for (i = 0; i < size; i += 4) {
- if (CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USE_WIC)) {
- asm volatile (
- "wic %0, r0;"
- "nop;"
- :
- : "r" (addr + i)
- : "memory");
- }
-
- if (CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USE_WDC)) {
- asm volatile (
- "wdc.flush %0, r0;"
- "nop;"
- :
- : "r" (addr + i)
- : "memory");
- }
- }
+ __invalidate_icache(addr, size);
+ __flush_dcache(addr, size);
}
--
2.25.1
More information about the U-Boot
mailing list