Hi
On Wed, 13 Apr 2022 at 17:45, Jinlong Mao <quic_jinlmao@xxxxxxxxxxx> wrote:
>
> Hi Konrad,
>
> Thank you for the review.
>
> On 4/13/2022 5:58 PM, Konrad Dybcio wrote:
> > Hi,
> >
> >
> > I added Bjorn, the linux-arm-msm maintainer to CC as he was missing
> > for some reason.
> >
> >
> > On 12/04/2022 14:50, Mao Jinlong wrote:
> >> Add coresight device tree for sm8250. STM/ETM are added.
> >>
> >> Signed-off-by: Tao Zhang <quic_taozha@xxxxxxxxxxx>
> >> Signed-off-by: Mao Jinlong <quic_jinlmao@xxxxxxxxxxx>
> >> ---
> >> .../arm64/boot/dts/qcom/sm8250-coresight.dtsi | 526 ++++++++++++++++++
> >> arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +
> >> 2 files changed, 528 insertions(+)
> >> create mode 100644 arch/arm64/boot/dts/qcom/sm8250-coresight.dtsi
> >>
> >> diff --git a/arch/arm64/boot/dts/qcom/sm8250-coresight.dtsi
> >> b/arch/arm64/boot/dts/qcom/sm8250-coresight.dtsi
> >> new file mode 100644
> >> index 000000000000..1de42fd39248
> >> --- /dev/null
> >> +++ b/arch/arm64/boot/dts/qcom/sm8250-coresight.dtsi
> >> @@ -0,0 +1,526 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >
> > sm8250.dtsi is BSD-3-Clause. Please consider relicensing.
> >
> >
> >> +/*
> >> + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights
> >> reserved.
> >> + */
> >> +
> >> +&soc {
> >> +
> >> + stm@6002000 {
> >> + compatible = "arm,coresight-stm", "arm,primecell";
> >> + reg = <0 0x06002000 0 0x1000>,
> >
> > You don't need to break the line at so few characters.
> >
> >
> >> + <0 0x16280000 0 0x180000>;
> >> + reg-names = "stm-base", "stm-stimulus-base";
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + stm_out: endpoint {
> >> + remote-endpoint =
> >> + <&funnel0_in7>;
> >
> > Same here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + funnel@6041000 {
> >> + compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> >> + reg = <0 0x06041000 0 0x1000>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + funnel0_out: endpoint {
> >> + remote-endpoint =
> >> + <&merge_funnel_in0>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> +
> >> + port@7 {
> >> + reg = <7>;
> >> + funnel0_in7: endpoint {
> >> + remote-endpoint = <&stm_out>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + funnel@6042000 {
> >> + compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> >> + reg = <0 0x06042000 0 0x1000>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + funnel2_out: endpoint {
> >> + remote-endpoint =
> >> + <&merge_funnel_in2>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> +
> >> + port@2 {
> >> + reg = <4>;
> >> + funnel2_in5: endpoint {
> >> + remote-endpoint =
> >> + <&apss_merge_funnel_out>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + funnel@6b04000 {
> >> + compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> >> + arm,primecell-periphid = <0x000bb908>;
> >> +
> >> + reg = <0 0x6b04000 0 0x1000>;
> >> + reg-names = "funnel-base";
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + merge_funnel_out: endpoint {
> >> + remote-endpoint =
> >> + <&etf_in>;
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> +
> >> + port@7 {
> >> + reg = <7>;
> >> + funnel_swao_in_funnel_merg: endpoint {
> >> + remote-endpoint=
> >
> > And here.
> >
> >
> >> + <&funnel_merg_out_funnel_swao>;
> >> + };
> >> + };
> >> + };
> >> +
> >> + };
> >> +
> >> + funnel@6045000 {
> >
> > The nodes are not sorted properly (by address). Please fix that.
> >
> >
> >> + compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> >> + reg = <0 0x06045000 0 0x1000>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + funnel_merg_out_funnel_swao: endpoint {
> >> + remote-endpoint = <&funnel_swao_in_funnel_merg>;
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> +
> >> + port@1 {
> >> + reg = <0>;
> >> + merge_funnel_in0: endpoint {
> >> + remote-endpoint =
> >> + <&funnel0_out>;
> >> + };
> >> + };
> >> +
> >> + port@2 {
> >> + reg = <1>;
> >> + merge_funnel_in2: endpoint {
> >> + remote-endpoint =
> >> + <&funnel2_out>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + replicator@6046000 {
> >> + compatible = "arm,coresight-dynamic-replicator",
> >> "arm,primecell";
> >> + reg = <0 0x06046000 0 0x1000>;
> >> +
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + replicator_out: endpoint {
> >> + remote-endpoint = <&etr_in>;
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + port {
> >> + replicator_cx_in_swao_out: endpoint {
> >> + remote-endpoint = <&replicator_swao_out_cx_in>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + replicator@6b06000 {
> >> + compatible = "arm,coresight-dynamic-replicator",
> >> "arm,primecell";
> >> + reg = <0 0x06b06000 0 0x1000>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + replicator_swao_out_cx_in: endpoint {
> >> + remote-endpoint = <&replicator_cx_in_swao_out>;
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + port {
> >> + replicator_in: endpoint {
> >> + remote-endpoint = <&etf_out>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etf@6b05000 {
> >> + compatible = "arm,coresight-tmc", "arm,primecell";
> >> + reg = <0 0x6b05000 0 0x1000>;
> >
> > Please pad the address to 8 chars.
> >
> >
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + etf_out: endpoint {
> >> + remote-endpoint =
> >> + <&replicator_in>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> +
> >> + port@1 {
> >> + reg = <0>;
> >> + etf_in: endpoint {
> >> + remote-endpoint =
> >> + <&merge_funnel_out>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etr@6048000 {
> >> + compatible = "arm,coresight-tmc", "arm,primecell";
> >> + reg = <0 0x06048000 0 0x1000>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,scatter-gather;
> >> +
> >> + in-ports {
> >> + port {
> >> + etr_in: endpoint {
> >> + remote-endpoint =
> >> + <&replicator_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7040000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07040000 0 0x1000>;
> >> +
> >> + cpu = <&CPU0>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm0_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in0>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7140000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07140000 0 0x1000>;
> >> +
> >> + cpu = <&CPU1>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm1_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in1>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7240000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07240000 0 0x1000>;
> >> +
> >> + cpu = <&CPU2>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm2_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in2>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7340000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07340000 0 0x1000>;
> >> +
> >> + cpu = <&CPU3>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm3_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in3>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7440000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07440000 0 0x1000>;
> >> +
> >> + cpu = <&CPU4>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm4_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in4>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7540000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07540000 0 0x1000>;
> >> +
> >> + cpu = <&CPU5>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm5_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in5>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7640000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07640000 0 0x1000>;
> >> +
> >> + cpu = <&CPU6>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm6_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in6>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + etm@7740000 {
> >> + compatible = "arm,coresight-etm4x", "arm,primecell";
> >> + reg = <0 0x07740000 0 0x1000>;
> >> +
> >> + cpu = <&CPU7>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> + arm,coresight-loses-context-with-cpu;
> >> +
> >> + out-ports {
> >> + port {
> >> + etm7_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_in7>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + funnel@7800000 {
> >> + compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> >> + reg = <0 0x07800000 0 0x1000>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + apss_funnel_out: endpoint {
> >> + remote-endpoint =
> >> + <&apss_merge_funnel_in>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> +
> >> + port@0 {
> >> + reg = <0>;
> >> + apss_funnel_in0: endpoint {
> >> + remote-endpoint =
> >> + <&etm0_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> +
> >> + port@1 {
> >> + reg = <1>;
> >> + apss_funnel_in1: endpoint {
> >> + remote-endpoint =
> >> + <&etm1_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> +
> >> + port@2 {
> >> + reg = <2>;
> >> + apss_funnel_in2: endpoint {
> >> + remote-endpoint =
> >> + <&etm2_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> +
> >> + port@3 {
> >> + reg = <3>;
> >> + apss_funnel_in3: endpoint {
> >> + remote-endpoint =
> >> + <&etm3_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> +
> >> + port@4 {
> >> + reg = <4>;
> >> + apss_funnel_in4: endpoint {
> >> + remote-endpoint =
> >> + <&etm4_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> +
> >> + port@5 {
> >> + reg = <5>;
> >> + apss_funnel_in5: endpoint {
> >> + remote-endpoint =
> >> + <&etm5_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> +
> >> + port@6 {
> >> + reg = <6>;
> >> + apss_funnel_in6: endpoint {
> >> + remote-endpoint =
> >> + <&etm6_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> +
> >> + port@7 {
> >> + reg = <7>;
> >> + apss_funnel_in7: endpoint {
> >> + remote-endpoint =
> >> + <&etm7_out>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> + };
> >> +
> >> + funnel@7810000 {
> >> + compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
> >> + reg = <0 0x07810000 0 0x1000>;
> >> +
> >> + clocks = <&aoss_qmp>;
> >> + clock-names = "apb_pclk";
> >> +
> >> + out-ports {
> >> + port {
> >> + apss_merge_funnel_out: endpoint {
> >> + remote-endpoint =
> >> + <&funnel2_in5>;
> >
> > And here.
> >
> >
> >> + };
> >> + };
> >> + };
> >> +
> >> + in-ports {
> >> + port@1 {
> >> + reg = <0>;
> >> + apss_merge_funnel_in: endpoint {
> >> + remote-endpoint =
> >> + <&apss_funnel_out>;
> >> + };
> >> + };
> >> + };
> >> + };
> >> +};
> >> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> >> b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> >> index af8f22636436..115623392183 100644
> >> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> >> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> >> @@ -5434,3 +5434,5 @@
> >> };
> >> };
> >> };
> >> +
> >> +#include "sm8250-coresight.dtsi"
> >
> > Why should everybody want coresight? It's not enabled on (most)
> > production devices and may cause a platform crash when you try to use
> > it on such ones.
> >
> >
> > These nodes should probably be added to sm8250.dtsi, all with status =
> > "disabled" by default, so that they don't break the devices that do
> > not support it due to fuse configuration.
> >
> I will address your comments above.
> I create coresight dtsi because of that there are dozens of coresight
> nodes for qualcomm HW.
> Add all the nodes in a separate file is easy to maintain.
> For disabling all the nodes by default, i will check internally and get
> back to you.
>
If the nodes are "disabled", then the base .dts files for platforms
that do include coresight would have to be updated to enable all those
nodes - which leaves potential for errors if nodes are accidentally
omitted.
Because sm8250-coresight.dtsi contains only Coresight devices, would
it not be better to include this directly in the base .dts file for
platforms that do have Coresight, and omit it from those that do not.
Regards
Mike
>
> Thanks
> Jinlong Mao
>
>
> >
> > Konrad
> >
--
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK
