This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch releases/10.3
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ec8fa7d2bfd649d8848448243744e30c96467ff2
Author: zhuyanlin <zhuyanl...@xiaomi.com>
AuthorDate: Tue Apr 19 20:55:32 2022 +0800
armv7/r:cp15_cache_all: fix error in LineSize 'r5' mask
r5 = r3 & r1
Signed-off-by: zhuyanlin <zhuyanl...@xiaomi.com>
---
arch/arm/src/armv7-a/cp15_flush_dcache_all.S | 2 +-
arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S | 2 +-
arch/arm/src/armv7-r/cp15_clean_dcache_all.S | 2 +-
arch/arm/src/armv7-r/cp15_flush_dcache_all.S | 2 +-
arch/arm/src/armv7-r/cp15_invalidate_dcache_all.S | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/armv7-a/cp15_flush_dcache_all.S
b/arch/arm/src/armv7-a/cp15_flush_dcache_all.S
index fc7c2600f2..ddb5d70637 100644
--- a/arch/arm/src/armv7-a/cp15_flush_dcache_all.S
+++ b/arch/arm/src/armv7-a/cp15_flush_dcache_all.S
@@ -99,7 +99,7 @@ cp15_flush_dcache_all:
and r0, r3, r1, lsr #13 /* r0=NumSets (number
of sets - 1) */
ldr r3,=0x7 /* Isolate the LineSize
field (bits 0-2) */
- and r5, r3 /* r4=(Log2LineSize -
2) in word */
+ and r5, r3, r1 /* r4=(Log2LineSize -
2) in word */
add r5, #4 /* r4=Set/way operation
line shfit */
ldr r3, =0x3ff /* Isolate the way
field (bits 3-12) */
diff --git a/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
b/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
index 9447b60c28..9b5f95491e 100644
--- a/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
+++ b/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
@@ -99,7 +99,7 @@ cp15_invalidate_dcache_all:
and r0, r3, r1, lsr #13 /* r0=NumSets (number
of sets - 1) */
ldr r3,=0x7 /* Isolate the LineSize
field (bits 0-2) */
- and r5, r3 /* r4=(Log2LineSize -
2) in word */
+ and r5, r3, r1 /* r4=(Log2LineSize -
2) in word */
add r5, #4 /* r4=Set/way operation
line shfit */
ldr r3, =0x3ff /* Isolate the way
field (bits 3-12) */
diff --git a/arch/arm/src/armv7-r/cp15_clean_dcache_all.S
b/arch/arm/src/armv7-r/cp15_clean_dcache_all.S
index c3c199fb10..4a08dfbc70 100644
--- a/arch/arm/src/armv7-r/cp15_clean_dcache_all.S
+++ b/arch/arm/src/armv7-r/cp15_clean_dcache_all.S
@@ -99,7 +99,7 @@ cp15_clean_dcache_all:
and r0, r3, r1, lsr #13 /* r0=NumSets (number
of sets - 1) */
ldr r3,=0x7 /* Isolate the LineSize
field (bits 0-2) */
- and r5, r3 /* r4=(Log2LineSize -
2) in word */
+ and r5, r3, r1 /* r4=(Log2LineSize -
2) in word */
add r5, #4 /* r4=Set/way operation
line shfit */
ldr r3, =0x3ff /* Isolate the way
field (bits 3-12) */
diff --git a/arch/arm/src/armv7-r/cp15_flush_dcache_all.S
b/arch/arm/src/armv7-r/cp15_flush_dcache_all.S
index 0ae8cfe6c8..747d12271d 100644
--- a/arch/arm/src/armv7-r/cp15_flush_dcache_all.S
+++ b/arch/arm/src/armv7-r/cp15_flush_dcache_all.S
@@ -99,7 +99,7 @@ cp15_flush_dcache_all:
and r0, r3, r1, lsr #13 /* r0=NumSets (number
of sets - 1) */
ldr r3,=0x7 /* Isolate the LineSize
field (bits 0-2) */
- and r5, r3 /* r4=(Log2LineSize -
2) in word */
+ and r5, r3, r1 /* r4=(Log2LineSize -
2) in word */
add r5, #4 /* r4=Set/way operation
line shfit */
ldr r3, =0x3ff /* Isolate the way
field (bits 3-12) */
diff --git a/arch/arm/src/armv7-r/cp15_invalidate_dcache_all.S
b/arch/arm/src/armv7-r/cp15_invalidate_dcache_all.S
index d1836a8c03..399e8cf8e2 100644
--- a/arch/arm/src/armv7-r/cp15_invalidate_dcache_all.S
+++ b/arch/arm/src/armv7-r/cp15_invalidate_dcache_all.S
@@ -99,7 +99,7 @@ cp15_invalidate_dcache_all:
and r0, r3, r1, lsr #13 /* r0=NumSets (number
of sets - 1) */
ldr r3,=0x7 /* Isolate the LineSize
field (bits 0-2) */
- and r5, r3 /* r4=(Log2LineSize -
2) in word */
+ and r5, r3, r1 /* r4=(Log2LineSize -
2) in word */
add r5, #4 /* r4=Set/way operation
line shfit */
ldr r3, =0x3ff /* Isolate the way
field (bits 3-12) */
