|
@@ -3552,7 +3552,18 @@ static inline int check_power_save_busiest_group(struct sd_lb_stats *sds,
|
|
}
|
|
}
|
|
#endif /* CONFIG_SCHED_MC || CONFIG_SCHED_SMT */
|
|
#endif /* CONFIG_SCHED_MC || CONFIG_SCHED_SMT */
|
|
|
|
|
|
-unsigned long __weak arch_scale_smt_power(struct sched_domain *sd, int cpu)
|
|
|
|
|
|
+
|
|
|
|
+unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu)
|
|
|
|
+{
|
|
|
|
+ return SCHED_LOAD_SCALE;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+unsigned long __weak arch_scale_freq_power(struct sched_domain *sd, int cpu)
|
|
|
|
+{
|
|
|
|
+ return default_scale_freq_power(sd, cpu);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu)
|
|
{
|
|
{
|
|
unsigned long weight = cpumask_weight(sched_domain_span(sd));
|
|
unsigned long weight = cpumask_weight(sched_domain_span(sd));
|
|
unsigned long smt_gain = sd->smt_gain;
|
|
unsigned long smt_gain = sd->smt_gain;
|
|
@@ -3562,6 +3573,11 @@ unsigned long __weak arch_scale_smt_power(struct sched_domain *sd, int cpu)
|
|
return smt_gain;
|
|
return smt_gain;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+unsigned long __weak arch_scale_smt_power(struct sched_domain *sd, int cpu)
|
|
|
|
+{
|
|
|
|
+ return default_scale_smt_power(sd, cpu);
|
|
|
|
+}
|
|
|
|
+
|
|
unsigned long scale_rt_power(int cpu)
|
|
unsigned long scale_rt_power(int cpu)
|
|
{
|
|
{
|
|
struct rq *rq = cpu_rq(cpu);
|
|
struct rq *rq = cpu_rq(cpu);
|
|
@@ -3586,7 +3602,8 @@ static void update_cpu_power(struct sched_domain *sd, int cpu)
|
|
unsigned long power = SCHED_LOAD_SCALE;
|
|
unsigned long power = SCHED_LOAD_SCALE;
|
|
struct sched_group *sdg = sd->groups;
|
|
struct sched_group *sdg = sd->groups;
|
|
|
|
|
|
- /* here we could scale based on cpufreq */
|
|
|
|
|
|
+ power *= arch_scale_freq_power(sd, cpu);
|
|
|
|
+ power >>= SCHED_LOAD_SHIFT;
|
|
|
|
|
|
if ((sd->flags & SD_SHARE_CPUPOWER) && weight > 1) {
|
|
if ((sd->flags & SD_SHARE_CPUPOWER) && weight > 1) {
|
|
power *= arch_scale_smt_power(sd, cpu);
|
|
power *= arch_scale_smt_power(sd, cpu);
|