* [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996
@ 2019-02-01 0:53 Sai Prakash Ranjan
2019-02-01 0:53 ` [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support Sai Prakash Ranjan
` (6 more replies)
0 siblings, 7 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-01 0:53 UTC (permalink / raw)
To: Rob Herring, Mathieu Poirier, Suzuki K Poulose, Mike Leach,
Leo Yan, Alexander Shishkin, Andy Gross, David Brown,
Vivek Gautam, Jeffrey Hugo, Doug Anderson, Stephen Boyd,
Bjorn Andersson, devicetree, Mark Rutland, Marc Gonzalez
Cc: Rajendra Nayak, Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
linux-kernel, linux-arm-msm, Sai Prakash Ranjan
This patch series adds support for coresight on SDM845, MSM8998, and MSM8996.
* Patch 1 adds device tree nodes for SDM845 coresight components.
* Patch 2 adds device tree nodes for MSM8998 coresight components.
* Patch 3 adds device tree nodes for MSM8996 coresight components.
* Patch 4 enables support for ETMv4.2 and enables SDM845 to make
use of same driver(etm4x).
* Patch 5 adds ETM PIDs for SDM845 and MSM8996.
* Patch 6 adds coresight CPU debug module for Qualcomm Kryo.
NOTE: All the dependent patches are applied in the below tree,
the first 12 commits represent the dependent patches.
* https://github.com/saiprakash-ranjan/linux/tree/coresight-next
Patch 1 and 4 depends on below AOSS QMP, AMBA bus pclk and address cell change:
* https://lore.kernel.org/lkml/20190131003933.11436-5-bjorn.andersson@linaro.org/
* https://lore.kernel.org/lkml/20190131003933.11436-6-bjorn.andersson@linaro.org/
* https://lore.kernel.org/lkml/20190131003933.11436-7-bjorn.andersson@linaro.org/
* https://lore.kernel.org/lkml/20190131003933.11436-10-bjorn.andersson@linaro.org/
* https://lore.kernel.org/lkml/20190131020141.28352-1-bjorn.andersson@linaro.org/
* https://lore.kernel.org/lkml/20190117042940.25487-2-bjorn.andersson@linaro.org/
Patch 2 depends on MSM8998 rpm clocks and rpmcc nodes:
* https://lore.kernel.org/lkml/1545099336-5615-1-git-send-email-jhugo@codeaurora.org/
* https://lore.kernel.org/lkml/1548866144-30265-1-git-send-email-jhugo@codeaurora.org/
* https://lore.kernel.org/lkml/6da00186-e7c9-c93d-a80a-65eda2516451@free.fr/
Patch 5 and 6 depends on UCI support by Mike Leach:
* https://lore.kernel.org/lkml/20190130234051.2294-1-mike.leach@linaro.org/
This patch series has been tested on SDM845 MTP and MSM8996
based Dragonboard 820c and MSM8998 MTP.
v7:
* Change uci_id_debug struct to const.
* Update the subject as suggested by Suzuki.
v6:
* Update the UCI table with the new macro introduced by
Mike.
* Rebase on top of coresight-next and provide a tree with
all the dependent patches applied.
v5:
* Added coresight support for MSM8998.
* Added ETM PIDs for SDM845 and MSM8996 as suggested
by Suzuki.
* Added UCI table for Coresight CPU debug module.
v4:
* Mask out the minor version as suggested by Mathieu.
* Added the dependent patch description in patch 1.
v3:
* Added arm,scatter-gather property as suggested by Suzuki.
v2:
* Added coresight support for msm8996 based on Vivek's patch.
Cleaned up and added coresight cpu debug nodes for msm8996.
* Merged coresight dtsi file into sdm845.dtsi as suggested by Bjorn
* Addressed Mathieu's feedback about masking the minor version in
etm4_arch_supported() and added a comment for reason to bypass
the AMBA bus discovery method.
Sai Prakash Ranjan (5):
arm64: dts: qcom: sdm845: Add Coresight support
arm64: dts: qcom: msm8998: Add Coresight support
coresight: etm4x: Add support to enable ETMv4.2
coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996
coresight: cpu-debug: Add support for Qualcomm Kryo
Vivek Gautam (1):
arm64: dts: qcom: msm8996: Add Coresight support
arch/arm64/boot/dts/qcom/msm8996.dtsi | 434 +++++++++++++++++
arch/arm64/boot/dts/qcom/msm8998.dtsi | 435 ++++++++++++++++++
arch/arm64/boot/dts/qcom/sdm845.dtsi | 434 +++++++++++++++++
.../hwtracing/coresight/coresight-cpu-debug.c | 33 +-
drivers/hwtracing/coresight/coresight-etm4x.c | 17 +-
5 files changed, 1330 insertions(+), 23 deletions(-)
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
@ 2019-02-01 0:53 ` Sai Prakash Ranjan
2019-02-07 20:19 ` Mathieu Poirier
2019-02-08 14:20 ` Suzuki K Poulose
2019-02-01 0:53 ` [PATCHv7 2/6] arm64: dts: qcom: msm8998: " Sai Prakash Ranjan
` (5 subsequent siblings)
6 siblings, 2 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-01 0:53 UTC (permalink / raw)
To: Rob Herring, Mathieu Poirier, Suzuki K Poulose, Mike Leach,
Leo Yan, Alexander Shishkin, Andy Gross, David Brown,
Vivek Gautam, Jeffrey Hugo, Doug Anderson, Stephen Boyd,
Bjorn Andersson, devicetree, Mark Rutland, Marc Gonzalez
Cc: Rajendra Nayak, Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
linux-kernel, linux-arm-msm, Sai Prakash Ranjan
Add coresight components found on Qualcomm SDM845 SoC.
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
---
For testing, all dependent patches are in below tree:
* https://github.com/saiprakash-ranjan/linux/tree/coresight-next
- Depends on AOSS QMP side channel patches by Bjorn Andersson [1] - [4].
- AMBA bus pclk change [5].
- Also depends on patch ("arm64: dts: qcom: sdm845: Increase address
and size cells for soc") [6].
[1] https://lore.kernel.org/lkml/20190131003933.11436-5-bjorn.andersson@linaro.org/
[2] https://lore.kernel.org/lkml/20190131003933.11436-6-bjorn.andersson@linaro.org/
[3] https://lore.kernel.org/lkml/20190131003933.11436-7-bjorn.andersson@linaro.org/
[4] https://lore.kernel.org/lkml/20190131003933.11436-10-bjorn.andersson@linaro.org/
[5] https://lore.kernel.org/lkml/20190131020141.28352-1-bjorn.andersson@linaro.org/
[6] https://lore.kernel.org/lkml/20190117042940.25487-2-bjorn.andersson@linaro.org/
---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 434 +++++++++++++++++++++++++++
1 file changed, 434 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index e2aaaa233e45..4121aac6d086 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -1349,6 +1349,440 @@
};
};
+ stm@6002000 {
+ compatible = "arm,coresight-stm", "arm,primecell";
+ reg = <0 0x06002000 0 0x1000>,
+ <0 0x16280000 0 0x180000>;
+ reg-names = "stm-base", "stm-stimulus-base";
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ stm_out: endpoint {
+ remote-endpoint =
+ <&funnel0_in7>;
+ };
+ };
+ };
+ };
+
+ funnel@6041000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0 0x06041000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ funnel0_out: endpoint {
+ remote-endpoint =
+ <&merge_funnel_in0>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@7 {
+ reg = <7>;
+ funnel0_in7: endpoint {
+ remote-endpoint = <&stm_out>;
+ };
+ };
+ };
+ };
+
+ funnel@6043000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0 0x06043000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ funnel2_out: endpoint {
+ remote-endpoint =
+ <&merge_funnel_in2>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@5 {
+ reg = <5>;
+ funnel2_in5: endpoint {
+ remote-endpoint =
+ <&apss_merge_funnel_out>;
+ };
+ };
+ };
+ };
+
+ funnel@6045000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0 0x06045000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ merge_funnel_out: endpoint {
+ remote-endpoint = <&etf_in>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ merge_funnel_in0: endpoint {
+ remote-endpoint =
+ <&funnel0_out>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+ merge_funnel_in2: endpoint {
+ remote-endpoint =
+ <&funnel2_out>;
+ };
+ };
+ };
+ };
+
+ replicator@6046000 {
+ compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+ reg = <0 0x06046000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ replicator_out: endpoint {
+ remote-endpoint = <&etr_in>;
+ };
+ };
+ };
+
+ in-ports {
+ port {
+ replicator_in: endpoint {
+ remote-endpoint = <&etf_out>;
+ };
+ };
+ };
+ };
+
+ etf@6047000 {
+ compatible = "arm,coresight-tmc", "arm,primecell";
+ reg = <0 0x06047000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etf_out: endpoint {
+ remote-endpoint =
+ <&replicator_in>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@1 {
+ reg = <1>;
+ etf_in: endpoint {
+ remote-endpoint =
+ <&merge_funnel_out>;
+ };
+ };
+ };
+ };
+
+ etr@6048000 {
+ compatible = "arm,coresight-tmc", "arm,primecell";
+ reg = <0 0x06048000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+ arm,scatter-gather;
+
+ in-ports {
+ port {
+ etr_in: endpoint {
+ remote-endpoint =
+ <&replicator_out>;
+ };
+ };
+ };
+ };
+
+ etm@7040000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0 0x07040000 0 0x1000>;
+
+ cpu = <&CPU0>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etm0_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in0>;
+ };
+ };
+ };
+ };
+
+ etm@7140000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0 0x07140000 0 0x1000>;
+
+ cpu = <&CPU1>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etm1_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in1>;
+ };
+ };
+ };
+ };
+
+ etm@7240000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0 0x07240000 0 0x1000>;
+
+ cpu = <&CPU2>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etm2_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in2>;
+ };
+ };
+ };
+ };
+
+ etm@7340000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0 0x07340000 0 0x1000>;
+
+ cpu = <&CPU3>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etm3_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in3>;
+ };
+ };
+ };
+ };
+
+ etm@7440000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0 0x07440000 0 0x1000>;
+
+ cpu = <&CPU4>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etm4_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in4>;
+ };
+ };
+ };
+ };
+
+ etm@7540000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0 0x07540000 0 0x1000>;
+
+ cpu = <&CPU5>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etm5_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in5>;
+ };
+ };
+ };
+ };
+
+ etm@7640000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0 0x07640000 0 0x1000>;
+
+ cpu = <&CPU6>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ 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>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ etm7_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in7>;
+ };
+ };
+ };
+ };
+
+ funnel@7800000 { /* APSS Funnel */
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0 0x07800000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ apss_funnel_out: endpoint {
+ remote-endpoint =
+ <&apss_merge_funnel_in>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ apss_funnel_in0: endpoint {
+ remote-endpoint =
+ <&etm0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ apss_funnel_in1: endpoint {
+ remote-endpoint =
+ <&etm1_out>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+ apss_funnel_in2: endpoint {
+ remote-endpoint =
+ <&etm2_out>;
+ };
+ };
+
+ port@3 {
+ reg = <3>;
+ apss_funnel_in3: endpoint {
+ remote-endpoint =
+ <&etm3_out>;
+ };
+ };
+
+ port@4 {
+ reg = <4>;
+ apss_funnel_in4: endpoint {
+ remote-endpoint =
+ <&etm4_out>;
+ };
+ };
+
+ port@5 {
+ reg = <5>;
+ apss_funnel_in5: endpoint {
+ remote-endpoint =
+ <&etm5_out>;
+ };
+ };
+
+ port@6 {
+ reg = <6>;
+ apss_funnel_in6: endpoint {
+ remote-endpoint =
+ <&etm6_out>;
+ };
+ };
+
+ port@7 {
+ reg = <7>;
+ apss_funnel_in7: endpoint {
+ remote-endpoint =
+ <&etm7_out>;
+ };
+ };
+ };
+ };
+
+ funnel@7810000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0 0x07810000 0 0x1000>;
+
+ power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
+
+ out-ports {
+ port {
+ apss_merge_funnel_out: endpoint {
+ remote-endpoint =
+ <&funnel2_in5>;
+ };
+ };
+ };
+
+ in-ports {
+ port {
+ apss_merge_funnel_in: endpoint {
+ remote-endpoint =
+ <&apss_funnel_out>;
+ };
+ };
+ };
+ };
+
usb_1_hsphy: phy@88e2000 {
compatible = "qcom,sdm845-qusb2-phy";
reg = <0 0x088e2000 0 0x400>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCHv7 2/6] arm64: dts: qcom: msm8998: Add Coresight support
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
2019-02-01 0:53 ` [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support Sai Prakash Ranjan
@ 2019-02-01 0:53 ` Sai Prakash Ranjan
2019-02-07 20:20 ` Mathieu Poirier
2019-02-08 14:23 ` Suzuki K Poulose
2019-02-01 0:53 ` [PATCHv7 3/6] arm64: dts: qcom: msm8996: " Sai Prakash Ranjan
` (4 subsequent siblings)
6 siblings, 2 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-01 0:53 UTC (permalink / raw)
To: Rob Herring, Mathieu Poirier, Suzuki K Poulose, Mike Leach,
Leo Yan, Alexander Shishkin, Andy Gross, David Brown,
Vivek Gautam, Jeffrey Hugo, Doug Anderson, Stephen Boyd,
Bjorn Andersson, devicetree, Mark Rutland, Marc Gonzalez
Cc: Rajendra Nayak, Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
linux-kernel, linux-arm-msm, Sai Prakash Ranjan
Enable coresight support by adding device nodes for the
available source, sinks and channel blocks on MSM8998.
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
---
For testing, all dependent patches are in below tree:
* https://github.com/saiprakash-ranjan/linux/tree/coresight-next
This depends on MSM8998 rpm clocks and rpmcc node by Jeffrey Hugo
and Marc Gonzalez [1][2][3].
[1] https://lore.kernel.org/lkml/1545099336-5615-1-git-send-email-jhugo@codeaurora.org/
[2] https://lore.kernel.org/lkml/1548866144-30265-1-git-send-email-jhugo@codeaurora.org/
[3] https://lore.kernel.org/lkml/6da00186-e7c9-c93d-a80a-65eda2516451@free.fr/
---
arch/arm64/boot/dts/qcom/msm8998.dtsi | 435 ++++++++++++++++++++++++++
1 file changed, 435 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index eb691be6e171..3020a76ed201 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -566,6 +566,441 @@
#interrupt-cells = <0x2>;
};
+ stm@6002000 {
+ compatible = "arm,coresight-stm", "arm,primecell";
+ reg = <0x06002000 0x1000>,
+ <0x16280000 0x180000>;
+ reg-names = "stm-base", "stm-data-base";
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ stm_out: endpoint {
+ remote-endpoint = <&funnel0_in7>;
+ };
+ };
+ };
+ };
+
+ funnel@6041000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x06041000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ funnel0_out: endpoint {
+ remote-endpoint =
+ <&merge_funnel_in0>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@7 {
+ reg = <7>;
+ funnel0_in7: endpoint {
+ remote-endpoint = <&stm_out>;
+ };
+ };
+ };
+ };
+
+ funnel@6042000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x06042000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ funnel1_out: endpoint {
+ remote-endpoint =
+ <&merge_funnel_in1>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@6 {
+ reg = <6>;
+ funnel1_in6: endpoint {
+ remote-endpoint =
+ <&apss_merge_funnel_out>;
+ };
+ };
+ };
+ };
+
+ funnel@6045000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x06045000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ merge_funnel_out: endpoint {
+ remote-endpoint =
+ <&etf_in>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ merge_funnel_in0: endpoint {
+ remote-endpoint =
+ <&funnel0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ merge_funnel_in1: endpoint {
+ remote-endpoint =
+ <&funnel1_out>;
+ };
+ };
+ };
+ };
+
+ replicator@6046000 {
+ compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+ reg = <0x06046000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ replicator_out: endpoint {
+ remote-endpoint = <&etr_in>;
+ };
+ };
+ };
+
+ in-ports {
+ port {
+ replicator_in: endpoint {
+ remote-endpoint = <&etf_out>;
+ };
+ };
+ };
+ };
+
+ etf@6047000 {
+ compatible = "arm,coresight-tmc", "arm,primecell";
+ reg = <0x06047000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ etf_out: endpoint {
+ remote-endpoint =
+ <&replicator_in>;
+ };
+ };
+ };
+
+ in-ports {
+ port {
+ etf_in: endpoint {
+ remote-endpoint =
+ <&merge_funnel_out>;
+ };
+ };
+ };
+ };
+
+ etr@6048000 {
+ compatible = "arm,coresight-tmc", "arm,primecell";
+ reg = <0x06048000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+ arm,scatter-gather;
+
+ in-ports {
+ port {
+ etr_in: endpoint {
+ remote-endpoint =
+ <&replicator_out>;
+ };
+ };
+ };
+ };
+
+ etm@7840000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07840000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU0>;
+
+ out-ports {
+ port {
+ etm0_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in0>;
+ };
+ };
+ };
+ };
+
+ etm@7940000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07940000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU1>;
+
+ out-ports {
+ port {
+ etm1_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in1>;
+ };
+ };
+ };
+ };
+
+ etm@7a40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07a40000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU2>;
+
+ out-ports {
+ port {
+ etm2_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in2>;
+ };
+ };
+ };
+ };
+
+ etm@7b40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07b40000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU3>;
+
+ out-ports {
+ port {
+ etm3_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel_in3>;
+ };
+ };
+ };
+ };
+
+ funnel@7b60000 { /* APSS Funnel */
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07b60000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ apss_funnel_out: endpoint {
+ remote-endpoint =
+ <&apss_merge_funnel_in>;
+ };
+ };
+ };
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ apss_funnel_in0: endpoint {
+ remote-endpoint =
+ <&etm0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ apss_funnel_in1: endpoint {
+ remote-endpoint =
+ <&etm1_out>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+ apss_funnel_in2: endpoint {
+ remote-endpoint =
+ <&etm2_out>;
+ };
+ };
+
+ port@3 {
+ reg = <3>;
+ apss_funnel_in3: endpoint {
+ remote-endpoint =
+ <&etm3_out>;
+ };
+ };
+
+ port@4 {
+ reg = <4>;
+ apss_funnel_in4: endpoint {
+ remote-endpoint =
+ <&etm4_out>;
+ };
+ };
+
+ port@5 {
+ reg = <5>;
+ apss_funnel_in5: endpoint {
+ remote-endpoint =
+ <&etm5_out>;
+ };
+ };
+
+ port@6 {
+ reg = <6>;
+ apss_funnel_in6: endpoint {
+ remote-endpoint =
+ <&etm6_out>;
+ };
+ };
+
+ port@7 {
+ reg = <7>;
+ apss_funnel_in7: endpoint {
+ remote-endpoint =
+ <&etm7_out>;
+ };
+ };
+ };
+ };
+
+ funnel@7b70000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x07b70000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ apss_merge_funnel_out: endpoint {
+ remote-endpoint =
+ <&funnel1_in6>;
+ };
+ };
+ };
+
+ in-ports {
+ port {
+ apss_merge_funnel_in: endpoint {
+ remote-endpoint =
+ <&apss_funnel_out>;
+ };
+ };
+ };
+ };
+
+ etm@7c40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07c40000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU4>;
+
+ port{
+ etm4_out: endpoint {
+ remote-endpoint = <&apss_funnel_in4>;
+ };
+ };
+ };
+
+ etm@7d40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07d40000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU5>;
+
+ port{
+ etm5_out: endpoint {
+ remote-endpoint = <&apss_funnel_in5>;
+ };
+ };
+ };
+
+ etm@7e40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07e40000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU6>;
+
+ port{
+ etm6_out: endpoint {
+ remote-endpoint = <&apss_funnel_in6>;
+ };
+ };
+ };
+
+ etm@7f40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x07f40000 0x1000>;
+
+ clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU7>;
+
+ port{
+ etm7_out: endpoint {
+ remote-endpoint = <&apss_funnel_in7>;
+ };
+ };
+ };
+
spmi_bus: spmi@800f000 {
compatible = "qcom,spmi-pmic-arb";
reg = <0x800f000 0x1000>,
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCHv7 3/6] arm64: dts: qcom: msm8996: Add Coresight support
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
2019-02-01 0:53 ` [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support Sai Prakash Ranjan
2019-02-01 0:53 ` [PATCHv7 2/6] arm64: dts: qcom: msm8998: " Sai Prakash Ranjan
@ 2019-02-01 0:53 ` Sai Prakash Ranjan
2019-02-07 20:23 ` Mathieu Poirier
2019-02-08 14:24 ` Suzuki K Poulose
2019-02-01 0:53 ` [PATCHv7 4/6] coresight: etm4x: Add support to enable ETMv4.2 Sai Prakash Ranjan
` (3 subsequent siblings)
6 siblings, 2 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-01 0:53 UTC (permalink / raw)
To: Rob Herring, Mathieu Poirier, Suzuki K Poulose, Mike Leach,
Leo Yan, Alexander Shishkin, Andy Gross, David Brown,
Vivek Gautam, Jeffrey Hugo, Doug Anderson, Stephen Boyd,
Bjorn Andersson, devicetree, Mark Rutland, Marc Gonzalez
Cc: Rajendra Nayak, Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
linux-kernel, linux-arm-msm, Sai Prakash Ranjan
From: Vivek Gautam <vivek.gautam@codeaurora.org>
Enable coresight support by adding device nodes for the
available source, sinks and channel blocks on msm8996.
This also adds coresight cpu debug nodes.
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
---
arch/arm64/boot/dts/qcom/msm8996.dtsi | 434 ++++++++++++++++++++++++++
1 file changed, 434 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 99b7495455a6..3406a10f40db 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -429,6 +429,440 @@
reg = <0x300000 0x90000>;
};
+ stm@3002000 {
+ compatible = "arm,coresight-stm", "arm,primecell";
+ reg = <0x3002000 0x1000>,
+ <0x8280000 0x180000>;
+ reg-names = "stm-base", "stm-stimulus-base";
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ out-ports {
+ port {
+ stm_out: endpoint {
+ remote-endpoint =
+ <&funnel0_in>;
+ };
+ };
+ };
+ };
+
+ tpiu@3020000 {
+ compatible = "arm,coresight-tpiu", "arm,primecell";
+ reg = <0x3020000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ port {
+ tpiu_in: endpoint {
+ remote-endpoint =
+ <&replicator_out1>;
+ };
+ };
+ };
+ };
+
+ funnel@3021000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x3021000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ port {
+ funnel0_in: endpoint {
+ remote-endpoint =
+ <&stm_out>;
+ };
+ };
+ };
+
+ out-ports {
+ port {
+ funnel0_out: endpoint {
+ remote-endpoint =
+ <&merge_funnel_in0>;
+ };
+ };
+ };
+ };
+
+ funnel@3022000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x3022000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ port {
+ funnel1_in: endpoint {
+ remote-endpoint =
+ <&apss_merge_funnel_out>;
+ };
+ };
+ };
+
+ out-ports {
+ port {
+ funnel1_out: endpoint {
+ remote-endpoint =
+ <&merge_funnel_in1>;
+ };
+ };
+ };
+ };
+
+ funnel@3025000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x3025000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ merge_funnel_in0: endpoint {
+ remote-endpoint =
+ <&funnel0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ merge_funnel_in1: endpoint {
+ remote-endpoint =
+ <&funnel1_out>;
+ };
+ };
+ };
+
+ out-ports {
+ port {
+ merge_funnel_out: endpoint {
+ remote-endpoint =
+ <&etf_in>;
+ };
+ };
+ };
+ };
+
+ replicator@3026000 {
+ compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+ reg = <0x3026000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ port {
+ replicator_in: endpoint {
+ remote-endpoint =
+ <&etf_out>;
+ };
+ };
+ };
+
+ out-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ replicator_out0: endpoint {
+ remote-endpoint =
+ <&etr_in>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ replicator_out1: endpoint {
+ remote-endpoint =
+ <&tpiu_in>;
+ };
+ };
+ };
+ };
+
+ etf@3027000 {
+ compatible = "arm,coresight-tmc", "arm,primecell";
+ reg = <0x3027000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ port {
+ etf_in: endpoint {
+ remote-endpoint =
+ <&merge_funnel_out>;
+ };
+ };
+ };
+
+ out-ports {
+ port {
+ etf_out: endpoint {
+ remote-endpoint =
+ <&replicator_in>;
+ };
+ };
+ };
+ };
+
+ etr@3028000 {
+ compatible = "arm,coresight-tmc", "arm,primecell";
+ reg = <0x3028000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+ arm,scatter-gather;
+
+ in-ports {
+ port {
+ etr_in: endpoint {
+ remote-endpoint =
+ <&replicator_out0>;
+ };
+ };
+ };
+ };
+
+ debug@3810000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0x3810000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>;
+ clock-names = "apb_pclk";
+
+ cpu = <&CPU0>;
+ };
+
+ etm@3840000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x3840000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU0>;
+
+ out-ports {
+ port {
+ etm0_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel0_in0>;
+ };
+ };
+ };
+ };
+
+ debug@3910000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0x3910000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>;
+ clock-names = "apb_pclk";
+
+ cpu = <&CPU1>;
+ };
+
+ etm@3940000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x3940000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU1>;
+
+ out-ports {
+ port {
+ etm1_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel0_in1>;
+ };
+ };
+ };
+ };
+
+ funnel@39b0000 { /* APSS Funnel 0 */
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x39b0000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ apss_funnel0_in0: endpoint {
+ remote-endpoint = <&etm0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ apss_funnel0_in1: endpoint {
+ remote-endpoint = <&etm1_out>;
+ };
+ };
+ };
+
+ out-ports {
+ port {
+ apss_funnel0_out: endpoint {
+ remote-endpoint =
+ <&apss_merge_funnel_in0>;
+ };
+ };
+ };
+ };
+
+ debug@3a10000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0x3a10000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>;
+ clock-names = "apb_pclk";
+
+ cpu = <&CPU2>;
+ };
+
+ etm@3a40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x3a40000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU2>;
+
+ out-ports {
+ port {
+ etm2_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel1_in0>;
+ };
+ };
+ };
+ };
+
+ debug@3b10000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0x3b10000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>;
+ clock-names = "apb_pclk";
+
+ cpu = <&CPU3>;
+ };
+
+ etm@3b40000 {
+ compatible = "arm,coresight-etm4x", "arm,primecell";
+ reg = <0x3b40000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ cpu = <&CPU3>;
+
+ out-ports {
+ port {
+ etm3_out: endpoint {
+ remote-endpoint =
+ <&apss_funnel1_in1>;
+ };
+ };
+ };
+ };
+
+ funnel@3bb0000 { /* APSS Funnel 1 */
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x3bb0000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ apss_funnel1_in0: endpoint {
+ remote-endpoint = <&etm2_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ apss_funnel1_in1: endpoint {
+ remote-endpoint = <&etm3_out>;
+ };
+ };
+ };
+
+ out-ports {
+ port {
+ apss_funnel1_out: endpoint {
+ remote-endpoint =
+ <&apss_merge_funnel_in1>;
+ };
+ };
+ };
+ };
+
+ funnel@3bc0000 {
+ compatible = "arm,coresight-funnel", "arm,primecell";
+ reg = <0x3bc0000 0x1000>;
+
+ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+ clock-names = "apb_pclk", "atclk";
+
+ in-ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ apss_merge_funnel_in0: endpoint {
+ remote-endpoint =
+ <&apss_funnel0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ apss_merge_funnel_in1: endpoint {
+ remote-endpoint =
+ <&apss_funnel1_out>;
+ };
+ };
+ };
+
+ out-ports {
+ port {
+ apss_merge_funnel_out: endpoint {
+ remote-endpoint =
+ <&funnel1_in>;
+ };
+ };
+ };
+ };
+
kryocc: clock-controller@6400000 {
compatible = "qcom,apcc-msm8996";
reg = <0x6400000 0x90000>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCHv7 4/6] coresight: etm4x: Add support to enable ETMv4.2
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
` (2 preceding siblings ...)
2019-02-01 0:53 ` [PATCHv7 3/6] arm64: dts: qcom: msm8996: " Sai Prakash Ranjan
@ 2019-02-01 0:53 ` Sai Prakash Ranjan
2019-02-07 20:23 ` Mathieu Poirier
2019-02-01 0:53 ` [PATCHv7 5/6] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996 Sai Prakash Ranjan
` (2 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-01 0:53 UTC (permalink / raw)
To: Rob Herring, Mathieu Poirier, Suzuki K Poulose, Mike Leach,
Leo Yan, Alexander Shishkin, Andy Gross, David Brown,
Vivek Gautam, Jeffrey Hugo, Doug Anderson, Stephen Boyd,
Bjorn Andersson, devicetree, Mark Rutland, Marc Gonzalez
Cc: Rajendra Nayak, Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
linux-kernel, linux-arm-msm, Sai Prakash Ranjan
SDM845 has ETMv4.2 and can use the existing etm4x driver.
But the current etm driver checks only for ETMv4.0 and
errors out for other etm4x versions. This patch adds this
missing support to enable SoC's with ETMv4x to use same
driver by checking only the ETM architecture major version
number.
Without this change, we get below error during etm probe:
/ # dmesg | grep etm
[ 6.660093] coresight-etm4x: probe of 7040000.etm failed with error -22
[ 6.666902] coresight-etm4x: probe of 7140000.etm failed with error -22
[ 6.673708] coresight-etm4x: probe of 7240000.etm failed with error -22
[ 6.680511] coresight-etm4x: probe of 7340000.etm failed with error -22
[ 6.687313] coresight-etm4x: probe of 7440000.etm failed with error -22
[ 6.694113] coresight-etm4x: probe of 7540000.etm failed with error -22
[ 6.700914] coresight-etm4x: probe of 7640000.etm failed with error -22
[ 6.707717] coresight-etm4x: probe of 7740000.etm failed with error -22
With this change, etm probe is successful:
/ # dmesg | grep etm
[ 6.659198] coresight-etm4x 7040000.etm: CPU0: ETM v4.2 initialized
[ 6.665848] coresight-etm4x 7140000.etm: CPU1: ETM v4.2 initialized
[ 6.672493] coresight-etm4x 7240000.etm: CPU2: ETM v4.2 initialized
[ 6.679129] coresight-etm4x 7340000.etm: CPU3: ETM v4.2 initialized
[ 6.685770] coresight-etm4x 7440000.etm: CPU4: ETM v4.2 initialized
[ 6.692403] coresight-etm4x 7540000.etm: CPU5: ETM v4.2 initialized
[ 6.699024] coresight-etm4x 7640000.etm: CPU6: ETM v4.2 initialized
[ 6.705646] coresight-etm4x 7740000.etm: CPU7: ETM v4.2 initialized
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
drivers/hwtracing/coresight/coresight-etm4x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index dd9b9b5ebb84..08ce37c9475d 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -55,7 +55,8 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)
static bool etm4_arch_supported(u8 arch)
{
- switch (arch) {
+ /* Mask out the minor version number */
+ switch (arch & 0xf0) {
case ETM_ARCH_V4:
break;
default:
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCHv7 5/6] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
` (3 preceding siblings ...)
2019-02-01 0:53 ` [PATCHv7 4/6] coresight: etm4x: Add support to enable ETMv4.2 Sai Prakash Ranjan
@ 2019-02-01 0:53 ` Sai Prakash Ranjan
2019-02-07 20:26 ` Mathieu Poirier
2019-02-01 0:53 ` [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo Sai Prakash Ranjan
2019-04-04 15:10 ` [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Marc Gonzalez
6 siblings, 1 reply; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-01 0:53 UTC (permalink / raw)
To: Rob Herring, Mathieu Poirier, Suzuki K Poulose, Mike Leach,
Leo Yan, Alexander Shishkin, Andy Gross, David Brown,
Vivek Gautam, Jeffrey Hugo, Doug Anderson, Stephen Boyd,
Bjorn Andersson, devicetree, Mark Rutland, Marc Gonzalez
Cc: Rajendra Nayak, Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
linux-kernel, linux-arm-msm, Sai Prakash Ranjan
Instead of overriding the peripheral id(PID) check in AMBA
by hardcoding them in DT, add the PIDs to the ETM4x driver.
Here we use Unique Component Identifier(UCI) for MSM8996
since the ETM and CPU debug module shares the same PIDs.
SDM845 does not support CPU debug module.
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
For testing, all dependent patches are in below tree:
* https://github.com/saiprakash-ranjan/linux/tree/coresight-next
This patch depends on UCI support by Mike Leach in below link:
* https://lore.kernel.org/lkml/20190130234051.2294-1-mike.leach@linaro.org/
---
drivers/hwtracing/coresight/coresight-etm4x.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index 08ce37c9475d..5819ced2beec 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -1078,11 +1078,15 @@ static struct amba_cs_uci_id uci_id_etm4[] = {
};
static const struct amba_id etm4_ids[] = {
- CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */
- CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */
- CS_AMBA_ID(0x000bb95a), /* Cortex-A72 */
- CS_AMBA_ID(0x000bb959), /* Cortex-A73 */
- CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4), /* Cortex-A35 */
+ CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */
+ CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */
+ CS_AMBA_ID(0x000bb95a), /* Cortex-A72 */
+ CS_AMBA_ID(0x000bb959), /* Cortex-A73 */
+ CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4),/* Cortex-A35 */
+ CS_AMBA_UCI_ID(0x000f0205, uci_id_etm4),/* Qualcomm Kryo */
+ CS_AMBA_UCI_ID(0x000f0211, uci_id_etm4),/* Qualcomm Kryo */
+ CS_AMBA_ID(0x000bb802), /* Qualcomm Kryo 385 Cortex-A55 */
+ CS_AMBA_ID(0x000bb803), /* Qualcomm Kryo 385 Cortex-A75 */
{},
};
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
` (4 preceding siblings ...)
2019-02-01 0:53 ` [PATCHv7 5/6] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996 Sai Prakash Ranjan
@ 2019-02-01 0:53 ` Sai Prakash Ranjan
2019-02-07 20:28 ` Mathieu Poirier
2019-02-08 14:19 ` Suzuki K Poulose
2019-04-04 15:10 ` [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Marc Gonzalez
6 siblings, 2 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-01 0:53 UTC (permalink / raw)
To: Rob Herring, Mathieu Poirier, Suzuki K Poulose, Mike Leach,
Leo Yan, Alexander Shishkin, Andy Gross, David Brown,
Vivek Gautam, Jeffrey Hugo, Doug Anderson, Stephen Boyd,
Bjorn Andersson, devicetree, Mark Rutland, Marc Gonzalez
Cc: Rajendra Nayak, Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
linux-kernel, linux-arm-msm, Sai Prakash Ranjan
Add support for coresight CPU debug module on Qualcomm
Kryo CPUs. This patch adds the UCI entries for Kryo CPUs
found on MSM8996 which shares the same PIDs as ETMs.
Without this, below error is observed on MSM8996:
[ 5.429867] OF: graph: no port node found in /soc/debug@3810000
[ 5.429938] coresight-etm4x: probe of 3810000.debug failed with error -22
[ 5.435415] coresight-cpu-debug 3810000.debug: Coresight debug-CPU0 initialized
[ 5.446474] OF: graph: no port node found in /soc/debug@3910000
[ 5.448927] coresight-etm4x: probe of 3910000.debug failed with error -22
[ 5.454681] coresight-cpu-debug 3910000.debug: Coresight debug-CPU1 initialized
[ 5.487765] OF: graph: no port node found in /soc/debug@3a10000
[ 5.488007] coresight-etm4x: probe of 3a10000.debug failed with error -22
[ 5.493024] coresight-cpu-debug 3a10000.debug: Coresight debug-CPU2 initialized
[ 5.501802] OF: graph: no port node found in /soc/debug@3b10000
[ 5.512901] coresight-etm4x: probe of 3b10000.debug failed with error -22
[ 5.513192] coresight-cpu-debug 3b10000.debug: Coresight debug-CPU3 initialized
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
---
For testing, all dependent patches are in below tree:
* https://github.com/saiprakash-ranjan/linux/tree/coresight-next
This patch depends on UCI support by Mike Leach in below link:
* https://lore.kernel.org/lkml/20190130234051.2294-1-mike.leach@linaro.org/
---
.../hwtracing/coresight/coresight-cpu-debug.c | 33 +++++++++----------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c
index e8819d750938..50ebf5b7fa4f 100644
--- a/drivers/hwtracing/coresight/coresight-cpu-debug.c
+++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c
@@ -655,24 +655,23 @@ static int debug_remove(struct amba_device *adev)
return 0;
}
+static const struct amba_cs_uci_id uci_id_debug[] = {
+ {
+ /* CPU Debug UCI data */
+ .devarch = 0x47706a15,
+ .devarch_mask = 0xfff0ffff,
+ .devtype = 0x00000015,
+ }
+};
+
static const struct amba_id debug_ids[] = {
- { /* Debug for Cortex-A53 */
- .id = 0x000bbd03,
- .mask = 0x000fffff,
- },
- { /* Debug for Cortex-A57 */
- .id = 0x000bbd07,
- .mask = 0x000fffff,
- },
- { /* Debug for Cortex-A72 */
- .id = 0x000bbd08,
- .mask = 0x000fffff,
- },
- { /* Debug for Cortex-A73 */
- .id = 0x000bbd09,
- .mask = 0x000fffff,
- },
- { 0, 0 },
+ CS_AMBA_ID(0x000bbd03), /* Cortex-A53 */
+ CS_AMBA_ID(0x000bbd07), /* Cortex-A57 */
+ CS_AMBA_ID(0x000bbd08), /* Cortex-A72 */
+ CS_AMBA_ID(0x000bbd09), /* Cortex-A73 */
+ CS_AMBA_UCI_ID(0x000f0205, uci_id_debug), /* Qualcomm Kryo */
+ CS_AMBA_UCI_ID(0x000f0211, uci_id_debug), /* Qualcomm Kryo */
+ {},
};
static struct amba_driver debug_driver = {
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support
2019-02-01 0:53 ` [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support Sai Prakash Ranjan
@ 2019-02-07 20:19 ` Mathieu Poirier
2019-02-08 14:20 ` Suzuki K Poulose
1 sibling, 0 replies; 21+ messages in thread
From: Mathieu Poirier @ 2019-02-07 20:19 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On Thu, 31 Jan 2019 at 17:53, Sai Prakash Ranjan
<saiprakash.ranjan@codeaurora.org> wrote:
>
> Add coresight components found on Qualcomm SDM845 SoC.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>
> ---
> For testing, all dependent patches are in below tree:
> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>
> - Depends on AOSS QMP side channel patches by Bjorn Andersson [1] - [4].
> - AMBA bus pclk change [5].
> - Also depends on patch ("arm64: dts: qcom: sdm845: Increase address
> and size cells for soc") [6].
>
> [1] https://lore.kernel.org/lkml/20190131003933.11436-5-bjorn.andersson@linaro.org/
> [2] https://lore.kernel.org/lkml/20190131003933.11436-6-bjorn.andersson@linaro.org/
> [3] https://lore.kernel.org/lkml/20190131003933.11436-7-bjorn.andersson@linaro.org/
> [4] https://lore.kernel.org/lkml/20190131003933.11436-10-bjorn.andersson@linaro.org/
> [5] https://lore.kernel.org/lkml/20190131020141.28352-1-bjorn.andersson@linaro.org/
> [6] https://lore.kernel.org/lkml/20190117042940.25487-2-bjorn.andersson@linaro.org/
> ---
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 434 +++++++++++++++++++++++++++
> 1 file changed, 434 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index e2aaaa233e45..4121aac6d086 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -1349,6 +1349,440 @@
> };
> };
>
> + stm@6002000 {
> + compatible = "arm,coresight-stm", "arm,primecell";
> + reg = <0 0x06002000 0 0x1000>,
> + <0 0x16280000 0 0x180000>;
> + reg-names = "stm-base", "stm-stimulus-base";
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + stm_out: endpoint {
> + remote-endpoint =
> + <&funnel0_in7>;
> + };
> + };
> + };
> + };
> +
> + funnel@6041000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0 0x06041000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + funnel0_out: endpoint {
> + remote-endpoint =
> + <&merge_funnel_in0>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@7 {
> + reg = <7>;
> + funnel0_in7: endpoint {
> + remote-endpoint = <&stm_out>;
> + };
> + };
> + };
> + };
> +
> + funnel@6043000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0 0x06043000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + funnel2_out: endpoint {
> + remote-endpoint =
> + <&merge_funnel_in2>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@5 {
> + reg = <5>;
> + funnel2_in5: endpoint {
> + remote-endpoint =
> + <&apss_merge_funnel_out>;
> + };
> + };
> + };
> + };
> +
> + funnel@6045000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0 0x06045000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + merge_funnel_out: endpoint {
> + remote-endpoint = <&etf_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + merge_funnel_in0: endpoint {
> + remote-endpoint =
> + <&funnel0_out>;
> + };
> + };
> +
> + port@2 {
> + reg = <2>;
> + merge_funnel_in2: endpoint {
> + remote-endpoint =
> + <&funnel2_out>;
> + };
> + };
> + };
> + };
> +
> + replicator@6046000 {
> + compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
> + reg = <0 0x06046000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + replicator_out: endpoint {
> + remote-endpoint = <&etr_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + port {
> + replicator_in: endpoint {
> + remote-endpoint = <&etf_out>;
> + };
> + };
> + };
> + };
> +
> + etf@6047000 {
> + compatible = "arm,coresight-tmc", "arm,primecell";
> + reg = <0 0x06047000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etf_out: endpoint {
> + remote-endpoint =
> + <&replicator_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@1 {
> + reg = <1>;
> + etf_in: endpoint {
> + remote-endpoint =
> + <&merge_funnel_out>;
> + };
> + };
> + };
> + };
> +
> + etr@6048000 {
> + compatible = "arm,coresight-tmc", "arm,primecell";
> + reg = <0 0x06048000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> + arm,scatter-gather;
> +
> + in-ports {
> + port {
> + etr_in: endpoint {
> + remote-endpoint =
> + <&replicator_out>;
> + };
> + };
> + };
> + };
> +
> + etm@7040000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0 0x07040000 0 0x1000>;
> +
> + cpu = <&CPU0>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etm0_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in0>;
> + };
> + };
> + };
> + };
> +
> + etm@7140000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0 0x07140000 0 0x1000>;
> +
> + cpu = <&CPU1>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etm1_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in1>;
> + };
> + };
> + };
> + };
> +
> + etm@7240000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0 0x07240000 0 0x1000>;
> +
> + cpu = <&CPU2>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etm2_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in2>;
> + };
> + };
> + };
> + };
> +
> + etm@7340000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0 0x07340000 0 0x1000>;
> +
> + cpu = <&CPU3>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etm3_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in3>;
> + };
> + };
> + };
> + };
> +
> + etm@7440000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0 0x07440000 0 0x1000>;
> +
> + cpu = <&CPU4>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etm4_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in4>;
> + };
> + };
> + };
> + };
> +
> + etm@7540000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0 0x07540000 0 0x1000>;
> +
> + cpu = <&CPU5>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etm5_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in5>;
> + };
> + };
> + };
> + };
> +
> + etm@7640000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0 0x07640000 0 0x1000>;
> +
> + cpu = <&CPU6>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + 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>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + etm7_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in7>;
> + };
> + };
> + };
> + };
> +
> + funnel@7800000 { /* APSS Funnel */
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0 0x07800000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + apss_funnel_out: endpoint {
> + remote-endpoint =
> + <&apss_merge_funnel_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + apss_funnel_in0: endpoint {
> + remote-endpoint =
> + <&etm0_out>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + apss_funnel_in1: endpoint {
> + remote-endpoint =
> + <&etm1_out>;
> + };
> + };
> +
> + port@2 {
> + reg = <2>;
> + apss_funnel_in2: endpoint {
> + remote-endpoint =
> + <&etm2_out>;
> + };
> + };
> +
> + port@3 {
> + reg = <3>;
> + apss_funnel_in3: endpoint {
> + remote-endpoint =
> + <&etm3_out>;
> + };
> + };
> +
> + port@4 {
> + reg = <4>;
> + apss_funnel_in4: endpoint {
> + remote-endpoint =
> + <&etm4_out>;
> + };
> + };
> +
> + port@5 {
> + reg = <5>;
> + apss_funnel_in5: endpoint {
> + remote-endpoint =
> + <&etm5_out>;
> + };
> + };
> +
> + port@6 {
> + reg = <6>;
> + apss_funnel_in6: endpoint {
> + remote-endpoint =
> + <&etm6_out>;
> + };
> + };
> +
> + port@7 {
> + reg = <7>;
> + apss_funnel_in7: endpoint {
> + remote-endpoint =
> + <&etm7_out>;
> + };
> + };
> + };
> + };
> +
> + funnel@7810000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0 0x07810000 0 0x1000>;
> +
> + power-domains = <&aoss_qmp AOSS_QMP_QDSS_CLK>;
> +
> + out-ports {
> + port {
> + apss_merge_funnel_out: endpoint {
> + remote-endpoint =
> + <&funnel2_in5>;
> + };
> + };
> + };
> +
> + in-ports {
> + port {
> + apss_merge_funnel_in: endpoint {
> + remote-endpoint =
> + <&apss_funnel_out>;
> + };
> + };
> + };
> + };
> +
> usb_1_hsphy: phy@88e2000 {
> compatible = "qcom,sdm845-qusb2-phy";
> reg = <0 0x088e2000 0 0x400>;
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 2/6] arm64: dts: qcom: msm8998: Add Coresight support
2019-02-01 0:53 ` [PATCHv7 2/6] arm64: dts: qcom: msm8998: " Sai Prakash Ranjan
@ 2019-02-07 20:20 ` Mathieu Poirier
2019-02-08 14:23 ` Suzuki K Poulose
1 sibling, 0 replies; 21+ messages in thread
From: Mathieu Poirier @ 2019-02-07 20:20 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On Thu, 31 Jan 2019 at 17:54, Sai Prakash Ranjan
<saiprakash.ranjan@codeaurora.org> wrote:
>
> Enable coresight support by adding device nodes for the
> available source, sinks and channel blocks on MSM8998.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>
> ---
> For testing, all dependent patches are in below tree:
> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>
> This depends on MSM8998 rpm clocks and rpmcc node by Jeffrey Hugo
> and Marc Gonzalez [1][2][3].
>
> [1] https://lore.kernel.org/lkml/1545099336-5615-1-git-send-email-jhugo@codeaurora.org/
> [2] https://lore.kernel.org/lkml/1548866144-30265-1-git-send-email-jhugo@codeaurora.org/
> [3] https://lore.kernel.org/lkml/6da00186-e7c9-c93d-a80a-65eda2516451@free.fr/
> ---
> arch/arm64/boot/dts/qcom/msm8998.dtsi | 435 ++++++++++++++++++++++++++
> 1 file changed, 435 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> index eb691be6e171..3020a76ed201 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> @@ -566,6 +566,441 @@
> #interrupt-cells = <0x2>;
> };
>
> + stm@6002000 {
> + compatible = "arm,coresight-stm", "arm,primecell";
> + reg = <0x06002000 0x1000>,
> + <0x16280000 0x180000>;
> + reg-names = "stm-base", "stm-data-base";
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + stm_out: endpoint {
> + remote-endpoint = <&funnel0_in7>;
> + };
> + };
> + };
> + };
> +
> + funnel@6041000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x06041000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + funnel0_out: endpoint {
> + remote-endpoint =
> + <&merge_funnel_in0>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@7 {
> + reg = <7>;
> + funnel0_in7: endpoint {
> + remote-endpoint = <&stm_out>;
> + };
> + };
> + };
> + };
> +
> + funnel@6042000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x06042000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + funnel1_out: endpoint {
> + remote-endpoint =
> + <&merge_funnel_in1>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@6 {
> + reg = <6>;
> + funnel1_in6: endpoint {
> + remote-endpoint =
> + <&apss_merge_funnel_out>;
> + };
> + };
> + };
> + };
> +
> + funnel@6045000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x06045000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + merge_funnel_out: endpoint {
> + remote-endpoint =
> + <&etf_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + merge_funnel_in0: endpoint {
> + remote-endpoint =
> + <&funnel0_out>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + merge_funnel_in1: endpoint {
> + remote-endpoint =
> + <&funnel1_out>;
> + };
> + };
> + };
> + };
> +
> + replicator@6046000 {
> + compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
> + reg = <0x06046000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + replicator_out: endpoint {
> + remote-endpoint = <&etr_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + port {
> + replicator_in: endpoint {
> + remote-endpoint = <&etf_out>;
> + };
> + };
> + };
> + };
> +
> + etf@6047000 {
> + compatible = "arm,coresight-tmc", "arm,primecell";
> + reg = <0x06047000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + etf_out: endpoint {
> + remote-endpoint =
> + <&replicator_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + port {
> + etf_in: endpoint {
> + remote-endpoint =
> + <&merge_funnel_out>;
> + };
> + };
> + };
> + };
> +
> + etr@6048000 {
> + compatible = "arm,coresight-tmc", "arm,primecell";
> + reg = <0x06048000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> + arm,scatter-gather;
> +
> + in-ports {
> + port {
> + etr_in: endpoint {
> + remote-endpoint =
> + <&replicator_out>;
> + };
> + };
> + };
> + };
> +
> + etm@7840000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07840000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU0>;
> +
> + out-ports {
> + port {
> + etm0_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in0>;
> + };
> + };
> + };
> + };
> +
> + etm@7940000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07940000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU1>;
> +
> + out-ports {
> + port {
> + etm1_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in1>;
> + };
> + };
> + };
> + };
> +
> + etm@7a40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07a40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU2>;
> +
> + out-ports {
> + port {
> + etm2_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in2>;
> + };
> + };
> + };
> + };
> +
> + etm@7b40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07b40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU3>;
> +
> + out-ports {
> + port {
> + etm3_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel_in3>;
> + };
> + };
> + };
> + };
> +
> + funnel@7b60000 { /* APSS Funnel */
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07b60000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + apss_funnel_out: endpoint {
> + remote-endpoint =
> + <&apss_merge_funnel_in>;
> + };
> + };
> + };
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + apss_funnel_in0: endpoint {
> + remote-endpoint =
> + <&etm0_out>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + apss_funnel_in1: endpoint {
> + remote-endpoint =
> + <&etm1_out>;
> + };
> + };
> +
> + port@2 {
> + reg = <2>;
> + apss_funnel_in2: endpoint {
> + remote-endpoint =
> + <&etm2_out>;
> + };
> + };
> +
> + port@3 {
> + reg = <3>;
> + apss_funnel_in3: endpoint {
> + remote-endpoint =
> + <&etm3_out>;
> + };
> + };
> +
> + port@4 {
> + reg = <4>;
> + apss_funnel_in4: endpoint {
> + remote-endpoint =
> + <&etm4_out>;
> + };
> + };
> +
> + port@5 {
> + reg = <5>;
> + apss_funnel_in5: endpoint {
> + remote-endpoint =
> + <&etm5_out>;
> + };
> + };
> +
> + port@6 {
> + reg = <6>;
> + apss_funnel_in6: endpoint {
> + remote-endpoint =
> + <&etm6_out>;
> + };
> + };
> +
> + port@7 {
> + reg = <7>;
> + apss_funnel_in7: endpoint {
> + remote-endpoint =
> + <&etm7_out>;
> + };
> + };
> + };
> + };
> +
> + funnel@7b70000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x07b70000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + apss_merge_funnel_out: endpoint {
> + remote-endpoint =
> + <&funnel1_in6>;
> + };
> + };
> + };
> +
> + in-ports {
> + port {
> + apss_merge_funnel_in: endpoint {
> + remote-endpoint =
> + <&apss_funnel_out>;
> + };
> + };
> + };
> + };
> +
> + etm@7c40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07c40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU4>;
> +
> + port{
> + etm4_out: endpoint {
> + remote-endpoint = <&apss_funnel_in4>;
> + };
> + };
> + };
> +
> + etm@7d40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07d40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU5>;
> +
> + port{
> + etm5_out: endpoint {
> + remote-endpoint = <&apss_funnel_in5>;
> + };
> + };
> + };
> +
> + etm@7e40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07e40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU6>;
> +
> + port{
> + etm6_out: endpoint {
> + remote-endpoint = <&apss_funnel_in6>;
> + };
> + };
> + };
> +
> + etm@7f40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x07f40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU7>;
> +
> + port{
> + etm7_out: endpoint {
> + remote-endpoint = <&apss_funnel_in7>;
> + };
> + };
> + };
> +
> spmi_bus: spmi@800f000 {
> compatible = "qcom,spmi-pmic-arb";
> reg = <0x800f000 0x1000>,
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 3/6] arm64: dts: qcom: msm8996: Add Coresight support
2019-02-01 0:53 ` [PATCHv7 3/6] arm64: dts: qcom: msm8996: " Sai Prakash Ranjan
@ 2019-02-07 20:23 ` Mathieu Poirier
2019-02-08 14:24 ` Suzuki K Poulose
1 sibling, 0 replies; 21+ messages in thread
From: Mathieu Poirier @ 2019-02-07 20:23 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On Thu, 31 Jan 2019 at 17:54, Sai Prakash Ranjan
<saiprakash.ranjan@codeaurora.org> wrote:
>
> From: Vivek Gautam <vivek.gautam@codeaurora.org>
>
> Enable coresight support by adding device nodes for the
> available source, sinks and channel blocks on msm8996.
>
> This also adds coresight cpu debug nodes.
>
> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> ---
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 434 ++++++++++++++++++++++++++
> 1 file changed, 434 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 99b7495455a6..3406a10f40db 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -429,6 +429,440 @@
> reg = <0x300000 0x90000>;
> };
>
> + stm@3002000 {
> + compatible = "arm,coresight-stm", "arm,primecell";
> + reg = <0x3002000 0x1000>,
> + <0x8280000 0x180000>;
> + reg-names = "stm-base", "stm-stimulus-base";
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + out-ports {
> + port {
> + stm_out: endpoint {
> + remote-endpoint =
> + <&funnel0_in>;
> + };
> + };
> + };
> + };
> +
> + tpiu@3020000 {
> + compatible = "arm,coresight-tpiu", "arm,primecell";
> + reg = <0x3020000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + port {
> + tpiu_in: endpoint {
> + remote-endpoint =
> + <&replicator_out1>;
> + };
> + };
> + };
> + };
> +
> + funnel@3021000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x3021000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + port {
> + funnel0_in: endpoint {
> + remote-endpoint =
> + <&stm_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + port {
> + funnel0_out: endpoint {
> + remote-endpoint =
> + <&merge_funnel_in0>;
> + };
> + };
> + };
> + };
> +
> + funnel@3022000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x3022000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + port {
> + funnel1_in: endpoint {
> + remote-endpoint =
> + <&apss_merge_funnel_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + port {
> + funnel1_out: endpoint {
> + remote-endpoint =
> + <&merge_funnel_in1>;
> + };
> + };
> + };
> + };
> +
> + funnel@3025000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x3025000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + merge_funnel_in0: endpoint {
> + remote-endpoint =
> + <&funnel0_out>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + merge_funnel_in1: endpoint {
> + remote-endpoint =
> + <&funnel1_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + port {
> + merge_funnel_out: endpoint {
> + remote-endpoint =
> + <&etf_in>;
> + };
> + };
> + };
> + };
> +
> + replicator@3026000 {
> + compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
> + reg = <0x3026000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + port {
> + replicator_in: endpoint {
> + remote-endpoint =
> + <&etf_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + replicator_out0: endpoint {
> + remote-endpoint =
> + <&etr_in>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + replicator_out1: endpoint {
> + remote-endpoint =
> + <&tpiu_in>;
> + };
> + };
> + };
> + };
> +
> + etf@3027000 {
> + compatible = "arm,coresight-tmc", "arm,primecell";
> + reg = <0x3027000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + port {
> + etf_in: endpoint {
> + remote-endpoint =
> + <&merge_funnel_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + port {
> + etf_out: endpoint {
> + remote-endpoint =
> + <&replicator_in>;
> + };
> + };
> + };
> + };
> +
> + etr@3028000 {
> + compatible = "arm,coresight-tmc", "arm,primecell";
> + reg = <0x3028000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> + arm,scatter-gather;
> +
> + in-ports {
> + port {
> + etr_in: endpoint {
> + remote-endpoint =
> + <&replicator_out0>;
> + };
> + };
> + };
> + };
> +
> + debug@3810000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0x3810000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>;
> + clock-names = "apb_pclk";
> +
> + cpu = <&CPU0>;
> + };
> +
> + etm@3840000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x3840000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU0>;
> +
> + out-ports {
> + port {
> + etm0_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel0_in0>;
> + };
> + };
> + };
> + };
> +
> + debug@3910000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0x3910000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>;
> + clock-names = "apb_pclk";
> +
> + cpu = <&CPU1>;
> + };
> +
> + etm@3940000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x3940000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU1>;
> +
> + out-ports {
> + port {
> + etm1_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel0_in1>;
> + };
> + };
> + };
> + };
> +
> + funnel@39b0000 { /* APSS Funnel 0 */
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x39b0000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + apss_funnel0_in0: endpoint {
> + remote-endpoint = <&etm0_out>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + apss_funnel0_in1: endpoint {
> + remote-endpoint = <&etm1_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + port {
> + apss_funnel0_out: endpoint {
> + remote-endpoint =
> + <&apss_merge_funnel_in0>;
> + };
> + };
> + };
> + };
> +
> + debug@3a10000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0x3a10000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>;
> + clock-names = "apb_pclk";
> +
> + cpu = <&CPU2>;
> + };
> +
> + etm@3a40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x3a40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU2>;
> +
> + out-ports {
> + port {
> + etm2_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel1_in0>;
> + };
> + };
> + };
> + };
> +
> + debug@3b10000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0x3b10000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>;
> + clock-names = "apb_pclk";
> +
> + cpu = <&CPU3>;
> + };
> +
> + etm@3b40000 {
> + compatible = "arm,coresight-etm4x", "arm,primecell";
> + reg = <0x3b40000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + cpu = <&CPU3>;
> +
> + out-ports {
> + port {
> + etm3_out: endpoint {
> + remote-endpoint =
> + <&apss_funnel1_in1>;
> + };
> + };
> + };
> + };
> +
> + funnel@3bb0000 { /* APSS Funnel 1 */
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x3bb0000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + apss_funnel1_in0: endpoint {
> + remote-endpoint = <&etm2_out>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + apss_funnel1_in1: endpoint {
> + remote-endpoint = <&etm3_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + port {
> + apss_funnel1_out: endpoint {
> + remote-endpoint =
> + <&apss_merge_funnel_in1>;
> + };
> + };
> + };
> + };
> +
> + funnel@3bc0000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0x3bc0000 0x1000>;
> +
> + clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
> + clock-names = "apb_pclk", "atclk";
> +
> + in-ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + apss_merge_funnel_in0: endpoint {
> + remote-endpoint =
> + <&apss_funnel0_out>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> + apss_merge_funnel_in1: endpoint {
> + remote-endpoint =
> + <&apss_funnel1_out>;
> + };
> + };
> + };
> +
> + out-ports {
> + port {
> + apss_merge_funnel_out: endpoint {
> + remote-endpoint =
> + <&funnel1_in>;
> + };
> + };
> + };
> + };
> +
Normally you'd want to have two seperate patches for coresight and
cpu-debug but that is up up to the David and Andy to decide.
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> kryocc: clock-controller@6400000 {
> compatible = "qcom,apcc-msm8996";
> reg = <0x6400000 0x90000>;
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 4/6] coresight: etm4x: Add support to enable ETMv4.2
2019-02-01 0:53 ` [PATCHv7 4/6] coresight: etm4x: Add support to enable ETMv4.2 Sai Prakash Ranjan
@ 2019-02-07 20:23 ` Mathieu Poirier
0 siblings, 0 replies; 21+ messages in thread
From: Mathieu Poirier @ 2019-02-07 20:23 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On Thu, 31 Jan 2019 at 17:54, Sai Prakash Ranjan
<saiprakash.ranjan@codeaurora.org> wrote:
>
> SDM845 has ETMv4.2 and can use the existing etm4x driver.
> But the current etm driver checks only for ETMv4.0 and
> errors out for other etm4x versions. This patch adds this
> missing support to enable SoC's with ETMv4x to use same
> driver by checking only the ETM architecture major version
> number.
>
> Without this change, we get below error during etm probe:
>
> / # dmesg | grep etm
> [ 6.660093] coresight-etm4x: probe of 7040000.etm failed with error -22
> [ 6.666902] coresight-etm4x: probe of 7140000.etm failed with error -22
> [ 6.673708] coresight-etm4x: probe of 7240000.etm failed with error -22
> [ 6.680511] coresight-etm4x: probe of 7340000.etm failed with error -22
> [ 6.687313] coresight-etm4x: probe of 7440000.etm failed with error -22
> [ 6.694113] coresight-etm4x: probe of 7540000.etm failed with error -22
> [ 6.700914] coresight-etm4x: probe of 7640000.etm failed with error -22
> [ 6.707717] coresight-etm4x: probe of 7740000.etm failed with error -22
>
> With this change, etm probe is successful:
>
> / # dmesg | grep etm
> [ 6.659198] coresight-etm4x 7040000.etm: CPU0: ETM v4.2 initialized
> [ 6.665848] coresight-etm4x 7140000.etm: CPU1: ETM v4.2 initialized
> [ 6.672493] coresight-etm4x 7240000.etm: CPU2: ETM v4.2 initialized
> [ 6.679129] coresight-etm4x 7340000.etm: CPU3: ETM v4.2 initialized
> [ 6.685770] coresight-etm4x 7440000.etm: CPU4: ETM v4.2 initialized
> [ 6.692403] coresight-etm4x 7540000.etm: CPU5: ETM v4.2 initialized
> [ 6.699024] coresight-etm4x 7640000.etm: CPU6: ETM v4.2 initialized
> [ 6.705646] coresight-etm4x 7740000.etm: CPU7: ETM v4.2 initialized
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
> ---
> drivers/hwtracing/coresight/coresight-etm4x.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
> index dd9b9b5ebb84..08ce37c9475d 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x.c
> @@ -55,7 +55,8 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)
>
> static bool etm4_arch_supported(u8 arch)
> {
> - switch (arch) {
> + /* Mask out the minor version number */
> + switch (arch & 0xf0) {
> case ETM_ARCH_V4:
> break;
> default:
Applied.
Thanks,
Mathieu
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 5/6] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996
2019-02-01 0:53 ` [PATCHv7 5/6] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996 Sai Prakash Ranjan
@ 2019-02-07 20:26 ` Mathieu Poirier
2019-02-08 5:13 ` Sai Prakash Ranjan
0 siblings, 1 reply; 21+ messages in thread
From: Mathieu Poirier @ 2019-02-07 20:26 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On Thu, 31 Jan 2019 at 17:54, Sai Prakash Ranjan
<saiprakash.ranjan@codeaurora.org> wrote:
>
> Instead of overriding the peripheral id(PID) check in AMBA
> by hardcoding them in DT, add the PIDs to the ETM4x driver.
> Here we use Unique Component Identifier(UCI) for MSM8996
> since the ETM and CPU debug module shares the same PIDs.
> SDM845 does not support CPU debug module.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
>
> ---
> For testing, all dependent patches are in below tree:
> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>
> This patch depends on UCI support by Mike Leach in below link:
> * https://lore.kernel.org/lkml/20190130234051.2294-1-mike.leach@linaro.org/
> ---
> drivers/hwtracing/coresight/coresight-etm4x.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
> index 08ce37c9475d..5819ced2beec 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x.c
> @@ -1078,11 +1078,15 @@ static struct amba_cs_uci_id uci_id_etm4[] = {
> };
>
> static const struct amba_id etm4_ids[] = {
> - CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */
> - CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */
> - CS_AMBA_ID(0x000bb95a), /* Cortex-A72 */
> - CS_AMBA_ID(0x000bb959), /* Cortex-A73 */
> - CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4), /* Cortex-A35 */
> + CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */
> + CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */
> + CS_AMBA_ID(0x000bb95a), /* Cortex-A72 */
> + CS_AMBA_ID(0x000bb959), /* Cortex-A73 */
> + CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4),/* Cortex-A35 */
> + CS_AMBA_UCI_ID(0x000f0205, uci_id_etm4),/* Qualcomm Kryo */
> + CS_AMBA_UCI_ID(0x000f0211, uci_id_etm4),/* Qualcomm Kryo */
> + CS_AMBA_ID(0x000bb802), /* Qualcomm Kryo 385 Cortex-A55 */
> + CS_AMBA_ID(0x000bb803), /* Qualcomm Kryo 385 Cortex-A75 */
I am good with this patch but there isn't much I can do with it until
Mike's patchset has been merged. Please submit again when that has
been done.
Thanks,
Mathieu
> {},
> };
>
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo
2019-02-01 0:53 ` [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo Sai Prakash Ranjan
@ 2019-02-07 20:28 ` Mathieu Poirier
2019-02-08 5:14 ` Sai Prakash Ranjan
2019-02-08 14:19 ` Suzuki K Poulose
1 sibling, 1 reply; 21+ messages in thread
From: Mathieu Poirier @ 2019-02-07 20:28 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On Thu, 31 Jan 2019 at 17:55, Sai Prakash Ranjan
<saiprakash.ranjan@codeaurora.org> wrote:
>
> Add support for coresight CPU debug module on Qualcomm
> Kryo CPUs. This patch adds the UCI entries for Kryo CPUs
> found on MSM8996 which shares the same PIDs as ETMs.
>
> Without this, below error is observed on MSM8996:
>
> [ 5.429867] OF: graph: no port node found in /soc/debug@3810000
> [ 5.429938] coresight-etm4x: probe of 3810000.debug failed with error -22
> [ 5.435415] coresight-cpu-debug 3810000.debug: Coresight debug-CPU0 initialized
> [ 5.446474] OF: graph: no port node found in /soc/debug@3910000
> [ 5.448927] coresight-etm4x: probe of 3910000.debug failed with error -22
> [ 5.454681] coresight-cpu-debug 3910000.debug: Coresight debug-CPU1 initialized
> [ 5.487765] OF: graph: no port node found in /soc/debug@3a10000
> [ 5.488007] coresight-etm4x: probe of 3a10000.debug failed with error -22
> [ 5.493024] coresight-cpu-debug 3a10000.debug: Coresight debug-CPU2 initialized
> [ 5.501802] OF: graph: no port node found in /soc/debug@3b10000
> [ 5.512901] coresight-etm4x: probe of 3b10000.debug failed with error -22
> [ 5.513192] coresight-cpu-debug 3b10000.debug: Coresight debug-CPU3 initialized
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>
> ---
> For testing, all dependent patches are in below tree:
> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>
> This patch depends on UCI support by Mike Leach in below link:
> * https://lore.kernel.org/lkml/20190130234051.2294-1-mike.leach@linaro.org/
> ---
> .../hwtracing/coresight/coresight-cpu-debug.c | 33 +++++++++----------
> 1 file changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c
> index e8819d750938..50ebf5b7fa4f 100644
> --- a/drivers/hwtracing/coresight/coresight-cpu-debug.c
> +++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c
> @@ -655,24 +655,23 @@ static int debug_remove(struct amba_device *adev)
> return 0;
> }
>
> +static const struct amba_cs_uci_id uci_id_debug[] = {
> + {
> + /* CPU Debug UCI data */
> + .devarch = 0x47706a15,
> + .devarch_mask = 0xfff0ffff,
> + .devtype = 0x00000015,
> + }
> +};
> +
Thank you for adding that.
> static const struct amba_id debug_ids[] = {
> - { /* Debug for Cortex-A53 */
> - .id = 0x000bbd03,
> - .mask = 0x000fffff,
> - },
> - { /* Debug for Cortex-A57 */
> - .id = 0x000bbd07,
> - .mask = 0x000fffff,
> - },
> - { /* Debug for Cortex-A72 */
> - .id = 0x000bbd08,
> - .mask = 0x000fffff,
> - },
> - { /* Debug for Cortex-A73 */
> - .id = 0x000bbd09,
> - .mask = 0x000fffff,
> - },
> - { 0, 0 },
> + CS_AMBA_ID(0x000bbd03), /* Cortex-A53 */
> + CS_AMBA_ID(0x000bbd07), /* Cortex-A57 */
> + CS_AMBA_ID(0x000bbd08), /* Cortex-A72 */
> + CS_AMBA_ID(0x000bbd09), /* Cortex-A73 */
> + CS_AMBA_UCI_ID(0x000f0205, uci_id_debug), /* Qualcomm Kryo */
> + CS_AMBA_UCI_ID(0x000f0211, uci_id_debug), /* Qualcomm Kryo */
> + {},
I have reviewed your work and things look good to me. Once again
there isn't much I can do with it right now. Please re-submit when
Mike's set has been merged.
Mathieu
> };
>
> static struct amba_driver debug_driver = {
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 5/6] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996
2019-02-07 20:26 ` Mathieu Poirier
@ 2019-02-08 5:13 ` Sai Prakash Ranjan
0 siblings, 0 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-08 5:13 UTC (permalink / raw)
To: Mathieu Poirier
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On 2/8/2019 1:56 AM, Mathieu Poirier wrote:
> On Thu, 31 Jan 2019 at 17:54, Sai Prakash Ranjan
> <saiprakash.ranjan@codeaurora.org> wrote:
>>
>
> I am good with this patch but there isn't much I can do with it until
> Mike's patchset has been merged. Please submit again when that has
> been done.
>
Sure, thanks.
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo
2019-02-07 20:28 ` Mathieu Poirier
@ 2019-02-08 5:14 ` Sai Prakash Ranjan
0 siblings, 0 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-08 5:14 UTC (permalink / raw)
To: Mathieu Poirier
Cc: Rob Herring, Suzuki K Poulose, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel,
Linux Kernel Mailing List, linux-arm-msm
On 2/8/2019 1:58 AM, Mathieu Poirier wrote:
> On Thu, 31 Jan 2019 at 17:55, Sai Prakash Ranjan
> <saiprakash.ranjan@codeaurora.org> wrote:
>>
>> Add support for coresight CPU debug module on Qualcomm
>> Kryo CPUs. This patch adds the UCI entries for Kryo CPUs
>> found on MSM8996 which shares the same PIDs as ETMs.
[..]
> I have reviewed your work and things look good to me. Once again
> there isn't much I can do with it right now. Please re-submit when
> Mike's set has been merged.
>
Sure, thanks.
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo
2019-02-01 0:53 ` [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo Sai Prakash Ranjan
2019-02-07 20:28 ` Mathieu Poirier
@ 2019-02-08 14:19 ` Suzuki K Poulose
1 sibling, 0 replies; 21+ messages in thread
From: Suzuki K Poulose @ 2019-02-08 14:19 UTC (permalink / raw)
To: saiprakash.ranjan, robh+dt, mathieu.poirier, mike.leach, leo.yan,
alexander.shishkin, andy.gross, david.brown, vivek.gautam, jhugo,
dianders, sboyd, bjorn.andersson, devicetree, mark.rutland,
marc.w.gonzalez
Cc: rnayak, sibis, tingwei, linux-arm-kernel, linux-kernel, linux-arm-msm
On 01/02/2019 00:53, Sai Prakash Ranjan wrote:
> Add support for coresight CPU debug module on Qualcomm
> Kryo CPUs. This patch adds the UCI entries for Kryo CPUs
> found on MSM8996 which shares the same PIDs as ETMs.
>
> Without this, below error is observed on MSM8996:
>
> [ 5.429867] OF: graph: no port node found in /soc/debug@3810000
> [ 5.429938] coresight-etm4x: probe of 3810000.debug failed with error -22
> [ 5.435415] coresight-cpu-debug 3810000.debug: Coresight debug-CPU0 initialized
> [ 5.446474] OF: graph: no port node found in /soc/debug@3910000
> [ 5.448927] coresight-etm4x: probe of 3910000.debug failed with error -22
> [ 5.454681] coresight-cpu-debug 3910000.debug: Coresight debug-CPU1 initialized
> [ 5.487765] OF: graph: no port node found in /soc/debug@3a10000
> [ 5.488007] coresight-etm4x: probe of 3a10000.debug failed with error -22
> [ 5.493024] coresight-cpu-debug 3a10000.debug: Coresight debug-CPU2 initialized
> [ 5.501802] OF: graph: no port node found in /soc/debug@3b10000
> [ 5.512901] coresight-etm4x: probe of 3b10000.debug failed with error -22
> [ 5.513192] coresight-cpu-debug 3b10000.debug: Coresight debug-CPU3 initialized
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support
2019-02-01 0:53 ` [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support Sai Prakash Ranjan
2019-02-07 20:19 ` Mathieu Poirier
@ 2019-02-08 14:20 ` Suzuki K Poulose
2019-02-08 14:53 ` Sai Prakash Ranjan
1 sibling, 1 reply; 21+ messages in thread
From: Suzuki K Poulose @ 2019-02-08 14:20 UTC (permalink / raw)
To: saiprakash.ranjan, robh+dt, mathieu.poirier, mike.leach, leo.yan,
alexander.shishkin, andy.gross, david.brown, vivek.gautam, jhugo,
dianders, sboyd, bjorn.andersson, devicetree, mark.rutland,
marc.w.gonzalez
Cc: rnayak, sibis, tingwei, linux-arm-kernel, linux-kernel, linux-arm-msm
On 01/02/2019 00:53, Sai Prakash Ranjan wrote:
> Add coresight components found on Qualcomm SDM845 SoC.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>
> ---
> For testing, all dependent patches are in below tree:
> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>
> - Depends on AOSS QMP side channel patches by Bjorn Andersson [1] - [4].
> - AMBA bus pclk change [5].
> - Also depends on patch ("arm64: dts: qcom: sdm845: Increase address
> and size cells for soc") [6].
>
> [1] https://lore.kernel.org/lkml/20190131003933.11436-5-bjorn.andersson@linaro.org/
> [2] https://lore.kernel.org/lkml/20190131003933.11436-6-bjorn.andersson@linaro.org/
> [3] https://lore.kernel.org/lkml/20190131003933.11436-7-bjorn.andersson@linaro.org/
> [4] https://lore.kernel.org/lkml/20190131003933.11436-10-bjorn.andersson@linaro.org/
> [5] https://lore.kernel.org/lkml/20190131020141.28352-1-bjorn.andersson@linaro.org/
> [6] https://lore.kernel.org/lkml/20190117042940.25487-2-bjorn.andersson@linaro.org/
> ---
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 434 +++++++++++++++++++++++++++
> 1 file changed, 434 insertions(+)
>
Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 2/6] arm64: dts: qcom: msm8998: Add Coresight support
2019-02-01 0:53 ` [PATCHv7 2/6] arm64: dts: qcom: msm8998: " Sai Prakash Ranjan
2019-02-07 20:20 ` Mathieu Poirier
@ 2019-02-08 14:23 ` Suzuki K Poulose
1 sibling, 0 replies; 21+ messages in thread
From: Suzuki K Poulose @ 2019-02-08 14:23 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Mathieu Poirier, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel, linux-kernel,
linux-arm-msm
On Fri, Feb 01, 2019 at 06:23:10AM +0530, Sai Prakash Ranjan wrote:
> Enable coresight support by adding device nodes for the
> available source, sinks and channel blocks on MSM8998.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>
> ---
> For testing, all dependent patches are in below tree:
> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>
> This depends on MSM8998 rpm clocks and rpmcc node by Jeffrey Hugo
> and Marc Gonzalez [1][2][3].
>
> [1] https://lore.kernel.org/lkml/1545099336-5615-1-git-send-email-jhugo@codeaurora.org/
> [2] https://lore.kernel.org/lkml/1548866144-30265-1-git-send-email-jhugo@codeaurora.org/
> [3] https://lore.kernel.org/lkml/6da00186-e7c9-c93d-a80a-65eda2516451@free.fr/
> ---
> arch/arm64/boot/dts/qcom/msm8998.dtsi | 435 ++++++++++++++++++++++++++
> 1 file changed, 435 insertions(+)
Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 3/6] arm64: dts: qcom: msm8996: Add Coresight support
2019-02-01 0:53 ` [PATCHv7 3/6] arm64: dts: qcom: msm8996: " Sai Prakash Ranjan
2019-02-07 20:23 ` Mathieu Poirier
@ 2019-02-08 14:24 ` Suzuki K Poulose
1 sibling, 0 replies; 21+ messages in thread
From: Suzuki K Poulose @ 2019-02-08 14:24 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: Rob Herring, Mathieu Poirier, Mike Leach, Leo Yan,
Alexander Shishkin, Andy Gross, David Brown, Vivek Gautam,
Jeffrey Hugo, Doug Anderson, Stephen Boyd, Bjorn Andersson,
devicetree, Mark Rutland, Marc Gonzalez, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, linux-arm-kernel, linux-kernel,
linux-arm-msm
On Fri, Feb 01, 2019 at 06:23:11AM +0530, Sai Prakash Ranjan wrote:
> From: Vivek Gautam <vivek.gautam@codeaurora.org>
>
> Enable coresight support by adding device nodes for the
> available source, sinks and channel blocks on msm8996.
>
> This also adds coresight cpu debug nodes.
>
> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> ---
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 434 ++++++++++++++++++++++++++
> 1 file changed, 434 insertions(+)
>
Acked-By: Suzuki K Poulose <suzuki.poulose@arm.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support
2019-02-08 14:20 ` Suzuki K Poulose
@ 2019-02-08 14:53 ` Sai Prakash Ranjan
0 siblings, 0 replies; 21+ messages in thread
From: Sai Prakash Ranjan @ 2019-02-08 14:53 UTC (permalink / raw)
To: Suzuki K Poulose, robh+dt, mathieu.poirier, mike.leach, leo.yan,
alexander.shishkin, andy.gross, david.brown, vivek.gautam, jhugo,
dianders, sboyd, bjorn.andersson, devicetree, mark.rutland,
marc.w.gonzalez
Cc: rnayak, sibis, tingwei, linux-arm-kernel, linux-kernel, linux-arm-msm
On 2/8/2019 7:50 PM, Suzuki K Poulose wrote:
>
>
> On 01/02/2019 00:53, Sai Prakash Ranjan wrote:
>> Add coresight components found on Qualcomm SDM845 SoC.
>>
>> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>>
>> ---
>> For testing, all dependent patches are in below tree:
>> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>>
>> - Depends on AOSS QMP side channel patches by Bjorn Andersson [1] - [4].
>> - AMBA bus pclk change [5].
>> - Also depends on patch ("arm64: dts: qcom: sdm845: Increase address
>> and size cells for soc") [6].
>>
>> [1]
>> https://lore.kernel.org/lkml/20190131003933.11436-5-bjorn.andersson@linaro.org/
>>
>> [2]
>> https://lore.kernel.org/lkml/20190131003933.11436-6-bjorn.andersson@linaro.org/
>>
>> [3]
>> https://lore.kernel.org/lkml/20190131003933.11436-7-bjorn.andersson@linaro.org/
>>
>> [4]
>> https://lore.kernel.org/lkml/20190131003933.11436-10-bjorn.andersson@linaro.org/
>>
>> [5]
>> https://lore.kernel.org/lkml/20190131020141.28352-1-bjorn.andersson@linaro.org/
>>
>> [6]
>> https://lore.kernel.org/lkml/20190117042940.25487-2-bjorn.andersson@linaro.org/
>>
>> ---
>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 434 +++++++++++++++++++++++++++
>> 1 file changed, 434 insertions(+)
>>
>
> Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Thanks!
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
` (5 preceding siblings ...)
2019-02-01 0:53 ` [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo Sai Prakash Ranjan
@ 2019-04-04 15:10 ` Marc Gonzalez
6 siblings, 0 replies; 21+ messages in thread
From: Marc Gonzalez @ 2019-04-04 15:10 UTC (permalink / raw)
To: Mathieu Poirier, Suzuki K Poulose, Bjorn Andersson, Greg Kroah-Hartman
Cc: Sai Prakash Ranjan, Vivek Gautam, Jeffrey Hugo, Rajendra Nayak,
Sibi Sankar, Tingwei Zhang, MSM, LKML
[Trim recipients to minimize noise]
On 01/02/2019 01:53, Sai Prakash Ranjan wrote:
> This patch series adds support for coresight on SDM845, MSM8998, and MSM8996.
>
> * Patch 1 adds device tree nodes for SDM845 coresight components.
>
> * Patch 2 adds device tree nodes for MSM8998 coresight components.
>
> * Patch 3 adds device tree nodes for MSM8996 coresight components.
>
> * Patch 4 enables support for ETMv4.2 and enables SDM845 to make
> use of same driver(etm4x).
>
> * Patch 5 adds ETM PIDs for SDM845 and MSM8996.
>
> * Patch 6 adds coresight CPU debug module for Qualcomm Kryo.
>
> NOTE: All the dependent patches are applied in the below tree,
> the first 12 commits represent the dependent patches.
> * https://github.com/saiprakash-ranjan/linux/tree/coresight-next
>
> Patch 1 and 4 depends on below AOSS QMP, AMBA bus pclk and address cell change:
> * https://lore.kernel.org/lkml/20190131003933.11436-5-bjorn.andersson@linaro.org/
> * https://lore.kernel.org/lkml/20190131003933.11436-6-bjorn.andersson@linaro.org/
> * https://lore.kernel.org/lkml/20190131003933.11436-7-bjorn.andersson@linaro.org/
> * https://lore.kernel.org/lkml/20190131003933.11436-10-bjorn.andersson@linaro.org/
> * https://lore.kernel.org/lkml/20190131020141.28352-1-bjorn.andersson@linaro.org/
> * https://lore.kernel.org/lkml/20190117042940.25487-2-bjorn.andersson@linaro.org/
>
> Patch 2 depends on MSM8998 rpm clocks and rpmcc nodes:
> * https://lore.kernel.org/lkml/1545099336-5615-1-git-send-email-jhugo@codeaurora.org/
> * https://lore.kernel.org/lkml/1548866144-30265-1-git-send-email-jhugo@codeaurora.org/
> * https://lore.kernel.org/lkml/6da00186-e7c9-c93d-a80a-65eda2516451@free.fr/
>
> Patch 5 and 6 depends on UCI support by Mike Leach:
> * https://lore.kernel.org/lkml/20190130234051.2294-1-mike.leach@linaro.org/
>
> This patch series has been tested on SDM845 MTP and MSM8996
> based Dragonboard 820c and MSM8998 MTP.
>
> v7:
> * Change uci_id_debug struct to const.
> * Update the subject as suggested by Suzuki.
>
> v6:
> * Update the UCI table with the new macro introduced by
> Mike.
> * Rebase on top of coresight-next and provide a tree with
> all the dependent patches applied.
>
> v5:
> * Added coresight support for MSM8998.
> * Added ETM PIDs for SDM845 and MSM8996 as suggested
> by Suzuki.
> * Added UCI table for Coresight CPU debug module.
>
> v4:
> * Mask out the minor version as suggested by Mathieu.
> * Added the dependent patch description in patch 1.
>
> v3:
> * Added arm,scatter-gather property as suggested by Suzuki.
>
> v2:
> * Added coresight support for msm8996 based on Vivek's patch.
> Cleaned up and added coresight cpu debug nodes for msm8996.
> * Merged coresight dtsi file into sdm845.dtsi as suggested by Bjorn
> * Addressed Mathieu's feedback about masking the minor version in
> etm4_arch_supported() and added a comment for reason to bypass
> the AMBA bus discovery method.
>
> Sai Prakash Ranjan (5):
> arm64: dts: qcom: sdm845: Add Coresight support
> arm64: dts: qcom: msm8998: Add Coresight support
> coresight: etm4x: Add support to enable ETMv4.2
> coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996
> coresight: cpu-debug: Add support for Qualcomm Kryo
>
> Vivek Gautam (1):
> arm64: dts: qcom: msm8996: Add Coresight support
>
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 434 +++++++++++++++++
> arch/arm64/boot/dts/qcom/msm8998.dtsi | 435 ++++++++++++++++++
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 434 +++++++++++++++++
> .../hwtracing/coresight/coresight-cpu-debug.c | 33 +-
> drivers/hwtracing/coresight/coresight-etm4x.c | 17 +-
> 5 files changed, 1330 insertions(+), 23 deletions(-)
It appears that only patch 4 has been picked up?
(I'm on next-20190401)
$ git ls --grep='arm64: dts: qcom: sdm845: Add Coresight support' --grep='arm64: dts: qcom: msm8996: Add Coresight support' --grep='arm64: dts: qcom: msm8998: Add Coresight support' --grep='coresight: etm4x: Add support to enable ETMv4.2' --grep='coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996' --grep='coresight: cpu-debug: Add support for Qualcomm Kryo'
5666dfd1d8a4 coresight: etm4x: Add support to enable ETMv4.2
Bjorn, I think the arch/arm64/boot/dts/qcom patches are for you?
Mathieu/Suzuki, the remaining 2 would be for you?
Regards.
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2019-04-04 15:10 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-01 0:53 [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
2019-02-01 0:53 ` [PATCHv7 1/6] arm64: dts: qcom: sdm845: Add Coresight support Sai Prakash Ranjan
2019-02-07 20:19 ` Mathieu Poirier
2019-02-08 14:20 ` Suzuki K Poulose
2019-02-08 14:53 ` Sai Prakash Ranjan
2019-02-01 0:53 ` [PATCHv7 2/6] arm64: dts: qcom: msm8998: " Sai Prakash Ranjan
2019-02-07 20:20 ` Mathieu Poirier
2019-02-08 14:23 ` Suzuki K Poulose
2019-02-01 0:53 ` [PATCHv7 3/6] arm64: dts: qcom: msm8996: " Sai Prakash Ranjan
2019-02-07 20:23 ` Mathieu Poirier
2019-02-08 14:24 ` Suzuki K Poulose
2019-02-01 0:53 ` [PATCHv7 4/6] coresight: etm4x: Add support to enable ETMv4.2 Sai Prakash Ranjan
2019-02-07 20:23 ` Mathieu Poirier
2019-02-01 0:53 ` [PATCHv7 5/6] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996 Sai Prakash Ranjan
2019-02-07 20:26 ` Mathieu Poirier
2019-02-08 5:13 ` Sai Prakash Ranjan
2019-02-01 0:53 ` [PATCHv7 6/6] coresight: cpu-debug: Add support for Qualcomm Kryo Sai Prakash Ranjan
2019-02-07 20:28 ` Mathieu Poirier
2019-02-08 5:14 ` Sai Prakash Ranjan
2019-02-08 14:19 ` Suzuki K Poulose
2019-04-04 15:10 ` [PATCHv7 0/6] Add coresight support for SDM845, MSM8998 and MSM8996 Marc Gonzalez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).