From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>
Subject: [PATCH 2/7] m68k: Rename icache_invalid to invalidate_icache_all
Date: Wed, 19 Jun 2024 15:27:54 -0600 [thread overview]
Message-ID: <20240619212759.3456158-2-trini@konsulko.com> (raw)
In-Reply-To: <20240619212759.3456158-1-trini@konsulko.com>
The implementation of icache_invalid appears to be doing what other
architectures call invalidate_icache_all so rename to match.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Huan Wang <alison.wang@nxp.com>
Angelo Dureghello <angelo@kernel-space.org>
---
arch/m68k/include/asm/cache.h | 1 -
arch/m68k/lib/cache.c | 6 +++---
drivers/net/mcffec.c | 5 +++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
index 6ef7f7be1af8..aa8d2edb40ba 100644
--- a/arch/m68k/include/asm/cache.h
+++ b/arch/m68k/include/asm/cache.h
@@ -185,7 +185,6 @@
#ifndef __ASSEMBLY__ /* put C only stuff in this section */
-void icache_invalid(void);
void dcache_invalid(void);
#endif
diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
index dab834c1cbd8..370ad40f1423 100644
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@@ -29,7 +29,7 @@ int dcache_status(void)
void icache_enable(void)
{
- icache_invalid();
+ invalidate_icache_all();
*cf_icache_status = 1;
@@ -53,7 +53,7 @@ void icache_disable(void)
u32 temp = 0;
*cf_icache_status = 0;
- icache_invalid();
+ invalidate_icache_all();
#if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E)
__asm__ __volatile__("movec %0, %%acr2"::"r"(temp));
@@ -68,7 +68,7 @@ void icache_disable(void)
#endif
}
-void icache_invalid(void)
+void invalidate_icache_all(void)
{
u32 temp;
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 04b711e4f650..7e53492733ed 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -11,6 +11,7 @@
*/
#include <config.h>
+#include <cpu_func.h>
#include <env.h>
#include <hang.h>
#include <malloc.h>
@@ -399,7 +400,7 @@ static int mcffec_send(struct udevice *dev, void *packet, int length)
#endif
#ifdef CONFIG_SYS_UNIFY_CACHE
- icache_invalid();
+ invalidate_icache_all();
#endif
j = 0;
@@ -433,7 +434,7 @@ static int mcffec_recv(struct udevice *dev, int flags, uchar **packetp)
for (;;) {
#ifdef CONFIG_SYS_UNIFY_CACHE
- icache_invalid();
+ invalidate_icache_all();
#endif
/* If nothing received - leave for() loop */
if (info->rxbd[info->rx_idx].cbd_sc & BD_ENET_RX_EMPTY)
--
2.34.1
next prev parent reply other threads:[~2024-06-19 21:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-19 21:27 [PATCH 1/7] m68k: Implement a default flush_dcache_all Tom Rini
2024-06-19 21:27 ` Tom Rini [this message]
2024-06-20 5:47 ` [PATCH 2/7] m68k: Rename icache_invalid to invalidate_icache_all Ilias Apalodimas
2024-06-19 21:27 ` [PATCH 3/7] sh: Implement a default flush_dcache_all Tom Rini
2024-06-25 8:23 ` Ilias Apalodimas
2024-09-10 0:17 ` Marek Vasut
2024-06-19 21:27 ` [PATCH 4/7] sh: Add the old invalidate_icache_all function Tom Rini
2024-09-10 0:18 ` Marek Vasut
2024-06-19 21:27 ` [PATCH 5/7] powerpc: Implement a default flush_dcache_all Tom Rini
2024-06-25 9:57 ` Ilias Apalodimas
2024-06-19 21:27 ` [PATCH 6/7] powerpc: Add the old invalidate_icache_all function Tom Rini
2024-06-19 21:27 ` [PATCH 7/7] cmd: cache: Remove weak functions Tom Rini
2024-06-20 5:48 ` Ilias Apalodimas
2024-06-24 7:37 ` Acked Angelo Dureghello
2024-06-25 8:23 ` [PATCH 1/7] m68k: Implement a default flush_dcache_all Ilias Apalodimas
2024-07-03 23:22 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240619212759.3456158-2-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=ilias.apalodimas@linaro.org \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox