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
|
ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric
The ll_add_cpu_to_smp_group(), ll_enable_coherency() and
ll_disable_coherency() are used on Armada XP to control the coherency
fabric. However, they make the assumption that the coherency fabric is
always available, which is currently a correct assumption but will no
longer be true with a followup commit that disables the usage of the
coherency fabric when the conditions are not met to use it.
Therefore, this commit modifies those functions so that they check the
return value of ll_get_coherency_base(), and if the return value is 0,
they simply return without configuring anything in the coherency
fabric.
The ll_get_coherency_base() function is also modified to properly
return 0 when the function is called with the MMU disabled. In this
case, it normally returns the physical address of the coherency
fabric, but we now check if the virtual address is 0, and if that's
case, return a physical address of 0 to indicate that the coherency
fabric is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1415871540-20302-2-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-13 16:38:56 +07:00
|
|
|
/*
|
|
|
|
* Returns the coherency base address in r1 (r0 is untouched), or 0 if
|
|
|
|
* the coherency fabric is not enabled.
|
|
|
|
*/
|
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
|
ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric
The ll_add_cpu_to_smp_group(), ll_enable_coherency() and
ll_disable_coherency() are used on Armada XP to control the coherency
fabric. However, they make the assumption that the coherency fabric is
always available, which is currently a correct assumption but will no
longer be true with a followup commit that disables the usage of the
coherency fabric when the conditions are not met to use it.
Therefore, this commit modifies those functions so that they check the
return value of ll_get_coherency_base(), and if the return value is 0,
they simply return without configuring anything in the coherency
fabric.
The ll_get_coherency_base() function is also modified to properly
return 0 when the function is called with the MMU disabled. In this
case, it normally returns the physical address of the coherency
fabric, but we now check if the virtual address is 0, and if that's
case, return a physical address of 0 to indicate that the coherency
fabric is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1415871540-20302-2-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-13 16:38:56 +07:00
|
|
|
* base address. However, if the coherency fabric isn't mapped
|
|
|
|
* (i.e its virtual address is zero), it means coherency is
|
|
|
|
* not enabled, so we return 0.
|
2014-05-22 19:48:01 +07:00
|
|
|
*/
|
ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric
The ll_add_cpu_to_smp_group(), ll_enable_coherency() and
ll_disable_coherency() are used on Armada XP to control the coherency
fabric. However, they make the assumption that the coherency fabric is
always available, which is currently a correct assumption but will no
longer be true with a followup commit that disables the usage of the
coherency fabric when the conditions are not met to use it.
Therefore, this commit modifies those functions so that they check the
return value of ll_get_coherency_base(), and if the return value is 0,
they simply return without configuring anything in the coherency
fabric.
The ll_get_coherency_base() function is also modified to properly
return 0 when the function is called with the MMU disabled. In this
case, it normally returns the physical address of the coherency
fabric, but we now check if the virtual address is 0, and if that's
case, return a physical address of 0 to indicate that the coherency
fabric is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1415871540-20302-2-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-13 16:38:56 +07:00
|
|
|
ldr r1, =coherency_base
|
|
|
|
cmp r1, #0
|
|
|
|
beq 2f
|
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)
|
ARM: mvebu: prefix coprocessor operand with p
In every other instance where mrc is used the coprocessor operand
is prefix with p (e.g. p15). Use the p prefix in this case too.
This fixes a build issue when using LLVM's integrated assembler:
arch/arm/mach-mvebu/coherency_ll.S:69:6: error: invalid operand for instruction
mrc 15, 0, r3, cr0, cr0, 5
^
arch/arm/mach-mvebu/pmsu_ll.S:19:6: error: invalid operand for instruction
mrc 15, 0, r0, cr0, cr0, 5 @ get the CPU ID
^
Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2019-04-11 14:54:03 +07:00
|
|
|
mrc p15, 0, r3, cr0, cr0, 5
|
2014-04-14 22:10:08 +07:00
|
|
|
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: make the coherency_ll.S functions work with no coherency fabric
The ll_add_cpu_to_smp_group(), ll_enable_coherency() and
ll_disable_coherency() are used on Armada XP to control the coherency
fabric. However, they make the assumption that the coherency fabric is
always available, which is currently a correct assumption but will no
longer be true with a followup commit that disables the usage of the
coherency fabric when the conditions are not met to use it.
Therefore, this commit modifies those functions so that they check the
return value of ll_get_coherency_base(), and if the return value is 0,
they simply return without configuring anything in the coherency
fabric.
The ll_get_coherency_base() function is also modified to properly
return 0 when the function is called with the MMU disabled. In this
case, it normally returns the physical address of the coherency
fabric, but we now check if the virtual address is 0, and if that's
case, return a physical address of 0 to indicate that the coherency
fabric is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1415871540-20302-2-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-13 16:38:56 +07:00
|
|
|
/* Bail out if the coherency is not enabled */
|
|
|
|
cmp r1, #0
|
|
|
|
reteq r0
|
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: make the coherency_ll.S functions work with no coherency fabric
The ll_add_cpu_to_smp_group(), ll_enable_coherency() and
ll_disable_coherency() are used on Armada XP to control the coherency
fabric. However, they make the assumption that the coherency fabric is
always available, which is currently a correct assumption but will no
longer be true with a followup commit that disables the usage of the
coherency fabric when the conditions are not met to use it.
Therefore, this commit modifies those functions so that they check the
return value of ll_get_coherency_base(), and if the return value is 0,
they simply return without configuring anything in the coherency
fabric.
The ll_get_coherency_base() function is also modified to properly
return 0 when the function is called with the MMU disabled. In this
case, it normally returns the physical address of the coherency
fabric, but we now check if the virtual address is 0, and if that's
case, return a physical address of 0 to indicate that the coherency
fabric is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1415871540-20302-2-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-13 16:38:56 +07:00
|
|
|
/* Bail out if the coherency is not enabled */
|
|
|
|
cmp r1, #0
|
|
|
|
reteq r0
|
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: make the coherency_ll.S functions work with no coherency fabric
The ll_add_cpu_to_smp_group(), ll_enable_coherency() and
ll_disable_coherency() are used on Armada XP to control the coherency
fabric. However, they make the assumption that the coherency fabric is
always available, which is currently a correct assumption but will no
longer be true with a followup commit that disables the usage of the
coherency fabric when the conditions are not met to use it.
Therefore, this commit modifies those functions so that they check the
return value of ll_get_coherency_base(), and if the return value is 0,
they simply return without configuring anything in the coherency
fabric.
The ll_get_coherency_base() function is also modified to properly
return 0 when the function is called with the MMU disabled. In this
case, it normally returns the physical address of the coherency
fabric, but we now check if the virtual address is 0, and if that's
case, return a physical address of 0 to indicate that the coherency
fabric is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1415871540-20302-2-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-11-13 16:38:56 +07:00
|
|
|
/* Bail out if the coherency is not enabled */
|
|
|
|
cmp r1, #0
|
|
|
|
reteq r0
|
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 - .
|