diff mbox series

[V3,4/6] arm64: dts: qcom: ipq9574: Add PCIe PHYs and controller nodes

Message ID 20230421124938.21974-5-quic_devipriy@quicinc.com (mailing list archive)
State Superseded
Headers show
Series Add PCIe support for IPQ9574 | expand

Commit Message

Devi Priya April 21, 2023, 12:49 p.m. UTC
Add PCIe0, PCIe1, PCIe2, PCIe3 (and corresponding PHY) devices
found on IPQ9574 platform. The PCIe0 & PCIe1 are 1-lane Gen3
host whereas PCIe2 & PCIe3 are 2-lane Gen3 host.

Co-developed-by: Anusha Rao <quic_anusha@quicinc.com>
Signed-off-by: Anusha Rao <quic_anusha@quicinc.com>
Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
---
 Changes in V3:
	- Fixed up the PCI I/O port ranges

 arch/arm64/boot/dts/qcom/ipq9574.dtsi | 375 +++++++++++++++++++++++++-
 1 file changed, 370 insertions(+), 5 deletions(-)

Comments

Dmitry Baryshkov April 22, 2023, 12:19 a.m. UTC | #1
On Fri, 21 Apr 2023 at 15:50, Devi Priya <quic_devipriy@quicinc.com> wrote:
>
> Add PCIe0, PCIe1, PCIe2, PCIe3 (and corresponding PHY) devices
> found on IPQ9574 platform. The PCIe0 & PCIe1 are 1-lane Gen3
> host whereas PCIe2 & PCIe3 are 2-lane Gen3 host.
>
> Co-developed-by: Anusha Rao <quic_anusha@quicinc.com>
> Signed-off-by: Anusha Rao <quic_anusha@quicinc.com>
> Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
> ---
>  Changes in V3:
>         - Fixed up the PCI I/O port ranges
>
>  arch/arm64/boot/dts/qcom/ipq9574.dtsi | 375 +++++++++++++++++++++++++-
>  1 file changed, 370 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> index e757b57957cf..953a839a1141 100644
> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> @@ -6,8 +6,8 @@
>   * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
>   */
>
> -#include <dt-bindings/interrupt-controller/arm-gic.h>
>  #include <dt-bindings/clock/qcom,ipq9574-gcc.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>  #include <dt-bindings/reset/qcom,ipq9574-gcc.h>
>
>  / {
> @@ -116,6 +116,58 @@
>                 #size-cells = <1>;
>                 ranges = <0 0 0 0xffffffff>;
>
> +               pcie0_phy: phy@84000 {
> +                       compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
> +                       reg = <0x00084000 0x1000>;
> +
> +                       clocks = <&gcc GCC_PCIE0_AUX_CLK>,
> +                                <&gcc GCC_PCIE0_AHB_CLK>,
> +                                <&gcc GCC_ANOC_PCIE0_1LANE_M_CLK>,
> +                                <&gcc GCC_SNOC_PCIE0_1LANE_S_CLK>,
> +                                <&gcc GCC_PCIE0_PIPE_CLK>;
> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
> +
> +                       assigned-clocks = <&gcc GCC_PCIE0_AUX_CLK>;
> +                       assigned-clock-rates = <20000000>;
> +
> +                       resets = <&gcc GCC_PCIE0_PHY_BCR>,
> +                                <&gcc GCC_PCIE0PHY_PHY_BCR>;
> +                       reset-names = "phy", "common";
> +
> +                       #clock-cells = <0>;
> +                       clock-output-names = "gcc_pcie0_pipe_clk_src";
> +
> +                       #phy-cells = <0>;
> +                       status = "disabled";
> +
> +               };
> +
> +               pcie2_phy: phy@8c000 {
> +                       compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
> +                       reg = <0x0008c000 0x2000>;
> +
> +                       clocks = <&gcc GCC_PCIE2_AUX_CLK>,
> +                                <&gcc GCC_PCIE2_AHB_CLK>,
> +                                <&gcc GCC_ANOC_PCIE2_2LANE_M_CLK>,
> +                                <&gcc GCC_SNOC_PCIE2_2LANE_S_CLK>,
> +                                <&gcc GCC_PCIE2_PIPE_CLK>;
> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
> +
> +                       assigned-clocks = <&gcc GCC_PCIE2_AUX_CLK>;
> +                       assigned-clock-rates = <20000000>;
> +
> +                       resets = <&gcc GCC_PCIE2_PHY_BCR>,
> +                                <&gcc GCC_PCIE2PHY_PHY_BCR>;
> +                       reset-names = "phy", "common";
> +
> +                       #clock-cells = <0>;
> +                       clock-output-names = "gcc_pcie2_pipe_clk_src";
> +
> +                       #phy-cells = <0>;
> +                       status = "disabled";
> +
> +               };
> +
>                 rng: rng@e3000 {
>                         compatible = "qcom,prng-ee";
>                         reg = <0x000e3000 0x1000>;
> @@ -123,6 +175,58 @@
>                         clock-names = "core";
>                 };
>
> +               pcie3_phy: phy@f4000 {
> +                       compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
> +                       reg = <0x000f4000 0x2000>;
> +
> +                       clocks = <&gcc GCC_PCIE3_AUX_CLK>,
> +                                <&gcc GCC_PCIE3_AHB_CLK>,
> +                                <&gcc GCC_ANOC_PCIE3_2LANE_M_CLK>,
> +                                <&gcc GCC_SNOC_PCIE3_2LANE_S_CLK>,
> +                                <&gcc GCC_PCIE3_PIPE_CLK>;
> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
> +
> +                       assigned-clocks = <&gcc GCC_PCIE3_AUX_CLK>;
> +                       assigned-clock-rates = <20000000>;
> +
> +                       resets = <&gcc GCC_PCIE3_PHY_BCR>,
> +                                <&gcc GCC_PCIE3PHY_PHY_BCR>;
> +                       reset-names = "phy", "common";
> +
> +                       #clock-cells = <0>;
> +                       clock-output-names = "gcc_pcie3_pipe_clk_src";
> +
> +                       #phy-cells = <0>;
> +                       status = "disabled";
> +
> +               };
> +
> +               pcie1_phy: phy@fc000 {
> +                       compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
> +                       reg = <0x000fc000 0x1000>;
> +
> +                       clocks = <&gcc GCC_PCIE1_AUX_CLK>,
> +                                <&gcc GCC_PCIE1_AHB_CLK>,
> +                                <&gcc GCC_ANOC_PCIE1_1LANE_M_CLK>,
> +                                <&gcc GCC_SNOC_PCIE1_1LANE_S_CLK>,
> +                                <&gcc GCC_PCIE1_PIPE_CLK>;
> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
> +
> +                       assigned-clocks = <&gcc GCC_PCIE1_AUX_CLK>;
> +                       assigned-clock-rates = <20000000>;
> +
> +                       resets = <&gcc GCC_PCIE1_PHY_BCR>,
> +                                <&gcc GCC_PCIE1PHY_PHY_BCR>;
> +                       reset-names = "phy", "common";
> +
> +                       #clock-cells = <0>;
> +                       clock-output-names = "gcc_pcie1_pipe_clk_src";
> +
> +                       #phy-cells = <0>;
> +                       status = "disabled";
> +
> +               };
> +
>                 tlmm: pinctrl@1000000 {
>                         compatible = "qcom,ipq9574-tlmm";
>                         reg = <0x01000000 0x300000>;
> @@ -146,10 +250,10 @@
>                         reg = <0x01800000 0x80000>;
>                         clocks = <&xo_board_clk>,
>                                  <&sleep_clk>,
> -                                <0>,
> -                                <0>,
> -                                <0>,
> -                                <0>,
> +                                <&pcie0_phy>,
> +                                <&pcie1_phy>,
> +                                <&pcie2_phy>,
> +                                <&pcie3_phy>,
>                                  <0>;
>                         #clock-cells = <1>;
>                         #reset-cells = <1>;
> @@ -478,6 +582,267 @@
>                                 status = "disabled";
>                         };
>                 };
> +
> +               pcie1: pci@10000000 {
> +                       compatible = "qcom,pcie-ipq9574";
> +                       reg =  <0x10000000 0xf1d>,
> +                              <0x10000F20 0xa8>,
> +                              <0x10001000 0x1000>,
> +                              <0x000F8000 0x4000>,
> +                              <0x10100000 0x1000>;
> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
> +                       device_type = "pci";
> +                       linux,pci-domain = <2>;
> +                       bus-range = <0x00 0xff>;
> +                       num-lanes = <1>;
> +                       #address-cells = <3>;
> +                       #size-cells = <2>;
> +
> +                       ranges = <0x01000000 0x0 0x00000000 0x10200000 0x0 0x100000>,  /* I/O */
> +                                <0x02000000 0x0 0x10300000 0x10300000 0x0 0x7d00000>; /* MEM */
> +
> +                       #interrupt-cells = <1>;
> +                       interrupt-map-mask = <0 0 0 0x7>;
> +                       interrupt-map = <0 0 0 1 &intc 0 35 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
> +                                       <0 0 0 2 &intc 0 49 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
> +                                       <0 0 0 3 &intc 0 84 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
> +                                       <0 0 0 4 &intc 0 85 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
> +

No iommu-map?

> +                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
> +                       interrupt-names = "global_irq";
> +
> +                       /* clocks and clock-names are used to enable the clock in CBCR */
> +                       clocks = <&gcc GCC_PCIE1_AHB_CLK>,
> +                                <&gcc GCC_PCIE1_AUX_CLK>,
> +                                <&gcc GCC_PCIE1_AXI_M_CLK>,
> +                                <&gcc GCC_PCIE1_AXI_S_CLK>,
> +                                <&gcc GCC_PCIE1_AXI_S_BRIDGE_CLK>,
> +                                <&gcc GCC_PCIE1_RCHNG_CLK>;
> +                       clock-names = "ahb",
> +                                     "aux",
> +                                     "axi_m",
> +                                     "axi_s",
> +                                     "axi_bridge",
> +                                     "rchng";
> +
> +                       resets = <&gcc GCC_PCIE1_PIPE_ARES>,
> +                                <&gcc GCC_PCIE1_CORE_STICKY_ARES>,
> +                                <&gcc GCC_PCIE1_AXI_S_STICKY_ARES>,
> +                                <&gcc GCC_PCIE1_AXI_S_ARES>,
> +                                <&gcc GCC_PCIE1_AXI_M_STICKY_ARES>,
> +                                <&gcc GCC_PCIE1_AXI_M_ARES>,
> +                                <&gcc GCC_PCIE1_AUX_ARES>,
> +                                <&gcc GCC_PCIE1_AHB_ARES>;
> +                       reset-names = "pipe",
> +                                     "sticky",
> +                                     "axi_s_sticky",
> +                                     "axi_s",
> +                                     "axi_m_sticky",
> +                                     "axi_m",
> +                                     "aux",
> +                                     "ahb";
> +
> +                       phys = <&pcie1_phy>;
> +                       phy-names = "pciephy";
> +                       msi-parent = <&v2m0>;
> +                       status = "disabled";
> +               };
> +
> +               pcie3: pci@18000000 {
> +                       compatible = "qcom,pcie-ipq9574";
> +                       reg =  <0x18000000 0xf1d>,
> +                              <0x18000F20 0xa8>,
> +                              <0x18001000 0x1000>,
> +                              <0x000F0000 0x4000>,
> +                              <0x18100000 0x1000>;
> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
> +                       device_type = "pci";
> +                       linux,pci-domain = <4>;
> +                       bus-range = <0x00 0xff>;
> +                       num-lanes = <2>;
> +                       #address-cells = <3>;
> +                       #size-cells = <2>;
> +
> +                       ranges = <0x01000000 0x0 0x00000000 0x18200000 0x0 0x100000>,  /* I/O */
> +                                <0x02000000 0x0 0x18300000 0x18300000 0x0 0x7d00000>; /* MEM */
> +
> +                       #interrupt-cells = <1>;
> +                       interrupt-map-mask = <0 0 0 0x7>;
> +                       interrupt-map = <0 0 0 1 &intc 0 189 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
> +                                       <0 0 0 2 &intc 0 190 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
> +                                       <0 0 0 3 &intc 0 191 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
> +                                       <0 0 0 4 &intc 0 192 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
> +
> +                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
> +                       interrupt-names = "global_irq";
> +
> +                       /* clocks and clock-names are used to enable the clock in CBCR */
> +                       clocks = <&gcc GCC_PCIE3_AHB_CLK>,
> +                                <&gcc GCC_PCIE3_AUX_CLK>,
> +                                <&gcc GCC_PCIE3_AXI_M_CLK>,
> +                                <&gcc GCC_PCIE3_AXI_S_CLK>,
> +                                <&gcc GCC_PCIE3_AXI_S_BRIDGE_CLK>,
> +                                <&gcc GCC_PCIE3_RCHNG_CLK>;
> +                       clock-names = "ahb",
> +                                     "aux",
> +                                     "axi_m",
> +                                     "axi_s",
> +                                     "axi_bridge",
> +                                     "rchng";
> +
> +                       resets = <&gcc GCC_PCIE3_PIPE_ARES>,
> +                                <&gcc GCC_PCIE3_CORE_STICKY_ARES>,
> +                                <&gcc GCC_PCIE3_AXI_S_STICKY_ARES>,
> +                                <&gcc GCC_PCIE3_AXI_S_ARES>,
> +                                <&gcc GCC_PCIE3_AXI_M_STICKY_ARES>,
> +                                <&gcc GCC_PCIE3_AXI_M_ARES>,
> +                                <&gcc GCC_PCIE3_AUX_ARES>,
> +                                <&gcc GCC_PCIE3_AHB_ARES>;
> +                       reset-names = "pipe",
> +                                     "sticky",
> +                                     "axi_s_sticky",
> +                                     "axi_s",
> +                                     "axi_m_sticky",
> +                                     "axi_m",
> +                                     "aux",
> +                                     "ahb";
> +
> +                       phys = <&pcie3_phy>;
> +                       phy-names = "pciephy";
> +                       msi-parent = <&v2m0>;
> +                       status = "disabled";
> +               };
> +
> +               pcie2: pci@20000000 {
> +                       compatible = "qcom,pcie-ipq9574";
> +                       reg =  <0x20000000 0xf1d>,
> +                              <0x20000F20 0xa8>,
> +                              <0x20001000 0x1000>,
> +                              <0x00088000 0x4000>,
> +                              <0x20100000 0x1000>;
> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
> +                       device_type = "pci";
> +                       linux,pci-domain = <3>;
> +                       bus-range = <0x00 0xff>;
> +                       num-lanes = <2>;
> +                       #address-cells = <3>;
> +                       #size-cells = <2>;
> +
> +                       ranges = <0x01000000 0x0 0x00000000 0x20200000 0x0 0x100000>,  /* I/O */
> +                                <0x02000000 0x0 0x20300000 0x20300000 0x0 0x7d00000>; /* MEM */
> +
> +                       #interrupt-cells = <1>;
> +                       interrupt-map-mask = <0 0 0 0x7>;
> +                       interrupt-map = <0 0 0 1 &intc 0 164 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
> +                                       <0 0 0 2 &intc 0 165 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
> +                                       <0 0 0 3 &intc 0 186 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
> +                                       <0 0 0 4 &intc 0 187 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
> +
> +                       interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
> +                       interrupt-names = "global_irq";
> +
> +                       /* clocks and clock-names are used to enable the clock in CBCR */
> +                       clocks = <&gcc GCC_PCIE2_AHB_CLK>,
> +                                <&gcc GCC_PCIE2_AUX_CLK>,
> +                                <&gcc GCC_PCIE2_AXI_M_CLK>,
> +                                <&gcc GCC_PCIE2_AXI_S_CLK>,
> +                                <&gcc GCC_PCIE2_AXI_S_BRIDGE_CLK>,
> +                                <&gcc GCC_PCIE2_RCHNG_CLK>;
> +                       clock-names = "ahb",
> +                                     "aux",
> +                                     "axi_m",
> +                                     "axi_s",
> +                                     "axi_bridge",
> +                                     "rchng";
> +
> +                       resets = <&gcc GCC_PCIE2_PIPE_ARES>,
> +                                <&gcc GCC_PCIE2_CORE_STICKY_ARES>,
> +                                <&gcc GCC_PCIE2_AXI_S_STICKY_ARES>,
> +                                <&gcc GCC_PCIE2_AXI_S_ARES>,
> +                                <&gcc GCC_PCIE2_AXI_M_STICKY_ARES>,
> +                                <&gcc GCC_PCIE2_AXI_M_ARES>,
> +                                <&gcc GCC_PCIE2_AUX_ARES>,
> +                                <&gcc GCC_PCIE2_AHB_ARES>;
> +                       reset-names = "pipe",
> +                                     "sticky",
> +                                     "axi_s_sticky",
> +                                     "axi_s",
> +                                     "axi_m_sticky",
> +                                     "axi_m",
> +                                     "aux",
> +                                     "ahb";
> +
> +                       phys = <&pcie2_phy>;
> +                       phy-names = "pciephy";
> +                       msi-parent = <&v2m0>;
> +                       status = "disabled";
> +               };
> +
> +               pcie0: pci@28000000 {
> +                       compatible = "qcom,pcie-ipq9574";
> +                       reg =  <0x28000000 0xf1d>,
> +                              <0x28000F20 0xa8>,
> +                              <0x28001000 0x1000>,
> +                              <0x00080000 0x4000>,
> +                              <0x28100000 0x1000>;
> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
> +                       device_type = "pci";
> +                       linux,pci-domain = <1>;
> +                       bus-range = <0x00 0xff>;
> +                       num-lanes = <1>;
> +                       #address-cells = <3>;
> +                       #size-cells = <2>;
> +
> +                       ranges = <0x01000000 0x0 0x00000000 0x28200000 0x0 0x100000>,  /* I/O */
> +                                <0x02000000 0x0 0x28300000 0x28300000 0x0 0x7d00000>; /* MEM */
> +
> +                       #interrupt-cells = <1>;
> +                       interrupt-map-mask = <0 0 0 0x7>;
> +                       interrupt-map = <0 0 0 1 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
> +                                       <0 0 0 2 &intc 0 78 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
> +                                       <0 0 0 3 &intc 0 79 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
> +                                       <0 0 0 4 &intc 0 83 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
> +
> +                       interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
> +                       interrupt-names = "global_irq";
> +
> +                       /* clocks and clock-names are used to enable the clock in CBCR */
> +                       clocks = <&gcc GCC_PCIE0_AHB_CLK>,
> +                                <&gcc GCC_PCIE0_AUX_CLK>,
> +                                <&gcc GCC_PCIE0_AXI_M_CLK>,
> +                                <&gcc GCC_PCIE0_AXI_S_CLK>,
> +                                <&gcc GCC_PCIE0_AXI_S_BRIDGE_CLK>,
> +                                <&gcc GCC_PCIE0_RCHNG_CLK>;
> +                       clock-names = "ahb",
> +                                     "aux",
> +                                     "axi_m",
> +                                     "axi_s",
> +                                     "axi_bridge",
> +                                     "rchng";
> +
> +                       resets = <&gcc GCC_PCIE0_PIPE_ARES>,
> +                                <&gcc GCC_PCIE0_CORE_STICKY_ARES>,
> +                                <&gcc GCC_PCIE0_AXI_S_STICKY_ARES>,
> +                                <&gcc GCC_PCIE0_AXI_S_ARES>,
> +                                <&gcc GCC_PCIE0_AXI_M_STICKY_ARES>,
> +                                <&gcc GCC_PCIE0_AXI_M_ARES>,
> +                                <&gcc GCC_PCIE0_AUX_ARES>,
> +                                <&gcc GCC_PCIE0_AHB_ARES>;
> +                       reset-names = "pipe",
> +                                     "sticky",
> +                                     "axi_s_sticky",
> +                                     "axi_s",
> +                                     "axi_m_sticky",
> +                                     "axi_m",
> +                                     "aux",
> +                                     "ahb";
> +
> +                       phys = <&pcie0_phy>;
> +                       phy-names = "pciephy";
> +                       msi-parent = <&v2m0>;
> +                       status = "disabled";
> +               };
> +
>         };
>
>         timer {
> --
> 2.17.1
>
Devi Priya May 8, 2023, 10:53 a.m. UTC | #2
On 4/22/2023 5:49 AM, Dmitry Baryshkov wrote:
> On Fri, 21 Apr 2023 at 15:50, Devi Priya <quic_devipriy@quicinc.com> wrote:
>>
>> Add PCIe0, PCIe1, PCIe2, PCIe3 (and corresponding PHY) devices
>> found on IPQ9574 platform. The PCIe0 & PCIe1 are 1-lane Gen3
>> host whereas PCIe2 & PCIe3 are 2-lane Gen3 host.
>>
>> Co-developed-by: Anusha Rao <quic_anusha@quicinc.com>
>> Signed-off-by: Anusha Rao <quic_anusha@quicinc.com>
>> Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
>> ---
>>   Changes in V3:
>>          - Fixed up the PCI I/O port ranges
>>
>>   arch/arm64/boot/dts/qcom/ipq9574.dtsi | 375 +++++++++++++++++++++++++-
>>   1 file changed, 370 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>> index e757b57957cf..953a839a1141 100644
>> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>> @@ -6,8 +6,8 @@
>>    * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
>>    */
>>
>> -#include <dt-bindings/interrupt-controller/arm-gic.h>
>>   #include <dt-bindings/clock/qcom,ipq9574-gcc.h>
>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>>   #include <dt-bindings/reset/qcom,ipq9574-gcc.h>
>>
>>   / {
>> @@ -116,6 +116,58 @@
>>                  #size-cells = <1>;
>>                  ranges = <0 0 0 0xffffffff>;
>>
>> +               pcie0_phy: phy@84000 {
>> +                       compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>> +                       reg = <0x00084000 0x1000>;
>> +
>> +                       clocks = <&gcc GCC_PCIE0_AUX_CLK>,
>> +                                <&gcc GCC_PCIE0_AHB_CLK>,
>> +                                <&gcc GCC_ANOC_PCIE0_1LANE_M_CLK>,
>> +                                <&gcc GCC_SNOC_PCIE0_1LANE_S_CLK>,
>> +                                <&gcc GCC_PCIE0_PIPE_CLK>;
>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
>> +
>> +                       assigned-clocks = <&gcc GCC_PCIE0_AUX_CLK>;
>> +                       assigned-clock-rates = <20000000>;
>> +
>> +                       resets = <&gcc GCC_PCIE0_PHY_BCR>,
>> +                                <&gcc GCC_PCIE0PHY_PHY_BCR>;
>> +                       reset-names = "phy", "common";
>> +
>> +                       #clock-cells = <0>;
>> +                       clock-output-names = "gcc_pcie0_pipe_clk_src";
>> +
>> +                       #phy-cells = <0>;
>> +                       status = "disabled";
>> +
>> +               };
>> +
>> +               pcie2_phy: phy@8c000 {
>> +                       compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>> +                       reg = <0x0008c000 0x2000>;
>> +
>> +                       clocks = <&gcc GCC_PCIE2_AUX_CLK>,
>> +                                <&gcc GCC_PCIE2_AHB_CLK>,
>> +                                <&gcc GCC_ANOC_PCIE2_2LANE_M_CLK>,
>> +                                <&gcc GCC_SNOC_PCIE2_2LANE_S_CLK>,
>> +                                <&gcc GCC_PCIE2_PIPE_CLK>;
>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
>> +
>> +                       assigned-clocks = <&gcc GCC_PCIE2_AUX_CLK>;
>> +                       assigned-clock-rates = <20000000>;
>> +
>> +                       resets = <&gcc GCC_PCIE2_PHY_BCR>,
>> +                                <&gcc GCC_PCIE2PHY_PHY_BCR>;
>> +                       reset-names = "phy", "common";
>> +
>> +                       #clock-cells = <0>;
>> +                       clock-output-names = "gcc_pcie2_pipe_clk_src";
>> +
>> +                       #phy-cells = <0>;
>> +                       status = "disabled";
>> +
>> +               };
>> +
>>                  rng: rng@e3000 {
>>                          compatible = "qcom,prng-ee";
>>                          reg = <0x000e3000 0x1000>;
>> @@ -123,6 +175,58 @@
>>                          clock-names = "core";
>>                  };
>>
>> +               pcie3_phy: phy@f4000 {
>> +                       compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>> +                       reg = <0x000f4000 0x2000>;
>> +
>> +                       clocks = <&gcc GCC_PCIE3_AUX_CLK>,
>> +                                <&gcc GCC_PCIE3_AHB_CLK>,
>> +                                <&gcc GCC_ANOC_PCIE3_2LANE_M_CLK>,
>> +                                <&gcc GCC_SNOC_PCIE3_2LANE_S_CLK>,
>> +                                <&gcc GCC_PCIE3_PIPE_CLK>;
>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
>> +
>> +                       assigned-clocks = <&gcc GCC_PCIE3_AUX_CLK>;
>> +                       assigned-clock-rates = <20000000>;
>> +
>> +                       resets = <&gcc GCC_PCIE3_PHY_BCR>,
>> +                                <&gcc GCC_PCIE3PHY_PHY_BCR>;
>> +                       reset-names = "phy", "common";
>> +
>> +                       #clock-cells = <0>;
>> +                       clock-output-names = "gcc_pcie3_pipe_clk_src";
>> +
>> +                       #phy-cells = <0>;
>> +                       status = "disabled";
>> +
>> +               };
>> +
>> +               pcie1_phy: phy@fc000 {
>> +                       compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>> +                       reg = <0x000fc000 0x1000>;
>> +
>> +                       clocks = <&gcc GCC_PCIE1_AUX_CLK>,
>> +                                <&gcc GCC_PCIE1_AHB_CLK>,
>> +                                <&gcc GCC_ANOC_PCIE1_1LANE_M_CLK>,
>> +                                <&gcc GCC_SNOC_PCIE1_1LANE_S_CLK>,
>> +                                <&gcc GCC_PCIE1_PIPE_CLK>;
>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
>> +
>> +                       assigned-clocks = <&gcc GCC_PCIE1_AUX_CLK>;
>> +                       assigned-clock-rates = <20000000>;
>> +
>> +                       resets = <&gcc GCC_PCIE1_PHY_BCR>,
>> +                                <&gcc GCC_PCIE1PHY_PHY_BCR>;
>> +                       reset-names = "phy", "common";
>> +
>> +                       #clock-cells = <0>;
>> +                       clock-output-names = "gcc_pcie1_pipe_clk_src";
>> +
>> +                       #phy-cells = <0>;
>> +                       status = "disabled";
>> +
>> +               };
>> +
>>                  tlmm: pinctrl@1000000 {
>>                          compatible = "qcom,ipq9574-tlmm";
>>                          reg = <0x01000000 0x300000>;
>> @@ -146,10 +250,10 @@
>>                          reg = <0x01800000 0x80000>;
>>                          clocks = <&xo_board_clk>,
>>                                   <&sleep_clk>,
>> -                                <0>,
>> -                                <0>,
>> -                                <0>,
>> -                                <0>,
>> +                                <&pcie0_phy>,
>> +                                <&pcie1_phy>,
>> +                                <&pcie2_phy>,
>> +                                <&pcie3_phy>,
>>                                   <0>;
>>                          #clock-cells = <1>;
>>                          #reset-cells = <1>;
>> @@ -478,6 +582,267 @@
>>                                  status = "disabled";
>>                          };
>>                  };
>> +
>> +               pcie1: pci@10000000 {
>> +                       compatible = "qcom,pcie-ipq9574";
>> +                       reg =  <0x10000000 0xf1d>,
>> +                              <0x10000F20 0xa8>,
>> +                              <0x10001000 0x1000>,
>> +                              <0x000F8000 0x4000>,
>> +                              <0x10100000 0x1000>;
>> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
>> +                       device_type = "pci";
>> +                       linux,pci-domain = <2>;
>> +                       bus-range = <0x00 0xff>;
>> +                       num-lanes = <1>;
>> +                       #address-cells = <3>;
>> +                       #size-cells = <2>;
>> +
>> +                       ranges = <0x01000000 0x0 0x00000000 0x10200000 0x0 0x100000>,  /* I/O */
>> +                                <0x02000000 0x0 0x10300000 0x10300000 0x0 0x7d00000>; /* MEM */
>> +
>> +                       #interrupt-cells = <1>;
>> +                       interrupt-map-mask = <0 0 0 0x7>;
>> +                       interrupt-map = <0 0 0 1 &intc 0 35 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
>> +                                       <0 0 0 2 &intc 0 49 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
>> +                                       <0 0 0 3 &intc 0 84 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
>> +                                       <0 0 0 4 &intc 0 85 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
>> +
> 
> No iommu-map?
We do not enable the IOMMU stage1 translation for PCIe and the registers
have secure access only from TrustZone (It enables only stage2 for
Access control)

Thanks,
Devi Priya
> 
>> +                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
>> +                       interrupt-names = "global_irq";
>> +
>> +                       /* clocks and clock-names are used to enable the clock in CBCR */
>> +                       clocks = <&gcc GCC_PCIE1_AHB_CLK>,
>> +                                <&gcc GCC_PCIE1_AUX_CLK>,
>> +                                <&gcc GCC_PCIE1_AXI_M_CLK>,
>> +                                <&gcc GCC_PCIE1_AXI_S_CLK>,
>> +                                <&gcc GCC_PCIE1_AXI_S_BRIDGE_CLK>,
>> +                                <&gcc GCC_PCIE1_RCHNG_CLK>;
>> +                       clock-names = "ahb",
>> +                                     "aux",
>> +                                     "axi_m",
>> +                                     "axi_s",
>> +                                     "axi_bridge",
>> +                                     "rchng";
>> +
>> +                       resets = <&gcc GCC_PCIE1_PIPE_ARES>,
>> +                                <&gcc GCC_PCIE1_CORE_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE1_AXI_S_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE1_AXI_S_ARES>,
>> +                                <&gcc GCC_PCIE1_AXI_M_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE1_AXI_M_ARES>,
>> +                                <&gcc GCC_PCIE1_AUX_ARES>,
>> +                                <&gcc GCC_PCIE1_AHB_ARES>;
>> +                       reset-names = "pipe",
>> +                                     "sticky",
>> +                                     "axi_s_sticky",
>> +                                     "axi_s",
>> +                                     "axi_m_sticky",
>> +                                     "axi_m",
>> +                                     "aux",
>> +                                     "ahb";
>> +
>> +                       phys = <&pcie1_phy>;
>> +                       phy-names = "pciephy";
>> +                       msi-parent = <&v2m0>;
>> +                       status = "disabled";
>> +               };
>> +
>> +               pcie3: pci@18000000 {
>> +                       compatible = "qcom,pcie-ipq9574";
>> +                       reg =  <0x18000000 0xf1d>,
>> +                              <0x18000F20 0xa8>,
>> +                              <0x18001000 0x1000>,
>> +                              <0x000F0000 0x4000>,
>> +                              <0x18100000 0x1000>;
>> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
>> +                       device_type = "pci";
>> +                       linux,pci-domain = <4>;
>> +                       bus-range = <0x00 0xff>;
>> +                       num-lanes = <2>;
>> +                       #address-cells = <3>;
>> +                       #size-cells = <2>;
>> +
>> +                       ranges = <0x01000000 0x0 0x00000000 0x18200000 0x0 0x100000>,  /* I/O */
>> +                                <0x02000000 0x0 0x18300000 0x18300000 0x0 0x7d00000>; /* MEM */
>> +
>> +                       #interrupt-cells = <1>;
>> +                       interrupt-map-mask = <0 0 0 0x7>;
>> +                       interrupt-map = <0 0 0 1 &intc 0 189 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
>> +                                       <0 0 0 2 &intc 0 190 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
>> +                                       <0 0 0 3 &intc 0 191 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
>> +                                       <0 0 0 4 &intc 0 192 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
>> +
>> +                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
>> +                       interrupt-names = "global_irq";
>> +
>> +                       /* clocks and clock-names are used to enable the clock in CBCR */
>> +                       clocks = <&gcc GCC_PCIE3_AHB_CLK>,
>> +                                <&gcc GCC_PCIE3_AUX_CLK>,
>> +                                <&gcc GCC_PCIE3_AXI_M_CLK>,
>> +                                <&gcc GCC_PCIE3_AXI_S_CLK>,
>> +                                <&gcc GCC_PCIE3_AXI_S_BRIDGE_CLK>,
>> +                                <&gcc GCC_PCIE3_RCHNG_CLK>;
>> +                       clock-names = "ahb",
>> +                                     "aux",
>> +                                     "axi_m",
>> +                                     "axi_s",
>> +                                     "axi_bridge",
>> +                                     "rchng";
>> +
>> +                       resets = <&gcc GCC_PCIE3_PIPE_ARES>,
>> +                                <&gcc GCC_PCIE3_CORE_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE3_AXI_S_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE3_AXI_S_ARES>,
>> +                                <&gcc GCC_PCIE3_AXI_M_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE3_AXI_M_ARES>,
>> +                                <&gcc GCC_PCIE3_AUX_ARES>,
>> +                                <&gcc GCC_PCIE3_AHB_ARES>;
>> +                       reset-names = "pipe",
>> +                                     "sticky",
>> +                                     "axi_s_sticky",
>> +                                     "axi_s",
>> +                                     "axi_m_sticky",
>> +                                     "axi_m",
>> +                                     "aux",
>> +                                     "ahb";
>> +
>> +                       phys = <&pcie3_phy>;
>> +                       phy-names = "pciephy";
>> +                       msi-parent = <&v2m0>;
>> +                       status = "disabled";
>> +               };
>> +
>> +               pcie2: pci@20000000 {
>> +                       compatible = "qcom,pcie-ipq9574";
>> +                       reg =  <0x20000000 0xf1d>,
>> +                              <0x20000F20 0xa8>,
>> +                              <0x20001000 0x1000>,
>> +                              <0x00088000 0x4000>,
>> +                              <0x20100000 0x1000>;
>> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
>> +                       device_type = "pci";
>> +                       linux,pci-domain = <3>;
>> +                       bus-range = <0x00 0xff>;
>> +                       num-lanes = <2>;
>> +                       #address-cells = <3>;
>> +                       #size-cells = <2>;
>> +
>> +                       ranges = <0x01000000 0x0 0x00000000 0x20200000 0x0 0x100000>,  /* I/O */
>> +                                <0x02000000 0x0 0x20300000 0x20300000 0x0 0x7d00000>; /* MEM */
>> +
>> +                       #interrupt-cells = <1>;
>> +                       interrupt-map-mask = <0 0 0 0x7>;
>> +                       interrupt-map = <0 0 0 1 &intc 0 164 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
>> +                                       <0 0 0 2 &intc 0 165 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
>> +                                       <0 0 0 3 &intc 0 186 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
>> +                                       <0 0 0 4 &intc 0 187 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
>> +
>> +                       interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
>> +                       interrupt-names = "global_irq";
>> +
>> +                       /* clocks and clock-names are used to enable the clock in CBCR */
>> +                       clocks = <&gcc GCC_PCIE2_AHB_CLK>,
>> +                                <&gcc GCC_PCIE2_AUX_CLK>,
>> +                                <&gcc GCC_PCIE2_AXI_M_CLK>,
>> +                                <&gcc GCC_PCIE2_AXI_S_CLK>,
>> +                                <&gcc GCC_PCIE2_AXI_S_BRIDGE_CLK>,
>> +                                <&gcc GCC_PCIE2_RCHNG_CLK>;
>> +                       clock-names = "ahb",
>> +                                     "aux",
>> +                                     "axi_m",
>> +                                     "axi_s",
>> +                                     "axi_bridge",
>> +                                     "rchng";
>> +
>> +                       resets = <&gcc GCC_PCIE2_PIPE_ARES>,
>> +                                <&gcc GCC_PCIE2_CORE_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE2_AXI_S_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE2_AXI_S_ARES>,
>> +                                <&gcc GCC_PCIE2_AXI_M_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE2_AXI_M_ARES>,
>> +                                <&gcc GCC_PCIE2_AUX_ARES>,
>> +                                <&gcc GCC_PCIE2_AHB_ARES>;
>> +                       reset-names = "pipe",
>> +                                     "sticky",
>> +                                     "axi_s_sticky",
>> +                                     "axi_s",
>> +                                     "axi_m_sticky",
>> +                                     "axi_m",
>> +                                     "aux",
>> +                                     "ahb";
>> +
>> +                       phys = <&pcie2_phy>;
>> +                       phy-names = "pciephy";
>> +                       msi-parent = <&v2m0>;
>> +                       status = "disabled";
>> +               };
>> +
>> +               pcie0: pci@28000000 {
>> +                       compatible = "qcom,pcie-ipq9574";
>> +                       reg =  <0x28000000 0xf1d>,
>> +                              <0x28000F20 0xa8>,
>> +                              <0x28001000 0x1000>,
>> +                              <0x00080000 0x4000>,
>> +                              <0x28100000 0x1000>;
>> +                       reg-names = "dbi", "elbi", "atu", "parf", "config";
>> +                       device_type = "pci";
>> +                       linux,pci-domain = <1>;
>> +                       bus-range = <0x00 0xff>;
>> +                       num-lanes = <1>;
>> +                       #address-cells = <3>;
>> +                       #size-cells = <2>;
>> +
>> +                       ranges = <0x01000000 0x0 0x00000000 0x28200000 0x0 0x100000>,  /* I/O */
>> +                                <0x02000000 0x0 0x28300000 0x28300000 0x0 0x7d00000>; /* MEM */
>> +
>> +                       #interrupt-cells = <1>;
>> +                       interrupt-map-mask = <0 0 0 0x7>;
>> +                       interrupt-map = <0 0 0 1 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
>> +                                       <0 0 0 2 &intc 0 78 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
>> +                                       <0 0 0 3 &intc 0 79 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
>> +                                       <0 0 0 4 &intc 0 83 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
>> +
>> +                       interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
>> +                       interrupt-names = "global_irq";
>> +
>> +                       /* clocks and clock-names are used to enable the clock in CBCR */
>> +                       clocks = <&gcc GCC_PCIE0_AHB_CLK>,
>> +                                <&gcc GCC_PCIE0_AUX_CLK>,
>> +                                <&gcc GCC_PCIE0_AXI_M_CLK>,
>> +                                <&gcc GCC_PCIE0_AXI_S_CLK>,
>> +                                <&gcc GCC_PCIE0_AXI_S_BRIDGE_CLK>,
>> +                                <&gcc GCC_PCIE0_RCHNG_CLK>;
>> +                       clock-names = "ahb",
>> +                                     "aux",
>> +                                     "axi_m",
>> +                                     "axi_s",
>> +                                     "axi_bridge",
>> +                                     "rchng";
>> +
>> +                       resets = <&gcc GCC_PCIE0_PIPE_ARES>,
>> +                                <&gcc GCC_PCIE0_CORE_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE0_AXI_S_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE0_AXI_S_ARES>,
>> +                                <&gcc GCC_PCIE0_AXI_M_STICKY_ARES>,
>> +                                <&gcc GCC_PCIE0_AXI_M_ARES>,
>> +                                <&gcc GCC_PCIE0_AUX_ARES>,
>> +                                <&gcc GCC_PCIE0_AHB_ARES>;
>> +                       reset-names = "pipe",
>> +                                     "sticky",
>> +                                     "axi_s_sticky",
>> +                                     "axi_s",
>> +                                     "axi_m_sticky",
>> +                                     "axi_m",
>> +                                     "aux",
>> +                                     "ahb";
>> +
>> +                       phys = <&pcie0_phy>;
>> +                       phy-names = "pciephy";
>> +                       msi-parent = <&v2m0>;
>> +                       status = "disabled";
>> +               };
>> +
>>          };
>>
>>          timer {
>> --
>> 2.17.1
>>
> 
>
Dmitry Baryshkov May 8, 2023, 11:40 a.m. UTC | #3
On 08/05/2023 13:53, Devi Priya wrote:
> 
> 
> On 4/22/2023 5:49 AM, Dmitry Baryshkov wrote:
>> On Fri, 21 Apr 2023 at 15:50, Devi Priya <quic_devipriy@quicinc.com> 
>> wrote:
>>>
>>> Add PCIe0, PCIe1, PCIe2, PCIe3 (and corresponding PHY) devices
>>> found on IPQ9574 platform. The PCIe0 & PCIe1 are 1-lane Gen3
>>> host whereas PCIe2 & PCIe3 are 2-lane Gen3 host.
>>>
>>> Co-developed-by: Anusha Rao <quic_anusha@quicinc.com>
>>> Signed-off-by: Anusha Rao <quic_anusha@quicinc.com>
>>> Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
>>> ---
>>>   Changes in V3:
>>>          - Fixed up the PCI I/O port ranges
>>>
>>>   arch/arm64/boot/dts/qcom/ipq9574.dtsi | 375 +++++++++++++++++++++++++-
>>>   1 file changed, 370 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi 
>>> b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>> index e757b57957cf..953a839a1141 100644
>>> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>> @@ -6,8 +6,8 @@
>>>    * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights 
>>> reserved.
>>>    */
>>>
>>> -#include <dt-bindings/interrupt-controller/arm-gic.h>
>>>   #include <dt-bindings/clock/qcom,ipq9574-gcc.h>
>>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>>>   #include <dt-bindings/reset/qcom,ipq9574-gcc.h>
>>>
>>>   / {
>>> @@ -116,6 +116,58 @@
>>>                  #size-cells = <1>;
>>>                  ranges = <0 0 0 0xffffffff>;
>>>
>>> +               pcie0_phy: phy@84000 {
>>> +                       compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>>> +                       reg = <0x00084000 0x1000>;
>>> +
>>> +                       clocks = <&gcc GCC_PCIE0_AUX_CLK>,
>>> +                                <&gcc GCC_PCIE0_AHB_CLK>,
>>> +                                <&gcc GCC_ANOC_PCIE0_1LANE_M_CLK>,
>>> +                                <&gcc GCC_SNOC_PCIE0_1LANE_S_CLK>,
>>> +                                <&gcc GCC_PCIE0_PIPE_CLK>;
>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>> "snoc_lane", "pipe";
>>> +
>>> +                       assigned-clocks = <&gcc GCC_PCIE0_AUX_CLK>;
>>> +                       assigned-clock-rates = <20000000>;
>>> +
>>> +                       resets = <&gcc GCC_PCIE0_PHY_BCR>,
>>> +                                <&gcc GCC_PCIE0PHY_PHY_BCR>;
>>> +                       reset-names = "phy", "common";
>>> +
>>> +                       #clock-cells = <0>;
>>> +                       clock-output-names = "gcc_pcie0_pipe_clk_src";
>>> +
>>> +                       #phy-cells = <0>;
>>> +                       status = "disabled";
>>> +
>>> +               };
>>> +
>>> +               pcie2_phy: phy@8c000 {
>>> +                       compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>>> +                       reg = <0x0008c000 0x2000>;
>>> +
>>> +                       clocks = <&gcc GCC_PCIE2_AUX_CLK>,
>>> +                                <&gcc GCC_PCIE2_AHB_CLK>,
>>> +                                <&gcc GCC_ANOC_PCIE2_2LANE_M_CLK>,
>>> +                                <&gcc GCC_SNOC_PCIE2_2LANE_S_CLK>,
>>> +                                <&gcc GCC_PCIE2_PIPE_CLK>;
>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>> "snoc_lane", "pipe";
>>> +
>>> +                       assigned-clocks = <&gcc GCC_PCIE2_AUX_CLK>;
>>> +                       assigned-clock-rates = <20000000>;
>>> +
>>> +                       resets = <&gcc GCC_PCIE2_PHY_BCR>,
>>> +                                <&gcc GCC_PCIE2PHY_PHY_BCR>;
>>> +                       reset-names = "phy", "common";
>>> +
>>> +                       #clock-cells = <0>;
>>> +                       clock-output-names = "gcc_pcie2_pipe_clk_src";
>>> +
>>> +                       #phy-cells = <0>;
>>> +                       status = "disabled";
>>> +
>>> +               };
>>> +
>>>                  rng: rng@e3000 {
>>>                          compatible = "qcom,prng-ee";
>>>                          reg = <0x000e3000 0x1000>;
>>> @@ -123,6 +175,58 @@
>>>                          clock-names = "core";
>>>                  };
>>>
>>> +               pcie3_phy: phy@f4000 {
>>> +                       compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>>> +                       reg = <0x000f4000 0x2000>;
>>> +
>>> +                       clocks = <&gcc GCC_PCIE3_AUX_CLK>,
>>> +                                <&gcc GCC_PCIE3_AHB_CLK>,
>>> +                                <&gcc GCC_ANOC_PCIE3_2LANE_M_CLK>,
>>> +                                <&gcc GCC_SNOC_PCIE3_2LANE_S_CLK>,
>>> +                                <&gcc GCC_PCIE3_PIPE_CLK>;
>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>> "snoc_lane", "pipe";
>>> +
>>> +                       assigned-clocks = <&gcc GCC_PCIE3_AUX_CLK>;
>>> +                       assigned-clock-rates = <20000000>;
>>> +
>>> +                       resets = <&gcc GCC_PCIE3_PHY_BCR>,
>>> +                                <&gcc GCC_PCIE3PHY_PHY_BCR>;
>>> +                       reset-names = "phy", "common";
>>> +
>>> +                       #clock-cells = <0>;
>>> +                       clock-output-names = "gcc_pcie3_pipe_clk_src";
>>> +
>>> +                       #phy-cells = <0>;
>>> +                       status = "disabled";
>>> +
>>> +               };
>>> +
>>> +               pcie1_phy: phy@fc000 {
>>> +                       compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>>> +                       reg = <0x000fc000 0x1000>;
>>> +
>>> +                       clocks = <&gcc GCC_PCIE1_AUX_CLK>,
>>> +                                <&gcc GCC_PCIE1_AHB_CLK>,
>>> +                                <&gcc GCC_ANOC_PCIE1_1LANE_M_CLK>,
>>> +                                <&gcc GCC_SNOC_PCIE1_1LANE_S_CLK>,
>>> +                                <&gcc GCC_PCIE1_PIPE_CLK>;
>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>> "snoc_lane", "pipe";
>>> +
>>> +                       assigned-clocks = <&gcc GCC_PCIE1_AUX_CLK>;
>>> +                       assigned-clock-rates = <20000000>;
>>> +
>>> +                       resets = <&gcc GCC_PCIE1_PHY_BCR>,
>>> +                                <&gcc GCC_PCIE1PHY_PHY_BCR>;
>>> +                       reset-names = "phy", "common";
>>> +
>>> +                       #clock-cells = <0>;
>>> +                       clock-output-names = "gcc_pcie1_pipe_clk_src";
>>> +
>>> +                       #phy-cells = <0>;
>>> +                       status = "disabled";
>>> +
>>> +               };
>>> +
>>>                  tlmm: pinctrl@1000000 {
>>>                          compatible = "qcom,ipq9574-tlmm";
>>>                          reg = <0x01000000 0x300000>;
>>> @@ -146,10 +250,10 @@
>>>                          reg = <0x01800000 0x80000>;
>>>                          clocks = <&xo_board_clk>,
>>>                                   <&sleep_clk>,
>>> -                                <0>,
>>> -                                <0>,
>>> -                                <0>,
>>> -                                <0>,
>>> +                                <&pcie0_phy>,
>>> +                                <&pcie1_phy>,
>>> +                                <&pcie2_phy>,
>>> +                                <&pcie3_phy>,
>>>                                   <0>;
>>>                          #clock-cells = <1>;
>>>                          #reset-cells = <1>;
>>> @@ -478,6 +582,267 @@
>>>                                  status = "disabled";
>>>                          };
>>>                  };
>>> +
>>> +               pcie1: pci@10000000 {
>>> +                       compatible = "qcom,pcie-ipq9574";
>>> +                       reg =  <0x10000000 0xf1d>,
>>> +                              <0x10000F20 0xa8>,
>>> +                              <0x10001000 0x1000>,
>>> +                              <0x000F8000 0x4000>,
>>> +                              <0x10100000 0x1000>;
>>> +                       reg-names = "dbi", "elbi", "atu", "parf", 
>>> "config";
>>> +                       device_type = "pci";
>>> +                       linux,pci-domain = <2>;
>>> +                       bus-range = <0x00 0xff>;
>>> +                       num-lanes = <1>;
>>> +                       #address-cells = <3>;
>>> +                       #size-cells = <2>;
>>> +
>>> +                       ranges = <0x01000000 0x0 0x00000000 
>>> 0x10200000 0x0 0x100000>,  /* I/O */
>>> +                                <0x02000000 0x0 0x10300000 
>>> 0x10300000 0x0 0x7d00000>; /* MEM */
>>> +
>>> +                       #interrupt-cells = <1>;
>>> +                       interrupt-map-mask = <0 0 0 0x7>;
>>> +                       interrupt-map = <0 0 0 1 &intc 0 35 
>>> IRQ_TYPE_LEVEL_HIGH>, /* int_a */
>>> +                                       <0 0 0 2 &intc 0 49 
>>> IRQ_TYPE_LEVEL_HIGH>, /* int_b */
>>> +                                       <0 0 0 3 &intc 0 84 
>>> IRQ_TYPE_LEVEL_HIGH>, /* int_c */
>>> +                                       <0 0 0 4 &intc 0 85 
>>> IRQ_TYPE_LEVEL_HIGH>; /* int_d */
>>> +
>>
>> No iommu-map?
> We do not enable the IOMMU stage1 translation for PCIe and the registers
> have secure access only from TrustZone (It enables only stage2 for
> Access control)

So, no SMMU protection for PCIe transactions? This sounds like a step 
backwards.
Devi Priya May 15, 2023, 9:36 a.m. UTC | #4
On 5/8/2023 5:10 PM, Dmitry Baryshkov wrote:
> On 08/05/2023 13:53, Devi Priya wrote:
>>
>>
>> On 4/22/2023 5:49 AM, Dmitry Baryshkov wrote:
>>> On Fri, 21 Apr 2023 at 15:50, Devi Priya <quic_devipriy@quicinc.com> 
>>> wrote:
>>>>
>>>> Add PCIe0, PCIe1, PCIe2, PCIe3 (and corresponding PHY) devices
>>>> found on IPQ9574 platform. The PCIe0 & PCIe1 are 1-lane Gen3
>>>> host whereas PCIe2 & PCIe3 are 2-lane Gen3 host.
>>>>
>>>> Co-developed-by: Anusha Rao <quic_anusha@quicinc.com>
>>>> Signed-off-by: Anusha Rao <quic_anusha@quicinc.com>
>>>> Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
>>>> ---
>>>>   Changes in V3:
>>>>          - Fixed up the PCI I/O port ranges
>>>>
>>>>   arch/arm64/boot/dts/qcom/ipq9574.dtsi | 375 
>>>> +++++++++++++++++++++++++-
>>>>   1 file changed, 370 insertions(+), 5 deletions(-)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi 
>>>> b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>>> index e757b57957cf..953a839a1141 100644
>>>> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>>> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>>> @@ -6,8 +6,8 @@
>>>>    * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights 
>>>> reserved.
>>>>    */
>>>>
>>>> -#include <dt-bindings/interrupt-controller/arm-gic.h>
>>>>   #include <dt-bindings/clock/qcom,ipq9574-gcc.h>
>>>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>>>>   #include <dt-bindings/reset/qcom,ipq9574-gcc.h>
>>>>
>>>>   / {
>>>> @@ -116,6 +116,58 @@
>>>>                  #size-cells = <1>;
>>>>                  ranges = <0 0 0 0xffffffff>;
>>>>
>>>> +               pcie0_phy: phy@84000 {
>>>> +                       compatible = 
>>>> "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>>>> +                       reg = <0x00084000 0x1000>;
>>>> +
>>>> +                       clocks = <&gcc GCC_PCIE0_AUX_CLK>,
>>>> +                                <&gcc GCC_PCIE0_AHB_CLK>,
>>>> +                                <&gcc GCC_ANOC_PCIE0_1LANE_M_CLK>,
>>>> +                                <&gcc GCC_SNOC_PCIE0_1LANE_S_CLK>,
>>>> +                                <&gcc GCC_PCIE0_PIPE_CLK>;
>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>>> "snoc_lane", "pipe";
>>>> +
>>>> +                       assigned-clocks = <&gcc GCC_PCIE0_AUX_CLK>;
>>>> +                       assigned-clock-rates = <20000000>;
>>>> +
>>>> +                       resets = <&gcc GCC_PCIE0_PHY_BCR>,
>>>> +                                <&gcc GCC_PCIE0PHY_PHY_BCR>;
>>>> +                       reset-names = "phy", "common";
>>>> +
>>>> +                       #clock-cells = <0>;
>>>> +                       clock-output-names = "gcc_pcie0_pipe_clk_src";
>>>> +
>>>> +                       #phy-cells = <0>;
>>>> +                       status = "disabled";
>>>> +
>>>> +               };
>>>> +
>>>> +               pcie2_phy: phy@8c000 {
>>>> +                       compatible = 
>>>> "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>>>> +                       reg = <0x0008c000 0x2000>;
>>>> +
>>>> +                       clocks = <&gcc GCC_PCIE2_AUX_CLK>,
>>>> +                                <&gcc GCC_PCIE2_AHB_CLK>,
>>>> +                                <&gcc GCC_ANOC_PCIE2_2LANE_M_CLK>,
>>>> +                                <&gcc GCC_SNOC_PCIE2_2LANE_S_CLK>,
>>>> +                                <&gcc GCC_PCIE2_PIPE_CLK>;
>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>>> "snoc_lane", "pipe";
>>>> +
>>>> +                       assigned-clocks = <&gcc GCC_PCIE2_AUX_CLK>;
>>>> +                       assigned-clock-rates = <20000000>;
>>>> +
>>>> +                       resets = <&gcc GCC_PCIE2_PHY_BCR>,
>>>> +                                <&gcc GCC_PCIE2PHY_PHY_BCR>;
>>>> +                       reset-names = "phy", "common";
>>>> +
>>>> +                       #clock-cells = <0>;
>>>> +                       clock-output-names = "gcc_pcie2_pipe_clk_src";
>>>> +
>>>> +                       #phy-cells = <0>;
>>>> +                       status = "disabled";
>>>> +
>>>> +               };
>>>> +
>>>>                  rng: rng@e3000 {
>>>>                          compatible = "qcom,prng-ee";
>>>>                          reg = <0x000e3000 0x1000>;
>>>> @@ -123,6 +175,58 @@
>>>>                          clock-names = "core";
>>>>                  };
>>>>
>>>> +               pcie3_phy: phy@f4000 {
>>>> +                       compatible = 
>>>> "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>>>> +                       reg = <0x000f4000 0x2000>;
>>>> +
>>>> +                       clocks = <&gcc GCC_PCIE3_AUX_CLK>,
>>>> +                                <&gcc GCC_PCIE3_AHB_CLK>,
>>>> +                                <&gcc GCC_ANOC_PCIE3_2LANE_M_CLK>,
>>>> +                                <&gcc GCC_SNOC_PCIE3_2LANE_S_CLK>,
>>>> +                                <&gcc GCC_PCIE3_PIPE_CLK>;
>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>>> "snoc_lane", "pipe";
>>>> +
>>>> +                       assigned-clocks = <&gcc GCC_PCIE3_AUX_CLK>;
>>>> +                       assigned-clock-rates = <20000000>;
>>>> +
>>>> +                       resets = <&gcc GCC_PCIE3_PHY_BCR>,
>>>> +                                <&gcc GCC_PCIE3PHY_PHY_BCR>;
>>>> +                       reset-names = "phy", "common";
>>>> +
>>>> +                       #clock-cells = <0>;
>>>> +                       clock-output-names = "gcc_pcie3_pipe_clk_src";
>>>> +
>>>> +                       #phy-cells = <0>;
>>>> +                       status = "disabled";
>>>> +
>>>> +               };
>>>> +
>>>> +               pcie1_phy: phy@fc000 {
>>>> +                       compatible = 
>>>> "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>>>> +                       reg = <0x000fc000 0x1000>;
>>>> +
>>>> +                       clocks = <&gcc GCC_PCIE1_AUX_CLK>,
>>>> +                                <&gcc GCC_PCIE1_AHB_CLK>,
>>>> +                                <&gcc GCC_ANOC_PCIE1_1LANE_M_CLK>,
>>>> +                                <&gcc GCC_SNOC_PCIE1_1LANE_S_CLK>,
>>>> +                                <&gcc GCC_PCIE1_PIPE_CLK>;
>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane", 
>>>> "snoc_lane", "pipe";
>>>> +
>>>> +                       assigned-clocks = <&gcc GCC_PCIE1_AUX_CLK>;
>>>> +                       assigned-clock-rates = <20000000>;
>>>> +
>>>> +                       resets = <&gcc GCC_PCIE1_PHY_BCR>,
>>>> +                                <&gcc GCC_PCIE1PHY_PHY_BCR>;
>>>> +                       reset-names = "phy", "common";
>>>> +
>>>> +                       #clock-cells = <0>;
>>>> +                       clock-output-names = "gcc_pcie1_pipe_clk_src";
>>>> +
>>>> +                       #phy-cells = <0>;
>>>> +                       status = "disabled";
>>>> +
>>>> +               };
>>>> +
>>>>                  tlmm: pinctrl@1000000 {
>>>>                          compatible = "qcom,ipq9574-tlmm";
>>>>                          reg = <0x01000000 0x300000>;
>>>> @@ -146,10 +250,10 @@
>>>>                          reg = <0x01800000 0x80000>;
>>>>                          clocks = <&xo_board_clk>,
>>>>                                   <&sleep_clk>,
>>>> -                                <0>,
>>>> -                                <0>,
>>>> -                                <0>,
>>>> -                                <0>,
>>>> +                                <&pcie0_phy>,
>>>> +                                <&pcie1_phy>,
>>>> +                                <&pcie2_phy>,
>>>> +                                <&pcie3_phy>,
>>>>                                   <0>;
>>>>                          #clock-cells = <1>;
>>>>                          #reset-cells = <1>;
>>>> @@ -478,6 +582,267 @@
>>>>                                  status = "disabled";
>>>>                          };
>>>>                  };
>>>> +
>>>> +               pcie1: pci@10000000 {
>>>> +                       compatible = "qcom,pcie-ipq9574";
>>>> +                       reg =  <0x10000000 0xf1d>,
>>>> +                              <0x10000F20 0xa8>,
>>>> +                              <0x10001000 0x1000>,
>>>> +                              <0x000F8000 0x4000>,
>>>> +                              <0x10100000 0x1000>;
>>>> +                       reg-names = "dbi", "elbi", "atu", "parf", 
>>>> "config";
>>>> +                       device_type = "pci";
>>>> +                       linux,pci-domain = <2>;
>>>> +                       bus-range = <0x00 0xff>;
>>>> +                       num-lanes = <1>;
>>>> +                       #address-cells = <3>;
>>>> +                       #size-cells = <2>;
>>>> +
>>>> +                       ranges = <0x01000000 0x0 0x00000000 
>>>> 0x10200000 0x0 0x100000>,  /* I/O */
>>>> +                                <0x02000000 0x0 0x10300000 
>>>> 0x10300000 0x0 0x7d00000>; /* MEM */
>>>> +
>>>> +                       #interrupt-cells = <1>;
>>>> +                       interrupt-map-mask = <0 0 0 0x7>;
>>>> +                       interrupt-map = <0 0 0 1 &intc 0 35 
>>>> IRQ_TYPE_LEVEL_HIGH>, /* int_a */
>>>> +                                       <0 0 0 2 &intc 0 49 
>>>> IRQ_TYPE_LEVEL_HIGH>, /* int_b */
>>>> +                                       <0 0 0 3 &intc 0 84 
>>>> IRQ_TYPE_LEVEL_HIGH>, /* int_c */
>>>> +                                       <0 0 0 4 &intc 0 85 
>>>> IRQ_TYPE_LEVEL_HIGH>; /* int_d */
>>>> +
>>>
>>> No iommu-map?
>> We do not enable the IOMMU stage1 translation for PCIe and the registers
>> have secure access only from TrustZone (It enables only stage2 for
>> Access control)
> 
> So, no SMMU protection for PCIe transactions? This sounds like a step 
> backwards.
Yes, we are not using stage1 translations.

Thanks,
Devi Priya
>
Dmitry Baryshkov May 15, 2023, 9:51 a.m. UTC | #5
On Mon, 15 May 2023 at 12:36, Devi Priya <quic_devipriy@quicinc.com> wrote:
>
>
>
> On 5/8/2023 5:10 PM, Dmitry Baryshkov wrote:
> > On 08/05/2023 13:53, Devi Priya wrote:
> >>
> >>
> >> On 4/22/2023 5:49 AM, Dmitry Baryshkov wrote:
> >>> On Fri, 21 Apr 2023 at 15:50, Devi Priya <quic_devipriy@quicinc.com>
> >>> wrote:
> >>>>
> >>>> Add PCIe0, PCIe1, PCIe2, PCIe3 (and corresponding PHY) devices
> >>>> found on IPQ9574 platform. The PCIe0 & PCIe1 are 1-lane Gen3
> >>>> host whereas PCIe2 & PCIe3 are 2-lane Gen3 host.
> >>>>
> >>>> Co-developed-by: Anusha Rao <quic_anusha@quicinc.com>
> >>>> Signed-off-by: Anusha Rao <quic_anusha@quicinc.com>
> >>>> Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
> >>>> ---
> >>>>   Changes in V3:
> >>>>          - Fixed up the PCI I/O port ranges
> >>>>
> >>>>   arch/arm64/boot/dts/qcom/ipq9574.dtsi | 375
> >>>> +++++++++++++++++++++++++-
> >>>>   1 file changed, 370 insertions(+), 5 deletions(-)
> >>>>
> >>>> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> >>>> b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> >>>> index e757b57957cf..953a839a1141 100644
> >>>> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> >>>> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> >>>> @@ -6,8 +6,8 @@
> >>>>    * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights
> >>>> reserved.
> >>>>    */
> >>>>
> >>>> -#include <dt-bindings/interrupt-controller/arm-gic.h>
> >>>>   #include <dt-bindings/clock/qcom,ipq9574-gcc.h>
> >>>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> >>>>   #include <dt-bindings/reset/qcom,ipq9574-gcc.h>
> >>>>
> >>>>   / {
> >>>> @@ -116,6 +116,58 @@
> >>>>                  #size-cells = <1>;
> >>>>                  ranges = <0 0 0 0xffffffff>;
> >>>>
> >>>> +               pcie0_phy: phy@84000 {
> >>>> +                       compatible =
> >>>> "qcom,ipq9574-qmp-gen3x1-pcie-phy";
> >>>> +                       reg = <0x00084000 0x1000>;
> >>>> +
> >>>> +                       clocks = <&gcc GCC_PCIE0_AUX_CLK>,
> >>>> +                                <&gcc GCC_PCIE0_AHB_CLK>,
> >>>> +                                <&gcc GCC_ANOC_PCIE0_1LANE_M_CLK>,
> >>>> +                                <&gcc GCC_SNOC_PCIE0_1LANE_S_CLK>,
> >>>> +                                <&gcc GCC_PCIE0_PIPE_CLK>;
> >>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
> >>>> "snoc_lane", "pipe";
> >>>> +
> >>>> +                       assigned-clocks = <&gcc GCC_PCIE0_AUX_CLK>;
> >>>> +                       assigned-clock-rates = <20000000>;
> >>>> +
> >>>> +                       resets = <&gcc GCC_PCIE0_PHY_BCR>,
> >>>> +                                <&gcc GCC_PCIE0PHY_PHY_BCR>;
> >>>> +                       reset-names = "phy", "common";
> >>>> +
> >>>> +                       #clock-cells = <0>;
> >>>> +                       clock-output-names = "gcc_pcie0_pipe_clk_src";
> >>>> +
> >>>> +                       #phy-cells = <0>;
> >>>> +                       status = "disabled";
> >>>> +
> >>>> +               };
> >>>> +
> >>>> +               pcie2_phy: phy@8c000 {
> >>>> +                       compatible =
> >>>> "qcom,ipq9574-qmp-gen3x2-pcie-phy";
> >>>> +                       reg = <0x0008c000 0x2000>;
> >>>> +
> >>>> +                       clocks = <&gcc GCC_PCIE2_AUX_CLK>,
> >>>> +                                <&gcc GCC_PCIE2_AHB_CLK>,
> >>>> +                                <&gcc GCC_ANOC_PCIE2_2LANE_M_CLK>,
> >>>> +                                <&gcc GCC_SNOC_PCIE2_2LANE_S_CLK>,
> >>>> +                                <&gcc GCC_PCIE2_PIPE_CLK>;
> >>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
> >>>> "snoc_lane", "pipe";
> >>>> +
> >>>> +                       assigned-clocks = <&gcc GCC_PCIE2_AUX_CLK>;
> >>>> +                       assigned-clock-rates = <20000000>;
> >>>> +
> >>>> +                       resets = <&gcc GCC_PCIE2_PHY_BCR>,
> >>>> +                                <&gcc GCC_PCIE2PHY_PHY_BCR>;
> >>>> +                       reset-names = "phy", "common";
> >>>> +
> >>>> +                       #clock-cells = <0>;
> >>>> +                       clock-output-names = "gcc_pcie2_pipe_clk_src";
> >>>> +
> >>>> +                       #phy-cells = <0>;
> >>>> +                       status = "disabled";
> >>>> +
> >>>> +               };
> >>>> +
> >>>>                  rng: rng@e3000 {
> >>>>                          compatible = "qcom,prng-ee";
> >>>>                          reg = <0x000e3000 0x1000>;
> >>>> @@ -123,6 +175,58 @@
> >>>>                          clock-names = "core";
> >>>>                  };
> >>>>
> >>>> +               pcie3_phy: phy@f4000 {
> >>>> +                       compatible =
> >>>> "qcom,ipq9574-qmp-gen3x2-pcie-phy";
> >>>> +                       reg = <0x000f4000 0x2000>;
> >>>> +
> >>>> +                       clocks = <&gcc GCC_PCIE3_AUX_CLK>,
> >>>> +                                <&gcc GCC_PCIE3_AHB_CLK>,
> >>>> +                                <&gcc GCC_ANOC_PCIE3_2LANE_M_CLK>,
> >>>> +                                <&gcc GCC_SNOC_PCIE3_2LANE_S_CLK>,
> >>>> +                                <&gcc GCC_PCIE3_PIPE_CLK>;
> >>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
> >>>> "snoc_lane", "pipe";
> >>>> +
> >>>> +                       assigned-clocks = <&gcc GCC_PCIE3_AUX_CLK>;
> >>>> +                       assigned-clock-rates = <20000000>;
> >>>> +
> >>>> +                       resets = <&gcc GCC_PCIE3_PHY_BCR>,
> >>>> +                                <&gcc GCC_PCIE3PHY_PHY_BCR>;
> >>>> +                       reset-names = "phy", "common";
> >>>> +
> >>>> +                       #clock-cells = <0>;
> >>>> +                       clock-output-names = "gcc_pcie3_pipe_clk_src";
> >>>> +
> >>>> +                       #phy-cells = <0>;
> >>>> +                       status = "disabled";
> >>>> +
> >>>> +               };
> >>>> +
> >>>> +               pcie1_phy: phy@fc000 {
> >>>> +                       compatible =
> >>>> "qcom,ipq9574-qmp-gen3x1-pcie-phy";
> >>>> +                       reg = <0x000fc000 0x1000>;
> >>>> +
> >>>> +                       clocks = <&gcc GCC_PCIE1_AUX_CLK>,
> >>>> +                                <&gcc GCC_PCIE1_AHB_CLK>,
> >>>> +                                <&gcc GCC_ANOC_PCIE1_1LANE_M_CLK>,
> >>>> +                                <&gcc GCC_SNOC_PCIE1_1LANE_S_CLK>,
> >>>> +                                <&gcc GCC_PCIE1_PIPE_CLK>;
> >>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
> >>>> "snoc_lane", "pipe";
> >>>> +
> >>>> +                       assigned-clocks = <&gcc GCC_PCIE1_AUX_CLK>;
> >>>> +                       assigned-clock-rates = <20000000>;
> >>>> +
> >>>> +                       resets = <&gcc GCC_PCIE1_PHY_BCR>,
> >>>> +                                <&gcc GCC_PCIE1PHY_PHY_BCR>;
> >>>> +                       reset-names = "phy", "common";
> >>>> +
> >>>> +                       #clock-cells = <0>;
> >>>> +                       clock-output-names = "gcc_pcie1_pipe_clk_src";
> >>>> +
> >>>> +                       #phy-cells = <0>;
> >>>> +                       status = "disabled";
> >>>> +
> >>>> +               };
> >>>> +
> >>>>                  tlmm: pinctrl@1000000 {
> >>>>                          compatible = "qcom,ipq9574-tlmm";
> >>>>                          reg = <0x01000000 0x300000>;
> >>>> @@ -146,10 +250,10 @@
> >>>>                          reg = <0x01800000 0x80000>;
> >>>>                          clocks = <&xo_board_clk>,
> >>>>                                   <&sleep_clk>,
> >>>> -                                <0>,
> >>>> -                                <0>,
> >>>> -                                <0>,
> >>>> -                                <0>,
> >>>> +                                <&pcie0_phy>,
> >>>> +                                <&pcie1_phy>,
> >>>> +                                <&pcie2_phy>,
> >>>> +                                <&pcie3_phy>,
> >>>>                                   <0>;
> >>>>                          #clock-cells = <1>;
> >>>>                          #reset-cells = <1>;
> >>>> @@ -478,6 +582,267 @@
> >>>>                                  status = "disabled";
> >>>>                          };
> >>>>                  };
> >>>> +
> >>>> +               pcie1: pci@10000000 {
> >>>> +                       compatible = "qcom,pcie-ipq9574";
> >>>> +                       reg =  <0x10000000 0xf1d>,
> >>>> +                              <0x10000F20 0xa8>,
> >>>> +                              <0x10001000 0x1000>,
> >>>> +                              <0x000F8000 0x4000>,
> >>>> +                              <0x10100000 0x1000>;
> >>>> +                       reg-names = "dbi", "elbi", "atu", "parf",
> >>>> "config";
> >>>> +                       device_type = "pci";
> >>>> +                       linux,pci-domain = <2>;
> >>>> +                       bus-range = <0x00 0xff>;
> >>>> +                       num-lanes = <1>;
> >>>> +                       #address-cells = <3>;
> >>>> +                       #size-cells = <2>;
> >>>> +
> >>>> +                       ranges = <0x01000000 0x0 0x00000000
> >>>> 0x10200000 0x0 0x100000>,  /* I/O */
> >>>> +                                <0x02000000 0x0 0x10300000
> >>>> 0x10300000 0x0 0x7d00000>; /* MEM */
> >>>> +
> >>>> +                       #interrupt-cells = <1>;
> >>>> +                       interrupt-map-mask = <0 0 0 0x7>;
> >>>> +                       interrupt-map = <0 0 0 1 &intc 0 35
> >>>> IRQ_TYPE_LEVEL_HIGH>, /* int_a */
> >>>> +                                       <0 0 0 2 &intc 0 49
> >>>> IRQ_TYPE_LEVEL_HIGH>, /* int_b */
> >>>> +                                       <0 0 0 3 &intc 0 84
> >>>> IRQ_TYPE_LEVEL_HIGH>, /* int_c */
> >>>> +                                       <0 0 0 4 &intc 0 85
> >>>> IRQ_TYPE_LEVEL_HIGH>; /* int_d */
> >>>> +
> >>>
> >>> No iommu-map?
> >> We do not enable the IOMMU stage1 translation for PCIe and the registers
> >> have secure access only from TrustZone (It enables only stage2 for
> >> Access control)
> >
> > So, no SMMU protection for PCIe transactions? This sounds like a step
> > backwards.
> Yes, we are not using stage1 translations.

We = software or we = hardware? If there is a hardware interface to
SMMU, please describe it here.
Devi Priya May 15, 2023, 1:15 p.m. UTC | #6
On 5/15/2023 3:21 PM, Dmitry Baryshkov wrote:
> On Mon, 15 May 2023 at 12:36, Devi Priya <quic_devipriy@quicinc.com> wrote:
>>
>>
>>
>> On 5/8/2023 5:10 PM, Dmitry Baryshkov wrote:
>>> On 08/05/2023 13:53, Devi Priya wrote:
>>>>
>>>>
>>>> On 4/22/2023 5:49 AM, Dmitry Baryshkov wrote:
>>>>> On Fri, 21 Apr 2023 at 15:50, Devi Priya <quic_devipriy@quicinc.com>
>>>>> wrote:
>>>>>>
>>>>>> Add PCIe0, PCIe1, PCIe2, PCIe3 (and corresponding PHY) devices
>>>>>> found on IPQ9574 platform. The PCIe0 & PCIe1 are 1-lane Gen3
>>>>>> host whereas PCIe2 & PCIe3 are 2-lane Gen3 host.
>>>>>>
>>>>>> Co-developed-by: Anusha Rao <quic_anusha@quicinc.com>
>>>>>> Signed-off-by: Anusha Rao <quic_anusha@quicinc.com>
>>>>>> Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
>>>>>> ---
>>>>>>    Changes in V3:
>>>>>>           - Fixed up the PCI I/O port ranges
>>>>>>
>>>>>>    arch/arm64/boot/dts/qcom/ipq9574.dtsi | 375
>>>>>> +++++++++++++++++++++++++-
>>>>>>    1 file changed, 370 insertions(+), 5 deletions(-)
>>>>>>
>>>>>> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>>>>> b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>>>>> index e757b57957cf..953a839a1141 100644
>>>>>> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>>>>> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>>>>> @@ -6,8 +6,8 @@
>>>>>>     * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights
>>>>>> reserved.
>>>>>>     */
>>>>>>
>>>>>> -#include <dt-bindings/interrupt-controller/arm-gic.h>
>>>>>>    #include <dt-bindings/clock/qcom,ipq9574-gcc.h>
>>>>>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>>>>>>    #include <dt-bindings/reset/qcom,ipq9574-gcc.h>
>>>>>>
>>>>>>    / {
>>>>>> @@ -116,6 +116,58 @@
>>>>>>                   #size-cells = <1>;
>>>>>>                   ranges = <0 0 0 0xffffffff>;
>>>>>>
>>>>>> +               pcie0_phy: phy@84000 {
>>>>>> +                       compatible =
>>>>>> "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>>>>>> +                       reg = <0x00084000 0x1000>;
>>>>>> +
>>>>>> +                       clocks = <&gcc GCC_PCIE0_AUX_CLK>,
>>>>>> +                                <&gcc GCC_PCIE0_AHB_CLK>,
>>>>>> +                                <&gcc GCC_ANOC_PCIE0_1LANE_M_CLK>,
>>>>>> +                                <&gcc GCC_SNOC_PCIE0_1LANE_S_CLK>,
>>>>>> +                                <&gcc GCC_PCIE0_PIPE_CLK>;
>>>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
>>>>>> "snoc_lane", "pipe";
>>>>>> +
>>>>>> +                       assigned-clocks = <&gcc GCC_PCIE0_AUX_CLK>;
>>>>>> +                       assigned-clock-rates = <20000000>;
>>>>>> +
>>>>>> +                       resets = <&gcc GCC_PCIE0_PHY_BCR>,
>>>>>> +                                <&gcc GCC_PCIE0PHY_PHY_BCR>;
>>>>>> +                       reset-names = "phy", "common";
>>>>>> +
>>>>>> +                       #clock-cells = <0>;
>>>>>> +                       clock-output-names = "gcc_pcie0_pipe_clk_src";
>>>>>> +
>>>>>> +                       #phy-cells = <0>;
>>>>>> +                       status = "disabled";
>>>>>> +
>>>>>> +               };
>>>>>> +
>>>>>> +               pcie2_phy: phy@8c000 {
>>>>>> +                       compatible =
>>>>>> "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>>>>>> +                       reg = <0x0008c000 0x2000>;
>>>>>> +
>>>>>> +                       clocks = <&gcc GCC_PCIE2_AUX_CLK>,
>>>>>> +                                <&gcc GCC_PCIE2_AHB_CLK>,
>>>>>> +                                <&gcc GCC_ANOC_PCIE2_2LANE_M_CLK>,
>>>>>> +                                <&gcc GCC_SNOC_PCIE2_2LANE_S_CLK>,
>>>>>> +                                <&gcc GCC_PCIE2_PIPE_CLK>;
>>>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
>>>>>> "snoc_lane", "pipe";
>>>>>> +
>>>>>> +                       assigned-clocks = <&gcc GCC_PCIE2_AUX_CLK>;
>>>>>> +                       assigned-clock-rates = <20000000>;
>>>>>> +
>>>>>> +                       resets = <&gcc GCC_PCIE2_PHY_BCR>,
>>>>>> +                                <&gcc GCC_PCIE2PHY_PHY_BCR>;
>>>>>> +                       reset-names = "phy", "common";
>>>>>> +
>>>>>> +                       #clock-cells = <0>;
>>>>>> +                       clock-output-names = "gcc_pcie2_pipe_clk_src";
>>>>>> +
>>>>>> +                       #phy-cells = <0>;
>>>>>> +                       status = "disabled";
>>>>>> +
>>>>>> +               };
>>>>>> +
>>>>>>                   rng: rng@e3000 {
>>>>>>                           compatible = "qcom,prng-ee";
>>>>>>                           reg = <0x000e3000 0x1000>;
>>>>>> @@ -123,6 +175,58 @@
>>>>>>                           clock-names = "core";
>>>>>>                   };
>>>>>>
>>>>>> +               pcie3_phy: phy@f4000 {
>>>>>> +                       compatible =
>>>>>> "qcom,ipq9574-qmp-gen3x2-pcie-phy";
>>>>>> +                       reg = <0x000f4000 0x2000>;
>>>>>> +
>>>>>> +                       clocks = <&gcc GCC_PCIE3_AUX_CLK>,
>>>>>> +                                <&gcc GCC_PCIE3_AHB_CLK>,
>>>>>> +                                <&gcc GCC_ANOC_PCIE3_2LANE_M_CLK>,
>>>>>> +                                <&gcc GCC_SNOC_PCIE3_2LANE_S_CLK>,
>>>>>> +                                <&gcc GCC_PCIE3_PIPE_CLK>;
>>>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
>>>>>> "snoc_lane", "pipe";
>>>>>> +
>>>>>> +                       assigned-clocks = <&gcc GCC_PCIE3_AUX_CLK>;
>>>>>> +                       assigned-clock-rates = <20000000>;
>>>>>> +
>>>>>> +                       resets = <&gcc GCC_PCIE3_PHY_BCR>,
>>>>>> +                                <&gcc GCC_PCIE3PHY_PHY_BCR>;
>>>>>> +                       reset-names = "phy", "common";
>>>>>> +
>>>>>> +                       #clock-cells = <0>;
>>>>>> +                       clock-output-names = "gcc_pcie3_pipe_clk_src";
>>>>>> +
>>>>>> +                       #phy-cells = <0>;
>>>>>> +                       status = "disabled";
>>>>>> +
>>>>>> +               };
>>>>>> +
>>>>>> +               pcie1_phy: phy@fc000 {
>>>>>> +                       compatible =
>>>>>> "qcom,ipq9574-qmp-gen3x1-pcie-phy";
>>>>>> +                       reg = <0x000fc000 0x1000>;
>>>>>> +
>>>>>> +                       clocks = <&gcc GCC_PCIE1_AUX_CLK>,
>>>>>> +                                <&gcc GCC_PCIE1_AHB_CLK>,
>>>>>> +                                <&gcc GCC_ANOC_PCIE1_1LANE_M_CLK>,
>>>>>> +                                <&gcc GCC_SNOC_PCIE1_1LANE_S_CLK>,
>>>>>> +                                <&gcc GCC_PCIE1_PIPE_CLK>;
>>>>>> +                       clock-names = "aux", "cfg_ahb", "anoc_lane",
>>>>>> "snoc_lane", "pipe";
>>>>>> +
>>>>>> +                       assigned-clocks = <&gcc GCC_PCIE1_AUX_CLK>;
>>>>>> +                       assigned-clock-rates = <20000000>;
>>>>>> +
>>>>>> +                       resets = <&gcc GCC_PCIE1_PHY_BCR>,
>>>>>> +                                <&gcc GCC_PCIE1PHY_PHY_BCR>;
>>>>>> +                       reset-names = "phy", "common";
>>>>>> +
>>>>>> +                       #clock-cells = <0>;
>>>>>> +                       clock-output-names = "gcc_pcie1_pipe_clk_src";
>>>>>> +
>>>>>> +                       #phy-cells = <0>;
>>>>>> +                       status = "disabled";
>>>>>> +
>>>>>> +               };
>>>>>> +
>>>>>>                   tlmm: pinctrl@1000000 {
>>>>>>                           compatible = "qcom,ipq9574-tlmm";
>>>>>>                           reg = <0x01000000 0x300000>;
>>>>>> @@ -146,10 +250,10 @@
>>>>>>                           reg = <0x01800000 0x80000>;
>>>>>>                           clocks = <&xo_board_clk>,
>>>>>>                                    <&sleep_clk>,
>>>>>> -                                <0>,
>>>>>> -                                <0>,
>>>>>> -                                <0>,
>>>>>> -                                <0>,
>>>>>> +                                <&pcie0_phy>,
>>>>>> +                                <&pcie1_phy>,
>>>>>> +                                <&pcie2_phy>,
>>>>>> +                                <&pcie3_phy>,
>>>>>>                                    <0>;
>>>>>>                           #clock-cells = <1>;
>>>>>>                           #reset-cells = <1>;
>>>>>> @@ -478,6 +582,267 @@
>>>>>>                                   status = "disabled";
>>>>>>                           };
>>>>>>                   };
>>>>>> +
>>>>>> +               pcie1: pci@10000000 {
>>>>>> +                       compatible = "qcom,pcie-ipq9574";
>>>>>> +                       reg =  <0x10000000 0xf1d>,
>>>>>> +                              <0x10000F20 0xa8>,
>>>>>> +                              <0x10001000 0x1000>,
>>>>>> +                              <0x000F8000 0x4000>,
>>>>>> +                              <0x10100000 0x1000>;
>>>>>> +                       reg-names = "dbi", "elbi", "atu", "parf",
>>>>>> "config";
>>>>>> +                       device_type = "pci";
>>>>>> +                       linux,pci-domain = <2>;
>>>>>> +                       bus-range = <0x00 0xff>;
>>>>>> +                       num-lanes = <1>;
>>>>>> +                       #address-cells = <3>;
>>>>>> +                       #size-cells = <2>;
>>>>>> +
>>>>>> +                       ranges = <0x01000000 0x0 0x00000000
>>>>>> 0x10200000 0x0 0x100000>,  /* I/O */
>>>>>> +                                <0x02000000 0x0 0x10300000
>>>>>> 0x10300000 0x0 0x7d00000>; /* MEM */
>>>>>> +
>>>>>> +                       #interrupt-cells = <1>;
>>>>>> +                       interrupt-map-mask = <0 0 0 0x7>;
>>>>>> +                       interrupt-map = <0 0 0 1 &intc 0 35
>>>>>> IRQ_TYPE_LEVEL_HIGH>, /* int_a */
>>>>>> +                                       <0 0 0 2 &intc 0 49
>>>>>> IRQ_TYPE_LEVEL_HIGH>, /* int_b */
>>>>>> +                                       <0 0 0 3 &intc 0 84
>>>>>> IRQ_TYPE_LEVEL_HIGH>, /* int_c */
>>>>>> +                                       <0 0 0 4 &intc 0 85
>>>>>> IRQ_TYPE_LEVEL_HIGH>; /* int_d */
>>>>>> +
>>>>>
>>>>> No iommu-map?
>>>> We do not enable the IOMMU stage1 translation for PCIe and the registers
>>>> have secure access only from TrustZone (It enables only stage2 for
>>>> Access control)
>>>
>>> So, no SMMU protection for PCIe transactions? This sounds like a step
>>> backwards.
>> Yes, we are not using stage1 translations.
> 
> We = software or we = hardware? If there is a hardware interface to
> SMMU, please describe it here.
> 
Trustzone software protects all non-secure access to any SMMU register.
Hence it is not possible to enable stage 1 translation from HLOS.
HLOS touching any SMMU register would result in a 'secure access violation'

Thanks,
Devi Priya
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
index e757b57957cf..953a839a1141 100644
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
@@ -6,8 +6,8 @@ 
  * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
-#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,ipq9574-gcc.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/reset/qcom,ipq9574-gcc.h>
 
 / {
@@ -116,6 +116,58 @@ 
 		#size-cells = <1>;
 		ranges = <0 0 0 0xffffffff>;
 
+		pcie0_phy: phy@84000 {
+			compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
+			reg = <0x00084000 0x1000>;
+
+			clocks = <&gcc GCC_PCIE0_AUX_CLK>,
+				 <&gcc GCC_PCIE0_AHB_CLK>,
+				 <&gcc GCC_ANOC_PCIE0_1LANE_M_CLK>,
+				 <&gcc GCC_SNOC_PCIE0_1LANE_S_CLK>,
+				 <&gcc GCC_PCIE0_PIPE_CLK>;
+			clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
+
+			assigned-clocks = <&gcc GCC_PCIE0_AUX_CLK>;
+			assigned-clock-rates = <20000000>;
+
+			resets = <&gcc GCC_PCIE0_PHY_BCR>,
+				 <&gcc GCC_PCIE0PHY_PHY_BCR>;
+			reset-names = "phy", "common";
+
+			#clock-cells = <0>;
+			clock-output-names = "gcc_pcie0_pipe_clk_src";
+
+			#phy-cells = <0>;
+			status = "disabled";
+
+		};
+
+		pcie2_phy: phy@8c000 {
+			compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
+			reg = <0x0008c000 0x2000>;
+
+			clocks = <&gcc GCC_PCIE2_AUX_CLK>,
+				 <&gcc GCC_PCIE2_AHB_CLK>,
+				 <&gcc GCC_ANOC_PCIE2_2LANE_M_CLK>,
+				 <&gcc GCC_SNOC_PCIE2_2LANE_S_CLK>,
+				 <&gcc GCC_PCIE2_PIPE_CLK>;
+			clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
+
+			assigned-clocks = <&gcc GCC_PCIE2_AUX_CLK>;
+			assigned-clock-rates = <20000000>;
+
+			resets = <&gcc GCC_PCIE2_PHY_BCR>,
+				 <&gcc GCC_PCIE2PHY_PHY_BCR>;
+			reset-names = "phy", "common";
+
+			#clock-cells = <0>;
+			clock-output-names = "gcc_pcie2_pipe_clk_src";
+
+			#phy-cells = <0>;
+			status = "disabled";
+
+		};
+
 		rng: rng@e3000 {
 			compatible = "qcom,prng-ee";
 			reg = <0x000e3000 0x1000>;
@@ -123,6 +175,58 @@ 
 			clock-names = "core";
 		};
 
+		pcie3_phy: phy@f4000 {
+			compatible = "qcom,ipq9574-qmp-gen3x2-pcie-phy";
+			reg = <0x000f4000 0x2000>;
+
+			clocks = <&gcc GCC_PCIE3_AUX_CLK>,
+				 <&gcc GCC_PCIE3_AHB_CLK>,
+				 <&gcc GCC_ANOC_PCIE3_2LANE_M_CLK>,
+				 <&gcc GCC_SNOC_PCIE3_2LANE_S_CLK>,
+				 <&gcc GCC_PCIE3_PIPE_CLK>;
+			clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
+
+			assigned-clocks = <&gcc GCC_PCIE3_AUX_CLK>;
+			assigned-clock-rates = <20000000>;
+
+			resets = <&gcc GCC_PCIE3_PHY_BCR>,
+				 <&gcc GCC_PCIE3PHY_PHY_BCR>;
+			reset-names = "phy", "common";
+
+			#clock-cells = <0>;
+			clock-output-names = "gcc_pcie3_pipe_clk_src";
+
+			#phy-cells = <0>;
+			status = "disabled";
+
+		};
+
+		pcie1_phy: phy@fc000 {
+			compatible = "qcom,ipq9574-qmp-gen3x1-pcie-phy";
+			reg = <0x000fc000 0x1000>;
+
+			clocks = <&gcc GCC_PCIE1_AUX_CLK>,
+				 <&gcc GCC_PCIE1_AHB_CLK>,
+				 <&gcc GCC_ANOC_PCIE1_1LANE_M_CLK>,
+				 <&gcc GCC_SNOC_PCIE1_1LANE_S_CLK>,
+				 <&gcc GCC_PCIE1_PIPE_CLK>;
+			clock-names = "aux", "cfg_ahb", "anoc_lane", "snoc_lane", "pipe";
+
+			assigned-clocks = <&gcc GCC_PCIE1_AUX_CLK>;
+			assigned-clock-rates = <20000000>;
+
+			resets = <&gcc GCC_PCIE1_PHY_BCR>,
+				 <&gcc GCC_PCIE1PHY_PHY_BCR>;
+			reset-names = "phy", "common";
+
+			#clock-cells = <0>;
+			clock-output-names = "gcc_pcie1_pipe_clk_src";
+
+			#phy-cells = <0>;
+			status = "disabled";
+
+		};
+
 		tlmm: pinctrl@1000000 {
 			compatible = "qcom,ipq9574-tlmm";
 			reg = <0x01000000 0x300000>;
@@ -146,10 +250,10 @@ 
 			reg = <0x01800000 0x80000>;
 			clocks = <&xo_board_clk>,
 				 <&sleep_clk>,
-				 <0>,
-				 <0>,
-				 <0>,
-				 <0>,
+				 <&pcie0_phy>,
+				 <&pcie1_phy>,
+				 <&pcie2_phy>,
+				 <&pcie3_phy>,
 				 <0>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -478,6 +582,267 @@ 
 				status = "disabled";
 			};
 		};
+
+		pcie1: pci@10000000 {
+			compatible = "qcom,pcie-ipq9574";
+			reg =  <0x10000000 0xf1d>,
+			       <0x10000F20 0xa8>,
+			       <0x10001000 0x1000>,
+			       <0x000F8000 0x4000>,
+			       <0x10100000 0x1000>;
+			reg-names = "dbi", "elbi", "atu", "parf", "config";
+			device_type = "pci";
+			linux,pci-domain = <2>;
+			bus-range = <0x00 0xff>;
+			num-lanes = <1>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+
+			ranges = <0x01000000 0x0 0x00000000 0x10200000 0x0 0x100000>,  /* I/O */
+				 <0x02000000 0x0 0x10300000 0x10300000 0x0 0x7d00000>; /* MEM */
+
+			#interrupt-cells = <1>;
+			interrupt-map-mask = <0 0 0 0x7>;
+			interrupt-map = <0 0 0 1 &intc 0 35 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+					<0 0 0 2 &intc 0 49 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+					<0 0 0 3 &intc 0 84 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+					<0 0 0 4 &intc 0 85 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+
+			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "global_irq";
+
+			/* clocks and clock-names are used to enable the clock in CBCR */
+			clocks = <&gcc GCC_PCIE1_AHB_CLK>,
+				 <&gcc GCC_PCIE1_AUX_CLK>,
+				 <&gcc GCC_PCIE1_AXI_M_CLK>,
+				 <&gcc GCC_PCIE1_AXI_S_CLK>,
+				 <&gcc GCC_PCIE1_AXI_S_BRIDGE_CLK>,
+				 <&gcc GCC_PCIE1_RCHNG_CLK>;
+			clock-names = "ahb",
+				      "aux",
+				      "axi_m",
+				      "axi_s",
+				      "axi_bridge",
+				      "rchng";
+
+			resets = <&gcc GCC_PCIE1_PIPE_ARES>,
+				 <&gcc GCC_PCIE1_CORE_STICKY_ARES>,
+				 <&gcc GCC_PCIE1_AXI_S_STICKY_ARES>,
+				 <&gcc GCC_PCIE1_AXI_S_ARES>,
+				 <&gcc GCC_PCIE1_AXI_M_STICKY_ARES>,
+				 <&gcc GCC_PCIE1_AXI_M_ARES>,
+				 <&gcc GCC_PCIE1_AUX_ARES>,
+				 <&gcc GCC_PCIE1_AHB_ARES>;
+			reset-names = "pipe",
+				      "sticky",
+				      "axi_s_sticky",
+				      "axi_s",
+				      "axi_m_sticky",
+				      "axi_m",
+				      "aux",
+				      "ahb";
+
+			phys = <&pcie1_phy>;
+			phy-names = "pciephy";
+			msi-parent = <&v2m0>;
+			status = "disabled";
+		};
+
+		pcie3: pci@18000000 {
+			compatible = "qcom,pcie-ipq9574";
+			reg =  <0x18000000 0xf1d>,
+			       <0x18000F20 0xa8>,
+			       <0x18001000 0x1000>,
+			       <0x000F0000 0x4000>,
+			       <0x18100000 0x1000>;
+			reg-names = "dbi", "elbi", "atu", "parf", "config";
+			device_type = "pci";
+			linux,pci-domain = <4>;
+			bus-range = <0x00 0xff>;
+			num-lanes = <2>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+
+			ranges = <0x01000000 0x0 0x00000000 0x18200000 0x0 0x100000>,  /* I/O */
+				 <0x02000000 0x0 0x18300000 0x18300000 0x0 0x7d00000>; /* MEM */
+
+			#interrupt-cells = <1>;
+			interrupt-map-mask = <0 0 0 0x7>;
+			interrupt-map = <0 0 0 1 &intc 0 189 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+					<0 0 0 2 &intc 0 190 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+					<0 0 0 3 &intc 0 191 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+					<0 0 0 4 &intc 0 192 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+
+			interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "global_irq";
+
+			/* clocks and clock-names are used to enable the clock in CBCR */
+			clocks = <&gcc GCC_PCIE3_AHB_CLK>,
+				 <&gcc GCC_PCIE3_AUX_CLK>,
+				 <&gcc GCC_PCIE3_AXI_M_CLK>,
+				 <&gcc GCC_PCIE3_AXI_S_CLK>,
+				 <&gcc GCC_PCIE3_AXI_S_BRIDGE_CLK>,
+				 <&gcc GCC_PCIE3_RCHNG_CLK>;
+			clock-names = "ahb",
+				      "aux",
+				      "axi_m",
+				      "axi_s",
+				      "axi_bridge",
+				      "rchng";
+
+			resets = <&gcc GCC_PCIE3_PIPE_ARES>,
+				 <&gcc GCC_PCIE3_CORE_STICKY_ARES>,
+				 <&gcc GCC_PCIE3_AXI_S_STICKY_ARES>,
+				 <&gcc GCC_PCIE3_AXI_S_ARES>,
+				 <&gcc GCC_PCIE3_AXI_M_STICKY_ARES>,
+				 <&gcc GCC_PCIE3_AXI_M_ARES>,
+				 <&gcc GCC_PCIE3_AUX_ARES>,
+				 <&gcc GCC_PCIE3_AHB_ARES>;
+			reset-names = "pipe",
+				      "sticky",
+				      "axi_s_sticky",
+				      "axi_s",
+				      "axi_m_sticky",
+				      "axi_m",
+				      "aux",
+				      "ahb";
+
+			phys = <&pcie3_phy>;
+			phy-names = "pciephy";
+			msi-parent = <&v2m0>;
+			status = "disabled";
+		};
+
+		pcie2: pci@20000000 {
+			compatible = "qcom,pcie-ipq9574";
+			reg =  <0x20000000 0xf1d>,
+			       <0x20000F20 0xa8>,
+			       <0x20001000 0x1000>,
+			       <0x00088000 0x4000>,
+			       <0x20100000 0x1000>;
+			reg-names = "dbi", "elbi", "atu", "parf", "config";
+			device_type = "pci";
+			linux,pci-domain = <3>;
+			bus-range = <0x00 0xff>;
+			num-lanes = <2>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+
+			ranges = <0x01000000 0x0 0x00000000 0x20200000 0x0 0x100000>,  /* I/O */
+				 <0x02000000 0x0 0x20300000 0x20300000 0x0 0x7d00000>; /* MEM */
+
+			#interrupt-cells = <1>;
+			interrupt-map-mask = <0 0 0 0x7>;
+			interrupt-map = <0 0 0 1 &intc 0 164 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+					<0 0 0 2 &intc 0 165 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+					<0 0 0 3 &intc 0 186 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+					<0 0 0 4 &intc 0 187 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+
+			interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "global_irq";
+
+			/* clocks and clock-names are used to enable the clock in CBCR */
+			clocks = <&gcc GCC_PCIE2_AHB_CLK>,
+				 <&gcc GCC_PCIE2_AUX_CLK>,
+				 <&gcc GCC_PCIE2_AXI_M_CLK>,
+				 <&gcc GCC_PCIE2_AXI_S_CLK>,
+				 <&gcc GCC_PCIE2_AXI_S_BRIDGE_CLK>,
+				 <&gcc GCC_PCIE2_RCHNG_CLK>;
+			clock-names = "ahb",
+				      "aux",
+				      "axi_m",
+				      "axi_s",
+				      "axi_bridge",
+				      "rchng";
+
+			resets = <&gcc GCC_PCIE2_PIPE_ARES>,
+				 <&gcc GCC_PCIE2_CORE_STICKY_ARES>,
+				 <&gcc GCC_PCIE2_AXI_S_STICKY_ARES>,
+				 <&gcc GCC_PCIE2_AXI_S_ARES>,
+				 <&gcc GCC_PCIE2_AXI_M_STICKY_ARES>,
+				 <&gcc GCC_PCIE2_AXI_M_ARES>,
+				 <&gcc GCC_PCIE2_AUX_ARES>,
+				 <&gcc GCC_PCIE2_AHB_ARES>;
+			reset-names = "pipe",
+				      "sticky",
+				      "axi_s_sticky",
+				      "axi_s",
+				      "axi_m_sticky",
+				      "axi_m",
+				      "aux",
+				      "ahb";
+
+			phys = <&pcie2_phy>;
+			phy-names = "pciephy";
+			msi-parent = <&v2m0>;
+			status = "disabled";
+		};
+
+		pcie0: pci@28000000 {
+			compatible = "qcom,pcie-ipq9574";
+			reg =  <0x28000000 0xf1d>,
+			       <0x28000F20 0xa8>,
+			       <0x28001000 0x1000>,
+			       <0x00080000 0x4000>,
+			       <0x28100000 0x1000>;
+			reg-names = "dbi", "elbi", "atu", "parf", "config";
+			device_type = "pci";
+			linux,pci-domain = <1>;
+			bus-range = <0x00 0xff>;
+			num-lanes = <1>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+
+			ranges = <0x01000000 0x0 0x00000000 0x28200000 0x0 0x100000>,  /* I/O */
+				 <0x02000000 0x0 0x28300000 0x28300000 0x0 0x7d00000>; /* MEM */
+
+			#interrupt-cells = <1>;
+			interrupt-map-mask = <0 0 0 0x7>;
+			interrupt-map = <0 0 0 1 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+					<0 0 0 2 &intc 0 78 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+					<0 0 0 3 &intc 0 79 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+					<0 0 0 4 &intc 0 83 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+
+			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "global_irq";
+
+			/* clocks and clock-names are used to enable the clock in CBCR */
+			clocks = <&gcc GCC_PCIE0_AHB_CLK>,
+				 <&gcc GCC_PCIE0_AUX_CLK>,
+				 <&gcc GCC_PCIE0_AXI_M_CLK>,
+				 <&gcc GCC_PCIE0_AXI_S_CLK>,
+				 <&gcc GCC_PCIE0_AXI_S_BRIDGE_CLK>,
+				 <&gcc GCC_PCIE0_RCHNG_CLK>;
+			clock-names = "ahb",
+				      "aux",
+				      "axi_m",
+				      "axi_s",
+				      "axi_bridge",
+				      "rchng";
+
+			resets = <&gcc GCC_PCIE0_PIPE_ARES>,
+				 <&gcc GCC_PCIE0_CORE_STICKY_ARES>,
+				 <&gcc GCC_PCIE0_AXI_S_STICKY_ARES>,
+				 <&gcc GCC_PCIE0_AXI_S_ARES>,
+				 <&gcc GCC_PCIE0_AXI_M_STICKY_ARES>,
+				 <&gcc GCC_PCIE0_AXI_M_ARES>,
+				 <&gcc GCC_PCIE0_AUX_ARES>,
+				 <&gcc GCC_PCIE0_AHB_ARES>;
+			reset-names = "pipe",
+				      "sticky",
+				      "axi_s_sticky",
+				      "axi_s",
+				      "axi_m_sticky",
+				      "axi_m",
+				      "aux",
+				      "ahb";
+
+			phys = <&pcie0_phy>;
+			phy-names = "pciephy";
+			msi-parent = <&v2m0>;
+			status = "disabled";
+		};
+
 	};
 
 	timer {