From 6a7e2f92b0ba7a51e01961b9aa840ab5b086115b Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
Date: Mon, 22 Nov 2021 09:47:09 +0100
Subject: asm-generic: move sync_caches_for_execution declaration to
 <asm/cache.h>

We have three architectures defining sync_caches_for_execution(). Have
them all do so in a header of the same name to allow using it in common
code later on, like in an EFI image loading routine.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20211122084732.2597109-8-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/include/asm/cache.h           |  3 +++
 arch/kvx/include/asm/cache.h           |  3 +++
 arch/riscv/include/asm/barebox-riscv.h |  3 +--
 arch/riscv/include/asm/cache.h         | 21 +++++++++++++++++++++
 arch/riscv/include/asm/cacheflush.h    | 16 ----------------
 arch/riscv/lib/reloc.c                 |  2 +-
 6 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 arch/riscv/include/asm/cache.h
 delete mode 100644 arch/riscv/include/asm/cacheflush.h

(limited to 'arch')

diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
index bf3a1a0ed2..9ebe80dc89 100644
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
@@ -21,6 +21,9 @@ int arm_set_cache_functions(void);
 void arm_early_mmu_cache_flush(void);
 void arm_early_mmu_cache_invalidate(void);
 
+#define sync_caches_for_execution sync_caches_for_execution
 void sync_caches_for_execution(void);
 
+#include <asm-generic/cache.h>
+
 #endif
diff --git a/arch/kvx/include/asm/cache.h b/arch/kvx/include/asm/cache.h
index 0bf3c8f06e..72de5d804f 100644
--- a/arch/kvx/include/asm/cache.h
+++ b/arch/kvx/include/asm/cache.h
@@ -10,6 +10,7 @@
 
 void invalidate_dcache_range(unsigned long addr, unsigned long stop);
 
+#define sync_caches_for_execution sync_caches_for_execution
 static inline void sync_caches_for_execution(void)
 {
 	__builtin_kvx_fence();
@@ -28,4 +29,6 @@ static inline void dcache_inval(void)
 	__builtin_kvx_dinval();
 }
 
+#include <asm-generic/cache.h>
+
 #endif /* __KVX_CACHE_H */
diff --git a/arch/riscv/include/asm/barebox-riscv.h b/arch/riscv/include/asm/barebox-riscv.h
index abb3202427..5c87d37c9e 100644
--- a/arch/riscv/include/asm/barebox-riscv.h
+++ b/arch/riscv/include/asm/barebox-riscv.h
@@ -20,6 +20,7 @@
 #include <asm/sections.h>
 #include <asm/barebox-riscv-head.h>
 #include <asm/system.h>
+#include <asm/cache.h>
 
 unsigned long get_runtime_offset(void);
 
@@ -27,8 +28,6 @@ void setup_c(void);
 void relocate_to_current_adr(void);
 void relocate_to_adr(unsigned long target);
 
-void sync_caches_for_execution(void);
-
 void __noreturn __naked barebox_riscv_entry(unsigned long membase, unsigned long memsize,
 					    void *boarddata, unsigned int flags);
 
diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h
new file mode 100644
index 0000000000..9a0b9326b2
--- /dev/null
+++ b/arch/riscv/include/asm/cache.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2015 Regents of the University of California
+ */
+
+#ifndef _ASM_RISCV_CACHE_H
+#define _ASM_RISCV_CACHE_H
+
+static inline void local_flush_icache_all(void)
+{
+#ifdef HAS_CACHE
+	asm volatile ("fence.i" ::: "memory");
+#endif
+}
+
+#define sync_caches_for_execution sync_caches_for_execution
+void sync_caches_for_execution(void);
+
+#include <asm-generic/cache.h>
+
+#endif /* _ASM_RISCV_CACHEFLUSH_H */
diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h
deleted file mode 100644
index 9ff25740c6..0000000000
--- a/arch/riscv/include/asm/cacheflush.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2015 Regents of the University of California
- */
-
-#ifndef _ASM_RISCV_CACHEFLUSH_H
-#define _ASM_RISCV_CACHEFLUSH_H
-
-static inline void local_flush_icache_all(void)
-{
-#ifdef HAS_CACHE
-	asm volatile ("fence.i" ::: "memory");
-#endif
-}
-
-#endif /* _ASM_RISCV_CACHEFLUSH_H */
diff --git a/arch/riscv/lib/reloc.c b/arch/riscv/lib/reloc.c
index 479d586afd..da53c50448 100644
--- a/arch/riscv/lib/reloc.c
+++ b/arch/riscv/lib/reloc.c
@@ -5,7 +5,7 @@
 #include <linux/linkage.h>
 #include <asm/sections.h>
 #include <asm/barebox-riscv.h>
-#include <asm/cacheflush.h>
+#include <asm/cache.h>
 #include <debug_ll.h>
 #include <asm-generic/module.h>
 
-- 
cgit v1.2.3