Patchwork [U-Boot,v2,2/3] cache_v7: Check for dcache enablement in dcache flush functions

login
register
mail settings
Submitter Tom Rini
Date June 14, 2012, 9:45 p.m.
Message ID <1339710323-20014-3-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/165021/
State Changes Requested
Delegated to: Marek Vasut
Headers show

Comments

Tom Rini - June 14, 2012, 9:45 p.m.
If we are built with D-CACHE enabled but have run 'dcache off' and then
attempt to flush unaligned regions we spam the console with problems
that aren't true (as the cache was off).

Signed-off-by: Tom Rini <trini@ti.com>
---
 arch/arm/cpu/armv7/cache_v7.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

Patch

diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c
index 1b4e808..1c0f5b0 100644
--- a/arch/arm/cpu/armv7/cache_v7.c
+++ b/arch/arm/cpu/armv7/cache_v7.c
@@ -250,6 +250,9 @@  static void v7_inval_tlb(void)
 
 void invalidate_dcache_all(void)
 {
+	if (!dcache_status())
+		return;
+
 	v7_maint_dcache_all(ARMV7_DCACHE_INVAL_ALL);
 
 	v7_outer_cache_inval_all();
@@ -261,6 +264,9 @@  void invalidate_dcache_all(void)
  */
 void flush_dcache_all(void)
 {
+	if (!dcache_status())
+		return;
+
 	v7_maint_dcache_all(ARMV7_DCACHE_CLEAN_INVAL_ALL);
 
 	v7_outer_cache_flush_all();
@@ -272,6 +278,8 @@  void flush_dcache_all(void)
  */
 void invalidate_dcache_range(unsigned long start, unsigned long stop)
 {
+	if (!dcache_status())
+		return;
 
 	v7_dcache_maint_range(start, stop, ARMV7_DCACHE_INVAL_RANGE);
 
@@ -285,6 +293,9 @@  void invalidate_dcache_range(unsigned long start, unsigned long stop)
  */
 void flush_dcache_range(unsigned long start, unsigned long stop)
 {
+	if (!dcache_status())
+		return;
+
 	v7_dcache_maint_range(start, stop, ARMV7_DCACHE_CLEAN_INVAL_RANGE);
 
 	v7_outer_cache_flush_range(start, stop);