From 11f1be4453c40385c5825e90b2a447c745cff852 Mon Sep 17 00:00:00 2001 From: Jeson Gao Date: Mon, 29 Nov 2021 17:01:50 +0800 Subject: [PATCH] ANDROID: thermal: Add vendor hooks for thermal Need to get the request frequency and target frequency use it to do frequency check and modify it according to the platform thermal requirements. Bug: 208166320 Signed-off-by: Jeson Gao Change-Id: I776b43c8f559b8a072abd8d3abcb3528348b2c5d (cherry picked from commit fc827b344f76709dc7f242c7db32e1828f510fdd) --- drivers/android/vendor_hooks.c | 3 +++ drivers/thermal/cpufreq_cooling.c | 5 +++++ include/trace/hooks/thermal.h | 24 ++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 include/trace/hooks/thermal.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 98a4f3fc8228..e48676990235 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -51,6 +51,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -248,3 +249,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sha256); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_aes_expandkey); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_aes_encrypt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_aes_decrypt); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_modify_thermal_request_freq); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_modify_thermal_target_freq); diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c index 43b1ae8a7789..af5b957f745b 100644 --- a/drivers/thermal/cpufreq_cooling.c +++ b/drivers/thermal/cpufreq_cooling.c @@ -23,6 +23,7 @@ #include #include +#include /* * Cooling state <-> CPUFreq frequency @@ -218,6 +219,8 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, freq = cpufreq_quick_get(policy->cpu); + trace_android_vh_modify_thermal_request_freq(policy, &freq); + if (trace_thermal_power_cpu_get_power_enabled()) { u32 ncpus = cpumask_weight(policy->related_cpus); @@ -317,6 +320,8 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, normalised_power = (power * 100) / last_load; target_freq = cpu_power_to_freq(cpufreq_cdev, normalised_power); + trace_android_vh_modify_thermal_target_freq(policy, &target_freq); + *state = get_level(cpufreq_cdev, target_freq); trace_thermal_power_cpu_limit(policy->related_cpus, target_freq, *state, power); diff --git a/include/trace/hooks/thermal.h b/include/trace/hooks/thermal.h new file mode 100644 index 000000000000..e4dbac3bc0d4 --- /dev/null +++ b/include/trace/hooks/thermal.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM thermal + +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_THERMAL_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_THERMAL_H + +#include +#include +#include + +DECLARE_HOOK(android_vh_modify_thermal_request_freq, + TP_PROTO(struct cpufreq_policy *policy, unsigned long *request_freq), + TP_ARGS(policy, request_freq)); + +DECLARE_HOOK(android_vh_modify_thermal_target_freq, + TP_PROTO(struct cpufreq_policy *policy, unsigned int *target_freq), + TP_ARGS(policy, target_freq)); + +#endif /* _TRACE_HOOK_THERMAL_H */ +/* This part must be outside protection */ +#include