Commit 4dd1b7fa authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper

ARM: mvebu: improve comments in coherency_ll.S

This commit makes no functional change, it only improves a bit the
various code comments in mach-mvebu/coherency_ll.S, by fixing a few
typos and adding a few more details.
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-4-git-send-email-thomas.petazzoni@free-electrons.comAcked-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 90ba76f6
...@@ -24,26 +24,32 @@ ...@@ -24,26 +24,32 @@
#include <asm/cp15.h> #include <asm/cp15.h>
.text .text
/* Returns with the coherency address in r1 (r0 is untouched)*/ /* Returns the coherency base address in r1 (r0 is untouched) */
ENTRY(ll_get_coherency_base) ENTRY(ll_get_coherency_base)
mrc p15, 0, r1, c1, c0, 0 mrc p15, 0, r1, c1, c0, 0
tst r1, #CR_M @ Check MMU bit enabled tst r1, #CR_M @ Check MMU bit enabled
bne 1f bne 1f
/* use physical address of the coherency register */ /*
* MMU is disabled, use the physical address of the coherency
* base address.
*/
adr r1, 3f adr r1, 3f
ldr r3, [r1] ldr r3, [r1]
ldr r1, [r1, r3] ldr r1, [r1, r3]
b 2f b 2f
1: 1:
/* use virtual address of the coherency register */ /*
* MMU is enabled, use the virtual address of the coherency
* base address.
*/
ldr r1, =coherency_base ldr r1, =coherency_base
ldr r1, [r1] ldr r1, [r1]
2: 2:
mov pc, lr mov pc, lr
ENDPROC(ll_get_coherency_base) ENDPROC(ll_get_coherency_base)
/* Returns with the CPU ID in r3 (r0 is untouched)*/ /* Returns the CPU ID in r3 (r0 is untouched) */
ENTRY(ll_get_cpuid) ENTRY(ll_get_cpuid)
mrc 15, 0, r3, cr0, cr0, 5 mrc 15, 0, r3, cr0, cr0, 5
and r3, r3, #15 and r3, r3, #15
...@@ -53,18 +59,22 @@ ARM_BE8(rev r3, r3) ...@@ -53,18 +59,22 @@ ARM_BE8(rev r3, r3)
mov pc, lr mov pc, lr
ENDPROC(ll_get_cpuid) ENDPROC(ll_get_cpuid)
/* ll_add_cpu_to_smp_group, ll_enable_coherency and /*
* ll_disable_coherency use strex/ldrex whereas MMU can be off. The * ll_add_cpu_to_smp_group(), ll_enable_coherency() and
* Armada XP SoC has an exclusive monitor that can track transactions * ll_disable_coherency() use the strex/ldrex instructions while the
* to Device and/or SO and as such also when MMU is disabled the * MMU can be disabled. The Armada XP SoC has an exclusive monitor
* exclusive transactions will be functional * that tracks transactions to Device and/or SO memory and thanks to
* that, exclusive transactions are functional even when the MMU is
* disabled.
*/ */
ENTRY(ll_add_cpu_to_smp_group) ENTRY(ll_add_cpu_to_smp_group)
/* /*
* r0 being untouched in ll_get_coherency_base and * As r0 is not modified by ll_get_coherency_base() and
* ll_get_cpuid, we can use it to save lr modifing it with the * ll_get_cpuid(), we use it to temporarly save lr and avoid
* following bl * it being modified by the branch and link calls. This
* function is used very early in the secondary CPU boot, and
* no stack is available at this point.
*/ */
mov r0, lr mov r0, lr
bl ll_get_coherency_base bl ll_get_coherency_base
...@@ -82,9 +92,11 @@ ENDPROC(ll_add_cpu_to_smp_group) ...@@ -82,9 +92,11 @@ ENDPROC(ll_add_cpu_to_smp_group)
ENTRY(ll_enable_coherency) ENTRY(ll_enable_coherency)
/* /*
* r0 being untouched in ll_get_coherency_base and * As r0 is not modified by ll_get_coherency_base() and
* ll_get_cpuid, we can use it to save lr modifing it with the * ll_get_cpuid(), we use it to temporarly save lr and avoid
* following bl * it being modified by the branch and link calls. This
* function is used very early in the secondary CPU boot, and
* no stack is available at this point.
*/ */
mov r0, lr mov r0, lr
bl ll_get_coherency_base bl ll_get_coherency_base
...@@ -104,9 +116,11 @@ ENDPROC(ll_enable_coherency) ...@@ -104,9 +116,11 @@ ENDPROC(ll_enable_coherency)
ENTRY(ll_disable_coherency) ENTRY(ll_disable_coherency)
/* /*
* r0 being untouched in ll_get_coherency_base and * As r0 is not modified by ll_get_coherency_base() and
* ll_get_cpuid, we can use it to save lr modifing it with the * ll_get_cpuid(), we use it to temporarly save lr and avoid
* following bl * it being modified by the branch and link calls. This
* function is used very early in the secondary CPU boot, and
* no stack is available at this point.
*/ */
mov r0, lr mov r0, lr
bl ll_get_coherency_base bl ll_get_coherency_base
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment