2012-08-02 15:16:29 +07:00
|
|
|
/*
|
|
|
|
* Coherency fabric: low level functions
|
|
|
|
*
|
|
|
|
* Copyright (C) 2012 Marvell
|
|
|
|
*
|
|
|
|
* Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
|
|
*
|
|
|
|
* This file is licensed under the terms of the GNU General Public
|
|
|
|
* License version 2. This program is licensed "as is" without any
|
|
|
|
* warranty of any kind, whether express or implied.
|
|
|
|
*
|
|
|
|
* This file implements the assembly function to add a CPU to the
|
|
|
|
* coherency fabric. This function is called by each of the secondary
|
|
|
|
* CPUs during their early boot in an SMP kernel, this why this
|
|
|
|
* function have to callable from assembly. It can also be called by a
|
|
|
|
* primary CPU from C code during its boot.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/linkage.h>
|
|
|
|
#define ARMADA_XP_CFB_CTL_REG_OFFSET 0x0
|
|
|
|
#define ARMADA_XP_CFB_CFG_REG_OFFSET 0x4
|
|
|
|
|
2013-02-01 17:36:22 +07:00
|
|
|
#include <asm/assembler.h>
|
2014-04-14 22:10:05 +07:00
|
|
|
#include <asm/cp15.h>
|
2013-02-01 17:36:22 +07:00
|
|
|
|
2012-08-02 15:16:29 +07:00
|
|
|
.text
|
2014-05-22 19:48:01 +07:00
|
|
|
/* Returns the coherency base address in r1 (r0 is untouched) */
|
2014-04-14 22:10:08 +07:00
|
|
|
ENTRY(ll_get_coherency_base)
|
2014-04-14 22:10:05 +07:00
|
|
|
mrc p15, 0, r1, c1, c0, 0
|
|
|
|
tst r1, #CR_M @ Check MMU bit enabled
|
|
|
|
bne 1f
|
|
|
|
|
2014-05-22 19:48:01 +07:00
|
|
|
/*
|
|
|
|
* MMU is disabled, use the physical address of the coherency
|
|
|
|
* base address.
|
|
|
|
*/
|
2014-04-14 22:10:08 +07:00
|
|
|
adr r1, 3f
|
|
|
|
ldr r3, [r1]
|
|
|
|
ldr r1, [r1, r3]
|
2014-04-14 22:10:05 +07:00
|
|
|
b 2f
|
|
|
|
1:
|
2014-05-22 19:48:01 +07:00
|
|
|
/*
|
|
|
|
* MMU is enabled, use the virtual address of the coherency
|
|
|
|
* base address.
|
|
|
|
*/
|
2014-04-14 22:10:08 +07:00
|
|
|
ldr r1, =coherency_base
|
|
|
|
ldr r1, [r1]
|
2014-04-14 22:10:05 +07:00
|
|
|
2:
|
2014-06-30 22:29:12 +07:00
|
|
|
ret lr
|
2014-04-14 22:10:08 +07:00
|
|
|
ENDPROC(ll_get_coherency_base)
|
|
|
|
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
/*
|
|
|
|
* Returns the coherency CPU mask in r3 (r0 is untouched). This
|
|
|
|
* coherency CPU mask can be used with the coherency fabric
|
|
|
|
* configuration and control registers. Note that the mask is already
|
|
|
|
* endian-swapped as appropriate so that the calling functions do not
|
|
|
|
* have to care about endianness issues while accessing the coherency
|
|
|
|
* fabric registers
|
|
|
|
*/
|
|
|
|
ENTRY(ll_get_coherency_cpumask)
|
2014-04-14 22:10:08 +07:00
|
|
|
mrc 15, 0, r3, cr0, cr0, 5
|
|
|
|
and r3, r3, #15
|
2014-04-14 22:10:06 +07:00
|
|
|
mov r2, #(1 << 24)
|
2014-04-14 22:10:08 +07:00
|
|
|
lsl r3, r2, r3
|
2014-05-22 19:47:59 +07:00
|
|
|
ARM_BE8(rev r3, r3)
|
2014-06-30 22:29:12 +07:00
|
|
|
ret lr
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
ENDPROC(ll_get_coherency_cpumask)
|
2012-08-02 15:16:29 +07:00
|
|
|
|
2014-05-22 19:48:01 +07:00
|
|
|
/*
|
|
|
|
* ll_add_cpu_to_smp_group(), ll_enable_coherency() and
|
|
|
|
* ll_disable_coherency() use the strex/ldrex instructions while the
|
|
|
|
* MMU can be disabled. The Armada XP SoC has an exclusive monitor
|
|
|
|
* that tracks transactions to Device and/or SO memory and thanks to
|
|
|
|
* that, exclusive transactions are functional even when the MMU is
|
|
|
|
* disabled.
|
2014-04-14 22:10:08 +07:00
|
|
|
*/
|
2012-08-02 15:16:29 +07:00
|
|
|
|
2014-04-14 22:10:08 +07:00
|
|
|
ENTRY(ll_add_cpu_to_smp_group)
|
|
|
|
/*
|
2014-05-22 19:48:01 +07:00
|
|
|
* As r0 is not modified by ll_get_coherency_base() and
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
* ll_get_coherency_cpumask(), we use it to temporarly save lr
|
|
|
|
* and avoid 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.
|
2014-04-14 22:10:08 +07:00
|
|
|
*/
|
2014-05-22 19:48:00 +07:00
|
|
|
mov r0, lr
|
2014-04-14 22:10:08 +07:00
|
|
|
bl ll_get_coherency_base
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
bl ll_get_coherency_cpumask
|
2014-05-22 19:48:00 +07:00
|
|
|
mov lr, r0
|
2014-04-14 22:10:08 +07:00
|
|
|
add r0, r1, #ARMADA_XP_CFB_CFG_REG_OFFSET
|
2013-05-23 15:54:02 +07:00
|
|
|
1:
|
2014-04-14 22:10:08 +07:00
|
|
|
ldrex r2, [r0]
|
|
|
|
orr r2, r2, r3
|
|
|
|
strex r1, r2, [r0]
|
|
|
|
cmp r1, #0
|
|
|
|
bne 1b
|
2014-06-30 22:29:12 +07:00
|
|
|
ret lr
|
2014-04-14 22:10:08 +07:00
|
|
|
ENDPROC(ll_add_cpu_to_smp_group)
|
2012-08-02 15:16:29 +07:00
|
|
|
|
2014-04-14 22:10:08 +07:00
|
|
|
ENTRY(ll_enable_coherency)
|
|
|
|
/*
|
2014-05-22 19:48:01 +07:00
|
|
|
* As r0 is not modified by ll_get_coherency_base() and
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
* ll_get_coherency_cpumask(), we use it to temporarly save lr
|
|
|
|
* and avoid 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.
|
2014-04-14 22:10:08 +07:00
|
|
|
*/
|
|
|
|
mov r0, lr
|
|
|
|
bl ll_get_coherency_base
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
bl ll_get_coherency_cpumask
|
2014-04-14 22:10:08 +07:00
|
|
|
mov lr, r0
|
|
|
|
add r0, r1, #ARMADA_XP_CFB_CTL_REG_OFFSET
|
|
|
|
1:
|
|
|
|
ldrex r2, [r0]
|
|
|
|
orr r2, r2, r3
|
|
|
|
strex r1, r2, [r0]
|
|
|
|
cmp r1, #0
|
|
|
|
bne 1b
|
2012-08-02 15:16:29 +07:00
|
|
|
dsb
|
|
|
|
mov r0, #0
|
2014-06-30 22:29:12 +07:00
|
|
|
ret lr
|
2014-04-14 22:10:08 +07:00
|
|
|
ENDPROC(ll_enable_coherency)
|
|
|
|
|
2014-04-14 22:10:09 +07:00
|
|
|
ENTRY(ll_disable_coherency)
|
|
|
|
/*
|
2014-05-22 19:48:01 +07:00
|
|
|
* As r0 is not modified by ll_get_coherency_base() and
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
* ll_get_coherency_cpumask(), we use it to temporarly save lr
|
|
|
|
* and avoid 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.
|
2014-04-14 22:10:09 +07:00
|
|
|
*/
|
2014-05-22 19:48:00 +07:00
|
|
|
mov r0, lr
|
2014-04-14 22:10:09 +07:00
|
|
|
bl ll_get_coherency_base
|
ARM: mvebu: returns ll_get_cpuid() to ll_get_coherency_cpumask()
In the refactoring of the coherency fabric assembly code, a function
called ll_get_cpuid() was created to factorize common logic between
functions adding CPU to the SMP coherency group, enabling and
disabling the coherency.
However, the name of the function is highly misleading: ll_get_cpuid()
makes one think tat it returns the ID of the CPU, i.e 0 for CPU0, 1
for CPU1, etc. In fact, this is not at all what this function returns:
it returns a CPU mask for the current CPU, usable for the coherency
fabric configuration and control registers.
Therefore this commit renames this function to
ll_get_coherency_cpumask(), and adds additional comments on top of the
function to explain in more details what it does, and also how the
endianess issue is handled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400762882-10116-5-git-send-email-thomas.petazzoni@free-electrons.com
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-05-22 19:48:02 +07:00
|
|
|
bl ll_get_coherency_cpumask
|
2014-05-22 19:48:00 +07:00
|
|
|
mov lr, r0
|
2014-04-14 22:10:09 +07:00
|
|
|
add r0, r1, #ARMADA_XP_CFB_CTL_REG_OFFSET
|
|
|
|
1:
|
|
|
|
ldrex r2, [r0]
|
|
|
|
bic r2, r2, r3
|
|
|
|
strex r1, r2, [r0]
|
|
|
|
cmp r1, #0
|
|
|
|
bne 1b
|
|
|
|
dsb
|
2014-06-30 22:29:12 +07:00
|
|
|
ret lr
|
2014-04-14 22:10:09 +07:00
|
|
|
ENDPROC(ll_disable_coherency)
|
2014-04-14 22:10:05 +07:00
|
|
|
|
|
|
|
.align 2
|
|
|
|
3:
|
|
|
|
.long coherency_phys_base - .
|