Merge branch '2021-09-30-whitespace-cleanups' into next

[platform/kernel/u-boot.git] / arch / arm / cpu / arm926ejs / cache.c

diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c
index 07f036f..95963d2 100644 (file)
--- a/arch/arm/cpu/arm926ejs/cache.c
+++ b/arch/arm/cpu/arm926ejs/cache.c
@@ -1,36 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011
  * Ilya Yanok, EmCraft Systems
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
  */
+#include <cpu_func.h>
+#include <asm/cache.h>
 #include <linux/types.h>
 #include <common.h>
 
-#ifndef CONFIG_SYS_DCACHE_OFF
-
-#ifndef CONFIG_SYS_CACHELINE_SIZE
-#define CONFIG_SYS_CACHELINE_SIZE      32
-#endif
-
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 void invalidate_dcache_all(void)
 {
-       asm volatile("mcr p15, 0, %0, c7, c6, 0\n"::"r"(0));
+       asm volatile("mcr p15, 0, %0, c7, c6, 0\n" : : "r"(0));
 }
 
 void flush_dcache_all(void)
@@ -40,34 +21,17 @@ void flush_dcache_all(void)
                "mrc p15, 0, r15, c7, c14, 3\n"
                "bne 0b\n"
                "mcr p15, 0, %0, c7, c10, 4\n"
-               ::"r"(0):"memory"
+                : : "r"(0) : "memory"
        );
 }
 
-static int check_cache_range(unsigned long start, unsigned long stop)
-{
-       int ok = 1;
-
-       if (start & (CONFIG_SYS_CACHELINE_SIZE - 1))
-               ok = 0;
-
-       if (stop & (CONFIG_SYS_CACHELINE_SIZE - 1))
-               ok = 0;
-
-       if (!ok)
-               debug("CACHE: Misaligned operation at range [%08lx, %08lx]\n",
-                       start, stop);
-
-       return ok;
-}
-
 void invalidate_dcache_range(unsigned long start, unsigned long stop)
 {
        if (!check_cache_range(start, stop))
                return;
 
        while (start < stop) {
-               asm volatile("mcr p15, 0, %0, c7, c6, 1\n"::"r"(start));
+               asm volatile("mcr p15, 0, %0, c7, c6, 1\n" : : "r"(start));
                start += CONFIG_SYS_CACHELINE_SIZE;
        }
 }
@@ -78,18 +42,13 @@ void flush_dcache_range(unsigned long start, unsigned long stop)
                return;
 
        while (start < stop) {
-               asm volatile("mcr p15, 0, %0, c7, c14, 1\n"::"r"(start));
+               asm volatile("mcr p15, 0, %0, c7, c14, 1\n" : : "r"(start));
                start += CONFIG_SYS_CACHELINE_SIZE;
        }
 
-       asm volatile("mcr p15, 0, %0, c7, c10, 4\n"::"r"(0));
-}
-
-void flush_cache(unsigned long start, unsigned long size)
-{
-       flush_dcache_range(start, start + size);
+       asm volatile("mcr p15, 0, %0, c7, c10, 4\n" : : "r"(0));
 }
-#else /* #ifndef CONFIG_SYS_DCACHE_OFF */
+#else /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */
 void invalidate_dcache_all(void)
 {
 }
@@ -97,25 +56,36 @@ void invalidate_dcache_all(void)
 void flush_dcache_all(void)
 {
 }
+#endif /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */
 
-void invalidate_dcache_range(unsigned long start, unsigned long stop)
-{
-}
+/*
+ * Stub implementations for l2 cache operations
+ */
 
-void flush_dcache_range(unsigned long start, unsigned long stop)
-{
-}
+__weak void l2_cache_disable(void) {}
+
+#if CONFIG_IS_ENABLED(SYS_THUMB_BUILD)
+__weak void invalidate_l2_cache(void) {}
+#endif
 
-void flush_cache(unsigned long start, unsigned long size)
+#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)
+/* Invalidate entire I-cache and branch predictor array */
+void invalidate_icache_all(void)
 {
+       unsigned long i = 0;
+
+       asm ("mcr p15, 0, %0, c7, c5, 0" : : "r" (i));
 }
-#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */
+#else
+void invalidate_icache_all(void) {}
+#endif
 
-/*
- * Stub implementations for l2 cache operations
- */
-void __l2_cache_disable(void)
+void enable_caches(void)
 {
+#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)
+       icache_enable();
+#endif
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
+       dcache_enable();
+#endif
 }
-void l2_cache_disable(void)
-        __attribute__((weak, alias("__l2_cache_disable")));