Skip to content

Commit d7d5a43

Browse files
tpetazzoniolofj
tpetazzoni
authored and
olofj
committed
ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window
When the Crypto SRAM mappings were added to the Device Tree files describing the Armada XP boards in commit c466d99 ("ARM: mvebu: define crypto SRAM ranges for all armada-xp boards"), the fact that those mappings were overlaping with the PCIe memory aperture was overlooked. Due to this, we currently have for all Armada XP platforms a situation that looks like this: Memory mapping on Armada XP boards with internal registers at 0xf1000000: - 0x00000000 -> 0xf0000000 3.75G RAM - 0xf0000000 -> 0xf1000000 16M NOR flashes (AXP GP / AXP DB) - 0xf1000000 -> 0xf1100000 1M internal registers - 0xf8000000 -> 0xffe0000 126M PCIe memory aperture - 0xf8100000 -> 0xf8110000 64KB Crypto SRAM #0 => OVERLAPS WITH PCIE ! - 0xf8110000 -> 0xf8120000 64KB Crypto SRAM #1 => OVERLAPS WITH PCIE ! - 0xffe00000 -> 0xfff00000 1M PCIe I/O aperture - 0xfff0000 -> 0xffffffff 1M BootROM The overlap means that when PCIe devices are added, depending on their memory window needs, they might or might not be mapped into the physical address space. Indeed, they will not be mapped if the area allocated in the PCIe memory aperture by the PCI core overlaps with one of the Crypto SRAM. Typically, a Intel IGB PCIe NIC that needs 8MB of PCIe memory will see its PCIe memory window allocated from 0xf80000000 for 8MB, which overlaps with the Crypto SRAM windows. Due to this, the PCIe window is not created, and any attempt to access the PCIe window makes the kernel explode: [ 3.302213] igb: Copyright (c) 2007-2014 Intel Corporation. [ 3.307841] pci 0000:00:09.0: enabling device (0140 -> 0143) [ 3.313539] mvebu_mbus: cannot add window '4:f8', conflicts with another window [ 3.320870] mvebu-pcie soc:pcie-controller: Could not create MBus window at [mem 0xf8000000-0xf87fffff]: -22 [ 3.330811] Unhandled fault: external abort on non-linefetch (0x1008) at 0xf08c0018 This problem does not occur on Armada 370 boards, because we use the following memory mapping (for boards that have internal registers at 0xf1000000): - 0x00000000 -> 0xf0000000 3.75G RAM - 0xf0000000 -> 0xf1000000 16M NOR flashes (AXP GP / AXP DB) - 0xf1000000 -> 0xf1100000 1M internal registers - 0xf1100000 -> 0xf1110000 64KB Crypto SRAM #0 => OK ! - 0xf8000000 -> 0xffe0000 126M PCIe memory - 0xffe00000 -> 0xfff00000 1M PCIe I/O - 0xfff0000 -> 0xffffffff 1M BootROM Obviously, the solution is to align the location of the Crypto SRAM mappings of Armada XP to be similar with the ones on Armada 370, i.e have them between the "internal registers" area and the beginning of the PCIe aperture. However, we have a special case with the OpenBlocks AX3-4 platform, which has a 128 MB NOR flash. Currently, this NOR flash is mapped from 0xf0000000 to 0xf8000000. This is possible because on OpenBlocks AX3-4, the internal registers are not at 0xf1000000. And this explains why the Crypto SRAM mappings were not configured at the same place on Armada XP. Hence, the solution is two-fold: (1) Move the NOR flash mapping on Armada XP OpenBlocks AX3-4 from 0xe8000000 to 0xf0000000. This frees the 0xf0000000 -> 0xf80000000 space. (2) Move the Crypto SRAM mappings on Armada XP to be similar to Armada 370 (except of course that Armada XP has two Crypto SRAM and not one). After this patch, the memory mapping on Armada XP boards with registers at 0xf1 is: - 0x00000000 -> 0xf0000000 3.75G RAM - 0xf0000000 -> 0xf1000000 16M NOR flashes (AXP GP / AXP DB) - 0xf1000000 -> 0xf1100000 1M internal registers - 0xf1100000 -> 0xf1110000 64KB Crypto SRAM #0 - 0xf1110000 -> 0xf1120000 64KB Crypto SRAM #1 - 0xf8000000 -> 0xffe0000 126M PCIe memory - 0xffe00000 -> 0xfff00000 1M PCIe I/O - 0xfff0000 -> 0xffffffff 1M BootROM And the memory mapping for the special case of the OpenBlocks AX3-4 (internal registers at 0xd0000000, NOR of 128 MB): - 0x00000000 -> 0xc0000000 3G RAM - 0xd0000000 -> 0xd1000000 1M internal registers - 0xe800000 -> 0xf0000000 128M NOR flash - 0xf1100000 -> 0xf1110000 64KB Crypto SRAM #0 - 0xf1110000 -> 0xf1120000 64KB Crypto SRAM #1 - 0xf8000000 -> 0xffe0000 126M PCIe memory - 0xffe00000 -> 0xfff00000 1M PCIe I/O - 0xfff0000 -> 0xffffffff 1M BootROM Fixes: c466d99 ("ARM: mvebu: define crypto SRAM ranges for all armada-xp boards") Reported-by: Phil Sutter <phil@nwl.cc> Cc: Phil Sutter <phil@nwl.cc> Cc: <stable@vger.kernel.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Olof Johansson <olof@lixom.net>
1 parent 1dea581 commit d7d5a43

9 files changed

+19
-19
lines changed

‎arch/arm/boot/dts/armada-xp-axpwifiap.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
soc {
7171
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7272
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
73-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
74-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
73+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
74+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7575

7676
pcie-controller {
7777
status = "okay";

‎arch/arm/boot/dts/armada-xp-db.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7777
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
7878
MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
79-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
80-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
79+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
80+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
8181

8282
devbus-bootcs {
8383
status = "okay";

‎arch/arm/boot/dts/armada-xp-gp.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
9696
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
9797
MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
98-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
99-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
98+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
99+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
100100

101101
devbus-bootcs {
102102
status = "okay";

‎arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
soc {
6666
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
6767
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
68-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
69-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
68+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
69+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7070

7171
pcie-controller {
7272
status = "okay";

‎arch/arm/boot/dts/armada-xp-linksys-mamba.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
soc {
7171
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7272
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
73-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
74-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
73+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
74+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7575

7676
pcie-controller {
7777
status = "okay";

‎arch/arm/boot/dts/armada-xp-matrix.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
soc {
6969
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7070
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
71-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
72-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
71+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
72+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7373

7474
internal-regs {
7575
serial@12000 {

‎arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
soc {
6565
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
6666
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
67-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
68-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
67+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
68+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
6969

7070
pcie-controller {
7171
status = "okay";

‎arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
soc {
6666
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
6767
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
68-
MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000
69-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
70-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
68+
MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
69+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
70+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7171

7272
devbus-bootcs {
7373
status = "okay";

‎arch/arm/boot/dts/armada-xp-synology-ds414.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
soc {
7979
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
8080
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
81-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
82-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
81+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
82+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
8383

8484
pcie-controller {
8585
status = "okay";

0 commit comments

Comments
 (0)