Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fc13da1 authored by Xiaogang Cui's avatar Xiaogang Cui Committed by Matt Wagantall
Browse files

coresight: unify remote processor etm drivers 



Unify modem, wcn, rpm, audio processor ETM drivers into a single remote
processor ETM driver.

Change-Id: I143b19f3a7be65bb476f57da924be2572a7add6a
Signed-off-by: default avatarShaoqing Liu <shaoqingliu@codeaurora.org>
Signed-off-by: default avatarXiaogang Cui <xiaogang@codeaurora.org>
parent d23091bc

Documentation/devicetree/bindings/coresight/coresight.txt

+6 −15
Original line number Diff line number Diff line
@@ -28,23 +28,14 @@ Required properties: 
	"arm,coresight-fuse" for coresight fuse v1 device,

	"arm,coresight-fuse-v2" for coresight fuse v2 device,

	"arm,coresight-fuse-v3" for coresight fuse v3 device,

	"qcom,coresight-audio-etm" for coresight audio etm trace device,

	"qcom,coresight-modem-etm" for coresight modem etm trace device,

	"qcom,coresight-wcn-etm" for coresight wireless etm trace device,

	"qcom,coresight-rpm-etm" for coresight rpm etm trace device,

	"qcom,coresight-remote-etm" for coresight remote processor etm trace device,

	"qcom,coresight-qpdi" for coresight qpdi device

- reg : physical base address and length of the register set(s) of the component.

	Not required for the following compatible strings:

	- "qcom,coresight-audio-etm",

	- "qcom,coresight-modem-etm",

	- "qcom,coresight-wcn-etm",

	- "qcom,coresight-rpm-etm"

	Not required for the following compatible string:

	- "qcom,coresight-remote-etm"

- reg-names : names corresponding to each reg property value.

	Not required for the following compatible strings:

	- "qcom,coresight-audio-etm",

	- "qcom,coresight-modem-etm",

	- "qcom,coresight-wcn-etm",

	- "qcom,coresight-rpm-etm"

	Not required for the following compatible string:

	- "qcom,coresight-remote-etm"

	The reg-names that need to be used with corresponding compatible string

	for a coresight device are:

	- for coresight tmc-etr or tmc-etf device:
@@ -119,6 +110,7 @@ Required properties: 
- coresight-id : unique integer identifier for the component

- coresight-name : unique descriptive name of the component

- coresight-nr-inports : number of input ports on the component

- qcom,inst-id : QMI instance id for remote ETMs

- coresight-cti-cpu : cpu phandle for cpu cti, required when qcom,cti-save is true

- coresight-etm-cpu : specifies phandle for the cpu associated with the ETM device

- qcom,dbgui-addr-offset : indicates the offset of dbgui address registers
@@ -215,7 +207,6 @@ Optional properties: 
		       connected to the aggregator on each port. Should be specified

		       in pairs (port, cmb element size).

- qcom,tpda-atid : specifies the ATID for TPDA.

-qcom,inst-id : QMI instance id for remote ETMs.



Examples:

arch/arm/boot/dts/qcom/msm8996-coresight-v1.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ 
	};



	audio_etm0 {

		compatible = "qcom,coresight-audio-etm";

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <26>;

		coresight-name = "coresight-audio-etm0";
@@ -505,7 +505,7 @@ 
	};



	rpm_etm0 {

		compatible = "qcom,coresight-rpm-etm";

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <27>;

		coresight-name = "coresight-rpm-etm0";

arch/arm/boot/dts/qcom/msm8996-coresight-v2.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ 
	};



	audio_etm0 {

		compatible = "qcom,coresight-audio-etm";

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <28>;

		coresight-name = "coresight-audio-etm0";
@@ -542,7 +542,7 @@ 
	};



	rpm_etm0 {

		compatible = "qcom,coresight-rpm-etm";

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <29>;

		coresight-name = "coresight-rpm-etm0";
@@ -555,7 +555,7 @@ 
	};



	modem_etm0 {

		compatible = "qcom,coresight-modem-etm";

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <30>;

		coresight-name = "coresight-modem-etm0";

arch/arm64/configs/msm_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -472,11 +472,8 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_STM=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_ETMV4=y

CONFIG_CORESIGHT_AUDIO_ETM=y

CONFIG_CORESIGHT_MODEM_ETM=y

CONFIG_CORESIGHT_WCN_ETM=y

CONFIG_CORESIGHT_RPM_ETM=y

CONFIG_CORESIGHT_QPDI=y

CONFIG_CORESIGHT_REMOTE_ETM=y

CONFIG_SENSORS_SSC=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

drivers/coresight/Kconfig

+7 −59
Original line number Diff line number Diff line
@@ -233,70 +233,18 @@ config CORESIGHT_ETMV4_DEFAULT_ENABLE 
	  If unsure, say 'N' here to avoid potential power and performance

	  penalty.



config CORESIGHT_AUDIO_ETM

	bool "Audio processor ETM trace support"

config CORESIGHT_REMOTE_ETM

	bool "Remote processor ETM trace support"

	help

	  Enables support for ETM trace collection on audio processor using

	  CoreSight framework. Enabling this will allow turning on ETM tracing

	  on audio processor via sysfs by configuring the required CoreSight

	  components.



config CORESIGHT_AUDIO_ETM_DEFAULT_ENABLE

	bool "Turn on audio processor ETM tracing by default"

	help

	  Turns on CoreSight audio processor ETM tracing by default. Otherwise,

	  tracing is disabled by default but can be enabled via sysfs.



	  If unsure, say 'N' here to avoid potential power and performance

	  penalty.



config CORESIGHT_MODEM_ETM

	bool "Modem processor ETM trace support"

	help

	  Enables support for ETM trace collection on modem processor using

	  CoreSight framework. Enabling this will allow turning on ETM tracing

	  on modem processor via sysfs by configuring the required CoreSight

	  components.



config CORESIGHT_MODEM_ETM_DEFAULT_ENABLE

	bool "Turn on modem processor ETM tracing by default"

	help

	  Turns on CoreSight modem processor ETM tracing by default. Otherwise,

	  tracing is disabled by default but can be enabled via sysfs.



	  If unsure, say 'N' here to avoid potential power and performance

	  penalty.



config CORESIGHT_WCN_ETM

	bool "Wireless subsystem processor ETM trace support"

	help

	  Enables support for ETM trace collection on wireless subsystem

	  processor  using CoreSight framework. Enabling this will allow

	  turning on ETM tracing on wireless subsystem via sysfs by configuring

	  the required CoreSight components.



config CORESIGHT_WCN_ETM_DEFAULT_ENABLE

	bool "Turn on wireless subsystem processor ETM tracing by default"

	help

	  Turns on CoreSight wireless subsystem processor ETM tracing by

	  default. Otherwise, tracing is disabled by default but can be enabled

	  via sysfs.



	  If unsure, say 'N' here to avoid potential power and performance

	  penalty.



config CORESIGHT_RPM_ETM

	bool "RPM processor ETM trace support"

	help

	  Enables support for ETM trace collection on RPM processor using

	  Enables support for ETM trace collection on remote processor using

	  CoreSight framework. Enabling this will allow turning on ETM

	  tracing on RPM processor via sysfs by configuring the required

	  tracing on remote processor via sysfs by configuring the required

	  CoreSight components.



config CORESIGHT_RPM_ETM_DEFAULT_ENABLE

	bool "Turn on RPM processor ETM tracing by default"

config CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE

	bool "Turn on remote processor ETM tracing by default"

	help

	  Turns on CoreSight RPM processor ETM tracing by default. Otherwise,

	  Turns on CoreSight remote processor ETM tracing by default. Otherwise,

	  tracing is disabled by default but can be enabled via sysfs.



	  If unsure, say 'N' here to avoid potential power and performance