diff mbox series

arm64: dts: qcom: add all 7 coresight ETE nodes

Message ID 20250129-topic-sm8650-upstream-add-all-coresight-cpus-v1-1-96996d37df8e@linaro.org (mailing list archive)
State New
Headers show
Series arm64: dts: qcom: add all 7 coresight ETE nodes | expand

Commit Message

Neil Armstrong Jan. 29, 2025, 9:54 a.m. UTC 
Only CPU0 Embedded Trace Extension (ETE) was added, but there's one
for all 7 CPUs, so add the missing ones.

Fixes: 256e6937e48a ("arm64: dts: qcom: sm8650: Add coresight nodes")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8650.dtsi | 163 ++++++++++++++++++++++++++++++++++-
 1 file changed, 161 insertions(+), 2 deletions(-)


---
base-commit: da7e6047a6264af16d2cb82bed9b6caa33eaf56a
change-id: 20250129-topic-sm8650-upstream-add-all-coresight-cpus-a3418606b354

Best regards,

Comments

Krzysztof Kozlowski Jan. 29, 2025, 10:40 a.m. UTC | #1 
On 29/01/2025 10:54, Neil Armstrong wrote:
> Only CPU0 Embedded Trace Extension (ETE) was added, but there's one
> for all 7 CPUs, so add the missing ones.
> 
> Fixes: 256e6937e48a ("arm64: dts: qcom: sm8650: Add coresight nodes")
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/sm8650.dtsi | 163 ++++++++++++++++++++++++++++++++++-
>  1 file changed, 161 insertions(+), 2 deletions(-)
> 


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof
Luca Weiss Jan. 29, 2025, 12:18 p.m. UTC | #2 
Hi Neil,

On Wed Jan 29, 2025 at 10:54 AM CET, Neil Armstrong wrote:
> Only CPU0 Embedded Trace Extension (ETE) was added, but there's one
> for all 7 CPUs, so add the missing ones.
>
> Fixes: 256e6937e48a ("arm64: dts: qcom: sm8650: Add coresight nodes")
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

The subject line is missing "sm8650"

Regards
Luca

> ---
>  arch/arm64/boot/dts/qcom/sm8650.dtsi | 163 ++++++++++++++++++++++++++++++++++-
>  1 file changed, 161 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> index 86684cb9a9325618ddb74458621cf4bbdc1cc0d1..d925d5e2c8182d522dd5b8e1fa0e253f5de2f7a7 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> @@ -365,7 +365,7 @@ cluster_sleep_1: cluster-sleep-1 {
>  		};
>  	};
>  
> -	ete0 {
> +	ete-0 {
>  		compatible = "arm,embedded-trace-extension";
>  
>  		cpu = <&cpu0>;
> @@ -379,15 +379,174 @@ ete0_out_funnel_ete: endpoint {
>  		};
>  	};
>  
> +	ete-1 {
> +		compatible = "arm,embedded-trace-extension";
> +
> +		cpu = <&cpu1>;
> +
> +		out-ports {
> +			port {
> +				ete1_out_funnel_ete: endpoint {
> +					remote-endpoint = <&funnel_ete_in_ete1>;
> +				};
> +			};
> +		};
> +	};
> +
> +	ete-2 {
> +		compatible = "arm,embedded-trace-extension";
> +
> +		cpu = <&cpu2>;
> +
> +		out-ports {
> +			port {
> +				ete2_out_funnel_ete: endpoint {
> +					remote-endpoint = <&funnel_ete_in_ete2>;
> +				};
> +			};
> +		};
> +	};
> +
> +	ete-3 {
> +		compatible = "arm,embedded-trace-extension";
> +
> +		cpu = <&cpu3>;
> +
> +		out-ports {
> +			port {
> +				ete3_out_funnel_ete: endpoint {
> +					remote-endpoint = <&funnel_ete_in_ete3>;
> +				};
> +			};
> +		};
> +	};
> +
> +	ete-4 {
> +		compatible = "arm,embedded-trace-extension";
> +
> +		cpu = <&cpu4>;
> +
> +		out-ports {
> +			port {
> +				ete4_out_funnel_ete: endpoint {
> +					remote-endpoint = <&funnel_ete_in_ete4>;
> +				};
> +			};
> +		};
> +	};
> +
> +	ete-5 {
> +		compatible = "arm,embedded-trace-extension";
> +
> +		cpu = <&cpu5>;
> +
> +		out-ports {
> +			port {
> +				ete5_out_funnel_ete: endpoint {
> +					remote-endpoint = <&funnel_ete_in_ete5>;
> +				};
> +			};
> +		};
> +	};
> +
> +	ete-6 {
> +		compatible = "arm,embedded-trace-extension";
> +
> +		cpu = <&cpu6>;
> +
> +		out-ports {
> +			port {
> +				ete6_out_funnel_ete: endpoint {
> +					remote-endpoint = <&funnel_ete_in_ete6>;
> +				};
> +			};
> +		};
> +	};
> +
> +	ete-7 {
> +		compatible = "arm,embedded-trace-extension";
> +
> +		cpu = <&cpu7>;
> +
> +		out-ports {
> +			port {
> +				ete7_out_funnel_ete: endpoint {
> +					remote-endpoint = <&funnel_ete_in_ete7>;
> +				};
> +			};
> +		};
> +	};
> +
>  	funnel-ete {
>  		compatible = "arm,coresight-static-funnel";
>  
>  		in-ports {
> -			port {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +
> +			port@0 {
> +				reg = <0>;
> +
>  				funnel_ete_in_ete0: endpoint {
>  					remote-endpoint = <&ete0_out_funnel_ete>;
>  				};
>  			};
> +
> +			port@1 {
> +				reg = <1>;
> +
> +				funnel_ete_in_ete1: endpoint {
> +					remote-endpoint = <&ete1_out_funnel_ete>;
> +				};
> +			};
> +
> +			port@2 {
> +				reg = <2>;
> +
> +				funnel_ete_in_ete2: endpoint {
> +					remote-endpoint = <&ete2_out_funnel_ete>;
> +				};
> +			};
> +
> +			port@3 {
> +				reg = <3>;
> +
> +				funnel_ete_in_ete3: endpoint {
> +					remote-endpoint = <&ete3_out_funnel_ete>;
> +				};
> +			};
> +
> +			port@4 {
> +				reg = <4>;
> +
> +				funnel_ete_in_ete4: endpoint {
> +					remote-endpoint = <&ete4_out_funnel_ete>;
> +				};
> +			};
> +
> +			port@5 {
> +				reg = <5>;
> +
> +				funnel_ete_in_ete5: endpoint {
> +					remote-endpoint = <&ete5_out_funnel_ete>;
> +				};
> +			};
> +
> +			port@6 {
> +				reg = <6>;
> +
> +				funnel_ete_in_ete6: endpoint {
> +					remote-endpoint = <&ete6_out_funnel_ete>;
> +				};
> +			};
> +
> +			port@7 {
> +				reg = <7>;
> +
> +				funnel_ete_in_ete7: endpoint {
> +					remote-endpoint = <&ete7_out_funnel_ete>;
> +				};
> +			};
>  		};
>  
>  		out-ports {
>
> ---
> base-commit: da7e6047a6264af16d2cb82bed9b6caa33eaf56a
> change-id: 20250129-topic-sm8650-upstream-add-all-coresight-cpus-a3418606b354
>
> Best regards,
Neil Armstrong Jan. 29, 2025, 1:39 p.m. UTC | #3 
On 29/01/2025 13:18, Luca Weiss wrote:
> Hi Neil,
> 
> On Wed Jan 29, 2025 at 10:54 AM CET, Neil Armstrong wrote:
>> Only CPU0 Embedded Trace Extension (ETE) was added, but there's one
>> for all 7 CPUs, so add the missing ones.
>>
>> Fixes: 256e6937e48a ("arm64: dts: qcom: sm8650: Add coresight nodes")
>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> 
> The subject line is missing "sm8650"

Damn, thx, I'll fix for v2

Neil

> 
> Regards
> Luca
> 
>> ---
>>   arch/arm64/boot/dts/qcom/sm8650.dtsi | 163 ++++++++++++++++++++++++++++++++++-
>>   1 file changed, 161 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> index 86684cb9a9325618ddb74458621cf4bbdc1cc0d1..d925d5e2c8182d522dd5b8e1fa0e253f5de2f7a7 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> @@ -365,7 +365,7 @@ cluster_sleep_1: cluster-sleep-1 {
>>   		};
>>   	};
>>   
>> -	ete0 {
>> +	ete-0 {
>>   		compatible = "arm,embedded-trace-extension";
>>   
>>   		cpu = <&cpu0>;
>> @@ -379,15 +379,174 @@ ete0_out_funnel_ete: endpoint {
>>   		};
>>   	};
>>   
>> +	ete-1 {
>> +		compatible = "arm,embedded-trace-extension";
>> +
>> +		cpu = <&cpu1>;
>> +
>> +		out-ports {
>> +			port {
>> +				ete1_out_funnel_ete: endpoint {
>> +					remote-endpoint = <&funnel_ete_in_ete1>;
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>> +	ete-2 {
>> +		compatible = "arm,embedded-trace-extension";
>> +
>> +		cpu = <&cpu2>;
>> +
>> +		out-ports {
>> +			port {
>> +				ete2_out_funnel_ete: endpoint {
>> +					remote-endpoint = <&funnel_ete_in_ete2>;
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>> +	ete-3 {
>> +		compatible = "arm,embedded-trace-extension";
>> +
>> +		cpu = <&cpu3>;
>> +
>> +		out-ports {
>> +			port {
>> +				ete3_out_funnel_ete: endpoint {
>> +					remote-endpoint = <&funnel_ete_in_ete3>;
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>> +	ete-4 {
>> +		compatible = "arm,embedded-trace-extension";
>> +
>> +		cpu = <&cpu4>;
>> +
>> +		out-ports {
>> +			port {
>> +				ete4_out_funnel_ete: endpoint {
>> +					remote-endpoint = <&funnel_ete_in_ete4>;
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>> +	ete-5 {
>> +		compatible = "arm,embedded-trace-extension";
>> +
>> +		cpu = <&cpu5>;
>> +
>> +		out-ports {
>> +			port {
>> +				ete5_out_funnel_ete: endpoint {
>> +					remote-endpoint = <&funnel_ete_in_ete5>;
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>> +	ete-6 {
>> +		compatible = "arm,embedded-trace-extension";
>> +
>> +		cpu = <&cpu6>;
>> +
>> +		out-ports {
>> +			port {
>> +				ete6_out_funnel_ete: endpoint {
>> +					remote-endpoint = <&funnel_ete_in_ete6>;
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>> +	ete-7 {
>> +		compatible = "arm,embedded-trace-extension";
>> +
>> +		cpu = <&cpu7>;
>> +
>> +		out-ports {
>> +			port {
>> +				ete7_out_funnel_ete: endpoint {
>> +					remote-endpoint = <&funnel_ete_in_ete7>;
>> +				};
>> +			};
>> +		};
>> +	};
>> +
>>   	funnel-ete {
>>   		compatible = "arm,coresight-static-funnel";
>>   
>>   		in-ports {
>> -			port {
>> +			#address-cells = <1>;
>> +			#size-cells = <0>;
>> +
>> +			port@0 {
>> +				reg = <0>;
>> +
>>   				funnel_ete_in_ete0: endpoint {
>>   					remote-endpoint = <&ete0_out_funnel_ete>;
>>   				};
>>   			};
>> +
>> +			port@1 {
>> +				reg = <1>;
>> +
>> +				funnel_ete_in_ete1: endpoint {
>> +					remote-endpoint = <&ete1_out_funnel_ete>;
>> +				};
>> +			};
>> +
>> +			port@2 {
>> +				reg = <2>;
>> +
>> +				funnel_ete_in_ete2: endpoint {
>> +					remote-endpoint = <&ete2_out_funnel_ete>;
>> +				};
>> +			};
>> +
>> +			port@3 {
>> +				reg = <3>;
>> +
>> +				funnel_ete_in_ete3: endpoint {
>> +					remote-endpoint = <&ete3_out_funnel_ete>;
>> +				};
>> +			};
>> +
>> +			port@4 {
>> +				reg = <4>;
>> +
>> +				funnel_ete_in_ete4: endpoint {
>> +					remote-endpoint = <&ete4_out_funnel_ete>;
>> +				};
>> +			};
>> +
>> +			port@5 {
>> +				reg = <5>;
>> +
>> +				funnel_ete_in_ete5: endpoint {
>> +					remote-endpoint = <&ete5_out_funnel_ete>;
>> +				};
>> +			};
>> +
>> +			port@6 {
>> +				reg = <6>;
>> +
>> +				funnel_ete_in_ete6: endpoint {
>> +					remote-endpoint = <&ete6_out_funnel_ete>;
>> +				};
>> +			};
>> +
>> +			port@7 {
>> +				reg = <7>;
>> +
>> +				funnel_ete_in_ete7: endpoint {
>> +					remote-endpoint = <&ete7_out_funnel_ete>;
>> +				};
>> +			};
>>   		};
>>   
>>   		out-ports {
>>
>> ---
>> base-commit: da7e6047a6264af16d2cb82bed9b6caa33eaf56a
>> change-id: 20250129-topic-sm8650-upstream-add-all-coresight-cpus-a3418606b354
>>
>> Best regards,
>
Konrad Dybcio Jan. 29, 2025, 1:47 p.m. UTC | #4 
On 29.01.2025 10:54 AM, Neil Armstrong wrote:
> Only CPU0 Embedded Trace Extension (ETE) was added, but there's one
> for all 7 CPUs, so add the missing ones.

all 8 CPUs or the 7 other CPUs

Konrad
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
index 86684cb9a9325618ddb74458621cf4bbdc1cc0d1..d925d5e2c8182d522dd5b8e1fa0e253f5de2f7a7 100644
--- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
@@ -365,7 +365,7 @@  cluster_sleep_1: cluster-sleep-1 {
 		};
 	};
 
-	ete0 {
+	ete-0 {
 		compatible = "arm,embedded-trace-extension";
 
 		cpu = <&cpu0>;
@@ -379,15 +379,174 @@  ete0_out_funnel_ete: endpoint {
 		};
 	};
 
+	ete-1 {
+		compatible = "arm,embedded-trace-extension";
+
+		cpu = <&cpu1>;
+
+		out-ports {
+			port {
+				ete1_out_funnel_ete: endpoint {
+					remote-endpoint = <&funnel_ete_in_ete1>;
+				};
+			};
+		};
+	};
+
+	ete-2 {
+		compatible = "arm,embedded-trace-extension";
+
+		cpu = <&cpu2>;
+
+		out-ports {
+			port {
+				ete2_out_funnel_ete: endpoint {
+					remote-endpoint = <&funnel_ete_in_ete2>;
+				};
+			};
+		};
+	};
+
+	ete-3 {
+		compatible = "arm,embedded-trace-extension";
+
+		cpu = <&cpu3>;
+
+		out-ports {
+			port {
+				ete3_out_funnel_ete: endpoint {
+					remote-endpoint = <&funnel_ete_in_ete3>;
+				};
+			};
+		};
+	};
+
+	ete-4 {
+		compatible = "arm,embedded-trace-extension";
+
+		cpu = <&cpu4>;
+
+		out-ports {
+			port {
+				ete4_out_funnel_ete: endpoint {
+					remote-endpoint = <&funnel_ete_in_ete4>;
+				};
+			};
+		};
+	};
+
+	ete-5 {
+		compatible = "arm,embedded-trace-extension";
+
+		cpu = <&cpu5>;
+
+		out-ports {
+			port {
+				ete5_out_funnel_ete: endpoint {
+					remote-endpoint = <&funnel_ete_in_ete5>;
+				};
+			};
+		};
+	};
+
+	ete-6 {
+		compatible = "arm,embedded-trace-extension";
+
+		cpu = <&cpu6>;
+
+		out-ports {
+			port {
+				ete6_out_funnel_ete: endpoint {
+					remote-endpoint = <&funnel_ete_in_ete6>;
+				};
+			};
+		};
+	};
+
+	ete-7 {
+		compatible = "arm,embedded-trace-extension";
+
+		cpu = <&cpu7>;
+
+		out-ports {
+			port {
+				ete7_out_funnel_ete: endpoint {
+					remote-endpoint = <&funnel_ete_in_ete7>;
+				};
+			};
+		};
+	};
+
 	funnel-ete {
 		compatible = "arm,coresight-static-funnel";
 
 		in-ports {
-			port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+
 				funnel_ete_in_ete0: endpoint {
 					remote-endpoint = <&ete0_out_funnel_ete>;
 				};
 			};
+
+			port@1 {
+				reg = <1>;
+
+				funnel_ete_in_ete1: endpoint {
+					remote-endpoint = <&ete1_out_funnel_ete>;
+				};
+			};
+
+			port@2 {
+				reg = <2>;
+
+				funnel_ete_in_ete2: endpoint {
+					remote-endpoint = <&ete2_out_funnel_ete>;
+				};
+			};
+
+			port@3 {
+				reg = <3>;
+
+				funnel_ete_in_ete3: endpoint {
+					remote-endpoint = <&ete3_out_funnel_ete>;
+				};
+			};
+
+			port@4 {
+				reg = <4>;
+
+				funnel_ete_in_ete4: endpoint {
+					remote-endpoint = <&ete4_out_funnel_ete>;
+				};
+			};
+
+			port@5 {
+				reg = <5>;
+
+				funnel_ete_in_ete5: endpoint {
+					remote-endpoint = <&ete5_out_funnel_ete>;
+				};
+			};
+
+			port@6 {
+				reg = <6>;
+
+				funnel_ete_in_ete6: endpoint {
+					remote-endpoint = <&ete6_out_funnel_ete>;
+				};
+			};
+
+			port@7 {
+				reg = <7>;
+
+				funnel_ete_in_ete7: endpoint {
+					remote-endpoint = <&ete7_out_funnel_ete>;
+				};
+			};
 		};
 
 		out-ports {