diff --git a/kernel/sched/walt/cpufreq_walt.c b/kernel/sched/walt/cpufreq_walt.c index 650fff45845b..7de85593f288 100644 --- a/kernel/sched/walt/cpufreq_walt.c +++ b/kernel/sched/walt/cpufreq_walt.c @@ -188,25 +188,6 @@ static void waltgov_calc_avg_cap(struct waltgov_policy *wg_policy, u64 curr_ws, wg_policy->last_ws = curr_ws; } -/* - * if waltgov is initialized, return the avg_cap seen - * over the last window. return 0 otherwise. - */ -unsigned int waltgov_get_avg_cap(unsigned int cpu) -{ - struct waltgov_cpu *wg_cpu = &per_cpu(waltgov_cpu, cpu); - struct waltgov_policy *wg_policy = wg_cpu->wg_policy; - - /* if the policy is not initialized, or the callback - * is not initialized. callback is initialized on - * start of waltgov, erased on stop of waltgov. - */ - if (!wg_policy || !wg_cpu->cb.func) - return 0; - - return wg_policy->avg_cap; -} - static void waltgov_fast_switch(struct waltgov_policy *wg_policy, u64 time, unsigned int next_freq) { diff --git a/kernel/sched/walt/sched_avg.c b/kernel/sched/walt/sched_avg.c index 4e5a267d2b17..c18e5c2234a9 100644 --- a/kernel/sched/walt/sched_avg.c +++ b/kernel/sched/walt/sched_avg.c @@ -56,16 +56,6 @@ unsigned int sched_get_cluster_util_pct(struct walt_sched_cluster *cluster) return cluster_util_pct; } -unsigned int sched_get_cpu_avg_cap(int cpu) -{ - unsigned int cpu_avg_cap = 0; - - if (cpu < WALT_NR_CPUS) - cpu_avg_cap = stats[cpu].avg_cap; - - return cpu_avg_cap; -} - /** * sched_get_nr_running_avg * @return: Average nr_running, iowait and nr_big_tasks value since last poll. @@ -119,7 +109,6 @@ struct sched_avg_stats *sched_get_nr_running_avg(void) NR_THRESHOLD_PCT), 100); stats[cpu].nr_max = per_cpu(nr_max, cpu); stats[cpu].nr_scaled = tmp_nr; - stats[cpu].avg_cap = waltgov_get_avg_cap(cpu); trace_sched_get_nr_running_avg(cpu, stats[cpu].nr, stats[cpu].nr_misfit, stats[cpu].nr_max, diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c index 1fcb74c80208..a1f2145f2345 100644 --- a/kernel/sched/walt/walt.c +++ b/kernel/sched/walt/walt.c @@ -345,21 +345,6 @@ static void fixup_walt_sched_stats_common(struct rq *rq, struct task_struct *p, static void rollover_cpu_window(struct rq *rq, bool full_window); static void rollover_top_tasks(struct rq *rq, bool full_window); -/* - * if last window's average capacity is less than or - * equal to the current capacity, return true. - */ -static inline bool is_cpufreq_avg_or_higher(int cpu) -{ - unsigned int avg_cap = sched_get_cpu_avg_cap(cpu); - unsigned int cur_cap = capacity_curr_of(cpu); - - if (cur_cap >= avg_cap && avg_cap != 0) - return true; - - return false; -} - /* walt_find_cluster_packing_cpu - Return a packing_cpu choice common for this cluster. * @start_cpu: The cpu from the cluster to choose from * @@ -429,10 +414,6 @@ bool walt_choose_packing_cpu(int packing_cpu, struct task_struct *p) if (task_util(p) >= sysctl_sched_idle_enough) return false; - /* if cpufreq is lower than the previous window */ - if (!is_cpufreq_avg_or_higher(packing_cpu)) - return false; - /* the packing cpu can be used, so pack! */ return true; } diff --git a/kernel/sched/walt/walt.h b/kernel/sched/walt/walt.h index 1663bbf281e1..b8a0e5bf8096 100644 --- a/kernel/sched/walt/walt.h +++ b/kernel/sched/walt/walt.h @@ -349,7 +349,6 @@ struct sched_avg_stats { int nr_misfit; int nr_max; int nr_scaled; - u32 avg_cap; }; struct waltgov_callback { @@ -791,8 +790,6 @@ static inline bool task_fits_max(struct task_struct *p, int cpu) extern struct sched_avg_stats *sched_get_nr_running_avg(void); extern unsigned int sched_get_cluster_util_pct(struct walt_sched_cluster *cluster); -extern unsigned int sched_get_cpu_avg_cap(int cpu); -extern unsigned int waltgov_get_avg_cap(unsigned int cpu); extern void sched_update_hyst_times(void); extern void walt_rt_init(void);