Hi Wanglai, [ + CoreSight mailing list ]
On Tue, Dec 11, 2018 at 06:05:49PM +0800, Wanglai Shi wrote:
> This patch adds devicetree entries for the CoreSight trace
> components on hi3660.
>
> Signed-off-by: Wanglai Shi <shiwang...@hisilicon.com>
> ---
> .../arm64/boot/dts/hisilicon/hi3660-coresight.dtsi | 428
> +++++++++++++++++++++
> 1 file changed, 428 insertions(+)
> create mode 100644 arch/arm64/boot/dts/hisilicon/hi3660-coresight.dtsi
This patch doesn't work on Hikey960 due CoreSight related dt binding
has not been really included by dts file.
> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-coresight.dtsi
> b/arch/arm64/boot/dts/hisilicon/hi3660-coresight.dtsi
> new file mode 100644
> index 0000000..95c79e4
> --- /dev/null
> +++ b/arch/arm64/boot/dts/hisilicon/hi3660-coresight.dtsi
> @@ -0,0 +1,428 @@
> +/*
> + * dtsi for Hisilicon Hi3660 Coresight
> + *
> + * Copyright (C) 2016-2017 Hisilicon Ltd.
s/2017/2018
> + *
> + * Author: Wanglai Shi <shiwang...@hisilicon.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * publishhed by the Free Software Foundation.
> + */
> +/ {
> + amba {
s/amba/soc
> + #address-cells = <2>;
> + #size-cells = <2>;
> + compatible = "arm,amba-bus";
> + ranges;
If under 'soc' node, because 'soc' has defined its address/size cells
length, thus you don't need to define these properties repeatly.
> +
> + /* A53 cluster internal coresight */
> + etm@0,ecc40000 {
s/etm@0,ecc40000/etm@ecc40000
> + compatible = "arm,coresight-etm4x","arm,primecell";
Add extra space between two compatible strings:
compatible = "arm,coresight-etm4x", "arm,primecell";
Please apply this rule for all below compatible string bindings.
> + reg = <0 0xecc40000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu0>;
> + port {
> + etm0_out_port: endpoint {
> + remote-endpoint = <&funnel0_in_port0>;
> + };
> + };
Since Suzuki introduced CoreSight DT bindings for "out-ports" and
"in-ports", so it's suggested to use more explict way to bind hardware
port with specifying direction:
out-ports {
port {
etm0_out: endpoint {
remote-endpoint =
<&funnel0_in_port0>;
};
};
};
> + };
> +
> + etm@1,ecd40000 {
Remove '1,'
> + compatible = "arm,coresight-etm4x","arm,primecell";
> + reg = <0 0xecd40000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu1>;
> + port {
Suggest for adding 'out-ports'.
> + etm1_out_port: endpoint {
> + remote-endpoint = <&funnel0_in_port1>;
> + };
> + };
> + };
> +
> + etm@2,ece40000 {
Remove '2,'
> + compatible = "arm,coresight-etm4x","arm,primecell";
> + reg = <0 0xece40000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu2>;
> + port {
Suggest for adding 'out-ports'.
> + etm2_out_port: endpoint {
> + remote-endpoint = <&funnel0_in_port2>;
> + };
> + };
> + };
> +
> + etm@3,ecf40000 {
Remove '3,'
> + compatible = "arm,coresight-etm4x","arm,primecell";
> + reg = <0 0xecf40000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu3>;
> + port {
Suggest for adding 'out-ports'.
> + etm3_out_port: endpoint {
> + remote-endpoint = <&funnel0_in_port3>;
> + };
> + };
> + };
> +
> + funnel0:funnel@0,ec801000 {
funnel0: funnel@ec801000
> + compatible = "arm,coresight-funnel","arm,primecell";
> + reg = <0 0xec801000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* funnel output port */
> + port@0 {
> + reg = <0>;
> + funnel0_out_port: endpoint {
> + remote-endpoint =
> + <&etf0_in_port>;
> + };
> + };
Suggest for below format:
out-ports {
port {
reg = <0>;
clusster0_funnel_out_port: endpoint {
remote-endpoint =
<&etf0_in_port>;
};
};
};
> +
> + /* funnel input ports */
> + port@1 {
Suggest for adding 'in-ports'.
BTW, please keep the consistence between node name and registers;
e.g. port@0 should be consistent with 'reg = <0>;' and port@1 for
'reg = <1>;' ...
So this should be port@0
> + reg = <0>;
> + funnel0_in_port0: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm0_out_port>;
> + };
> + };
> +
> + port@2 {
s/port@2/port@1
> + reg = <1>;
> + funnel0_in_port1: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm1_out_port>;
> + };
> + };
> +
> + port@3 {
s/port@3/port@2
> + reg = <2>;
> + funnel0_in_port2: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm2_out_port>;
> + };
> + };
> +
> + port@4 {
s/port@4/port@3
> + reg = <3>;
> + funnel0_in_port3: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm3_out_port>;
> + };
> + };
> + };
> + };
> +
> + etf0:etf@0,ec802000 {
etf0: etf@ec802000
> + compatible = "arm,coresight-tmc","arm,primecell";
> + reg = <0 0xec802000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + ports {
Same with upper suggestions: add 'in-ports' and 'out-ports'.
> + #address-cells = <1>;
> + #size-cells = <0>;
> + /* input port */
> + port@0 {
> + reg = <0>;
> + etf0_in_port: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&funnel0_out_port>;
> + };
> + };
> +
> + /* output port */
> + port@1 {
s/port@1/port@0
> + reg = <0>;
> + etf0_out_port: endpoint {
> + remote-endpoint =
> + <&funnel2_in_port0>;
> + };
> + };
> + };
> + };
> +
> + /* A73 cluster internal coresight */
> + etm@4,ed440000 {
Same suggestion with CA53 cluster bindings for etm.
> + compatible = "arm,coresight-etm4x","arm,primecell";
> + reg = <0 0xed440000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu4>;
> + port {
> + etm4_out_port: endpoint {
> + remote-endpoint = <&funnel1_in_port0>;
> + };
> + };
> + };
> +
> + etm@5,ed540000 {
> + compatible = "arm,coresight-etm4x","arm,primecell";
> + reg = <0 0xed540000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu5>;
> + port {
> + etm5_out_port: endpoint {
> + remote-endpoint = <&funnel1_in_port1>;
> + };
> + };
> + };
> +
> + etm@6,ed640000 {
> + compatible = "arm,coresight-etm4x","arm,primecell";
> + reg = <0 0xed640000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu6>;
> + port {
> + etm6_out_port: endpoint {
> + remote-endpoint = <&funnel1_in_port2>;
> + };
> + };
> + };
> +
> + etm@7,ed740000 {
> + compatible = "arm,coresight-etm4x","arm,primecell";
> + reg = <0 0xed740000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu7>;
> + port {
> + etm7_out_port: endpoint {
> + remote-endpoint = <&funnel1_in_port3>;
> + };
> + };
> + };
> +
> + funnel1:funnel@1,ed001000 {
Same suggestion for funnel0.
> + compatible = "arm,coresight-funnel","arm,primecell";
> + reg = <0 0xed001000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* funnel output port */
> + port@0 {
> + reg = <0>;
> + funnel1_out_port: endpoint {
> + remote-endpoint =
> + <&etf1_in_port>;
> + };
> + };
> +
> + /* funnel input ports */
> + port@1 {
> + reg = <0>;
> + funnel1_in_port0: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm4_out_port>;
> + };
> + };
> +
> + port@2 {
> + reg = <1>;
> + funnel1_in_port1: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm5_out_port>;
> + };
> + };
> +
> + port@3 {
> + reg = <2>;
> + funnel1_in_port2: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm6_out_port>;
> + };
> + };
> +
> + port@4 {
> + reg = <3>;
> + funnel1_in_port3: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etm7_out_port>;
> + };
> + };
> + };
> + };
> +
> + etf1:etf@1,ed002000 {
Same suggestion for etf0.
> + compatible = "arm,coresight-tmc","arm,primecell";
> + reg = <0 0xed002000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + /* input port */
> + port@0 {
> + reg = <0>;
> + etf1_in_port: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&funnel1_out_port>;
> + };
> + };
> +
> + /* output port */
> + port@1 {
> + reg = <0>;
> + etf1_out_port: endpoint {
> + remote-endpoint =
> + <&funnel2_in_port0>;
> + };
> + };
> + };
> + };
> +
> + /* Top coresight config */
> + funnel@2,ec031000 {
> + compatible = "arm,coresight-funnel","arm,primecell";
> + reg = <0 0xec031000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* funnel output port */
> + port@0 {
> + reg = <0>;
> + funnel2_out_port: endpoint {
> + remote-endpoint =
> + <&etf2_in_port>;
> + };
> + };
> +
> + /* funnel input ports */
> + port@1 {
> + reg = <0>;
> + funnel2_in_port0: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etf0_out_port>;
> + };
> + };
I think this funnel should have two input ports: one is for etf0 and
another is for connection etf1, but here it misses for etf1.
Do I miss anything for this?
> + };
> + };
> +
> + etf@2,ec036000 {
Same suggestion for etf0/1.
> + compatible = "arm,coresight-tmc","arm,primecell";
> + reg = <0 0xec036000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + /* input port */
> + port@0 {
> + reg = <0>;
> + etf2_in_port: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&funnel2_out_port>;
> + };
> + };
> +
> + /* output port */
> + port@1 {
> + reg = <0>;
> + etf2_out_port: endpoint {
> + remote-endpoint =
> + <&replicator0_in_port>;
> + };
> + };
> + };
> + };
> +
> + replicator {
> + compatible = "arm,coresight-replicator";
Replicator doesn't have clock?
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* etr out port */
> + port@0 {
> + reg = <0>;
> + replicator0_out_port0: endpoint {
> + remote-endpoint =
> + <&etr_in_port>;
> + };
> + };
> + /* TPIU out port */
> + port@1 {
> + reg = <1>;
> + replicator0_out_port1: endpoint {
> + remote-endpoint =
> + <&tpiu_in_port>;
> + };
> + };
> + /* input port */
> + port@2 {
> + reg = <0>;
> + replicator0_in_port: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&etf2_out_port>;
> + };
> + };
> + };
> + };
> +
> + etr@0,ec033000 {
> + compatible = "arm,coresight-tmc","arm,primecell";
> + reg = <0 0xec033000 0 0x1000>;
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
Usually etr doesn't need to set address-cells and size-cell anymore.
> +
> + /* etr input port */
> + port@0 {
> + reg = <0>;
> + etr_in_port: endpoint {
> + slave-mode;
>From Documentation/devicetree/bindings/arm/coresight.txt, I cannot see
there have 'slave-mode' property.
> + remote-endpoint =
> + <&replicator0_out_port0>;
> + };
> + };
> + };
> + };
> +
> + tpiu@ec032000 {
> + compatible = "arm,coresight-tpiu", "arm,primecell";
> + reg = <0 0xec032000 0 0x1000>;
> +
> + clocks = <&pclk>;
> + clock-names = "apb_pclk";
> + port {
> + tpiu_in_port: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&replicator0_out_port1>;
> + };
> + };
> + };
> + };
I don't see CPU debug module DT binding, could you add them as well?
You could use the single one patch to contain CPU debug module or use
one dedicated patch, both will be okay for me.
Thanks,
Leo Yan
> +};
> --
> 2.7.4
>
