From: Greg Kroah-Hartman Date: Mon, 27 Sep 2021 11:07:41 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.4.150~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1895d402e528ddd069d47c33271af53043f3282d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: arm64-dts-marvell-armada-37xx-extend-pcie-mem-space.patch --- diff --git a/queue-4.9/arm64-dts-marvell-armada-37xx-extend-pcie-mem-space.patch b/queue-4.9/arm64-dts-marvell-armada-37xx-extend-pcie-mem-space.patch new file mode 100644 index 00000000000..c6189d67646 --- /dev/null +++ b/queue-4.9/arm64-dts-marvell-armada-37xx-extend-pcie-mem-space.patch @@ -0,0 +1,72 @@ +From 514ef1e62d6521c2199d192b1c71b79d2aa21d5a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pali=20Roh=C3=A1r?= +Date: Thu, 24 Jun 2021 23:55:46 +0200 +Subject: arm64: dts: marvell: armada-37xx: Extend PCIe MEM space +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +commit 514ef1e62d6521c2199d192b1c71b79d2aa21d5a upstream. + +Current PCIe MEM space of size 16 MB is not enough for some combination +of PCIe cards (e.g. NVMe disk together with ath11k wifi card). ARM Trusted +Firmware for Armada 3700 platform already assigns 128 MB for PCIe window, +so extend PCIe MEM space to the end of 128 MB PCIe window which allows to +allocate more PCIe BARs for more PCIe cards. + +Without this change some combination of PCIe cards cannot be used and +kernel show error messages in dmesg during initialization: + + pci 0000:00:00.0: BAR 8: no space for [mem size 0x01800000] + pci 0000:00:00.0: BAR 8: failed to assign [mem size 0x01800000] + pci 0000:00:00.0: BAR 6: assigned [mem 0xe8000000-0xe80007ff pref] + pci 0000:01:00.0: BAR 8: no space for [mem size 0x01800000] + pci 0000:01:00.0: BAR 8: failed to assign [mem size 0x01800000] + pci 0000:02:03.0: BAR 8: no space for [mem size 0x01000000] + pci 0000:02:03.0: BAR 8: failed to assign [mem size 0x01000000] + pci 0000:02:07.0: BAR 8: no space for [mem size 0x00100000] + pci 0000:02:07.0: BAR 8: failed to assign [mem size 0x00100000] + pci 0000:03:00.0: BAR 0: no space for [mem size 0x01000000 64bit] + pci 0000:03:00.0: BAR 0: failed to assign [mem size 0x01000000 64bit] + +Due to bugs in U-Boot port for Turris Mox, the second range in Turris Mox +kernel DTS file for PCIe must start at 16 MB offset. Otherwise U-Boot +crashes during loading of kernel DTB file. This bug is present only in +U-Boot code for Turris Mox and therefore other Armada 3700 devices are not +affected by this bug. Bug is fixed in U-Boot version 2021.07. + +To not break booting new kernels on existing versions of U-Boot on Turris +Mox, use first 16 MB range for IO and second range with rest of PCIe window +for MEM. + +Signed-off-by: Pali Rohár +Fixes: 76f6386b25cc ("arm64: dts: marvell: Add Aardvark PCIe support for Armada 3700") +Signed-off-by: Gregory CLEMENT +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi ++++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +@@ -186,8 +186,15 @@ + #interrupt-cells = <1>; + msi-parent = <&pcie0>; + msi-controller; +- ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x1000000 /* Port 0 MEM */ +- 0x81000000 0 0xe9000000 0 0xe9000000 0 0x10000>; /* Port 0 IO*/ ++ /* ++ * The 128 MiB address range [0xe8000000-0xf0000000] is ++ * dedicated for PCIe and can be assigned to 8 windows ++ * with size a power of two. Use one 64 KiB window for ++ * IO at the end and the remaining seven windows ++ * (totaling 127 MiB) for MEM. ++ */ ++ ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x07f00000 /* Port 0 MEM */ ++ 0x81000000 0 0xefff0000 0 0xefff0000 0 0x00010000>; /* Port 0 IO */ + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie_intc 0>, + <0 0 0 2 &pcie_intc 1>, diff --git a/queue-4.9/series b/queue-4.9/series index f7a46e196f5..152d00a266f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -27,3 +27,4 @@ arm64-mark-__stack_chk_guard-as-__ro_after_init.patch alpha-declare-virt_to_phys-and-virt_to_bus-parameter.patch net-6pack-fix-tx-timeout-and-slot-time.patch spi-fix-tegra20-build-with-config_pm-n.patch +arm64-dts-marvell-armada-37xx-extend-pcie-mem-space.patch