| Message ID | 1465228765-14038-2-git-send-email-sudeep.holla@arm.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Jun 06, 2016 at 04:59:23PM +0100, Sudeep Holla wrote: > Most of the debug-related components on Juno are located in the coreSight > subsystem while others are located in the Cortex-Axx clusters, the SCP > subsystem, and in the main system. > > Each core in the two processor clusters contain an Embedded Trace > Macrocell(ETM) which generates real-time trace information that trace > tools can use and an ATB trace output that is sent to a funnel before > going to the CoreSight subsystem. > > The trace output signals combine with two trace expansions using another > funnel and fed into the Embedded Trace FIFO(ETF0). > > The output trace data stream of the funnel is then replicated before it > is sent to either the: > - Trace Port Interface Unit(TPIU), that sends it out using the trace port. > - ETR that can write the trace data to memory located in the application > memory space > > Cc: Liviu Dudau <liviu.dudau@arm.com> Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: devicetree@vger.kernel.org > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > --- > arch/arm64/boot/dts/arm/juno-base.dtsi | 296 +++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ > arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ > arch/arm64/boot/dts/arm/juno.dts | 24 +++ > 4 files changed, 368 insertions(+) > > diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi > index dee2386d3b9b..90a8710f7032 100644 > --- a/arch/arm64/boot/dts/arm/juno-base.dtsi > +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi > @@ -56,6 +56,302 @@ > <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; > }; > > + /* > + * Juno TRMs specify the size for these coresight components as 64K. > + * The actual size is just 4K though 64K is reserved. Access to the > + * unmapped reserved region results in a DECERR response. > + */ > + etf@20010000 { > + compatible = "arm,coresight-tmc", "arm,primecell"; > + reg = <0 0x20010000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + /* input port */ > + port@0 { > + reg = <0>; > + etf_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&main_funnel_out_port>; > + }; > + }; > + > + /* output port */ > + port@1 { > + reg = <0>; > + etf_out_port: endpoint { > + remote-endpoint = <&replicator_in_port0>; > + }; > + }; > + }; > + }; > + > + tpiu@20030000 { > + compatible = "arm,coresight-tpiu", "arm,primecell"; > + reg = <0 0x20030000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + tpiu_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&replicator_out_port0>; > + }; > + }; > + }; > + > + main_funnel@20040000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x20040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + main_funnel_out_port: endpoint { > + remote-endpoint = <&etf_in_port>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + main_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_funnel_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + main_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_funnel_out_port>; > + }; > + }; > + > + }; > + }; > + > + etr@20070000 { > + compatible = "arm,coresight-tmc", "arm,primecell"; > + reg = <0 0x20070000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + etr_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&replicator_out_port1>; > + }; > + }; > + }; > + > + coresight-replicator { > + /* non-configurable replicators don't show up on the > + * AMBA bus. As such no need to add "arm,primecell". > + */ > + compatible = "arm,coresight-replicator"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + /* replicator output ports */ > + port@0 { > + reg = <0>; > + replicator_out_port0: endpoint { > + remote-endpoint = <&tpiu_in_port>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + replicator_out_port1: endpoint { > + remote-endpoint = <&etr_in_port>; > + }; > + }; > + > + /* replicator input port */ > + port@2 { > + reg = <0>; > + replicator_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&etf_out_port>; > + }; > + }; > + }; > + }; > + > + cluster0_funnel@220c0000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x220c0000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + cluster0_funnel_out_port: endpoint { > + remote-endpoint = <&main_funnel_in_port0>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + cluster0_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_etm0_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + cluster0_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_etm1_out_port>; > + }; > + }; > + }; > + }; > + > + cluster1_funnel@230c0000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x230c0000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + cluster1_funnel_out_port: endpoint { > + remote-endpoint = <&main_funnel_in_port1>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + cluster1_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm0_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + cluster1_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm1_out_port>; > + }; > + }; > + port@3 { > + reg = <2>; > + cluster1_funnel_in_port2: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm2_out_port>; > + }; > + }; > + port@4 { > + reg = <3>; > + cluster1_funnel_in_port3: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm3_out_port>; > + }; > + }; > + }; > + }; > + > + etm0: etm@22040000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x22040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster0_etm0_out_port: endpoint { > + remote-endpoint = <&cluster0_funnel_in_port0>; > + }; > + }; > + }; > + > + etm1: etm@22140000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x22140000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster0_etm1_out_port: endpoint { > + remote-endpoint = <&cluster0_funnel_in_port1>; > + }; > + }; > + }; > + > + etm2: etm@23040000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm0_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port0>; > + }; > + }; > + }; > + > + etm3: etm@23140000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23140000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm1_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port1>; > + }; > + }; > + }; > + > + etm4: etm@23240000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23240000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm2_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port2>; > + }; > + }; > + }; > + > + etm5: etm@23340000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23340000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm3_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port3>; > + }; > + }; > + }; > + > sram: sram@2e000000 { > compatible = "arm,juno-sram-ns", "mmio-sram"; > reg = <0x0 0x2e000000 0x0 0x8000>; > diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts > index d95d9e7e2dc0..f4f8f54f8b85 100644 > --- a/arch/arm64/boot/dts/arm/juno-r1.dts > +++ b/arch/arm64/boot/dts/arm/juno-r1.dts > @@ -181,3 +181,27 @@ > &pcie_ctlr { > status = "okay"; > }; > + > +&etm0 { > + cpu = <&A57_0>; > +}; > + > +&etm1 { > + cpu = <&A57_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts > index 88ecd6182b67..d903e545b64c 100644 > --- a/arch/arm64/boot/dts/arm/juno-r2.dts > +++ b/arch/arm64/boot/dts/arm/juno-r2.dts > @@ -181,3 +181,27 @@ > &pcie_ctlr { > status = "okay"; > }; > + > +&etm0 { > + cpu = <&A72_0>; > +}; > + > +&etm1 { > + cpu = <&A72_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts > index dcfcf15a17f5..a7270eff6939 100644 > --- a/arch/arm64/boot/dts/arm/juno.dts > +++ b/arch/arm64/boot/dts/arm/juno.dts > @@ -173,3 +173,27 @@ > > #include "juno-base.dtsi" > }; > + > +&etm0 { > + cpu = <&A57_0>; > +}; > + > +&etm1 { > + cpu = <&A57_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > -- > 2.7.4 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 6 June 2016 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: > Most of the debug-related components on Juno are located in the coreSight > subsystem while others are located in the Cortex-Axx clusters, the SCP > subsystem, and in the main system. > > Each core in the two processor clusters contain an Embedded Trace > Macrocell(ETM) which generates real-time trace information that trace > tools can use and an ATB trace output that is sent to a funnel before > going to the CoreSight subsystem. > > The trace output signals combine with two trace expansions using another > funnel and fed into the Embedded Trace FIFO(ETF0). > > The output trace data stream of the funnel is then replicated before it > is sent to either the: > - Trace Port Interface Unit(TPIU), that sends it out using the trace port. > - ETR that can write the trace data to memory located in the application > memory space Hi Sudeep, Did you try booting this on juno-r0? On my side the system won't boot unless I enable the debug power domain by externally connecting to the system using DS-5. The branch I used is here [1]. Thanks, Mathieu [1]. https://git.linaro.org/kernel/coresight.git (branch next) > > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: devicetree@vger.kernel.org > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > --- > arch/arm64/boot/dts/arm/juno-base.dtsi | 296 +++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ > arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ > arch/arm64/boot/dts/arm/juno.dts | 24 +++ > 4 files changed, 368 insertions(+) > > diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi > index dee2386d3b9b..90a8710f7032 100644 > --- a/arch/arm64/boot/dts/arm/juno-base.dtsi > +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi > @@ -56,6 +56,302 @@ > <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; > }; > > + /* > + * Juno TRMs specify the size for these coresight components as 64K. > + * The actual size is just 4K though 64K is reserved. Access to the > + * unmapped reserved region results in a DECERR response. > + */ > + etf@20010000 { > + compatible = "arm,coresight-tmc", "arm,primecell"; > + reg = <0 0x20010000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + /* input port */ > + port@0 { > + reg = <0>; > + etf_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&main_funnel_out_port>; > + }; > + }; > + > + /* output port */ > + port@1 { > + reg = <0>; > + etf_out_port: endpoint { > + remote-endpoint = <&replicator_in_port0>; > + }; > + }; > + }; > + }; > + > + tpiu@20030000 { > + compatible = "arm,coresight-tpiu", "arm,primecell"; > + reg = <0 0x20030000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + tpiu_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&replicator_out_port0>; > + }; > + }; > + }; > + > + main_funnel@20040000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x20040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + main_funnel_out_port: endpoint { > + remote-endpoint = <&etf_in_port>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + main_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_funnel_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + main_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_funnel_out_port>; > + }; > + }; > + > + }; > + }; > + > + etr@20070000 { > + compatible = "arm,coresight-tmc", "arm,primecell"; > + reg = <0 0x20070000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + etr_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&replicator_out_port1>; > + }; > + }; > + }; > + > + coresight-replicator { > + /* non-configurable replicators don't show up on the > + * AMBA bus. As such no need to add "arm,primecell". > + */ > + compatible = "arm,coresight-replicator"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + /* replicator output ports */ > + port@0 { > + reg = <0>; > + replicator_out_port0: endpoint { > + remote-endpoint = <&tpiu_in_port>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + replicator_out_port1: endpoint { > + remote-endpoint = <&etr_in_port>; > + }; > + }; > + > + /* replicator input port */ > + port@2 { > + reg = <0>; > + replicator_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&etf_out_port>; > + }; > + }; > + }; > + }; > + > + cluster0_funnel@220c0000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x220c0000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + cluster0_funnel_out_port: endpoint { > + remote-endpoint = <&main_funnel_in_port0>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + cluster0_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_etm0_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + cluster0_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_etm1_out_port>; > + }; > + }; > + }; > + }; > + > + cluster1_funnel@230c0000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x230c0000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + cluster1_funnel_out_port: endpoint { > + remote-endpoint = <&main_funnel_in_port1>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + cluster1_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm0_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + cluster1_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm1_out_port>; > + }; > + }; > + port@3 { > + reg = <2>; > + cluster1_funnel_in_port2: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm2_out_port>; > + }; > + }; > + port@4 { > + reg = <3>; > + cluster1_funnel_in_port3: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm3_out_port>; > + }; > + }; > + }; > + }; > + > + etm0: etm@22040000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x22040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster0_etm0_out_port: endpoint { > + remote-endpoint = <&cluster0_funnel_in_port0>; > + }; > + }; > + }; > + > + etm1: etm@22140000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x22140000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster0_etm1_out_port: endpoint { > + remote-endpoint = <&cluster0_funnel_in_port1>; > + }; > + }; > + }; > + > + etm2: etm@23040000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm0_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port0>; > + }; > + }; > + }; > + > + etm3: etm@23140000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23140000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm1_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port1>; > + }; > + }; > + }; > + > + etm4: etm@23240000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23240000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm2_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port2>; > + }; > + }; > + }; > + > + etm5: etm@23340000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23340000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm3_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port3>; > + }; > + }; > + }; > + > sram: sram@2e000000 { > compatible = "arm,juno-sram-ns", "mmio-sram"; > reg = <0x0 0x2e000000 0x0 0x8000>; > diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts > index d95d9e7e2dc0..f4f8f54f8b85 100644 > --- a/arch/arm64/boot/dts/arm/juno-r1.dts > +++ b/arch/arm64/boot/dts/arm/juno-r1.dts > @@ -181,3 +181,27 @@ > &pcie_ctlr { > status = "okay"; > }; > + > +&etm0 { > + cpu = <&A57_0>; > +}; > + > +&etm1 { > + cpu = <&A57_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts > index 88ecd6182b67..d903e545b64c 100644 > --- a/arch/arm64/boot/dts/arm/juno-r2.dts > +++ b/arch/arm64/boot/dts/arm/juno-r2.dts > @@ -181,3 +181,27 @@ > &pcie_ctlr { > status = "okay"; > }; > + > +&etm0 { > + cpu = <&A72_0>; > +}; > + > +&etm1 { > + cpu = <&A72_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts > index dcfcf15a17f5..a7270eff6939 100644 > --- a/arch/arm64/boot/dts/arm/juno.dts > +++ b/arch/arm64/boot/dts/arm/juno.dts > @@ -173,3 +173,27 @@ > > #include "juno-base.dtsi" > }; > + > +&etm0 { > + cpu = <&A57_0>; > +}; > + > +&etm1 { > + cpu = <&A57_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12 June 2016 at 15:57, Mathieu Poirier <mathieu.poirier@linaro.org> wrote: > On 6 June 2016 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: >> Most of the debug-related components on Juno are located in the coreSight >> subsystem while others are located in the Cortex-Axx clusters, the SCP >> subsystem, and in the main system. >> >> Each core in the two processor clusters contain an Embedded Trace >> Macrocell(ETM) which generates real-time trace information that trace >> tools can use and an ATB trace output that is sent to a funnel before >> going to the CoreSight subsystem. >> >> The trace output signals combine with two trace expansions using another >> funnel and fed into the Embedded Trace FIFO(ETF0). >> >> The output trace data stream of the funnel is then replicated before it >> is sent to either the: >> - Trace Port Interface Unit(TPIU), that sends it out using the trace port. >> - ETR that can write the trace data to memory located in the application >> memory space > > Hi Sudeep, > > Did you try booting this on juno-r0? Forget this comment - I just noticed the dependency on the SCPI patches in the cover letter. I'll test again tomorrow. > On my side the system won't boot > unless I enable the debug power domain by externally connecting to the > system using DS-5. > > The branch I used is here [1]. > > Thanks, > Mathieu > > [1]. https://git.linaro.org/kernel/coresight.git (branch next) > > >> >> Cc: Liviu Dudau <liviu.dudau@arm.com> >> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: devicetree@vger.kernel.org >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> >> --- >> arch/arm64/boot/dts/arm/juno-base.dtsi | 296 +++++++++++++++++++++++++++++++++ >> arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ >> arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ >> arch/arm64/boot/dts/arm/juno.dts | 24 +++ >> 4 files changed, 368 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi >> index dee2386d3b9b..90a8710f7032 100644 >> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi >> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi >> @@ -56,6 +56,302 @@ >> <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; >> }; >> >> + /* >> + * Juno TRMs specify the size for these coresight components as 64K. >> + * The actual size is just 4K though 64K is reserved. Access to the >> + * unmapped reserved region results in a DECERR response. >> + */ >> + etf@20010000 { >> + compatible = "arm,coresight-tmc", "arm,primecell"; >> + reg = <0 0x20010000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + ports { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + /* input port */ >> + port@0 { >> + reg = <0>; >> + etf_in_port: endpoint { >> + slave-mode; >> + remote-endpoint = <&main_funnel_out_port>; >> + }; >> + }; >> + >> + /* output port */ >> + port@1 { >> + reg = <0>; >> + etf_out_port: endpoint { >> + remote-endpoint = <&replicator_in_port0>; >> + }; >> + }; >> + }; >> + }; >> + >> + tpiu@20030000 { >> + compatible = "arm,coresight-tpiu", "arm,primecell"; >> + reg = <0 0x20030000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + tpiu_in_port: endpoint { >> + slave-mode; >> + remote-endpoint = <&replicator_out_port0>; >> + }; >> + }; >> + }; >> + >> + main_funnel@20040000 { >> + compatible = "arm,coresight-funnel", "arm,primecell"; >> + reg = <0 0x20040000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + ports { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + port@0 { >> + reg = <0>; >> + main_funnel_out_port: endpoint { >> + remote-endpoint = <&etf_in_port>; >> + }; >> + }; >> + >> + port@1 { >> + reg = <0>; >> + main_funnel_in_port0: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster0_funnel_out_port>; >> + }; >> + }; >> + >> + port@2 { >> + reg = <1>; >> + main_funnel_in_port1: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster1_funnel_out_port>; >> + }; >> + }; >> + >> + }; >> + }; >> + >> + etr@20070000 { >> + compatible = "arm,coresight-tmc", "arm,primecell"; >> + reg = <0 0x20070000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + etr_in_port: endpoint { >> + slave-mode; >> + remote-endpoint = <&replicator_out_port1>; >> + }; >> + }; >> + }; >> + >> + coresight-replicator { >> + /* non-configurable replicators don't show up on the >> + * AMBA bus. As such no need to add "arm,primecell". >> + */ >> + compatible = "arm,coresight-replicator"; >> + >> + ports { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + /* replicator output ports */ >> + port@0 { >> + reg = <0>; >> + replicator_out_port0: endpoint { >> + remote-endpoint = <&tpiu_in_port>; >> + }; >> + }; >> + >> + port@1 { >> + reg = <1>; >> + replicator_out_port1: endpoint { >> + remote-endpoint = <&etr_in_port>; >> + }; >> + }; >> + >> + /* replicator input port */ >> + port@2 { >> + reg = <0>; >> + replicator_in_port0: endpoint { >> + slave-mode; >> + remote-endpoint = <&etf_out_port>; >> + }; >> + }; >> + }; >> + }; >> + >> + cluster0_funnel@220c0000 { >> + compatible = "arm,coresight-funnel", "arm,primecell"; >> + reg = <0 0x220c0000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + ports { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + port@0 { >> + reg = <0>; >> + cluster0_funnel_out_port: endpoint { >> + remote-endpoint = <&main_funnel_in_port0>; >> + }; >> + }; >> + >> + port@1 { >> + reg = <0>; >> + cluster0_funnel_in_port0: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster0_etm0_out_port>; >> + }; >> + }; >> + >> + port@2 { >> + reg = <1>; >> + cluster0_funnel_in_port1: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster0_etm1_out_port>; >> + }; >> + }; >> + }; >> + }; >> + >> + cluster1_funnel@230c0000 { >> + compatible = "arm,coresight-funnel", "arm,primecell"; >> + reg = <0 0x230c0000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + ports { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + port@0 { >> + reg = <0>; >> + cluster1_funnel_out_port: endpoint { >> + remote-endpoint = <&main_funnel_in_port1>; >> + }; >> + }; >> + >> + port@1 { >> + reg = <0>; >> + cluster1_funnel_in_port0: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster1_etm0_out_port>; >> + }; >> + }; >> + >> + port@2 { >> + reg = <1>; >> + cluster1_funnel_in_port1: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster1_etm1_out_port>; >> + }; >> + }; >> + port@3 { >> + reg = <2>; >> + cluster1_funnel_in_port2: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster1_etm2_out_port>; >> + }; >> + }; >> + port@4 { >> + reg = <3>; >> + cluster1_funnel_in_port3: endpoint { >> + slave-mode; >> + remote-endpoint = <&cluster1_etm3_out_port>; >> + }; >> + }; >> + }; >> + }; >> + >> + etm0: etm@22040000 { >> + compatible = "arm,coresight-etm4x", "arm,primecell"; >> + reg = <0 0x22040000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + cluster0_etm0_out_port: endpoint { >> + remote-endpoint = <&cluster0_funnel_in_port0>; >> + }; >> + }; >> + }; >> + >> + etm1: etm@22140000 { >> + compatible = "arm,coresight-etm4x", "arm,primecell"; >> + reg = <0 0x22140000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + cluster0_etm1_out_port: endpoint { >> + remote-endpoint = <&cluster0_funnel_in_port1>; >> + }; >> + }; >> + }; >> + >> + etm2: etm@23040000 { >> + compatible = "arm,coresight-etm4x", "arm,primecell"; >> + reg = <0 0x23040000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + cluster1_etm0_out_port: endpoint { >> + remote-endpoint = <&cluster1_funnel_in_port0>; >> + }; >> + }; >> + }; >> + >> + etm3: etm@23140000 { >> + compatible = "arm,coresight-etm4x", "arm,primecell"; >> + reg = <0 0x23140000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + cluster1_etm1_out_port: endpoint { >> + remote-endpoint = <&cluster1_funnel_in_port1>; >> + }; >> + }; >> + }; >> + >> + etm4: etm@23240000 { >> + compatible = "arm,coresight-etm4x", "arm,primecell"; >> + reg = <0 0x23240000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + cluster1_etm2_out_port: endpoint { >> + remote-endpoint = <&cluster1_funnel_in_port2>; >> + }; >> + }; >> + }; >> + >> + etm5: etm@23340000 { >> + compatible = "arm,coresight-etm4x", "arm,primecell"; >> + reg = <0 0x23340000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + cluster1_etm3_out_port: endpoint { >> + remote-endpoint = <&cluster1_funnel_in_port3>; >> + }; >> + }; >> + }; >> + >> sram: sram@2e000000 { >> compatible = "arm,juno-sram-ns", "mmio-sram"; >> reg = <0x0 0x2e000000 0x0 0x8000>; >> diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts >> index d95d9e7e2dc0..f4f8f54f8b85 100644 >> --- a/arch/arm64/boot/dts/arm/juno-r1.dts >> +++ b/arch/arm64/boot/dts/arm/juno-r1.dts >> @@ -181,3 +181,27 @@ >> &pcie_ctlr { >> status = "okay"; >> }; >> + >> +&etm0 { >> + cpu = <&A57_0>; >> +}; >> + >> +&etm1 { >> + cpu = <&A57_1>; >> +}; >> + >> +&etm2 { >> + cpu = <&A53_0>; >> +}; >> + >> +&etm3 { >> + cpu = <&A53_1>; >> +}; >> + >> +&etm4 { >> + cpu = <&A53_2>; >> +}; >> + >> +&etm5 { >> + cpu = <&A53_3>; >> +}; >> diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts >> index 88ecd6182b67..d903e545b64c 100644 >> --- a/arch/arm64/boot/dts/arm/juno-r2.dts >> +++ b/arch/arm64/boot/dts/arm/juno-r2.dts >> @@ -181,3 +181,27 @@ >> &pcie_ctlr { >> status = "okay"; >> }; >> + >> +&etm0 { >> + cpu = <&A72_0>; >> +}; >> + >> +&etm1 { >> + cpu = <&A72_1>; >> +}; >> + >> +&etm2 { >> + cpu = <&A53_0>; >> +}; >> + >> +&etm3 { >> + cpu = <&A53_1>; >> +}; >> + >> +&etm4 { >> + cpu = <&A53_2>; >> +}; >> + >> +&etm5 { >> + cpu = <&A53_3>; >> +}; >> diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts >> index dcfcf15a17f5..a7270eff6939 100644 >> --- a/arch/arm64/boot/dts/arm/juno.dts >> +++ b/arch/arm64/boot/dts/arm/juno.dts >> @@ -173,3 +173,27 @@ >> >> #include "juno-base.dtsi" >> }; >> + >> +&etm0 { >> + cpu = <&A57_0>; >> +}; >> + >> +&etm1 { >> + cpu = <&A57_1>; >> +}; >> + >> +&etm2 { >> + cpu = <&A53_0>; >> +}; >> + >> +&etm3 { >> + cpu = <&A53_1>; >> +}; >> + >> +&etm4 { >> + cpu = <&A53_2>; >> +}; >> + >> +&etm5 { >> + cpu = <&A53_3>; >> +}; >> -- >> 2.7.4 >> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/06/16 22:57, Mathieu Poirier wrote: > On 6 June 2016 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: >> Most of the debug-related components on Juno are located in the coreSight >> subsystem while others are located in the Cortex-Axx clusters, the SCP >> subsystem, and in the main system. >> >> Each core in the two processor clusters contain an Embedded Trace >> Macrocell(ETM) which generates real-time trace information that trace >> tools can use and an ATB trace output that is sent to a funnel before >> going to the CoreSight subsystem. >> >> The trace output signals combine with two trace expansions using another >> funnel and fed into the Embedded Trace FIFO(ETF0). >> >> The output trace data stream of the funnel is then replicated before it >> is sent to either the: >> - Trace Port Interface Unit(TPIU), that sends it out using the trace port. >> - ETR that can write the trace data to memory located in the application >> memory space > > Hi Sudeep, > > Did you try booting this on juno-r0? On my side the system won't boot > unless I enable the debug power domain by externally connecting to the > system using DS-5. > As you have already realized that you need SCPI power domain patches for the functionality. However, in absence of those patches or when it's disabled, it shouldn't cause any boot or runtime issues. Only ETM or coresight won't work. If it's causing any crash or hang, please do let me know, that needs to be fixed. I have only tested with latest firmware. Let me know the details of hang/crash and firmware version you are using. -- Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 13 June 2016 at 03:18, Sudeep Holla <sudeep.holla@arm.com> wrote: > > > On 12/06/16 22:57, Mathieu Poirier wrote: >> >> On 6 June 2016 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: >>> >>> Most of the debug-related components on Juno are located in the coreSight >>> subsystem while others are located in the Cortex-Axx clusters, the SCP >>> subsystem, and in the main system. >>> >>> Each core in the two processor clusters contain an Embedded Trace >>> Macrocell(ETM) which generates real-time trace information that trace >>> tools can use and an ATB trace output that is sent to a funnel before >>> going to the CoreSight subsystem. >>> >>> The trace output signals combine with two trace expansions using another >>> funnel and fed into the Embedded Trace FIFO(ETF0). >>> >>> The output trace data stream of the funnel is then replicated before it >>> is sent to either the: >>> - Trace Port Interface Unit(TPIU), that sends it out using the trace >>> port. >>> - ETR that can write the trace data to memory located in the application >>> memory space >> >> >> Hi Sudeep, >> >> Did you try booting this on juno-r0? On my side the system won't boot >> unless I enable the debug power domain by externally connecting to the >> system using DS-5. >> > > As you have already realized that you need SCPI power domain patches for > the functionality. However, in absence of those patches or when it's > disabled, it shouldn't cause any boot or runtime issues. Only ETM or > coresight won't work. If it's causing any crash or hang, please do let > me know, that needs to be fixed. I have only tested with latest > firmware. Let me know the details of hang/crash and firmware version you > are using. We have a problem then. Booting with this branch[1] and the 3 DT patches from this set the system hangs. But before going any further I'd bet the FW on my board is too old. This is what I get on my side: RM V2M-Juno Boot loader v1.0.0 HBI0262 build 1684 ARM V2M_Juno Firmware v1.3.4 Build Date: Aug 27 2015 Time : 14:44:50 Date : 13:06:2016 Press Enter to stop auto boot... What version are you using? In the mean time I'm digging up your SCPI patches... Thanks, Mathieu [1]. https://git.linaro.org/kernel/coresight.git/ (branch next) > > -- > Regards, > Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 13/06/16 15:47, Mathieu Poirier wrote: > On 13 June 2016 at 03:18, Sudeep Holla <sudeep.holla@arm.com> wrote: >> >> >> On 12/06/16 22:57, Mathieu Poirier wrote: >>> >>> On 6 June 2016 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: >>>> >>>> Most of the debug-related components on Juno are located in the coreSight >>>> subsystem while others are located in the Cortex-Axx clusters, the SCP >>>> subsystem, and in the main system. >>>> >>>> Each core in the two processor clusters contain an Embedded Trace >>>> Macrocell(ETM) which generates real-time trace information that trace >>>> tools can use and an ATB trace output that is sent to a funnel before >>>> going to the CoreSight subsystem. >>>> >>>> The trace output signals combine with two trace expansions using another >>>> funnel and fed into the Embedded Trace FIFO(ETF0). >>>> >>>> The output trace data stream of the funnel is then replicated before it >>>> is sent to either the: >>>> - Trace Port Interface Unit(TPIU), that sends it out using the trace >>>> port. >>>> - ETR that can write the trace data to memory located in the application >>>> memory space >>> >>> >>> Hi Sudeep, >>> >>> Did you try booting this on juno-r0? On my side the system won't boot >>> unless I enable the debug power domain by externally connecting to the >>> system using DS-5. >>> >> >> As you have already realized that you need SCPI power domain patches for >> the functionality. However, in absence of those patches or when it's >> disabled, it shouldn't cause any boot or runtime issues. Only ETM or >> coresight won't work. If it's causing any crash or hang, please do let >> me know, that needs to be fixed. I have only tested with latest >> firmware. Let me know the details of hang/crash and firmware version you >> are using. > > We have a problem then. Booting with this branch[1] and the 3 DT > patches from this set the system hangs. But before going any further > I'd bet the FW on my board is too old. This is what I get on my side: > > RM V2M-Juno Boot loader v1.0.0 > HBI0262 build 1684 > > ARM V2M_Juno Firmware v1.3.4 > Build Date: Aug 27 2015 > Yes looks old *but* these are motherboard firmware, while I was interested in SCP firmware. Anyways can you provide more details on the hang (where/what/...)? Also the boot log(what ever you are getting out if any) -- Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 6 June 2016 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: > Most of the debug-related components on Juno are located in the coreSight > subsystem while others are located in the Cortex-Axx clusters, the SCP > subsystem, and in the main system. > > Each core in the two processor clusters contain an Embedded Trace > Macrocell(ETM) which generates real-time trace information that trace > tools can use and an ATB trace output that is sent to a funnel before > going to the CoreSight subsystem. > > The trace output signals combine with two trace expansions using another > funnel and fed into the Embedded Trace FIFO(ETF0). > > The output trace data stream of the funnel is then replicated before it > is sent to either the: > - Trace Port Interface Unit(TPIU), that sends it out using the trace port. > - ETR that can write the trace data to memory located in the application > memory space > > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: devicetree@vger.kernel.org > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > --- > arch/arm64/boot/dts/arm/juno-base.dtsi | 296 +++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ > arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ > arch/arm64/boot/dts/arm/juno.dts | 24 +++ > 4 files changed, 368 insertions(+) > > diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi > index dee2386d3b9b..90a8710f7032 100644 > --- a/arch/arm64/boot/dts/arm/juno-base.dtsi > +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi > @@ -56,6 +56,302 @@ > <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; > }; > > + /* > + * Juno TRMs specify the size for these coresight components as 64K. > + * The actual size is just 4K though 64K is reserved. Access to the > + * unmapped reserved region results in a DECERR response. > + */ > + etf@20010000 { > + compatible = "arm,coresight-tmc", "arm,primecell"; > + reg = <0 0x20010000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + /* input port */ > + port@0 { > + reg = <0>; > + etf_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&main_funnel_out_port>; > + }; > + }; > + > + /* output port */ > + port@1 { > + reg = <0>; > + etf_out_port: endpoint { > + remote-endpoint = <&replicator_in_port0>; > + }; > + }; > + }; > + }; > + > + tpiu@20030000 { > + compatible = "arm,coresight-tpiu", "arm,primecell"; > + reg = <0 0x20030000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + tpiu_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&replicator_out_port0>; > + }; > + }; > + }; > + > + main_funnel@20040000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x20040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + main_funnel_out_port: endpoint { > + remote-endpoint = <&etf_in_port>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + main_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_funnel_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + main_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_funnel_out_port>; > + }; > + }; > + > + }; > + }; > + > + etr@20070000 { > + compatible = "arm,coresight-tmc", "arm,primecell"; > + reg = <0 0x20070000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + etr_in_port: endpoint { > + slave-mode; > + remote-endpoint = <&replicator_out_port1>; > + }; > + }; > + }; > + > + coresight-replicator { > + /* non-configurable replicators don't show up on the > + * AMBA bus. As such no need to add "arm,primecell". > + */ Please use kernel documentation style. > + compatible = "arm,coresight-replicator"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + /* replicator output ports */ > + port@0 { > + reg = <0>; > + replicator_out_port0: endpoint { > + remote-endpoint = <&tpiu_in_port>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + replicator_out_port1: endpoint { > + remote-endpoint = <&etr_in_port>; > + }; > + }; > + > + /* replicator input port */ > + port@2 { > + reg = <0>; > + replicator_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&etf_out_port>; > + }; > + }; > + }; > + }; > + > + cluster0_funnel@220c0000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x220c0000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + cluster0_funnel_out_port: endpoint { > + remote-endpoint = <&main_funnel_in_port0>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + cluster0_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_etm0_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + cluster0_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster0_etm1_out_port>; > + }; > + }; > + }; > + }; > + > + cluster1_funnel@230c0000 { > + compatible = "arm,coresight-funnel", "arm,primecell"; > + reg = <0 0x230c0000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + cluster1_funnel_out_port: endpoint { > + remote-endpoint = <&main_funnel_in_port1>; > + }; > + }; > + > + port@1 { > + reg = <0>; > + cluster1_funnel_in_port0: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm0_out_port>; > + }; > + }; > + > + port@2 { > + reg = <1>; > + cluster1_funnel_in_port1: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm1_out_port>; > + }; > + }; > + port@3 { > + reg = <2>; > + cluster1_funnel_in_port2: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm2_out_port>; > + }; > + }; > + port@4 { > + reg = <3>; > + cluster1_funnel_in_port3: endpoint { > + slave-mode; > + remote-endpoint = <&cluster1_etm3_out_port>; > + }; > + }; > + }; > + }; > + > + etm0: etm@22040000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x22040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster0_etm0_out_port: endpoint { > + remote-endpoint = <&cluster0_funnel_in_port0>; > + }; > + }; > + }; > + > + etm1: etm@22140000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x22140000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster0_etm1_out_port: endpoint { > + remote-endpoint = <&cluster0_funnel_in_port1>; > + }; > + }; > + }; > + > + etm2: etm@23040000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23040000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm0_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port0>; > + }; > + }; > + }; > + > + etm3: etm@23140000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23140000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm1_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port1>; > + }; > + }; > + }; > + > + etm4: etm@23240000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23240000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm2_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port2>; > + }; > + }; > + }; > + > + etm5: etm@23340000 { > + compatible = "arm,coresight-etm4x", "arm,primecell"; > + reg = <0 0x23340000 0 0x1000>; > + > + clocks = <&soc_smc50mhz>; > + clock-names = "apb_pclk"; > + port { > + cluster1_etm3_out_port: endpoint { > + remote-endpoint = <&cluster1_funnel_in_port3>; > + }; > + }; > + }; > + > sram: sram@2e000000 { > compatible = "arm,juno-sram-ns", "mmio-sram"; > reg = <0x0 0x2e000000 0x0 0x8000>; > diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts > index d95d9e7e2dc0..f4f8f54f8b85 100644 > --- a/arch/arm64/boot/dts/arm/juno-r1.dts > +++ b/arch/arm64/boot/dts/arm/juno-r1.dts > @@ -181,3 +181,27 @@ > &pcie_ctlr { > status = "okay"; > }; > + > +&etm0 { > + cpu = <&A57_0>; > +}; > + > +&etm1 { > + cpu = <&A57_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts > index 88ecd6182b67..d903e545b64c 100644 > --- a/arch/arm64/boot/dts/arm/juno-r2.dts > +++ b/arch/arm64/boot/dts/arm/juno-r2.dts > @@ -181,3 +181,27 @@ > &pcie_ctlr { > status = "okay"; > }; > + > +&etm0 { > + cpu = <&A72_0>; > +}; > + > +&etm1 { > + cpu = <&A72_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts > index dcfcf15a17f5..a7270eff6939 100644 > --- a/arch/arm64/boot/dts/arm/juno.dts > +++ b/arch/arm64/boot/dts/arm/juno.dts > @@ -173,3 +173,27 @@ > > #include "juno-base.dtsi" > }; > + > +&etm0 { > + cpu = <&A57_0>; > +}; > + > +&etm1 { > + cpu = <&A57_1>; > +}; > + > +&etm2 { > + cpu = <&A53_0>; > +}; > + > +&etm3 { > + cpu = <&A53_1>; > +}; > + > +&etm4 { > + cpu = <&A53_2>; > +}; > + > +&etm5 { > + cpu = <&A53_3>; > +}; > -- > 2.7.4 > With the above change: Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 17/06/16 16:29, Mathieu Poirier wrote: > On 6 June 2016 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: >> Most of the debug-related components on Juno are located in the coreSight >> subsystem while others are located in the Cortex-Axx clusters, the SCP >> subsystem, and in the main system. >> >> Each core in the two processor clusters contain an Embedded Trace >> Macrocell(ETM) which generates real-time trace information that trace >> tools can use and an ATB trace output that is sent to a funnel before >> going to the CoreSight subsystem. >> >> The trace output signals combine with two trace expansions using another >> funnel and fed into the Embedded Trace FIFO(ETF0). >> >> The output trace data stream of the funnel is then replicated before it >> is sent to either the: >> - Trace Port Interface Unit(TPIU), that sends it out using the trace port. >> - ETR that can write the trace data to memory located in the application >> memory space >> >> Cc: Liviu Dudau <liviu.dudau@arm.com> >> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: devicetree@vger.kernel.org >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> >> --- >> arch/arm64/boot/dts/arm/juno-base.dtsi | 296 +++++++++++++++++++++++++++++++++ >> arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ >> arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ >> arch/arm64/boot/dts/arm/juno.dts | 24 +++ >> 4 files changed, 368 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi >> index dee2386d3b9b..90a8710f7032 100644 >> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi >> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi [...] >> + >> + coresight-replicator { >> + /* non-configurable replicators don't show up on the >> + * AMBA bus. As such no need to add "arm,primecell". >> + */ > > Please use kernel documentation style. > Ah, that's copy paste from arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts ;) [...] >> > > With the above change: > > Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> > Thanks. -- Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21/06/16 06:41, Olof Johansson wrote: > Hi, > > Some nits below. > My bad, I blindly copy-pasted it from vexpress TC2 platform. > On Mon, Jun 6, 2016 at 8:59 AM, Sudeep Holla <sudeep.holla@arm.com> wrote: >> Most of the debug-related components on Juno are located in the coreSight >> subsystem while others are located in the Cortex-Axx clusters, the SCP >> subsystem, and in the main system. >> >> Each core in the two processor clusters contain an Embedded Trace >> Macrocell(ETM) which generates real-time trace information that trace >> tools can use and an ATB trace output that is sent to a funnel before >> going to the CoreSight subsystem. >> >> The trace output signals combine with two trace expansions using another >> funnel and fed into the Embedded Trace FIFO(ETF0). >> >> The output trace data stream of the funnel is then replicated before it >> is sent to either the: >> - Trace Port Interface Unit(TPIU), that sends it out using the trace port. >> - ETR that can write the trace data to memory located in the application >> memory space >> >> Cc: Liviu Dudau <liviu.dudau@arm.com> >> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: devicetree@vger.kernel.org >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> >> --- >> arch/arm64/boot/dts/arm/juno-base.dtsi | 296 +++++++++++++++++++++++++++++++++ >> arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ >> arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ >> arch/arm64/boot/dts/arm/juno.dts | 24 +++ >> 4 files changed, 368 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi >> index dee2386d3b9b..90a8710f7032 100644 >> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi >> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi >> @@ -56,6 +56,302 @@ >> <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; >> }; >> >> + /* >> + * Juno TRMs specify the size for these coresight components as 64K. >> + * The actual size is just 4K though 64K is reserved. Access to the >> + * unmapped reserved region results in a DECERR response. >> + */ >> + etf@20010000 { > > Would it make sense to name it something like trace-fifo instead? We > normally name the nodes based on type of device (ethernet@, pci@, > etc). > As Suzuki already pointed out, these are standard acronyms used in various CoreSight specifications. Let me know if you need them to be expanded instead of abbreviations. > >> + compatible = "arm,coresight-tmc", "arm,primecell"; > > Is there a more specific compatible needed here, or does > arm,coresight-tmc give you all the information you need on how to use > this interface? > > The bindings doc is sort of sparse in this area, all it says is "you > might use one of these compatibles". > Again Suzuki commented on that. I will leave it to Mathieu who is the author of the binding to comment further(if any). But I agree, it would be good to have one line description on each of them as they are pretty much standard primecells or even URL to their specifications. >> + tpiu@20030000 { > > Again, these names are not great. Luckily they don't affect the > binding, so they can be fixed. What would be a more human readable and > functionally describing name here? > >> + compatible = "arm,coresight-tpiu", "arm,primecell"; >> + reg = <0 0x20030000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + tpiu_in_port: endpoint { >> + slave-mode; >> + remote-endpoint = <&replicator_out_port0>; >> + }; >> + }; >> + }; >> + >> + main_funnel@20040000 { > > Underscores are usually frowned upon. funnel@ or ideally a better more > descriptive name should be used here. > Use dashes if you really have to. > Agreed and fixed locally now. [...] >> + compatible = "arm,coresight-tmc", "arm,primecell"; >> + reg = <0 0x20070000 0 0x1000>; >> + >> + clocks = <&soc_smc50mhz>; >> + clock-names = "apb_pclk"; >> + port { >> + etr_in_port: endpoint { >> + slave-mode; >> + remote-endpoint = <&replicator_out_port1>; >> + }; >> + }; >> + }; >> + >> + coresight-replicator { > > Hm. It'd sort of be nice to stick all the coresight stuff under one > node instead of having them all at the toplevel, but that doesn't > really go with the concept of having each device where it's at in the > bus/address hierarchy. > I understand. > Should _all_ the nodes be at the toplevel though? Looks like you have > a few address ranges that most of the toplevel devices are at, is > there really not a physical bus they're each connected to that you can > describe? > I need to look at the Juno documents again and refine. It may affect other devices too. Can that be addressed later separately ? [...] >> + >> + etm0: etm@22040000 { > > If this file is sorted on reg values, then this node and the two after > are out of order. > Yes that was the intent, will fix it. But I see some oddities, may be will fix those once I address the address/bus hierarchy. -- -- Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21 June 2016 at 05:27, Sudeep Holla <sudeep.holla@arm.com> wrote: > > > On 21/06/16 06:41, Olof Johansson wrote: >> >> Hi, >> >> Some nits below. >> > > My bad, I blindly copy-pasted it from vexpress TC2 platform. > >> On Mon, Jun 6, 2016 at 8:59 AM, Sudeep Holla <sudeep.holla@arm.com> wrote: >>> >>> Most of the debug-related components on Juno are located in the coreSight >>> subsystem while others are located in the Cortex-Axx clusters, the SCP >>> subsystem, and in the main system. >>> >>> Each core in the two processor clusters contain an Embedded Trace >>> Macrocell(ETM) which generates real-time trace information that trace >>> tools can use and an ATB trace output that is sent to a funnel before >>> going to the CoreSight subsystem. >>> >>> The trace output signals combine with two trace expansions using another >>> funnel and fed into the Embedded Trace FIFO(ETF0). >>> >>> The output trace data stream of the funnel is then replicated before it >>> is sent to either the: >>> - Trace Port Interface Unit(TPIU), that sends it out using the trace >>> port. >>> - ETR that can write the trace data to memory located in the application >>> memory space >>> >>> Cc: Liviu Dudau <liviu.dudau@arm.com> >>> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >>> Cc: linux-arm-kernel@lists.infradead.org >>> Cc: devicetree@vger.kernel.org >>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> >>> --- >>> arch/arm64/boot/dts/arm/juno-base.dtsi | 296 >>> +++++++++++++++++++++++++++++++++ >>> arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ >>> arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ >>> arch/arm64/boot/dts/arm/juno.dts | 24 +++ >>> 4 files changed, 368 insertions(+) >>> >>> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi >>> b/arch/arm64/boot/dts/arm/juno-base.dtsi >>> index dee2386d3b9b..90a8710f7032 100644 >>> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi >>> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi >>> @@ -56,6 +56,302 @@ >>> <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | >>> IRQ_TYPE_LEVEL_LOW)>; >>> }; >>> >>> + /* >>> + * Juno TRMs specify the size for these coresight components as >>> 64K. >>> + * The actual size is just 4K though 64K is reserved. Access to >>> the >>> + * unmapped reserved region results in a DECERR response. >>> + */ >>> + etf@20010000 { >> >> >> Would it make sense to name it something like trace-fifo instead? We >> normally name the nodes based on type of device (ethernet@, pci@, >> etc). >> > > As Suzuki already pointed out, these are standard acronyms used in > various CoreSight specifications. Let me know if you need them to be > expanded instead of abbreviations. > >> >>> + compatible = "arm,coresight-tmc", "arm,primecell"; >> >> >> Is there a more specific compatible needed here, or does >> arm,coresight-tmc give you all the information you need on how to use >> this interface? >> >> The bindings doc is sort of sparse in this area, all it says is "you >> might use one of these compatibles". >> > > Again Suzuki commented on that. I will leave it to Mathieu who is the > author of the binding to comment further(if any). > > But I agree, it would be good to have one line description on each of > them as they are pretty much standard primecells or even URL to their > specifications. I initially wrote the bindings from a developer's point of view, or someone implementing CoreSight on their system. As such there would be no doubts about the acronyms found in the bindings as the same nomenclature is used throughout the documentation. But from an onlooker's perspective I can see how they can be confusing. As Sudeep suggested I will add a short description for each binding. > >>> + tpiu@20030000 { >> >> >> Again, these names are not great. Luckily they don't affect the >> binding, so they can be fixed. What would be a more human readable and >> functionally describing name here? >> >>> + compatible = "arm,coresight-tpiu", "arm,primecell"; >>> + reg = <0 0x20030000 0 0x1000>; >>> + >>> + clocks = <&soc_smc50mhz>; >>> + clock-names = "apb_pclk"; >>> + port { >>> + tpiu_in_port: endpoint { >>> + slave-mode; >>> + remote-endpoint = >>> <&replicator_out_port0>; >>> + }; >>> + }; >>> + }; >>> + >>> + main_funnel@20040000 { >> >> >> Underscores are usually frowned upon. funnel@ or ideally a better more >> descriptive name should be used here. >> Use dashes if you really have to. >> > > Agreed and fixed locally now. > > [...] > >>> + compatible = "arm,coresight-tmc", "arm,primecell"; >>> + reg = <0 0x20070000 0 0x1000>; >>> + >>> + clocks = <&soc_smc50mhz>; >>> + clock-names = "apb_pclk"; >>> + port { >>> + etr_in_port: endpoint { >>> + slave-mode; >>> + remote-endpoint = >>> <&replicator_out_port1>; >>> + }; >>> + }; >>> + }; >>> + >>> + coresight-replicator { >> >> >> Hm. It'd sort of be nice to stick all the coresight stuff under one >> node instead of having them all at the toplevel, but that doesn't >> really go with the concept of having each device where it's at in the >> bus/address hierarchy. I thought long and hard about this when initially working on the bindings. All CoreSight blocks are independent from one another and they don't need a bus to be accessed or configured. >> > > I understand. > >> Should _all_ the nodes be at the toplevel though? Looks like you have >> a few address ranges that most of the toplevel devices are at, is >> there really not a physical bus they're each connected to that you can >> describe? >> > > I need to look at the Juno documents again and refine. It may affect > other devices too. Can that be addressed later separately ? > > [...] > > >>> + >>> + etm0: etm@22040000 { >> >> >> If this file is sorted on reg values, then this node and the two after >> are out of order. >> > > Yes that was the intent, will fix it. But I see some oddities, may be > will fix those once I address the address/bus hierarchy. > > -- > -- > Regards, > Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Olof, On 21/06/16 12:27, Sudeep Holla wrote: > > > On 21/06/16 06:41, Olof Johansson wrote: >> Hi, >> >> Some nits below. >> > > My bad, I blindly copy-pasted it from vexpress TC2 platform. > Any further comments on the replies so far ? -- Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index dee2386d3b9b..90a8710f7032 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -56,6 +56,302 @@ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; }; + /* + * Juno TRMs specify the size for these coresight components as 64K. + * The actual size is just 4K though 64K is reserved. Access to the + * unmapped reserved region results in a DECERR response. + */ + etf@20010000 { + compatible = "arm,coresight-tmc", "arm,primecell"; + reg = <0 0x20010000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* input port */ + port@0 { + reg = <0>; + etf_in_port: endpoint { + slave-mode; + remote-endpoint = <&main_funnel_out_port>; + }; + }; + + /* output port */ + port@1 { + reg = <0>; + etf_out_port: endpoint { + remote-endpoint = <&replicator_in_port0>; + }; + }; + }; + }; + + tpiu@20030000 { + compatible = "arm,coresight-tpiu", "arm,primecell"; + reg = <0 0x20030000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + tpiu_in_port: endpoint { + slave-mode; + remote-endpoint = <&replicator_out_port0>; + }; + }; + }; + + main_funnel@20040000 { + compatible = "arm,coresight-funnel", "arm,primecell"; + reg = <0 0x20040000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + main_funnel_out_port: endpoint { + remote-endpoint = <&etf_in_port>; + }; + }; + + port@1 { + reg = <0>; + main_funnel_in_port0: endpoint { + slave-mode; + remote-endpoint = <&cluster0_funnel_out_port>; + }; + }; + + port@2 { + reg = <1>; + main_funnel_in_port1: endpoint { + slave-mode; + remote-endpoint = <&cluster1_funnel_out_port>; + }; + }; + + }; + }; + + etr@20070000 { + compatible = "arm,coresight-tmc", "arm,primecell"; + reg = <0 0x20070000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + etr_in_port: endpoint { + slave-mode; + remote-endpoint = <&replicator_out_port1>; + }; + }; + }; + + coresight-replicator { + /* non-configurable replicators don't show up on the + * AMBA bus. As such no need to add "arm,primecell". + */ + compatible = "arm,coresight-replicator"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* replicator output ports */ + port@0 { + reg = <0>; + replicator_out_port0: endpoint { + remote-endpoint = <&tpiu_in_port>; + }; + }; + + port@1 { + reg = <1>; + replicator_out_port1: endpoint { + remote-endpoint = <&etr_in_port>; + }; + }; + + /* replicator input port */ + port@2 { + reg = <0>; + replicator_in_port0: endpoint { + slave-mode; + remote-endpoint = <&etf_out_port>; + }; + }; + }; + }; + + cluster0_funnel@220c0000 { + compatible = "arm,coresight-funnel", "arm,primecell"; + reg = <0 0x220c0000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + cluster0_funnel_out_port: endpoint { + remote-endpoint = <&main_funnel_in_port0>; + }; + }; + + port@1 { + reg = <0>; + cluster0_funnel_in_port0: endpoint { + slave-mode; + remote-endpoint = <&cluster0_etm0_out_port>; + }; + }; + + port@2 { + reg = <1>; + cluster0_funnel_in_port1: endpoint { + slave-mode; + remote-endpoint = <&cluster0_etm1_out_port>; + }; + }; + }; + }; + + cluster1_funnel@230c0000 { + compatible = "arm,coresight-funnel", "arm,primecell"; + reg = <0 0x230c0000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + cluster1_funnel_out_port: endpoint { + remote-endpoint = <&main_funnel_in_port1>; + }; + }; + + port@1 { + reg = <0>; + cluster1_funnel_in_port0: endpoint { + slave-mode; + remote-endpoint = <&cluster1_etm0_out_port>; + }; + }; + + port@2 { + reg = <1>; + cluster1_funnel_in_port1: endpoint { + slave-mode; + remote-endpoint = <&cluster1_etm1_out_port>; + }; + }; + port@3 { + reg = <2>; + cluster1_funnel_in_port2: endpoint { + slave-mode; + remote-endpoint = <&cluster1_etm2_out_port>; + }; + }; + port@4 { + reg = <3>; + cluster1_funnel_in_port3: endpoint { + slave-mode; + remote-endpoint = <&cluster1_etm3_out_port>; + }; + }; + }; + }; + + etm0: etm@22040000 { + compatible = "arm,coresight-etm4x", "arm,primecell"; + reg = <0 0x22040000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + cluster0_etm0_out_port: endpoint { + remote-endpoint = <&cluster0_funnel_in_port0>; + }; + }; + }; + + etm1: etm@22140000 { + compatible = "arm,coresight-etm4x", "arm,primecell"; + reg = <0 0x22140000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + cluster0_etm1_out_port: endpoint { + remote-endpoint = <&cluster0_funnel_in_port1>; + }; + }; + }; + + etm2: etm@23040000 { + compatible = "arm,coresight-etm4x", "arm,primecell"; + reg = <0 0x23040000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + cluster1_etm0_out_port: endpoint { + remote-endpoint = <&cluster1_funnel_in_port0>; + }; + }; + }; + + etm3: etm@23140000 { + compatible = "arm,coresight-etm4x", "arm,primecell"; + reg = <0 0x23140000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + cluster1_etm1_out_port: endpoint { + remote-endpoint = <&cluster1_funnel_in_port1>; + }; + }; + }; + + etm4: etm@23240000 { + compatible = "arm,coresight-etm4x", "arm,primecell"; + reg = <0 0x23240000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + cluster1_etm2_out_port: endpoint { + remote-endpoint = <&cluster1_funnel_in_port2>; + }; + }; + }; + + etm5: etm@23340000 { + compatible = "arm,coresight-etm4x", "arm,primecell"; + reg = <0 0x23340000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + port { + cluster1_etm3_out_port: endpoint { + remote-endpoint = <&cluster1_funnel_in_port3>; + }; + }; + }; + sram: sram@2e000000 { compatible = "arm,juno-sram-ns", "mmio-sram"; reg = <0x0 0x2e000000 0x0 0x8000>; diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts index d95d9e7e2dc0..f4f8f54f8b85 100644 --- a/arch/arm64/boot/dts/arm/juno-r1.dts +++ b/arch/arm64/boot/dts/arm/juno-r1.dts @@ -181,3 +181,27 @@ &pcie_ctlr { status = "okay"; }; + +&etm0 { + cpu = <&A57_0>; +}; + +&etm1 { + cpu = <&A57_1>; +}; + +&etm2 { + cpu = <&A53_0>; +}; + +&etm3 { + cpu = <&A53_1>; +}; + +&etm4 { + cpu = <&A53_2>; +}; + +&etm5 { + cpu = <&A53_3>; +}; diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts index 88ecd6182b67..d903e545b64c 100644 --- a/arch/arm64/boot/dts/arm/juno-r2.dts +++ b/arch/arm64/boot/dts/arm/juno-r2.dts @@ -181,3 +181,27 @@ &pcie_ctlr { status = "okay"; }; + +&etm0 { + cpu = <&A72_0>; +}; + +&etm1 { + cpu = <&A72_1>; +}; + +&etm2 { + cpu = <&A53_0>; +}; + +&etm3 { + cpu = <&A53_1>; +}; + +&etm4 { + cpu = <&A53_2>; +}; + +&etm5 { + cpu = <&A53_3>; +}; diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index dcfcf15a17f5..a7270eff6939 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -173,3 +173,27 @@ #include "juno-base.dtsi" }; + +&etm0 { + cpu = <&A57_0>; +}; + +&etm1 { + cpu = <&A57_1>; +}; + +&etm2 { + cpu = <&A53_0>; +}; + +&etm3 { + cpu = <&A53_1>; +}; + +&etm4 { + cpu = <&A53_2>; +}; + +&etm5 { + cpu = <&A53_3>; +};
Most of the debug-related components on Juno are located in the coreSight subsystem while others are located in the Cortex-Axx clusters, the SCP subsystem, and in the main system. Each core in the two processor clusters contain an Embedded Trace Macrocell(ETM) which generates real-time trace information that trace tools can use and an ATB trace output that is sent to a funnel before going to the CoreSight subsystem. The trace output signals combine with two trace expansions using another funnel and fed into the Embedded Trace FIFO(ETF0). The output trace data stream of the funnel is then replicated before it is sent to either the: - Trace Port Interface Unit(TPIU), that sends it out using the trace port. - ETR that can write the trace data to memory located in the application memory space Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- arch/arm64/boot/dts/arm/juno-base.dtsi | 296 +++++++++++++++++++++++++++++++++ arch/arm64/boot/dts/arm/juno-r1.dts | 24 +++ arch/arm64/boot/dts/arm/juno-r2.dts | 24 +++ arch/arm64/boot/dts/arm/juno.dts | 24 +++ 4 files changed, 368 insertions(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html