diff options
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r-- | kernel/sched/core.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 12cb272dc607..a222750c5ccb 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5099,6 +5099,7 @@ static void init_sched_energy(int cpu, struct sched_domain *sd, struct sched_group_energy *energy = sg->sge; sched_domain_energy_f fn = tl->energy; struct cpumask *mask = sched_group_cpus(sg); + int idle_states_below = 0; if (!fn || !fn(cpu)) return; @@ -5106,9 +5107,20 @@ static void init_sched_energy(int cpu, struct sched_domain *sd, if (cpumask_weight(mask) > 1) check_sched_energy_data(cpu, fn, mask); + /* Figure out the number of true cpuidle states below current group */ + sd = sd->child; + for_each_lower_domain(sd) { + idle_states_below += sd->groups->sge->nr_idle_states; + + /* Disregard non-cpuidle 'active' idle states */ + if (sd->child) + idle_states_below--; + } + energy->nr_idle_states = fn(cpu)->nr_idle_states; memcpy(energy->idle_states, fn(cpu)->idle_states, energy->nr_idle_states*sizeof(struct idle_state)); + energy->idle_states_below = idle_states_below; energy->nr_cap_states = fn(cpu)->nr_cap_states; memcpy(energy->cap_states, fn(cpu)->cap_states, energy->nr_cap_states*sizeof(struct capacity_state)); |