diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-22 15:28:30 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-22 15:28:30 +0000 |
| commit | 9d069f462c65190c5116e750e7b376793cd32a15 (patch) | |
| tree | 1ee1898ec9205a69428eecf20df4777ef14024c6 | |
| parent | 4105a61b153ff238387b999be6f8bf97a2843690 (diff) | |
| parent | 3fc18fc1b3bd044b362cc18d4d6c45ff6c5303eb (diff) | |
| download | linaro-lsk-linux-linaro-lsk-test.tar.gz | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm32-cache' into linux-linaro-lsklinux-linaro-lsk-test
| -rw-r--r-- | arch/arm/mm/cache-v7.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index 515b00064da..a84e0536ce7 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S @@ -146,18 +146,18 @@ flush_levels: ldr r7, =0x7fff ands r7, r7, r1, lsr #13 @ extract max number of the index size loop1: - mov r9, r4 @ create working copy of max way size + mov r9, r7 @ create working copy of max index loop2: - ARM( orr r11, r10, r9, lsl r5 ) @ factor way and cache number into r11 - THUMB( lsl r6, r9, r5 ) + ARM( orr r11, r10, r4, lsl r5 ) @ factor way and cache number into r11 + THUMB( lsl r6, r4, r5 ) THUMB( orr r11, r10, r6 ) @ factor way and cache number into r11 - ARM( orr r11, r11, r7, lsl r2 ) @ factor index number into r11 - THUMB( lsl r6, r7, r2 ) + ARM( orr r11, r11, r9, lsl r2 ) @ factor index number into r11 + THUMB( lsl r6, r9, r2 ) THUMB( orr r11, r11, r6 ) @ factor index number into r11 mcr p15, 0, r11, c7, c14, 2 @ clean & invalidate by set/way - subs r9, r9, #1 @ decrement the way + subs r9, r9, #1 @ decrement the index bge loop2 - subs r7, r7, #1 @ decrement the index + subs r4, r4, #1 @ decrement the way bge loop1 skip: add r10, r10, #2 @ increment cache number |