Skip to content

armv7-a/r:cp15_invalidate_dcache_all: fix Sets mask error. #5354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Jan 27, 2022
Merged

armv7-a/r:cp15_invalidate_dcache_all: fix Sets mask error. #5354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,12 @@
cp15_invalidate_dcache_all:

mrc CP15_CCSIDR(r0) /* Read the Cache Size Identification Register */
ldr r3, =0xffff /* Isolate the NumSets field (bits 13-27) */
ldr r3, =0x7fff /* Isolate the NumSets field (bits 13-27) */
and r0, r3, r0, lsr #13 /* r0=NumSets (number of sets - 1) */

ldr r3, =0x3ff /* Isolate the way field (bits 3-12) */
add r4, r3, r0, lsr #3 /* r4=(number of ways - 1) */

mov r1, #0 /* r1 = way loop counter */
way_loop:

Expand All @@ -108,7 +111,7 @@ set_loop:
bne set_loop /* Keep looping if not */

add r1, r1, #1 /* Increment the way counter */
cmp r1, #4 /* Last way? (four ways assumed) */
cmp r4, r1 /* Last way? */
bne way_loop /* Keep looping if not */

dsb
Expand Down
7 changes: 5 additions & 2 deletions arch/arm/src/armv7-r/cp15_invalidate_dcache_all.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,12 @@
cp15_invalidate_dcache_all:

mrc CP15_CCSIDR(r0) /* Read the Cache Size Identification Register */
ldr r3, =0xffff /* Isolate the NumSets field (bits 13-27) */
ldr r3, =0x7fff /* Isolate the NumSets field (bits 13-27) */
and r0, r3, r0, lsr #13 /* r0=NumSets (number of sets - 1) */

ldr r3, =0x3ff /* Isolate the way field (bits 3-12) */
add r4, r3, r0, lsr #3 /* r4=(number of ways - 1) */

mov r1, #0 /* r1 = way loop counter */
way_loop:

Expand All @@ -108,7 +111,7 @@ set_loop:
bne set_loop /* Keep looping if not */

add r1, r1, #1 /* Increment the way counter */
cmp r1, #4 /* Last way? (four ways assumed) */
cmp r4, r1 /* Last way? (four ways assumed) */
bne way_loop /* Keep looping if not */

dsb
Expand Down