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

Commit 9cc62302 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: llcc: Create child platform device for llcc_perfmon"

parents 20190559 33ce3508

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ CONFIG_MSM_QBT_HANDLER=y 
CONFIG_QCOM_IPCC=y

CONFIG_QCOM_LLCC=y

CONFIG_QCOM_KONA_LLCC=y

CONFIG_QCOM_LLCC_PERFMON=m

CONFIG_QCOM_MDT_LOADER=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_QMI_RMNET=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ CONFIG_MSM_QBT_HANDLER=y 
CONFIG_QCOM_IPCC=y

CONFIG_QCOM_LLCC=y

CONFIG_QCOM_KONA_LLCC=y

CONFIG_QCOM_LLCC_PERFMON=m

CONFIG_QCOM_MDT_LOADER=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_QMI_RMNET=y

drivers/soc/qcom/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -131,6 +131,16 @@ config QCOM_SDM845_LLCC 
	  data required to configure LLCC so that clients can start using the

	  LLCC slices.



config QCOM_LLCC_PERFMON

	tristate "Qualcomm Technologies, Inc. LLCC Perfmon driver"

	depends on QCOM_LLCC

	help

	  This option enables driver for LLCC Performance monitor block. Using

	  this various events in different LLCC sub ports can be monitored.

	  This is used for performance and debug activity and exports sysfs

	  interface. sysfs interface is used to configure and dump the LLCC

	  performance events.



config QCOM_MDT_LOADER

	tristate "Qualcomm Technologies, Inc. Firmware parser for MDT format"

	select QCOM_SCM

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ obj-$(CONFIG_QCOM_IPCC) += qcom_ipcc.o 
obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o

obj-$(CONFIG_QCOM_KONA_LLCC) += llcc-kona.o

obj-$(CONFIG_QCOM_LITO_LLCC) += llcc-lito.o

obj-$(CONFIG_QCOM_LLCC_PERFMON) += llcc_perfmon.o

obj-$(CONFIG_QCOM_APR) += apr.o

obj-$(CONFIG_QCOM_SECURE_BUFFER) += secure_buffer.o

obj-$(CONFIG_MSM_TZ_SMMU) += msm_tz_smmu.o

drivers/soc/qcom/llcc-slice.c

+7 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ int qcom_llcc_probe(struct platform_device *pdev, 
	struct resource *banks_res, *bcast_res;

	void __iomem *banks_base, *bcast_base;

	int ret, i;

	struct platform_device *llcc_edac;

	struct platform_device *llcc_edac, *llcc_perfmon;



	drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);

	if (!drv_data)
@@ -430,6 +430,12 @@ int qcom_llcc_probe(struct platform_device *pdev, 
	if (IS_ERR(llcc_edac))

		dev_err(dev, "Failed to register llcc edac driver\n");



	llcc_perfmon = platform_device_register_data(&pdev->dev,

					"qcom_llcc_perfmon", -1,

					drv_data, sizeof(*drv_data));

	if (IS_ERR(llcc_perfmon))

		dev_err(dev, "Failed to register llcc perfmon device\n");



	return ret;

}