Merge branches 'pm-cpufreq-sched' and 'intel_pstate'

rafaeljw · rafaeljw · commit a252c258dd0d · 2017-07-14T13:16:16.000+02:00
* pm-cpufreq-sched:
  cpufreq: schedutil: Fix sugov_start() versus sugov_update_shared() race

* intel_pstate:
  cpufreq: intel_pstate: Fix ratio setting for min_perf_pct
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
@@ -572,7 +572,7 @@ static int min_perf_pct_min(void)
 	int turbo_pstate = cpu->pstate.turbo_pstate;
 
 	return turbo_pstate ?
-		DIV_ROUND_UP(cpu->pstate.min_pstate * 100, turbo_pstate) : 0;
+		(cpu->pstate.min_pstate * 100 / turbo_pstate) : 0;
 }
 
 static s16 intel_pstate_get_epb(struct cpudata *cpu_data)
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
@@ -610,6 +610,11 @@ static int sugov_start(struct cpufreq_policy *policy)
 		sg_cpu->sg_policy = sg_policy;
 		sg_cpu->flags = SCHED_CPUFREQ_RT;
 		sg_cpu->iowait_boost_max = policy->cpuinfo.max_freq;
+	}
+
+	for_each_cpu(cpu, policy->cpus) {
+		struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu);
+
 		cpufreq_add_update_util_hook(cpu, &sg_cpu->update_util,
 					     policy_is_shared(policy) ?
 							sugov_update_shared :

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ static int min_perf_pct_min(void)`
`572`	`572`	`int turbo_pstate = cpu->pstate.turbo_pstate;`
`573`	`573`
`574`	`574`	`return turbo_pstate ?`
`575`		`- DIV_ROUND_UP(cpu->pstate.min_pstate * 100, turbo_pstate) : 0;`
	`575`	`+ (cpu->pstate.min_pstate * 100 / turbo_pstate) : 0;`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`static s16 intel_pstate_get_epb(struct cpudata *cpu_data)`