| Message ID | 1484655313-9025-5-git-send-email-sudeep.holla@arm.com |
|---|---|
| State | Accepted |
| Commit | cde6f9ab10c6099f5e8daed898a43562b9911b70 |
| Headers | show |
| Series | arm64: dts: juno: CoreSight support updates | expand |
On 17/01/17 13:39, Suzuki K Poulose wrote: > On 17/01/17 12:15, Sudeep Holla wrote: >> From: Mike Leach <mike.leach@linaro.org> >> >> This patch adds the missing CoreSight STM component definition to the >> device tree of all the juno variants(r0,r1,r2) >> >> STM component is connected to different funnels depending on Juno >> platform variant. >> >> Reviewed-and-Tested-by: Mathieu Poirier <mathieu.poirier@linaro.org> >> Signed-off-by: Mike Leach <mike.leach@linaro.org> >> [sudeep.holla@arm.com: minor changelog update and reorganising the STM >> node back into juno-base.dtsi to avoid duplication] >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> >> --- >> arch/arm64/boot/dts/arm/juno-base.dtsi | 15 +++++++++++++++ >> arch/arm64/boot/dts/arm/juno-r1.dts | 4 ++++ >> arch/arm64/boot/dts/arm/juno-r2.dts | 4 ++++ >> arch/arm64/boot/dts/arm/juno.dts | 16 ++++++++++++++++ >> 4 files changed, 39 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi >> b/arch/arm64/boot/dts/arm/juno-base.dtsi >> index faedf357db3b..58c1773c3aa4 100644 >> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi >> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi >> @@ -185,6 +185,21 @@ >> }; >> }; >> >> + stm@20100000 { >> + compatible = "arm,coresight-stm", "arm,primecell"; >> + reg = <0 0x20100000 0 0x1000>, >> + <0 0x28000000 0 0x180000>; > > The size of the stimulus base is 16MB (as per TRM), implies => 0x1000000. > Fixed locally. Mike, Can you confirm ? I know TRM had some issues with size of other coresight components. > with that fixed : > > Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> > 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
---------------------------------------------------------------- Mike Leach +44 (0)1254 893911 (Direct) Principal Engineer +44 (0)1254 893900 (Main) Arm Blackburn Design Centre +44 (0)1254 893901 (Fax) Belthorn House Walker Rd mailto:mike.leach@arm.com Guide Blackburn BB1 2QE ---------------------------------------------------------------- > -----Original Message----- > From: Sudeep Holla [mailto:sudeep.holla@arm.com] > Sent: 17 January 2017 14:01 > To: Suzuki Poulose; linux-arm-kernel@lists.infradead.org; Mike Leach; Mike > Leach > Cc: Sudeep Holla; Mathieu Poirier; Lorenzo Pieralisi; coresight@lists.linaro.org; > Liviu Dudau; devicetree@vger.kernel.org; Olof Johansson > Subject: Re: [PATCH v4 4/4] arm64: dts: juno: add missing CoreSight STM > component > > > > On 17/01/17 13:39, Suzuki K Poulose wrote: > > On 17/01/17 12:15, Sudeep Holla wrote: > >> From: Mike Leach <mike.leach@linaro.org> > >> > >> This patch adds the missing CoreSight STM component definition to the > >> device tree of all the juno variants(r0,r1,r2) > >> > >> STM component is connected to different funnels depending on Juno > >> platform variant. > >> > >> Reviewed-and-Tested-by: Mathieu Poirier <mathieu.poirier@linaro.org> > >> Signed-off-by: Mike Leach <mike.leach@linaro.org> > >> [sudeep.holla@arm.com: minor changelog update and reorganising the STM > >> node back into juno-base.dtsi to avoid duplication] > >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > >> --- > >> arch/arm64/boot/dts/arm/juno-base.dtsi | 15 +++++++++++++++ > >> arch/arm64/boot/dts/arm/juno-r1.dts | 4 ++++ > >> arch/arm64/boot/dts/arm/juno-r2.dts | 4 ++++ > >> arch/arm64/boot/dts/arm/juno.dts | 16 ++++++++++++++++ > >> 4 files changed, 39 insertions(+) > >> > >> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi > >> b/arch/arm64/boot/dts/arm/juno-base.dtsi > >> index faedf357db3b..58c1773c3aa4 100644 > >> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi > >> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi > >> @@ -185,6 +185,21 @@ > >> }; > >> }; > >> > >> + stm@20100000 { > >> + compatible = "arm,coresight-stm", "arm,primecell"; > >> + reg = <0 0x20100000 0 0x1000>, > >> + <0 0x28000000 0 0x180000>; > > > > The size of the stimulus base is 16MB (as per TRM), implies => 0x1000000. > > > > Fixed locally. > > Mike, > > Can you confirm ? I know TRM had some issues with size of other > coresight components. > Checked both Juno and STM arch manuals - these are in agreement that the STM memory stimulus area is 16MB in size. Thus for Juno specifically with all masters seeing the same area @ base 0x28000000, <0 0x28000000 0 0x1000000 > would be the correct description. Mike > > with that fixed : > > > > Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > > > Thanks. > > -- > Regards, > Sudeep IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. -- 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/01/17 14:52, Mike Leach wrote: [...] >> >> Mike, >> >> Can you confirm ? I know TRM had some issues with size of other >> coresight components. >> > Checked both Juno and STM arch manuals - these are in agreement that > the STM memory stimulus area is 16MB in size. Thus for Juno > specifically with all masters seeing the same area @ base 0x28000000, > <0 0x28000000 0 0x1000000 > would be the correct description. > Thanks for the confirmation, I have already made the changes in [1] -- Regards, Sudeep [1] git.kernel.org/sudeep.holla/linux/h/for-next/updates/juno -- 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 faedf357db3b..58c1773c3aa4 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -185,6 +185,21 @@ }; }; + stm@20100000 { + compatible = "arm,coresight-stm", "arm,primecell"; + reg = <0 0x20100000 0 0x1000>, + <0 0x28000000 0 0x180000>; + reg-names = "stm-base", "stm-stimulus-base"; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + power-domains = <&scpi_devpd 0>; + port { + stm_out_port: endpoint { + }; + }; + }; + etm0: etm@22040000 { compatible = "arm,coresight-etm4x", "arm,primecell"; reg = <0 0x22040000 0 0x1000>; diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts index aef138aa5765..0033c59a64b5 100644 --- a/arch/arm64/boot/dts/arm/juno-r1.dts +++ b/arch/arm64/boot/dts/arm/juno-r1.dts @@ -235,3 +235,7 @@ &replicator_in_port0 { remote-endpoint = <&csys2_funnel_out_port>; }; + +&stm_out_port { + remote-endpoint = <&csys1_funnel_in_port0>; +}; diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts index 827da7c92607..218d0e4736a8 100644 --- a/arch/arm64/boot/dts/arm/juno-r2.dts +++ b/arch/arm64/boot/dts/arm/juno-r2.dts @@ -235,3 +235,7 @@ &replicator_in_port0 { remote-endpoint = <&csys2_funnel_out_port>; }; + +&stm_out_port { + remote-endpoint = <&csys1_funnel_in_port0>; +}; diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index 66fa4388d181..bb2820ef3d5b 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -210,3 +210,19 @@ &replicator_in_port0 { remote-endpoint = <&etf0_out_port>; }; + +&stm_out_port { + remote-endpoint = <&main_funnel_in_port2>; +}; + +&main_funnel { + ports { + port@3 { + reg = <2>; + main_funnel_in_port2: endpoint { + slave-mode; + remote-endpoint = <&stm_out_port>; + }; + }; + }; +};