diff options
| author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2013-11-25 17:26:46 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-11-25 18:22:10 +0000 |
| commit | b6dda00cddcc71d2030668bc0cc0fed758c411c2 (patch) | |
| tree | 09fc727a5f92659d0e112f0aaa11027353bf34c9 /arch/arm/boot/dts/armada-370-xp.dtsi | |
| parent | 2163e61c92d9337e721a0d067d88ae62b52e0d3e (diff) | |
| download | blackbird-obmc-linux-b6dda00cddcc71d2030668bc0cc0fed758c411c2.tar.gz blackbird-obmc-linux-b6dda00cddcc71d2030668bc0cc0fed758c411c2.zip | |
ARM: mvebu: use the virtual CPU registers to access coherency registers
The Armada XP provides a mechanism called "virtual CPU registers" or
"per-CPU register banking", to access the per-CPU registers of the
current CPU, without having to worry about finding on which CPU we're
running. CPU0 has its registers at 0x21800, CPU1 at 0x21900, CPU2 at
0x21A00 and CPU3 at 0x21B00. The virtual registers accessing the
current CPU registers are at 0x21000.
However, in the Device Tree node that provides the register addresses
for the coherency unit (which is responsible for ensuring coherency
between processors, and I/O coherency between processors and the
DMA-capable devices), a mistake was made: the CPU0-specific registers
were specified instead of the virtual CPU registers. This means that
the coherency barrier needed for I/O coherency was not behaving
properly when executed from a CPU different from CPU0. This patch
fixes that by using the virtual CPU registers.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.8+
Fixes: e60304f8cb7bb5 "arm: mvebu: Add hardware I/O Coherency support"
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-370-xp.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 00d6a798c705..7f10f627ae5b 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -118,7 +118,7 @@ coherency-fabric@20200 { compatible = "marvell,coherency-fabric"; - reg = <0x20200 0xb0>, <0x21810 0x1c>; + reg = <0x20200 0xb0>, <0x21010 0x1c>; }; serial@12000 { |
