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

Pull more power management updates from Rafael Wysocki:
 "This includes a couple of fixes for cpufreq regressions introduced in
  4.8, a rework of the intel_pstate algorithm used on Atom processors
  (that took some time to test) plus a fix and a couple of cleanups in
  that driver, a CPPC cpufreq driver fix, and a some devfreq fixes and
  cleanups (core and exynos-nocp).

  Specifics:

   - Fix two cpufreq regressions causing undesirable changes in behavior
     to appear (one in the core and one in the conservative governor)
     introduced during the 4.8 cycle (Aaro Koskinen, Rafael Wysocki).

   - Fix the way the intel_pstate driver accesses MSRs related to the
     hardware-managed P-states (HWP) feature during the initialization
     which currently is unsafe and may cause the processor to generate a
     general protection fault (Srinivas Pandruvada).

   - Rework the intel_pstate's P-state selection algorithm used on Atom
     processors to avoid known problems with the current one and to make
     the computation more straightforward, which also happens to improve
     performance in multiple benchmarks a bit (Rafael Wysocki).

   - Improve two comments in the intel_pstate driver (Rafael Wysocki).

   - Fix the desired performance computation in the CPPC cpufreq driver
     (Hoan Tran).

   - Fix the devfreq core to avoid printing misleading error messages in
     some cases (Tobias Jakobi).

   - Fix the error code path in devfreq_add_device() to use proper
     locking around list modifications (Axel Lin).

   - Fix a build failure and remove a couple of redundant updates of
     variables in the exynos-nocp devfreq driver (Axel Lin)"

* tag 'pm-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: CPPC: Correct desired_perf calculation
  cpufreq: conservative: Fix next frequency selection
  cpufreq: skip invalid entries when searching the frequency
  cpufreq: intel_pstate: Fix struct pstate_adjust_policy kerneldoc
  cpufreq: intel_pstate: Proportional algorithm for Atom
  PM / devfreq: Skip status update on uninitialized previous_freq
  PM / devfreq: Add proper locking around list_del()
  PM / devfreq: exynos-nocp: Remove redundant code
  PM / devfreq: exynos-nocp: Select REGMAP_MMIO
  cpufreq: intel_pstate: Clarify comment in get_target_pstate_use_performance()
  cpufreq: intel_pstate: Fix unsafe HWP MSR access

3 files changed, 55 insertions, 15 deletions

diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index 1b2f28f69a81..4852d9efe74e 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -80,11 +80,17 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,
 {
         struct cppc_cpudata *cpu;
         struct cpufreq_freqs freqs;
+        u32 desired_perf;
         int ret = 0;
 
         cpu = all_cpu_data[policy->cpu];
 
-        cpu->perf_ctrls.desired_perf = (u64)target_freq * policy->max / cppc_dmi_max_khz;
+        desired_perf = (u64)target_freq * cpu->perf_caps.highest_perf / cppc_dmi_max_khz;
+        /* Return if it is exactly the same perf */
+        if (desired_perf == cpu->perf_ctrls.desired_perf)
+                return ret;
+
+        cpu->perf_ctrls.desired_perf = desired_perf;
         freqs.old = policy->cur;
         freqs.new = target_freq;
 
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 18da4f8051d3..13475890d792 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -17,6 +17,7 @@
 struct cs_policy_dbs_info {
         struct policy_dbs_info policy_dbs;
         unsigned int down_skip;
+        unsigned int requested_freq;
 };
 
 static inline struct cs_policy_dbs_info *to_dbs_info(struct policy_dbs_info *policy_dbs)
@@ -61,6 +62,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
 {
         struct policy_dbs_info *policy_dbs = policy->governor_data;
         struct cs_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs);
+        unsigned int requested_freq = dbs_info->requested_freq;
         struct dbs_data *dbs_data = policy_dbs->dbs_data;
         struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
         unsigned int load = dbs_update(policy);
@@ -72,10 +74,16 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
         if (cs_tuners->freq_step == 0)
                 goto out;
 
+        /*
+         * If requested_freq is out of range, it is likely that the limits
+         * changed in the meantime, so fall back to current frequency in that
+         * case.
+         */
+        if (requested_freq > policy->max || requested_freq < policy->min)
+                requested_freq = policy->cur;
+
         /* Check for frequency increase */
         if (load > dbs_data->up_threshold) {
-                unsigned int requested_freq = policy->cur;
-
                 dbs_info->down_skip = 0;
 
                 /* if we are already at full speed then break out early */
@@ -83,8 +91,11 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
                         goto out;
 
                 requested_freq += get_freq_target(cs_tuners, policy);
+                if (requested_freq > policy->max)
+                        requested_freq = policy->max;
 
                 __cpufreq_driver_target(policy, requested_freq, CPUFREQ_RELATION_H);
+                dbs_info->requested_freq = requested_freq;
                 goto out;
         }
 
@@ -95,7 +106,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
 
         /* Check for frequency decrease */
         if (load < cs_tuners->down_threshold) {
-                unsigned int freq_target, requested_freq = policy->cur;
+                unsigned int freq_target;
                 /*
                  * if we cannot reduce the frequency anymore, break out early
                  */
@@ -109,6 +120,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
                         requested_freq = policy->min;
 
                 __cpufreq_driver_target(policy, requested_freq, CPUFREQ_RELATION_L);
+                dbs_info->requested_freq = requested_freq;
         }
 
  out:
@@ -287,6 +299,7 @@ static void cs_start(struct cpufreq_policy *policy)
         struct cs_policy_dbs_info *dbs_info = to_dbs_info(policy->governor_data);
 
         dbs_info->down_skip = 0;
+        dbs_info->requested_freq = policy->cur;
 }
 
 static struct dbs_governor cs_governor = {
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 806f2039571e..f535f8123258 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -225,7 +225,7 @@ struct cpudata {
 static struct cpudata **all_cpu_data;
 
 /**
- * struct pid_adjust_policy - Stores static PID configuration data
+ * struct pstate_adjust_policy - Stores static PID configuration data
  * @sample_rate_ms:     PID calculation sample rate in ms
  * @sample_rate_ns:     Sample rate calculation in ns
  * @deadband:           PID deadband
@@ -562,12 +562,12 @@ static void intel_pstate_hwp_set(const struct cpumask *cpumask)
         int min, hw_min, max, hw_max, cpu, range, adj_range;
         u64 value, cap;
 
-        rdmsrl(MSR_HWP_CAPABILITIES, cap);
-        hw_min = HWP_LOWEST_PERF(cap);
-        hw_max = HWP_HIGHEST_PERF(cap);
-        range = hw_max - hw_min;
-
         for_each_cpu(cpu, cpumask) {
+                rdmsrl_on_cpu(cpu, MSR_HWP_CAPABILITIES, &cap);
+                hw_min = HWP_LOWEST_PERF(cap);
+                hw_max = HWP_HIGHEST_PERF(cap);
+                range = hw_max - hw_min;
+
                 rdmsrl_on_cpu(cpu, MSR_HWP_REQUEST, &value);
                 adj_range = limits->min_perf_pct * range / 100;
                 min = hw_min + adj_range;
@@ -1232,6 +1232,7 @@ static inline int32_t get_target_pstate_use_cpu_load(struct cpudata *cpu)
 {
         struct sample *sample = &cpu->sample;
         int32_t busy_frac, boost;
+        int target, avg_pstate;
 
         busy_frac = div_fp(sample->mperf, sample->tsc);
 
@@ -1242,7 +1243,26 @@ static inline int32_t get_target_pstate_use_cpu_load(struct cpudata *cpu)
                 busy_frac = boost;
 
         sample->busy_scaled = busy_frac * 100;
-        return get_avg_pstate(cpu) - pid_calc(&cpu->pid, sample->busy_scaled);
+
+        target = limits->no_turbo || limits->turbo_disabled ?
+                        cpu->pstate.max_pstate : cpu->pstate.turbo_pstate;
+        target += target >> 2;
+        target = mul_fp(target, busy_frac);
+        if (target < cpu->pstate.min_pstate)
+                target = cpu->pstate.min_pstate;
+
+        /*
+         * If the average P-state during the previous cycle was higher than the
+         * current target, add 50% of the difference to the target to reduce
+         * possible performance oscillations and offset possible performance
+         * loss related to moving the workload from one CPU to another within
+         * a package/module.
+         */
+        avg_pstate = get_avg_pstate(cpu);
+        if (avg_pstate > target)
+                target += (avg_pstate - target) >> 1;
+
+        return target;
 }
 
 static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)
@@ -1251,10 +1271,11 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)
         u64 duration_ns;
 
         /*
-         * perf_scaled is the average performance during the last sampling
-         * period scaled by the ratio of the maximum P-state to the P-state
-         * requested last time (in percent).  That measures the system's
-         * response to the previous P-state selection.
+         * perf_scaled is the ratio of the average P-state during the last
+         * sampling period to the P-state requested last time (in percent).
+         *
+         * That measures the system's response to the previous P-state
+         * selection.
          */
         max_pstate = cpu->pstate.max_pstate_physical;
         current_pstate = cpu->pstate.current_pstate;