From 4a77dcca5c5367a43309b370d2a326cd584a95c2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Jul 2022 19:18:20 +0200 Subject: [PATCH] Revert "ANDROID: sched: add vendor hook for correcting cpu capacity" This reverts commit e209b3b88d9772ecd782d71c1ae7c5425dd20289. The hooks in arch_topology break in 5.19-rc1 so revert them for now. If they are still needed, we can add them back in later on. Bug: 163935827 Cc: Yun Hsiang Signed-off-by: Greg Kroah-Hartman Change-Id: Ibb0c787934107ecf1882615c9002a2b91a38e5a3 --- drivers/android/vendor_hooks.c | 2 -- drivers/base/arch_topology.c | 3 --- include/trace/hooks/topology.h | 18 ------------------ 3 files changed, 23 deletions(-) delete mode 100644 include/trace/hooks/topology.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index e530f20aab51..a34c371550f7 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -53,7 +52,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_prepare_prio_fork); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_finish_prio_fork); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_user_nice); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_setscheduler); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_arch_set_freq_scale); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_transaction_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_set_priority); diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 78d597d4a8ee..f73b836047cf 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -18,7 +18,6 @@ #include #include #include -#include static DEFINE_PER_CPU(struct scale_freq_data __rcu *, sft_data); static struct cpumask scale_freq_counters_mask; @@ -143,8 +142,6 @@ void topology_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq, scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq; - trace_android_vh_arch_set_freq_scale(cur_freq, max_freq, &scale); - for_each_cpu(i, cpus) per_cpu(arch_freq_scale, i) = scale; } diff --git a/include/trace/hooks/topology.h b/include/trace/hooks/topology.h deleted file mode 100644 index 429a551deb76..000000000000 --- a/include/trace/hooks/topology.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM topology - -#define TRACE_INCLUDE_PATH trace/hooks - -#if !defined(_TRACE_HOOK_TOPOLOGY_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_HOOK_TOPOLOGY_H - -#include - -DECLARE_HOOK(android_vh_arch_set_freq_scale, - TP_PROTO(unsigned long freq, unsigned long max, unsigned long *scale), - TP_ARGS(freq, max, scale)); - -#endif /* _TRACE_HOOK_TOPOLOGY_H */ -/* This part must be outside protection */ -#include