From b88d770112807fa9e82344c14e9a271f56b162fd Mon Sep 17 00:00:00 2001
From: Kent McLeod <Kent.Mcleod@data61.csiro.au>
Date: Wed, 13 Feb 2019 17:25:09 +1100
Subject: [PATCH] arm: Rename plat_cleanInvalidateCache
Rename plat_cleanInvalidateCache to plat_cleanInvalidateL2Cache to
indicate that it is a L2 cache maintenance operation only.
---
include/arch/arm/arch/machine.h | 2 +-
include/arch/arm/arch/machine/l2c_310.h | 2 +-
src/arch/arm/kernel/boot.c | 2 +-
src/arch/arm/machine/cache.c | 2 +-
src/arch/arm/machine/l2c_310.c | 2 +-
src/arch/arm/machine/l2c_nop.c | 2 +-
src/plat/allwinnerA20/machine/l2cache.c | 2 +-
src/plat/am335x/machine/l2cache.c | 2 +-
src/plat/imx31/machine/hardware.c | 2 +-
src/plat/omap3/machine/l2cache.c | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/arch/arm/arch/machine.h b/include/arch/arm/arch/machine.h
index 6f09e37b8..5560a1718 100644
--- a/include/arch/arm/arch/machine.h
+++ b/include/arch/arm/arch/machine.h
@@ -33,7 +33,7 @@ void setIRQTrigger(irq_t irq, bool_t trigger);
static inline void plat_cleanL2Range(paddr_t start, paddr_t end);
static inline void plat_invalidateL2Range(paddr_t start, paddr_t end);
static inline void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end);
-static inline void plat_cleanInvalidateCache(void);
+static inline void plat_cleanInvalidateL2Cache(void);
void cleanInvalidateCacheRange_RAM(word_t start, word_t end, paddr_t pstart);
void cleanCacheRange_RAM(word_t start, word_t end, paddr_t pstart);
diff --git a/include/arch/arm/arch/machine/l2c_310.h b/include/arch/arm/arch/machine/l2c_310.h
index ef3ca6190..e1c4ece79 100644
--- a/include/arch/arm/arch/machine/l2c_310.h
+++ b/include/arch/arm/arch/machine/l2c_310.h
@@ -20,7 +20,7 @@
void initL2Cache(void);
-void plat_cleanInvalidateCache(void);
+void plat_cleanInvalidateL2Cache(void);
void plat_cleanCache(void);
void plat_cleanL2Range(paddr_t start, paddr_t end);
void plat_invalidateL2Range(paddr_t start, paddr_t end);
diff --git a/src/arch/arm/kernel/boot.c b/src/arch/arm/kernel/boot.c
index 14e740efa..2c5bef5e0 100644
--- a/src/arch/arm/kernel/boot.c
+++ b/src/arch/arm/kernel/boot.c
@@ -350,7 +350,7 @@ release_secondary_cpus(void)
* turns on the cache. Thus, we do not need to clean and invaliate the cache.
*/
cleanInvalidateL1Caches();
- plat_cleanInvalidateCache();
+ plat_cleanInvalidateL2Cache();
#endif
/* Wait until all the secondary cores are done initialising */
diff --git a/src/arch/arm/machine/cache.c b/src/arch/arm/machine/cache.c
index 0c5ee031f..b587cde11 100644
--- a/src/arch/arm/machine/cache.c
+++ b/src/arch/arm/machine/cache.c
@@ -190,7 +190,7 @@ void
arch_clean_invalidate_caches(void)
{
cleanCaches_PoU();
- plat_cleanInvalidateCache();
+ plat_cleanInvalidateL2Cache();
cleanInvalidateL1Caches();
isb();
}
diff --git a/src/arch/arm/machine/l2c_310.c b/src/arch/arm/machine/l2c_310.c
index 3072faa30..6b23461b8 100644
--- a/src/arch/arm/machine/l2c_310.c
+++ b/src/arch/arm/machine/l2c_310.c
@@ -360,7 +360,7 @@ static inline void L2_cacheSync(void)
while (l2cc->maintenance.cache_sync & MAINTENANCE_PENDING);
}
-void plat_cleanInvalidateCache(void)
+void plat_cleanInvalidateL2Cache(void)
{
if (!config_set(CONFIG_DEBUG_DISABLE_L2_CACHE)) {
l2cc->maintenance.clean_way = 0xffff;
diff --git a/src/arch/arm/machine/l2c_nop.c b/src/arch/arm/machine/l2c_nop.c
index 1277c927d..c5f46f99f 100644
--- a/src/arch/arm/machine/l2c_nop.c
+++ b/src/arch/arm/machine/l2c_nop.c
@@ -19,4 +19,4 @@ void initL2Cache(void) {}
void plat_cleanL2Range(paddr_t start, paddr_t end) {}
void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}
diff --git a/src/plat/allwinnerA20/machine/l2cache.c b/src/plat/allwinnerA20/machine/l2cache.c
index 5e3a29486..fe18b4613 100755
--- a/src/plat/allwinnerA20/machine/l2cache.c
+++ b/src/plat/allwinnerA20/machine/l2cache.c
@@ -44,4 +44,4 @@ initL2Cache(void)
void plat_cleanL2Range(paddr_t start, paddr_t end) {}
void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}
diff --git a/src/plat/am335x/machine/l2cache.c b/src/plat/am335x/machine/l2cache.c
index 9537555f7..407b6d8ca 100644
--- a/src/plat/am335x/machine/l2cache.c
+++ b/src/plat/am335x/machine/l2cache.c
@@ -44,4 +44,4 @@ initL2Cache(void)
void plat_cleanL2Range(paddr_t start, paddr_t end) {}
void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}
diff --git a/src/plat/imx31/machine/hardware.c b/src/plat/imx31/machine/hardware.c
index 7d5130483..720da49e5 100644
--- a/src/plat/imx31/machine/hardware.c
+++ b/src/plat/imx31/machine/hardware.c
@@ -143,7 +143,7 @@ void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end)
finaliseL2Op();
}
-void plat_cleanInvalidateCache(void)
+void plat_cleanInvalidateL2Cache(void)
{
cleanL2();
invalidateL2();
diff --git a/src/plat/omap3/machine/l2cache.c b/src/plat/omap3/machine/l2cache.c
index 9537555f7..407b6d8ca 100644
--- a/src/plat/omap3/machine/l2cache.c
+++ b/src/plat/omap3/machine/l2cache.c
@@ -44,4 +44,4 @@ initL2Cache(void)
void plat_cleanL2Range(paddr_t start, paddr_t end) {}
void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}
--
GitLab