Merge tag 'pm-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-2.6-microblaze.git] / kernel / sched / cpufreq_schedutil.c

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index fd76497..3cde464 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -191,22 +191,21 @@ static void sugov_get_util(struct sugov_cpu *sg_cpu)
 static unsigned long sugov_aggregate_util(struct sugov_cpu *sg_cpu)
 {
        struct rq *rq = cpu_rq(sg_cpu->cpu);
-       unsigned long util;
 
-       if (rq->rt.rt_nr_running) {
-               util = sg_cpu->max;
-       } else {
-               util = sg_cpu->util_dl;
-               if (rq->cfs.h_nr_running)
-                       util += sg_cpu->util_cfs;
-       }
+       if (rq->rt.rt_nr_running)
+               return sg_cpu->max;
 
        /*
+        * Utilization required by DEADLINE must always be granted while, for
+        * FAIR, we use blocked utilization of IDLE CPUs as a mechanism to
+        * gracefully reduce the frequency when no tasks show up for longer
+        * periods of time.
+        *
         * Ideally we would like to set util_dl as min/guaranteed freq and
         * util_cfs + util_dl as requested freq. However, cpufreq is not yet
         * ready for such an interface. So, we only do the latter for now.
         */
-       return min(util, sg_cpu->max);
+       return min(sg_cpu->max, (sg_cpu->util_dl + sg_cpu->util_cfs));
 }
 
 /**