From 7191b6a759ebf0a14eae87c743b95c07c3fe9493 Mon Sep 17 00:00:00 2001 From: Di Shen Date: Thu, 7 Apr 2022 19:46:18 +0800 Subject: [PATCH] ANDROID: thermal: Add vendor hook to get thermal zone device Need to get temperature data and config info from thermal zone device. Bug: 208946028 Signed-off-by: Di Shen Signed-off-by: Jeson Gao Change-Id: I5945df5258181b4a441b6bbe09327099491418b3 (cherry picked from commit c53f0e3530641d6b696bae12eed55c58599ab516) (cherry picked from commit 12b8ef18b20dde557e696b6898c19d7353dcc90c) --- drivers/android/vendor_hooks.c | 1 + drivers/thermal/thermal_core.c | 4 ++++ include/trace/hooks/thermal.h | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 59ff0d4e2d81..aa108c53e286 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -270,3 +270,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_new_ref); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_del_ref); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_thermal_register); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_thermal_unregister); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_thermal_zone_device); diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 1eae4ec719a8..25b9dbda5e55 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -23,6 +23,8 @@ #define CREATE_TRACE_POINTS #include +#undef CREATE_TRACE_POINTS +#include #include "thermal_core.h" #include "thermal_hwmon.h" @@ -481,6 +483,8 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, handle_thermal_trip(tz, count); monitor_thermal_zone(tz); + + trace_android_vh_get_thermal_zone_device(tz); out: mutex_unlock(&tz->lock); } diff --git a/include/trace/hooks/thermal.h b/include/trace/hooks/thermal.h index 9cb2eb156d24..5e525ef0df7b 100644 --- a/include/trace/hooks/thermal.h +++ b/include/trace/hooks/thermal.h @@ -40,6 +40,10 @@ DECLARE_HOOK(android_vh_thermal_unregister, TP_PROTO(struct cpufreq_policy *policy), TP_ARGS(policy)); +DECLARE_HOOK(android_vh_get_thermal_zone_device, + TP_PROTO(struct thermal_zone_device *tz), + TP_ARGS(tz)); + #endif /* _TRACE_HOOK_THERMAL_H */ /* This part must be outside protection */ #include