tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: cpu/hotplug: vendor hook for resume cpus"

Browse Source 
This reverts commit 782131fed0.

CPU Pause causes major merge conflicts with the 5.11 scheduler changes
(migrate-disable specifically), so lets revert Pause temporarily as it
is not needed urgently in android-mainline.

Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: Iefd741900143a60b945b7523bf0495a07cff8234
This commit is contained in:
Quentin Perret
2020-12-15 17:54:48 +00:00
parent 34ef9324f3
commit e5c11a5d82
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/android/vendor_hooks.c
-1
View File
@@ -84,7 +84,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_newidle_balance);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_nohz_balancer_kick);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_busiest_queue);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_migrate_queued_task);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_resume_cpus);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_energy_efficient_cpu);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_sugov_sched_attr);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_iowait);
include/trace/hooks/sched.h
-5
View File
@@ -102,10 +102,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_migrate_queued_task,
int *detached),
TP_ARGS(rq, rf, p, new_cpu, detached), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_resume_cpus,
TP_PROTO(struct cpumask *cpus, int *err),
TP_ARGS(cpus, err), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_find_energy_efficient_cpu,
TP_PROTO(struct task_struct *p, int prev_cpu, int sync, int *new_cpu),
TP_ARGS(p, prev_cpu, sync, new_cpu), 1);
@@ -215,7 +211,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_cpu_cgroup_attach,
#define trace_android_rvh_sched_nohz_balancer_kick(rq, flags, done)
#define trace_android_rvh_find_busiest_queue(dst_cpu, group, env_cpus, busiest, done)
#define trace_android_rvh_migrate_queued_task(rq, rf, p, new_cpu, detached)
#define trace_android_rvh_resume_cpus(cpus, err)
#define trace_android_rvh_find_energy_efficient_cpu(p, prev_cpu, sync, new_cpu)
#define trace_android_vh_set_sugov_sched_attr(attr)
#define trace_android_rvh_set_iowait(p, should_iowait_boost)
kernel/cpu.c
-7
View File
@@ -39,9 +39,6 @@
#define CREATE_TRACE_POINTS
#include <trace/events/cpuhp.h>
#undef CREATE_TRACE_POINTS
#include <trace/hooks/sched.h>
#include "smpboot.h"
/**
@@ -1264,10 +1261,6 @@ int resume_cpus(struct cpumask *cpus)
for_each_cpu(cpu, cpus)
set_cpu_active(cpu, true);
trace_android_rvh_resume_cpus(cpus, &err);
if (err)
goto err_cpu_maps_update;
/* Lazy Resume. Build domains immediately instead of scheduling
* a workqueue. This is so that the cpu can pull load when
* sent a load balancing kick.