[PATCH v2 0/2] Enable ETR and CTCU device for hamoa

[PATCH v2 0/2] Enable ETR and CTCU device for hamoa

[Jie Gan]

Enable support for ETR and CTCU devices on the Hamoa platform. The
newly added CTCU compatible will fallback to qcom,sa8775p-ctcu for device
probing.

Dependency of the binding patch:
https://lore.kernel.org/all/20251103-enable-ctcu-for-monaco-v4-1-92ff83201584@oss.qualcomm.com/

Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
---
Changes in v2:
- fix space issue.
- Link to v1: https://lore.kernel.org/r/20251104-enable-etr-and-ctcu-for-hamoa-v1-0-af552cfb902c@oss.qualcomm.com

---
Jie Gan (2):
      dt-binding: arm: add CTCU device for hamoa
      arm64: dts: qcom: hamoa: enable ETR and CTCU devices

 .../bindings/arm/qcom,coresight-ctcu.yaml          |   1 +
 arch/arm64/boot/dts/qcom/hamoa.dtsi                | 160 ++++++++++++++++++++-
 2 files changed, 160 insertions(+), 1 deletion(-)
---
base-commit: 9823120909776bbca58a3c55ef1f27d49283c1f3
change-id: 20251104-enable-etr-and-ctcu-for-hamoa-5dc4959e438e
prerequisite-change-id: 20251103-enable-ctcu-for-monaco-0db252ddf010:v4
prerequisite-patch-id: 24741288526740f3ac246613ce8398433d5c61c9
prerequisite-patch-id: b361d3a1a00bd5a94aef678c052e8728f7583339

Best regards,
-- 
Jie Gan <jie.gan@oss.qualcomm.com>

[PATCH v2 1/2] dt-binding: arm: add CTCU device for hamoa

[Jie Gan]

Document the CTCU compatible for Hamoa, enabling support for the
CTCU device on the Hamoa platform.

Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
---
 Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
index 460f38ddbd73..57dede7a90e9 100644
--- a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
@@ -29,6 +29,7 @@ properties:
     oneOf:
       - items:
           - enum:
+              - qcom,hamoa-ctcu
               - qcom,qcs8300-ctcu
           - const: qcom,sa8775p-ctcu
       - enum:

-- 
2.34.1

Re: [PATCH v2 1/2] dt-binding: arm: add CTCU device for hamoa

[Krzysztof Kozlowski]

On Thu, Nov 06, 2025 at 09:57:25AM +0800, Jie Gan wrote:
> Document the CTCU compatible for Hamoa, enabling support for the
> CTCU device on the Hamoa platform.
> 
> Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
> ---
>  Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 

Nothing changes, so same comment.

Best regards,
Krzysztof

Re: [PATCH v2 1/2] dt-binding: arm: add CTCU device for hamoa

[Jie Gan]

On 11/6/2025 4:27 PM, Krzysztof Kozlowski wrote:
> On Thu, Nov 06, 2025 at 09:57:25AM +0800, Jie Gan wrote:
>> Document the CTCU compatible for Hamoa, enabling support for the
>> CTCU device on the Hamoa platform.
>>
>> Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
>> ---
>>   Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml | 1 +
>>   1 file changed, 1 insertion(+)
>>
> 
> Nothing changes, so same comment.

Got your comment. I had add the dependency in cover-letter. Seems it 
would be better add it within the patch itself. Will address the comment 
in next version.

Thanks,
Jie

> 
> Best regards,
> Krzysztof
> 

Re: [PATCH v2 1/2] dt-binding: arm: add CTCU device for hamoa

[Jie Gan]

On 11/6/2025 9:57 AM, Jie Gan wrote:
> Document the CTCU compatible for Hamoa, enabling support for the
> CTCU device on the Hamoa platform.
> 

Gentle reminder.

The dependency[1] has applied and I have tested this series on 
next-20251219, no conflict and work well.

[1]https://lore.kernel.org/all/176615287813.688536.723538049922655005.b4-ty@arm.com/

Thanks,
Jie

> Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
> ---
>   Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> index 460f38ddbd73..57dede7a90e9 100644
> --- a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> +++ b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> @@ -29,6 +29,7 @@ properties:
>       oneOf:
>         - items:
>             - enum:
> +              - qcom,hamoa-ctcu
>                 - qcom,qcs8300-ctcu
>             - const: qcom,sa8775p-ctcu
>         - enum:
> 

Re: [PATCH v2 1/2] dt-binding: arm: add CTCU device for hamoa

[Bjorn Andersson]

On Tue, Dec 23, 2025 at 05:14:11PM +0800, Jie Gan wrote:
> 
> 
> On 11/6/2025 9:57 AM, Jie Gan wrote:
> > Document the CTCU compatible for Hamoa, enabling support for the
> > CTCU device on the Hamoa platform.
> > 
> 
> Gentle reminder.
> 
> The dependency[1] has applied and I have tested this series on
> next-20251219, no conflict and work well.
> 

In your previous reply, you're stating that you will update the patch?
Are you saying that whatever concern Krzysztof had is now resolved?

Regards,
Bjorn

> [1]https://lore.kernel.org/all/176615287813.688536.723538049922655005.b4-ty@arm.com/
> 
> Thanks,
> Jie
> 
> > Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
> > ---
> >   Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> > index 460f38ddbd73..57dede7a90e9 100644
> > --- a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> > +++ b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> > @@ -29,6 +29,7 @@ properties:
> >       oneOf:
> >         - items:
> >             - enum:
> > +              - qcom,hamoa-ctcu
> >                 - qcom,qcs8300-ctcu
> >             - const: qcom,sa8775p-ctcu
> >         - enum:
> > 
> 

Re: [PATCH v2 1/2] dt-binding: arm: add CTCU device for hamoa

[Jie Gan]

On 1/4/2026 1:33 AM, Bjorn Andersson wrote:
> On Tue, Dec 23, 2025 at 05:14:11PM +0800, Jie Gan wrote:
>>
>>
>> On 11/6/2025 9:57 AM, Jie Gan wrote:
>>> Document the CTCU compatible for Hamoa, enabling support for the
>>> CTCU device on the Hamoa platform.
>>>
>>
>> Gentle reminder.
>>
>> The dependency[1] has applied and I have tested this series on
>> next-20251219, no conflict and work well.
>>
> 
> In your previous reply, you're stating that you will update the patch?
> Are you saying that whatever concern Krzysztof had is now resolved?

Yes. Krzysztof mentioned that the patch should include the info of its 
dependency, as this makes the review process much easier.

Currently, the dependency of the patch has been applied, that's why I 
sent "gentle reminder".

Thanks,
Jie

> 
> Regards,
> Bjorn
> 
>> [1]https://lore.kernel.org/all/176615287813.688536.723538049922655005.b4-ty@arm.com/
>>
>> Thanks,
>> Jie
>>
>>> Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
>>> ---
>>>    Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml | 1 +
>>>    1 file changed, 1 insertion(+)
>>>
>>> diff --git a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
>>> index 460f38ddbd73..57dede7a90e9 100644
>>> --- a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
>>> +++ b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
>>> @@ -29,6 +29,7 @@ properties:
>>>        oneOf:
>>>          - items:
>>>              - enum:
>>> +              - qcom,hamoa-ctcu
>>>                  - qcom,qcs8300-ctcu
>>>              - const: qcom,sa8775p-ctcu
>>>          - enum:
>>>
>>

Re: [PATCH v2 1/2] dt-binding: arm: add CTCU device for hamoa

[Jie Gan]

On 11/6/2025 9:57 AM, Jie Gan wrote:
> Document the CTCU compatible for Hamoa, enabling support for the
> CTCU device on the Hamoa platform.
> 

Gentle ping.

> Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
> ---
>   Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> index 460f38ddbd73..57dede7a90e9 100644
> --- a/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> +++ b/Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
> @@ -29,6 +29,7 @@ properties:
>       oneOf:
>         - items:
>             - enum:
> +              - qcom,hamoa-ctcu
>                 - qcom,qcs8300-ctcu
>             - const: qcom,sa8775p-ctcu
>         - enum:
> 

[PATCH v2 2/2] arm64: dts: qcom: hamoa: enable ETR and CTCU devices

[Jie Gan]

Embedded Trace Router(ETR) is working as a DDR memory sink to collect
tracing data from source device.

The CTCU serves as the control unit for the ETR device, managing its
behavior to determine how trace data is collected.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/hamoa.dtsi | 160 +++++++++++++++++++++++++++++++++++-
 1 file changed, 159 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/hamoa.dtsi b/arch/arm64/boot/dts/qcom/hamoa.dtsi
index a17900eacb20..3b90133da4e7 100644
--- a/arch/arm64/boot/dts/qcom/hamoa.dtsi
+++ b/arch/arm64/boot/dts/qcom/hamoa.dtsi
@@ -6713,6 +6713,35 @@ data-pins {
 			};
 		};
 
+		ctcu@10001000 {
+			compatible = "qcom,hamoa-ctcu", "qcom,sa8775p-ctcu";
+			reg = <0x0 0x10001000 0x0 0x1000>;
+
+			clocks = <&aoss_qmp>;
+			clock-names = "apb";
+
+			in-ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+
+					ctcu_in0: endpoint {
+						remote-endpoint = <&etr0_out>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+
+					ctcu_in1: endpoint {
+						remote-endpoint = <&etr1_out>;
+					};
+				};
+			};
+		};
+
 		stm@10002000 {
 			compatible = "arm,coresight-stm", "arm,primecell";
 			reg = <0x0 0x10002000 0x0 0x1000>,
@@ -6927,6 +6956,122 @@ qdss_funnel_out: endpoint {
 			};
 		};
 
+		replicator@10046000 {
+			compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+			reg = <0x0 0x10046000 0x0 0x1000>;
+
+			clocks = <&aoss_qmp>;
+			clock-names = "apb_pclk";
+
+			in-ports {
+				port {
+					qdss_rep_in: endpoint {
+						remote-endpoint = <&swao_rep_out0>;
+					};
+				};
+			};
+
+			out-ports {
+				port {
+					qdss_rep_out0: endpoint {
+						remote-endpoint = <&etr_rep_in>;
+					};
+				};
+			};
+		};
+
+		tmc_etr: tmc@10048000 {
+			compatible = "arm,coresight-tmc", "arm,primecell";
+			reg = <0x0 0x10048000 0x0 0x1000>;
+
+			clocks = <&aoss_qmp>;
+			clock-names = "apb_pclk";
+			iommus = <&apps_smmu 0x04e0 0x0>;
+
+			arm,scatter-gather;
+
+			in-ports {
+				port {
+					etr0_in: endpoint {
+						remote-endpoint = <&etr_rep_out0>;
+					};
+				};
+			};
+
+			out-ports {
+				port {
+					etr0_out: endpoint {
+						remote-endpoint = <&ctcu_in0>;
+					};
+				};
+			};
+		};
+
+		replicator@1004e000 {
+			compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+			reg = <0x0 0x1004e000 0x0 0x1000>;
+
+			clocks = <&aoss_qmp>;
+			clock-names = "apb_pclk";
+
+			in-ports {
+				port {
+					etr_rep_in: endpoint {
+						remote-endpoint = <&qdss_rep_out0>;
+					};
+				};
+			};
+
+			out-ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+
+					etr_rep_out0: endpoint {
+						remote-endpoint = <&etr0_in>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+
+					etr_rep_out1: endpoint {
+						remote-endpoint = <&etr1_in>;
+					};
+				};
+			};
+		};
+
+		tmc_etr1: tmc@1004f000 {
+			compatible = "arm,coresight-tmc", "arm,primecell";
+			reg = <0x0 0x1004f000 0x0 0x1000>;
+
+			clocks = <&aoss_qmp>;
+			clock-names = "apb_pclk";
+			iommus = <&apps_smmu 0x0500 0x0>;
+
+			arm,scatter-gather;
+			arm,buffer-size = <0x400000>;
+
+			in-ports {
+				port {
+					etr1_in: endpoint {
+						remote-endpoint = <&etr_rep_out1>;
+					};
+				};
+			};
+
+			out-ports {
+				port {
+					etr1_out: endpoint {
+						remote-endpoint = <&ctcu_in1>;
+					};
+				};
+			};
+		};
+
 		tpdm@10800000 {
 			compatible = "qcom,coresight-tpdm", "arm,primecell";
 			reg = <0x0 0x10800000 0x0 0x1000>;
@@ -7240,7 +7385,20 @@ swao_rep_in: endpoint {
 			};
 
 			out-ports {
-				port {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+
+					swao_rep_out0: endpoint {
+						remote-endpoint = <&qdss_rep_in>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+
 					swao_rep_out1: endpoint {
 						remote-endpoint = <&eud_in>;
 					};

-- 
2.34.1