Skip to content

Commit 46c56b7

Browse files
shawn1221mmind
authored andcommitted
arm64: dts: rockchip: Fix rk3588 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: 0acf4fa ("arm64: dts: rockchip: add PCIe3 support for rk3588") Fixes: 8d81b77 ("arm64: dts: rockchip: add rk3588 PCIe2 support") Cc: stable@vger.kernel.org Cc: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Link: https://patch.msgid.link/1767600929-195341-2-git-send-email-shawn.lin@rock-chips.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent f63ea19 commit 46c56b7

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,7 +2019,7 @@
20192019
power-domains = <&power RK3588_PD_PCIE>;
20202020
ranges = <0x01000000 0x0 0xf3100000 0x0 0xf3100000 0x0 0x00100000>,
20212021
<0x02000000 0x0 0xf3200000 0x0 0xf3200000 0x0 0x00e00000>,
2022-
<0x03000000 0x0 0x40000000 0x9 0xc0000000 0x0 0x40000000>;
2022+
<0x03000000 0x9 0xc0000000 0x9 0xc0000000 0x0 0x40000000>;
20232023
reg = <0xa 0x40c00000 0x0 0x00400000>,
20242024
<0x0 0xfe180000 0x0 0x00010000>,
20252025
<0x0 0xf3000000 0x0 0x00100000>;
@@ -2071,7 +2071,7 @@
20712071
power-domains = <&power RK3588_PD_PCIE>;
20722072
ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x00100000>,
20732073
<0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0x00e00000>,
2074-
<0x03000000 0x0 0x40000000 0xa 0x00000000 0x0 0x40000000>;
2074+
<0x03000000 0xa 0x00000000 0xa 0x00000000 0x0 0x40000000>;
20752075
reg = <0xa 0x41000000 0x0 0x00400000>,
20762076
<0x0 0xfe190000 0x0 0x00010000>,
20772077
<0x0 0xf4000000 0x0 0x00100000>;

arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
power-domains = <&power RK3588_PD_PCIE>;
376376
ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0 0x00100000>,
377377
<0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0 0x00e00000>,
378-
<0x03000000 0x0 0x40000000 0x9 0x00000000 0x0 0x40000000>;
378+
<0x03000000 0x9 0x00000000 0x9 0x00000000 0x0 0x40000000>;
379379
reg = <0xa 0x40000000 0x0 0x00400000>,
380380
<0x0 0xfe150000 0x0 0x00010000>,
381381
<0x0 0xf0000000 0x0 0x00100000>;
@@ -462,7 +462,7 @@
462462
power-domains = <&power RK3588_PD_PCIE>;
463463
ranges = <0x01000000 0x0 0xf1100000 0x0 0xf1100000 0x0 0x00100000>,
464464
<0x02000000 0x0 0xf1200000 0x0 0xf1200000 0x0 0x00e00000>,
465-
<0x03000000 0x0 0x40000000 0x9 0x40000000 0x0 0x40000000>;
465+
<0x03000000 0x9 0x40000000 0x9 0x40000000 0x0 0x40000000>;
466466
reg = <0xa 0x40400000 0x0 0x00400000>,
467467
<0x0 0xfe160000 0x0 0x00010000>,
468468
<0x0 0xf1000000 0x0 0x00100000>;
@@ -512,7 +512,7 @@
512512
power-domains = <&power RK3588_PD_PCIE>;
513513
ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0 0x00100000>,
514514
<0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0 0x00e00000>,
515-
<0x03000000 0x0 0x40000000 0x9 0x80000000 0x0 0x40000000>;
515+
<0x03000000 0x9 0x80000000 0x9 0x80000000 0x0 0x40000000>;
516516
reg = <0xa 0x40800000 0x0 0x00400000>,
517517
<0x0 0xfe170000 0x0 0x00010000>,
518518
<0x0 0xf2000000 0x0 0x00100000>;

0 commit comments

Comments
 (0)