Re: [PATCH v5 11/11] riscv: dts: starfive: add PCIe dts configuration for JH7110

From: Kevin Xie
Date: Mon Sep 11 2023 - 22:37:44 EST



On 2023/9/8 1:19, Rob Herring wrote:
> On Thu, Sep 7, 2023 at 4:11 AM Minda Chen <minda.chen@xxxxxxxxxxxxxxxx> wrote:
>>
>> Add PCIe dts configuraion for JH7110 SoC platform.
>>
>> Signed-off-by: Minda Chen <minda.chen@xxxxxxxxxxxxxxxx>
>> Reviewed-by: Hal Feng <hal.feng@xxxxxxxxxxxxxxxx>
>> ---
>> .../jh7110-starfive-visionfive-2.dtsi | 64 ++++++++++++++
>> arch/riscv/boot/dts/starfive/jh7110.dtsi | 86 +++++++++++++++++++
>> 2 files changed, 150 insertions(+)
>>
>> diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
>> index de0f40a8be93..4dd61e2fec7d 100644
>> --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
>> +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
>> @@ -15,6 +15,8 @@
>> i2c2 = &i2c2;
>> i2c5 = &i2c5;
>> i2c6 = &i2c6;
>> + pcie0 = &pcie0;
>> + pcie1 = &pcie1;
>
> That's not a defined alias. We already have "linux,pci-domain" if you
> need to number PCI host bridges.
>

Okay, we will number PCI host bridges by "linux,pci-domain".

>> serial0 = &uart0;
>> };
>>
>> @@ -208,6 +210,54 @@
>> };
>> };
>>
>> + pcie0_pins: pcie0-0 {
>> + wake-pins {
>> + pinmux = <GPIOMUX(32, GPOUT_LOW,
>> + GPOEN_DISABLE,
>> + GPI_NONE)>;
>> + bias-pull-up;
>> + drive-strength = <2>;
>> + input-enable;
>> + input-schmitt-disable;
>> + slew-rate = <0>;
>> + };
>> +
>> + clkreq-pins {
>> + pinmux = <GPIOMUX(27, GPOUT_LOW,
>> + GPOEN_DISABLE,
>> + GPI_NONE)>;
>> + bias-pull-down;
>> + drive-strength = <2>;
>> + input-enable;
>> + input-schmitt-disable;
>> + slew-rate = <0>;
>> + };
>> + };
>> +
>> + pcie1_pins: pcie1-0 {
>> + wake-pins {
>> + pinmux = <GPIOMUX(21, GPOUT_LOW,
>> + GPOEN_DISABLE,
>> + GPI_NONE)>;
>> + bias-pull-up;
>> + drive-strength = <2>;
>> + input-enable;
>> + input-schmitt-disable;
>> + slew-rate = <0>;
>> + };
>> +
>> + clkreq-pins {
>> + pinmux = <GPIOMUX(29, GPOUT_LOW,
>> + GPOEN_DISABLE,
>> + GPI_NONE)>;
>> + bias-pull-down;
>> + drive-strength = <2>;
>> + input-enable;
>> + input-schmitt-disable;
>> + slew-rate = <0>;
>> + };
>> + };
>> +
>> uart0_pins: uart0-0 {
>> tx-pins {
>> pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX,
>> @@ -233,6 +283,20 @@
>> };
>> };
>>
>> +&pcie0 {
>> + pinctrl-names = "default";
>> + perst-gpios = <&sysgpio 26 GPIO_ACTIVE_LOW>;
>> + pinctrl-0 = <&pcie0_pins>;
>> + status = "okay";
>> +};
>> +
>> +&pcie1 {
>> + pinctrl-names = "default";
>> + perst-gpios = <&sysgpio 28 GPIO_ACTIVE_LOW>;
>> + pinctrl-0 = <&pcie1_pins>;
>> + status = "okay";
>> +};
>> +
>> &uart0 {
>> pinctrl-names = "default";
>> pinctrl-0 = <&uart0_pins>;
>> diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
>> index 02354e642c44..7a5dc43cf63c 100644
>> --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
>> +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
>> @@ -629,5 +629,91 @@
>> #reset-cells = <1>;
>> power-domains = <&pwrc JH7110_PD_VOUT>;
>> };
>> +
>> + pcie0: pcie@940000000 {
>> + compatible = "starfive,jh7110-pcie";
>> + reg = <0x9 0x40000000 0x0 0x1000000>,
>> + <0x0 0x2b000000 0x0 0x100000>;
>> + reg-names = "cfg", "apb";
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + #interrupt-cells = <1>;
>> + ranges = <0x82000000 0x0 0x30000000 0x0 0x30000000 0x0 0x08000000>,
>> + <0xc3000000 0x9 0x00000000 0x9 0x00000000 0x0 0x40000000>;
>> + interrupts = <56>;
>> + interrupt-parent = <&plic>;
>> + interrupt-map-mask = <0x0 0x0 0x0 0x7>;
>> + interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc0 0x1>,
>> + <0x0 0x0 0x0 0x2 &pcie_intc0 0x2>,
>> + <0x0 0x0 0x0 0x3 &pcie_intc0 0x3>,
>> + <0x0 0x0 0x0 0x4 &pcie_intc0 0x4>;
>> + msi-controller;
>> + device_type = "pci";
>> + starfive,stg-syscon = <&stg_syscon>;
>> + bus-range = <0x0 0xff>;
>> + clocks = <&syscrg JH7110_SYSCLK_NOC_BUS_STG_AXI>,
>> + <&stgcrg JH7110_STGCLK_PCIE0_TL>,
>> + <&stgcrg JH7110_STGCLK_PCIE0_AXI_MST0>,
>> + <&stgcrg JH7110_STGCLK_PCIE0_APB>;
>> + clock-names = "noc", "tl", "axi_mst0", "apb";
>> + resets = <&stgcrg JH7110_STGRST_PCIE0_AXI_MST0>,
>> + <&stgcrg JH7110_STGRST_PCIE0_AXI_SLV0>,
>> + <&stgcrg JH7110_STGRST_PCIE0_AXI_SLV>,
>> + <&stgcrg JH7110_STGRST_PCIE0_BRG>,
>> + <&stgcrg JH7110_STGRST_PCIE0_CORE>,
>> + <&stgcrg JH7110_STGRST_PCIE0_APB>;
>> + reset-names = "mst0", "slv0", "slv", "brg",
>> + "core", "apb";
>> + status = "disabled";
>> +
>> + pcie_intc0: interrupt-controller {
>> + #address-cells = <0>;
>> + #interrupt-cells = <1>;
>> + interrupt-controller;
>> + };
>> + };
>> +
>> + pcie1: pcie@9c0000000 {
>> + compatible = "starfive,jh7110-pcie";
>> + reg = <0x9 0xc0000000 0x0 0x1000000>,
>> + <0x0 0x2c000000 0x0 0x100000>;
>> + reg-names = "cfg", "apb";
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + #interrupt-cells = <1>;
>> + ranges = <0x82000000 0x0 0x38000000 0x0 0x38000000 0x0 0x08000000>,
>> + <0xc3000000 0x9 0x80000000 0x9 0x80000000 0x0 0x40000000>;
>> + interrupts = <57>;
>> + interrupt-parent = <&plic>;
>> + interrupt-map-mask = <0x0 0x0 0x0 0x7>;
>> + interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc1 0x1>,
>> + <0x0 0x0 0x0 0x2 &pcie_intc1 0x2>,
>> + <0x0 0x0 0x0 0x3 &pcie_intc1 0x3>,
>> + <0x0 0x0 0x0 0x4 &pcie_intc1 0x4>;
>> + msi-controller;
>> + device_type = "pci";
>> + starfive,stg-syscon = <&stg_syscon>;
>> + bus-range = <0x0 0xff>;
>> + clocks = <&syscrg JH7110_SYSCLK_NOC_BUS_STG_AXI>,
>> + <&stgcrg JH7110_STGCLK_PCIE1_TL>,
>> + <&stgcrg JH7110_STGCLK_PCIE1_AXI_MST0>,
>> + <&stgcrg JH7110_STGCLK_PCIE1_APB>;
>> + clock-names = "noc", "tl", "axi_mst0", "apb";
>> + resets = <&stgcrg JH7110_STGRST_PCIE1_AXI_MST0>,
>> + <&stgcrg JH7110_STGRST_PCIE1_AXI_SLV0>,
>> + <&stgcrg JH7110_STGRST_PCIE1_AXI_SLV>,
>> + <&stgcrg JH7110_STGRST_PCIE1_BRG>,
>> + <&stgcrg JH7110_STGRST_PCIE1_CORE>,
>> + <&stgcrg JH7110_STGRST_PCIE1_APB>;
>> + reset-names = "mst0", "slv0", "slv", "brg",
>> + "core", "apb";
>> + status = "disabled";
>> +
>> + pcie_intc1: interrupt-controller {
>> + #address-cells = <0>;
>> + #interrupt-cells = <1>;
>> + interrupt-controller;
>> + };
>> + };
>> };
>> };
>> --
>> 2.17.1
>>