Skip to content

Commit 7e606ed

Browse files
committed
Merge tag 'mvebu-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes
mvebu fixes for 5.17 (part 2) Allow using old PCIe card on Armada 37xx * tag 'mvebu-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 Link: https://lore.kernel.org/r/87bkydj4fn.fsf@BL-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents d986afd + a1cc169 commit 7e606ed

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@
139139
/*
140140
* U-Boot port for Turris Mox has a bug which always expects that "ranges" DT property
141141
* contains exactly 2 ranges with 3 (child) address cells, 2 (parent) address cells and
142-
* 2 size cells and also expects that the second range starts at 16 MB offset. If these
142+
* 2 size cells and also expects that the second range starts at 16 MB offset. Also it
143+
* expects that first range uses same address for PCI (child) and CPU (parent) cells (so
144+
* no remapping) and that this address is the lowest from all specified ranges. If these
143145
* conditions are not met then U-Boot crashes during loading kernel DTB file. PCIe address
144146
* space is 128 MB long, so the best split between MEM and IO is to use fixed 16 MB window
145147
* for IO and the rest 112 MB (64+32+16) for MEM, despite that maximal IO size is just 64 kB.
@@ -148,6 +150,9 @@
148150
* https://source.denx.de/u-boot/u-boot/-/commit/cb2ddb291ee6fcbddd6d8f4ff49089dfe580f5d7
149151
* https://source.denx.de/u-boot/u-boot/-/commit/c64ac3b3185aeb3846297ad7391fc6df8ecd73bf
150152
* https://source.denx.de/u-boot/u-boot/-/commit/4a82fca8e330157081fc132a591ebd99ba02ee33
153+
* Bug related to requirement of same child and parent addresses for first range is fixed
154+
* in U-Boot version 2022.04 by following commit:
155+
* https://source.denx.de/u-boot/u-boot/-/commit/1fd54253bca7d43d046bba4853fe5fafd034bc17
151156
*/
152157
#address-cells = <3>;
153158
#size-cells = <2>;

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
* (totaling 127 MiB) for MEM.
500500
*/
501501
ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x07f00000 /* Port 0 MEM */
502-
0x81000000 0 0xefff0000 0 0xefff0000 0 0x00010000>; /* Port 0 IO */
502+
0x81000000 0 0x00000000 0 0xefff0000 0 0x00010000>; /* Port 0 IO */
503503
interrupt-map-mask = <0 0 0 7>;
504504
interrupt-map = <0 0 0 1 &pcie_intc 0>,
505505
<0 0 0 2 &pcie_intc 1>,

0 commit comments

Comments
 (0)