lkml.org 
[lkml]   [2019]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH V2 12/16] arm64: tegra: Add P2U and PCIe controller nodes to Tegra194 DT
From
Date
On 4/15/2019 8:45 PM, Thierry Reding wrote:
> On Fri, Apr 05, 2019 at 01:24:39AM +0530, Vidya Sagar wrote:
>> Add P2U (PIPE to UPHY) and PCIe controller nodes to device tree.
>> The Tegra194 SoC contains six PCIe controllers and twenty P2U instances
>> grouped into two different PHY bricks namely High-Speed IO (HSIO-12 P2Us)
>> and NVIDIA High Speed (NVHS-8 P2Us) respectively.
>>
>> Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
>> ---
>> Changes since [v1]:
>> * Flattened all P2U nodes by removing 'hsio-p2u' and 'nvhs-p2u' super nodes
>> * Changed P2U nodes compatible string from 'nvidia,tegra194-phy-p2u' to 'nvidia,tegra194-p2u'
>> * Changed reg-name from 'base' to 'ctl'
>> * Updated all PCIe nodes according to the changes made to DT documentation file
>>
>> arch/arm64/boot/dts/nvidia/tegra194.dtsi | 449 +++++++++++++++++++++++++++++++
>> 1 file changed, 449 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
>> index c77ca211fa8f..5b62136d97a5 100644
>> --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
>> +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
>> @@ -884,6 +884,166 @@
>> nvidia,interface = <3>;
>> };
>> };
>> +
>> + p2u_0: p2u@03e10000 { /* HSIO-Lane-0 */
>> + compatible = "nvidia,tegra194-p2u";
>> + reg = <0x03e10000 0x10000>;
>> + reg-names = "ctl";
>> +
>> + #phy-cells = <0>;
>> + };
>> +
> [...]
>> + p2u_12: p2u@03eb0000 { /* NVHS-Lane-0 */
>> + compatible = "nvidia,tegra194-p2u";
>> + reg = <0x03eb0000 0x10000>;
>> + reg-names = "ctl";
>> +
>> + #phy-cells = <0>;
>> + };
> [...]
>
> Do we perhaps want to include the type of P2U in the label? That would
> make it more obvious which ones to list in the PCIe controller nodes'
> phys properties. Something like:
>
> p2u_hsio_0: p2u@3e10000 {
> ...
> };
>
> ...
>
> p2u_nvhs_0: p2u@3eb0000 {
> ...
> };
>
> ? Also, make sure to drop the leading 0 from unit-addresses. Recent
> versions of DTC have checks for that in place and will warn about it in
> recent Linux builds.
Done.

>
> [...]
>> @@ -1054,4 +1214,293 @@
>> (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
>> interrupt-parent = <&gic>;
>> };
>> +
>> + pcie@14180000 {
>> + compatible = "nvidia,tegra194-pcie", "snps,dw-pcie";
>> + power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX8B>;
>> + reg = <0x00 0x14180000 0x0 0x00020000 /* appl registers (128K) */
>> + 0x00 0x38000000 0x0 0x00040000 /* configuration space (256K) */
>> + 0x00 0x38040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
>> + 0x00 0x38080000 0x0 0x00040000>; /* DBI reg space (256K) */
>> + reg-names = "appl", "config", "atu_dma", "dbi";
>> +
>> + status = "disabled";
>> +
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + device_type = "pci";
>> + num-lanes = <8>;
>> + num-viewport = <8>;
>> + linux,pci-domain = <0>;
>> +
>> + clocks = <&bpmp TEGRA194_CLK_PEX0_CORE_0>;
>> + clock-names = "core";
>> +
>> + resets = <&bpmp TEGRA194_RESET_PEX0_CORE_0_APB>,
>> + <&bpmp TEGRA194_RESET_PEX0_CORE_0>;
>> + reset-names = "core_apb", "core";
>> +
>> + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
>> + <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
>> + interrupt-names = "intr", "msi";
>> +
>> + #interrupt-cells = <1>;
>> + interrupt-map-mask = <0 0 0 0>;
>> + interrupt-map = <0 0 0 0 &gic 0 72 0x04>;
>> +
>> + nvidia,bpmp = <&bpmp>;
>> +
>> + supports-clkreq;
>> + nvidia,disable-aspm-states = <0xf>;
>> + nvidia,controller-id = <0>;
>> + nvidia,aspm-cmrt-us = <60>;
>> + nvidia,aspm-pwr-on-t-us = <20>;
>> + nvidia,aspm-l0s-entrance-latency-us = <3>;
>
> Didn't you remove some of these from the bindings?
I've removed some but what we see here are still present in bindings.

>
> Thierry
>
>> +
>> + bus-range = <0x0 0xff>;
>> + ranges = <0x81000000 0x0 0x38100000 0x0 0x38100000 0x0 0x00100000 /* downstream I/O (1MB) */
>> + 0xc2000000 0x18 0x00000000 0x18 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */
>> + 0x82000000 0x0 0x40000000 0x1B 0x40000000 0x0 0xC0000000>; /* non-prefetchable memory (3GB) */
>> + };
>> +
>> + pcie@14100000 {
>> + compatible = "nvidia,tegra194-pcie", "snps,dw-pcie";
>> + power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX1A>;
>> + reg = <0x00 0x14100000 0x0 0x00020000 /* appl registers (128K) */
>> + 0x00 0x30000000 0x0 0x00040000 /* configuration space (256K) */
>> + 0x00 0x30040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
>> + 0x00 0x30080000 0x0 0x00040000>; /* DBI reg space (256K) */
>> + reg-names = "appl", "config", "atu_dma", "dbi";
>> +
>> + status = "disabled";
>> +
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + device_type = "pci";
>> + num-lanes = <1>;
>> + num-viewport = <8>;
>> + linux,pci-domain = <1>;
>> +
>> + clocks = <&bpmp TEGRA194_CLK_PEX0_CORE_1>;
>> + clock-names = "core";
>> +
>> + resets = <&bpmp TEGRA194_RESET_PEX0_CORE_1_APB>,
>> + <&bpmp TEGRA194_RESET_PEX0_CORE_1>;
>> + reset-names = "core_apb", "core";
>> +
>> + interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
>> + <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
>> + interrupt-names = "intr", "msi";
>> +
>> + #interrupt-cells = <1>;
>> + interrupt-map-mask = <0 0 0 0>;
>> + interrupt-map = <0 0 0 0 &gic 0 45 0x04>;
>> +
>> + nvidia,bpmp = <&bpmp>;
>> +
>> + supports-clkreq;
>> + nvidia,disable-aspm-states = <0xf>;
>> + nvidia,controller-id = <1>;
>> + nvidia,aspm-cmrt-us = <60>;
>> + nvidia,aspm-pwr-on-t-us = <20>;
>> + nvidia,aspm-l0s-entrance-latency-us = <3>;
>> +
>> + bus-range = <0x0 0xff>;
>> + ranges = <0x81000000 0x0 0x30100000 0x0 0x30100000 0x0 0x00100000 /* downstream I/O (1MB) */
>> + 0xc2000000 0x12 0x00000000 0x12 0x00000000 0x0 0x30000000 /* prefetchable memory (768MB) */
>> + 0x82000000 0x0 0x40000000 0x12 0x30000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */
>> + };
>> +
>> + pcie@14120000 {
>> + compatible = "nvidia,tegra194-pcie", "snps,dw-pcie";
>> + power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX1A>;
>> + reg = <0x00 0x14120000 0x0 0x00020000 /* appl registers (128K) */
>> + 0x00 0x32000000 0x0 0x00040000 /* configuration space (256K) */
>> + 0x00 0x32040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
>> + 0x00 0x32080000 0x0 0x00040000>; /* DBI reg space (256K) */
>> + reg-names = "appl", "config", "atu_dma", "dbi";
>> +
>> + status = "disabled";
>> +
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + device_type = "pci";
>> + num-lanes = <1>;
>> + num-viewport = <8>;
>> + linux,pci-domain = <2>;
>> +
>> + clocks = <&bpmp TEGRA194_CLK_PEX0_CORE_2>;
>> + clock-names = "core";
>> +
>> + resets = <&bpmp TEGRA194_RESET_PEX0_CORE_2_APB>,
>> + <&bpmp TEGRA194_RESET_PEX0_CORE_2>;
>> + reset-names = "core_apb", "core";
>> +
>> + interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
>> + <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
>> + interrupt-names = "intr", "msi";
>> +
>> + #interrupt-cells = <1>;
>> + interrupt-map-mask = <0 0 0 0>;
>> + interrupt-map = <0 0 0 0 &gic 0 47 0x04>;
>> +
>> + nvidia,bpmp = <&bpmp>;
>> +
>> + supports-clkreq;
>> + nvidia,disable-aspm-states = <0xf>;
>> + nvidia,controller-id = <2>;
>> + nvidia,aspm-cmrt-us = <60>;
>> + nvidia,aspm-pwr-on-t-us = <20>;
>> + nvidia,aspm-l0s-entrance-latency-us = <3>;
>> +
>> + bus-range = <0x0 0xff>;
>> + ranges = <0x81000000 0x0 0x32100000 0x0 0x32100000 0x0 0x00100000 /* downstream I/O (1MB) */
>> + 0xc2000000 0x12 0x40000000 0x12 0x40000000 0x0 0x30000000 /* prefetchable memory (768MB) */
>> + 0x82000000 0x0 0x40000000 0x12 0x70000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */
>> + };
>> +
>> + pcie@14140000 {
>> + compatible = "nvidia,tegra194-pcie", "snps,dw-pcie";
>> + power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX1A>;
>> + reg = <0x00 0x14140000 0x0 0x00020000 /* appl registers (128K) */
>> + 0x00 0x34000000 0x0 0x00040000 /* configuration space (256K) */
>> + 0x00 0x34040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
>> + 0x00 0x34080000 0x0 0x00040000>; /* DBI reg space (256K) */
>> + reg-names = "appl", "config", "atu_dma", "dbi";
>> +
>> + status = "disabled";
>> +
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + device_type = "pci";
>> + num-lanes = <1>;
>> + num-viewport = <8>;
>> + linux,pci-domain = <3>;
>> +
>> + clocks = <&bpmp TEGRA194_CLK_PEX0_CORE_3>;
>> + clock-names = "core";
>> +
>> + resets = <&bpmp TEGRA194_RESET_PEX0_CORE_3_APB>,
>> + <&bpmp TEGRA194_RESET_PEX0_CORE_3>;
>> + reset-names = "core_apb", "core";
>> +
>> + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
>> + <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
>> + interrupt-names = "intr", "msi";
>> +
>> + #interrupt-cells = <1>;
>> + interrupt-map-mask = <0 0 0 0>;
>> + interrupt-map = <0 0 0 0 &gic 0 49 0x04>;
>> +
>> + nvidia,bpmp = <&bpmp>;
>> +
>> + supports-clkreq;
>> + nvidia,disable-aspm-states = <0xf>;
>> + nvidia,controller-id = <3>;
>> + nvidia,aspm-cmrt-us = <60>;
>> + nvidia,aspm-pwr-on-t-us = <20>;
>> + nvidia,aspm-l0s-entrance-latency-us = <3>;
>> +
>> + bus-range = <0x0 0xff>;
>> + ranges = <0x81000000 0x0 0x34100000 0x0 0x34100000 0x0 0x00100000 /* downstream I/O (1MB) */
>> + 0xc2000000 0x12 0x80000000 0x12 0x80000000 0x0 0x30000000 /* prefetchable memory (768MB) */
>> + 0x82000000 0x0 0x40000000 0x12 0xB0000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */
>> + };
>> +
>> + pcie@14160000 {
>> + compatible = "nvidia,tegra194-pcie", "snps,dw-pcie";
>> + power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX4A>;
>> + reg = <0x00 0x14160000 0x0 0x00020000 /* appl registers (128K) */
>> + 0x00 0x36000000 0x0 0x00040000 /* configuration space (256K) */
>> + 0x00 0x36040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
>> + 0x00 0x36080000 0x0 0x00040000>; /* DBI reg space (256K) */
>> + reg-names = "appl", "config", "atu_dma", "dbi";
>> +
>> + status = "disabled";
>> +
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + device_type = "pci";
>> + num-lanes = <4>;
>> + num-viewport = <8>;
>> + linux,pci-domain = <4>;
>> +
>> + clocks = <&bpmp TEGRA194_CLK_PEX0_CORE_4>;
>> + clock-names = "core";
>> +
>> + resets = <&bpmp TEGRA194_RESET_PEX0_CORE_4_APB>,
>> + <&bpmp TEGRA194_RESET_PEX0_CORE_4>;
>> + reset-names = "core_apb", "core";
>> +
>> + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
>> + <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
>> + interrupt-names = "intr", "msi";
>> +
>> + #interrupt-cells = <1>;
>> + interrupt-map-mask = <0 0 0 0>;
>> + interrupt-map = <0 0 0 0 &gic 0 51 0x04>;
>> +
>> + nvidia,bpmp = <&bpmp>;
>> +
>> + supports-clkreq;
>> + nvidia,disable-aspm-states = <0xf>;
>> + nvidia,controller-id = <4>;
>> + nvidia,aspm-cmrt-us = <60>;
>> + nvidia,aspm-pwr-on-t-us = <20>;
>> + nvidia,aspm-l0s-entrance-latency-us = <3>;
>> +
>> + bus-range = <0x0 0xff>;
>> + ranges = <0x81000000 0x0 0x36100000 0x0 0x36100000 0x0 0x00100000 /* downstream I/O (1MB) */
>> + 0xc2000000 0x14 0x00000000 0x14 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */
>> + 0x82000000 0x0 0x40000000 0x17 0x40000000 0x0 0xC0000000>; /* non-prefetchable memory (3GB) */
>> + };
>> +
>> + pcie@141a0000 {
>> + compatible = "nvidia,tegra194-pcie", "snps,dw-pcie";
>> + power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX8A>;
>> + reg = <0x00 0x141a0000 0x0 0x00020000 /* appl registers (128K) */
>> + 0x00 0x3a000000 0x0 0x00040000 /* configuration space (256K) */
>> + 0x00 0x3a040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
>> + 0x00 0x3a080000 0x0 0x00040000>; /* DBI reg space (256K) */
>> + reg-names = "appl", "config", "atu_dma", "dbi";
>> +
>> + status = "disabled";
>> +
>> + #address-cells = <3>;
>> + #size-cells = <2>;
>> + device_type = "pci";
>> + num-lanes = <8>;
>> + num-viewport = <8>;
>> + linux,pci-domain = <5>;
>> +
>> + clocks = <&bpmp TEGRA194_CLK_PEX1_CORE_5>,
>> + <&bpmp TEGRA194_CLK_PEX1_CORE_5M>;
>> + clock-names = "core", "core_m";
>> +
>> + resets = <&bpmp TEGRA194_RESET_PEX1_CORE_5_APB>,
>> + <&bpmp TEGRA194_RESET_PEX1_CORE_5>;
>> + reset-names = "core_apb", "core";
>> +
>> + interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
>> + <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
>> + interrupt-names = "intr", "msi";
>> +
>> + nvidia,bpmp = <&bpmp>;
>> +
>> + #interrupt-cells = <1>;
>> + interrupt-map-mask = <0 0 0 0>;
>> + interrupt-map = <0 0 0 0 &gic 0 53 0x04>;
>> +
>> + supports-clkreq;
>> + nvidia,disable-aspm-states = <0xf>;
>> + nvidia,controller-id = <5>;
>> + nvidia,aspm-cmrt-us = <60>;
>> + nvidia,aspm-pwr-on-t-us = <20>;
>> + nvidia,aspm-l0s-entrance-latency-us = <3>;
>> +
>> + bus-range = <0x0 0xff>;
>> + ranges = <0x81000000 0x0 0x3a100000 0x0 0x3a100000 0x0 0x00100000 /* downstream I/O (1MB) */
>> + 0xc2000000 0x1c 0x00000000 0x1c 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */
>> + 0x82000000 0x0 0x40000000 0x1f 0x40000000 0x0 0xC0000000>; /* non-prefetchable memory (3GB) */
>> + };
>> };
>> --
>> 2.7.4
>>

\
 
 \ /
  Last update: 2019-04-16 19:48    [W:0.078 / U:7.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site