Skip to content

Commit f63ea19

Browse files
shawn1221mmind
authored andcommitted
arm64: dts: rockchip: Fix rk356x PCIe range mappings
The pcie bus address should be mapped 1:1 to the cpu side MMIO address, so that there is no same address allocated from normal system memory. Otherwise it's broken if the same address assigned to the EP for DMA purpose.Fix it to sync with the vendor BSP. Fixes: 568a67e ("arm64: dts: rockchip: Fix rk356x PCIe register and range mappings") Fixes: 66b51ea ("arm64: dts: rockchip: Add rk3568 PCIe2x1 controller") Cc: stable@vger.kernel.org Cc: Andrew Powers-Holmes <aholmes@omnom.net> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Link: https://patch.msgid.link/1767600929-195341-1-git-send-email-shawn.lin@rock-chips.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent 9e3f8ae commit f63ea19

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3568.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<0x0 0xf2000000 0x0 0x00100000>;
186186
ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0 0x00100000>,
187187
<0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0 0x01e00000>,
188-
<0x03000000 0x0 0x40000000 0x3 0x40000000 0x0 0x40000000>;
188+
<0x03000000 0x3 0x40000000 0x3 0x40000000 0x0 0x40000000>;
189189
reg-names = "dbi", "apb", "config";
190190
resets = <&cru SRST_PCIE30X1_POWERUP>;
191191
reset-names = "pipe";
@@ -238,7 +238,7 @@
238238
<0x0 0xf0000000 0x0 0x00100000>;
239239
ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0 0x00100000>,
240240
<0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0 0x01e00000>,
241-
<0x03000000 0x0 0x40000000 0x3 0x80000000 0x0 0x40000000>;
241+
<0x03000000 0x3 0x80000000 0x3 0x80000000 0x0 0x40000000>;
242242
reg-names = "dbi", "apb", "config";
243243
resets = <&cru SRST_PCIE30X2_POWERUP>;
244244
reset-names = "pipe";

arch/arm64/boot/dts/rockchip/rk356x-base.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@
10221022
power-domains = <&power RK3568_PD_PIPE>;
10231023
ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x00100000>,
10241024
<0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0x01e00000>,
1025-
<0x03000000 0x0 0x40000000 0x3 0x00000000 0x0 0x40000000>;
1025+
<0x03000000 0x3 0x00000000 0x3 0x00000000 0x0 0x40000000>;
10261026
resets = <&cru SRST_PCIE20_POWERUP>;
10271027
reset-names = "pipe";
10281028
#address-cells = <3>;

0 commit comments

Comments
 (0)