2024-05-25 17:52:01

by Bjorn Andersson

Subject: [PATCH] arm64: dts: qcom: sc8180x: Correct PCIe slave ports

From: Bjorn Andersson <[email protected]>

The interconnects property was clearly copy-pasted between the 4 PCIe
controllers, giving all four the cpu-pcie path destination of SLAVE_0.

The four ports are all associated with CN0, but update the property for
correctness sake.

Fixes: d20b6c84f56a ("arm64: dts: qcom: sc8180x: Add PCIe instances")
Signed-off-by: Bjorn Andersson <[email protected]>
---
arch/arm64/boot/dts/qcom/sc8180x.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
index 067712310560..61ce17e602c5 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
@@ -1890,7 +1890,7 @@ pcie3: pcie@1c08000 {
power-domains = <&gcc PCIE_3_GDSC>;

interconnects = <&aggre2_noc MASTER_PCIE_3 0 &mc_virt SLAVE_EBI_CH0 0>,
- <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>;
+ <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_3 0>;
interconnect-names = "pcie-mem", "cpu-pcie";

phys = <&pcie3_phy>;
@@ -2012,7 +2012,7 @@ pcie1: pcie@1c10000 {
power-domains = <&gcc PCIE_1_GDSC>;

interconnects = <&aggre2_noc MASTER_PCIE_1 0 &mc_virt SLAVE_EBI_CH0 0>,
- <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>;
+ <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_1 0>;
interconnect-names = "pcie-mem", "cpu-pcie";

phys = <&pcie1_phy>;
@@ -2134,7 +2134,7 @@ pcie2: pcie@1c18000 {
power-domains = <&gcc PCIE_2_GDSC>;

interconnects = <&aggre2_noc MASTER_PCIE_2 0 &mc_virt SLAVE_EBI_CH0 0>,
- <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>;
+ <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_2 0>;
interconnect-names = "pcie-mem", "cpu-pcie";

phys = <&pcie2_phy>;

---
base-commit: 3689b0ef08b70e4e03b82ebd37730a03a672853a
change-id: 20240525-sc8180x-pcie-interconnect-port-fix-d9d8d487f12c

Best regards,
--
Bjorn Andersson <[email protected]>

2024-05-25 20:12:40

by Dmitry Baryshkov

Subject: Re: [PATCH] arm64: dts: qcom: sc8180x: Correct PCIe slave ports

On Sat, May 25, 2024 at 10:56:20AM -0700, Bjorn Andersson wrote:
> From: Bjorn Andersson <[email protected]>
>
> The interconnects property was clearly copy-pasted between the 4 PCIe
> controllers, giving all four the cpu-pcie path destination of SLAVE_0.
>
> The four ports are all associated with CN0, but update the property for
> correctness sake.
>
> Fixes: d20b6c84f56a ("arm64: dts: qcom: sc8180x: Add PCIe instances")
> Signed-off-by: Bjorn Andersson <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc8180x.dtsi | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>

Reviewed-by: Dmitry Baryshkov <[email protected]>

--
With best wishes
Dmitry

2024-05-27 03:01:02

by Bjorn Andersson

Subject: Re: [PATCH] arm64: dts: qcom: sc8180x: Correct PCIe slave ports

On Sat, 25 May 2024 10:56:20 -0700, Bjorn Andersson wrote:
> The interconnects property was clearly copy-pasted between the 4 PCIe
> controllers, giving all four the cpu-pcie path destination of SLAVE_0.
>
> The four ports are all associated with CN0, but update the property for
> correctness sake.
>
>
> [...]

Applied, thanks!

[1/1] arm64: dts: qcom: sc8180x: Correct PCIe slave ports
commit: dc402e084a9e0cc714ffd6008dce3c63281b8142

Best regards,
--
Bjorn Andersson <[email protected]>