From b9e673f6bbd03f98fa3af2561d6618eb5f814a90 Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 14:35:47 +0800 Subject: [PATCH 1/8] ARM: dts: msm: Remove hwevent node on monaco Remove hwevent DT node as hwevent is a legacy feature which is not used on monaco. Change-Id: I8236e94039309beb5c6c5e057f485e57cdb67851 Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 9 --------- 1 file changed, 9 deletions(-) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 1fc8403e..942c18e8 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -4,15 +4,6 @@ */ &soc { - hwevent { - /* compatible = "qcom,coresight-hwevent"; */ - - coresight-name = "coresight-hwevent"; - coresight-csr = <&csr>; - clocks = <&rpmcc RPM_SMD_QDSS_CLK>; - clock-names = "apb_pclk"; - }; - apss_tgu: tgu@9900000 { compatible = "arm,primecell"; arm,primecell-periphid = <0x0003b999>; From ffbf6d9d8dce6762a705551a0c54ab25520f5a24 Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 14:39:01 +0800 Subject: [PATCH 2/8] ARM: dts: msm: Set STM traceid as static id on monaco Set STM traceid as static id on monaco. Change-Id: I141bcf8afe0eeb9e009a918ee9b5344a427e1386 Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 942c18e8..5cb835e2 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -60,6 +60,7 @@ reg-names = "stm-base", "stm-stimulus-base"; coresight-name = "coresight-stm"; + atid = <16>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>; clock-names = "apb_pclk"; From 0cc0fea8bec2185db20f84d2b609a97e515ebaad Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 14:43:44 +0800 Subject: [PATCH 3/8] ARM: dts: msm: Adapt coresight-dummy "compatible" in DT node to kernel-6.6 Adapt coresight-dummy "compatible" in DT node to kernel-6.6. Change-Id: Iefb6d3521ebca78034cc1c82670b62a60781413c Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 5cb835e2..85bbd395 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -116,9 +116,10 @@ }; modem_rfxe: modem_rfxe { - /* compatible = "qcom,coresight-dummy"; */ + compatible = "arm,coresight-dummy-source"; + coresight-name = "coresight-modem-rfxe"; - qcom,dummy-source; + out-ports { port { modem_rxfe_out_funnel_in1: endpoint { @@ -145,10 +146,9 @@ }; snoc: snoc { - /* compatible = "qcom,coresight-dummy"; */ + compatible = "arm,coresight-dummy-source"; coresight-name = "coresight-snoc"; - qcom,dummy-source; out-ports { port { @@ -161,10 +161,10 @@ }; tpdm_lpass: tpdm@8a26000 { - /* compatible = "qcom,coresight-dummy"; */ + compatible = "arm,coresight-dummy-source"; coresight-name = "coresight-tpdm-lpass"; - qcom,dummy-source; + out-ports { port { tpdm_lpass_out_funnel_lpass: endpoint { @@ -439,9 +439,8 @@ }; tpdm_wcss: tpdm@899c000 { - /* compatible = "qcom,coresight-dummy"; */ + compatible = "arm,coresight-dummy-source"; coresight-name = "coresight-tpdm-wcss"; - qcom,dummy-source; out-ports { port { From e661d21688e9dd160c89469788b691c955b6b176 Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 15:19:46 +0800 Subject: [PATCH 4/8] ARM: dts: msm: Set static traceid for coresight-dummy on monaco Set static traceid for coresight-dummy-source on monaco. Change-Id: Iff574a8f13b42c31240eb8f958f1b830cab4a4f0 Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 85bbd395..2800154f 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -119,7 +119,7 @@ compatible = "arm,coresight-dummy-source"; coresight-name = "coresight-modem-rfxe"; - + atid = <50>; out-ports { port { modem_rxfe_out_funnel_in1: endpoint { @@ -149,6 +149,7 @@ compatible = "arm,coresight-dummy-source"; coresight-name = "coresight-snoc"; + atid = <125>; out-ports { port { @@ -164,7 +165,7 @@ compatible = "arm,coresight-dummy-source"; coresight-name = "coresight-tpdm-lpass"; - + atid = <26>; out-ports { port { tpdm_lpass_out_funnel_lpass: endpoint { @@ -441,6 +442,7 @@ tpdm_wcss: tpdm@899c000 { compatible = "arm,coresight-dummy-source"; coresight-name = "coresight-tpdm-wcss"; + atid = <67>; out-ports { port { From bb7c60c9dbbc6a729856564e08813c364a77e209 Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 15:24:01 +0800 Subject: [PATCH 5/8] ARM: dts: msm: Set static traceid for coresight-remote-etm on monaco Set static traceid for coresight-remote-etm on monaco. Change-Id: Id2c423639bde6a896982f289d9688668ffaad2fb Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 2800154f..13fe8d74 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -134,6 +134,7 @@ compatible = "qcom,coresight-remote-etm"; coresight-name = "coresight-audio-etm0"; + atid = <40>; qcom,inst-id = <5>; out-ports { port { @@ -484,6 +485,7 @@ compatible = "qcom,coresight-remote-etm"; coresight-name = "coresight-modem-etm0"; + atid = <36>; qcom,inst-id = <2>; out-ports { From 7371da08155cdedec823230f947a5ef774325ee7 Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 15:32:12 +0800 Subject: [PATCH 6/8] ARM: dts: msm: Add audio-qmi dev node for audio_etm0 on monaco On kernel-6.6, QMI feature used by coresight needs to be abstracted as a device. Add audio-qmi dev node for audio_etm0 to support QMI feature. Change-Id: Ie66ef820b6cc7cdaff2cc516753ece87de4f9607 Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 13fe8d74..2bf941e0 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -135,14 +135,39 @@ coresight-name = "coresight-audio-etm0"; atid = <40>; - qcom,inst-id = <5>; + out-ports { - port { + port@0 { + reg = <0>; audio_etm0_out_funnel_lpass: endpoint { remote-endpoint = <&funnel_lpass_in_audio_etm0>; }; }; + + port@1 { + reg = <1>; + audio_etm0_out_qmi: endpoint { + remote-endpoint = + <&qmi_in_audio_etm0>; + }; + }; + }; + }; + + audio-qmi { + compatible = "qcom,coresight-qmi"; + + coresight-name = "coresight-qmi-auido"; + qcom,inst-id = <5>; + + in-ports { + port { + qmi_in_audio_etm0: endpoint { + remote-endpoint = + <&audio_etm0_out_qmi>; + }; + }; }; }; From dc8994ff511aaf321c69170665b5bfffecf07630 Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 15:38:49 +0800 Subject: [PATCH 7/8] ARM: dts: msm: Add modem-qmi dev node for modem_etm0 on monaco On kernel-6.6, QMI feature used by coresight needs to be abstracted as a device. Add modem-qmi dev node for modem_etm0 to support QMI feature. Change-Id: I2b56be596208f88353e5cf1a89751f7760c89851 Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 2bf941e0..9bf758a1 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -511,15 +511,39 @@ coresight-name = "coresight-modem-etm0"; atid = <36>; - qcom,inst-id = <2>; out-ports { - port { + port@0 { + reg = <0>; modem_etm0_out_funnel_in1: endpoint { remote-endpoint = <&funnel_in1_in_modem_etm0>; }; }; + + port@1 { + reg = <1>; + modem_etm0_out_qmi: endpoint { + remote-endpoint = + <&qmi_in_modem_etm0>; + }; + }; + }; + }; + + modem-qmi { + compatible = "qcom,coresight-qmi"; + + coresight-name = "coresight-qmi-modem"; + qcom,inst-id = <2>; + + in-ports { + port { + qmi_in_modem_etm0: endpoint { + remote-endpoint = + <&modem_etm0_out_qmi>; + }; + }; }; }; From d671d1270decea77e327679bc9c4be43dabd8e0e Mon Sep 17 00:00:00 2001 From: Xiaoqi Zhuang Date: Tue, 25 Jun 2024 15:40:59 +0800 Subject: [PATCH 8/8] ARM: dts: msm: Modify tpda dev name to adapt kernel-6.6 on monaco Modify tpda dev name to adapt kernel-6.6 on monaco. Change-Id: Ia314bb681817ab6f4c66e10adb3be4c01fbe7b6f Signed-off-by: Xiaoqi Zhuang --- qcom/monaco-coresight.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi index 9bf758a1..afb072f1 100644 --- a/qcom/monaco-coresight.dtsi +++ b/qcom/monaco-coresight.dtsi @@ -957,13 +957,13 @@ }; }; - tpda: tpda@8004000 { + tpda_dl: tpda@8004000 { compatible = "arm,primecell"; arm,primecell-periphid = <0x000bb969>; reg = <0x8004000 0x1000>; reg-names = "tpda-base"; - coresight-name = "coresight-tpda"; + coresight-name = "coresight-tpda-dl"; qcom,tpda-atid = <65>; qcom,dsb-elem-size = <0 32>,