Skip to contentSkip to conversation

ARM1136: Fix cache range checks

PATCH New Benoît Thébaudeau 2 participants 2 messages Jul 19, 2012 Arm (32-bit)

lore
Share & tools
lore

Benoît Thébaudeau

author
#0 lore raw

PATCH 1/1 ARM1136: Fix cache range checks

bad_cache_range actually returned true if the range was OK, but it was used according to its name, which resulted in all valid dcache range invalidate/flush operations being dropped. Hence, most DMA transfers resulted in garbage data.

This patch renames this function according to what it does, and it fixes the interpretation of its return value by other functions. The chosen naming is the same as for ARM926EJ-S in order to be consistent.

Signed-off-by Beno?t Th?baudeau <[email protected]>
Cc Albert Aribaud <[email protected]>
---
 .../arch/arm/cpu/arm1136/cpu.c                     |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/cpu/arm1136/cpu.c +3 -3
index f72bab6..b98e3d9 100644
@@ -95,7 +95,7 @@ void flush_dcache_all(void)
 	asm volatile("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
 }
 
-static inline int bad_cache_range(unsigned long start, unsigned long stop)
+static int check_cache_range(unsigned long start, unsigned long stop)
 {
 	int ok = 1;
 

@@ -114,7 +114,7 @@ static inline int bad_cache_range(unsigned long start, unsigned long stop)
 
 void invalidate_dcache_range(unsigned long start, unsigned long stop)
 {
-	if (bad_cache_range(start, stop))
+	if (!check_cache_range(start, stop))
 		return;
 
 	while (start < stop) {

@@ -125,7 +125,7 @@ void invalidate_dcache_range(unsigned long start, unsigned long stop)
 
 void flush_dcache_range(unsigned long start, unsigned long stop)
 {
-	if (bad_cache_range(start, stop))
+	if (!check_cache_range(start, stop))
 		return;
 
 	while (start < stop) {
#1 lore raw

PATCH 1/1 ARM1136: Fix cache range checks

Quoted 11 lines · Beno?t Th?baudeau

bad_cache_range actually returned true if the range was OK, but it was used according to its name, which resulted in all valid dcache range invalidate/flush operations being dropped. Hence, most DMA transfers resulted in garbage data.

This patch renames this function according to what it does, and it fixes the interpretation of its return value by other functions. The chosen naming is the same as for ARM926EJ-S in order to be consistent.

Signed-off-by Beno?t Th?baudeau <[email protected]>
Cc Albert Aribaud <[email protected]>

---

Hi Beno?t,

thanks for fix this !

Quoted 26 lines
 .../arch/arm/cpu/arm1136/cpu.c                     |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/cpu/arm1136/cpu.c +2 -2
index f72bab6..b98e3d9 100644
@@ -95,7 +95,7 @@ void flush_dcache_all(void)
 	asm volatile("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
 }
 
-static inline int bad_cache_range(unsigned long start, unsigned long stop)
+static int check_cache_range(unsigned long start, unsigned long stop)
 {
 	int ok = 1;
 

@@ -114,7 +114,7 @@ static inline int bad_cache_range(unsigned long start, unsigned long stop)
 
 void invalidate_dcache_range(unsigned long start, unsigned long stop)
 {
-	if (bad_cache_range(start, stop))
+	if (!check_cache_range(start, stop))
 		return;
 
 	while (start < stop) {

arch/arm/cpu/arm1136/cpu.c void invalidate_dcache_range(unsigned long start, unsigned long stop) · line 131

Quoted 8 lines
arch/arm/cpu/arm1136/cpu.c +1 -1
@@ -125,7 +125,7 @@ void invalidate_dcache_range(unsigned long start, unsigned long stop)
 
 void flush_dcache_range(unsigned long start, unsigned long stop)
 {
-	if (bad_cache_range(start, stop))
+	if (!check_cache_range(start, stop))
 		return;
 
 	while (start < stop) {
Acked-by Stefano Babic <[email protected]>

Albert, this is surely a fix - can you apply it for the release ?

Thanks,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================