Merge tag 'pm+acpi-4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "One revert of a recent cpufreq commit that introduced a regression and
  a fix for intel_pstate's Turbo Activation Ratio handling code.

  Specifics:

   - Revert cpufreq commit that attempted to fix a problem in the
     ondemand/conservative governor code, but did that incorrectly and
     introduced another problem instead (Rafael Wysocki).

   - Fix incorrect decoding of MSR contents related to the Turbo
     Activation Ratio (TAR) handling in the intel_pstate driver
     (Srinivas Pandruvada)"

* tag 'pm+acpi-4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: intel_pstate: Fix processing for turbo activation ratio
  Revert "cpufreq: governor: Fix negative idle_time when configured with CONFIG_HZ_PERIODIC"

2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 10a5cfeae8c5..5f1147fa9239 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -193,12 +193,8 @@ unsigned int dbs_update(struct cpufreq_policy *policy)
                 wall_time = cur_wall_time - j_cdbs->prev_cpu_wall;
                 j_cdbs->prev_cpu_wall = cur_wall_time;
 
-                if (cur_idle_time <= j_cdbs->prev_cpu_idle) {
-                        idle_time = 0;
-                } else {
-                        idle_time = cur_idle_time - j_cdbs->prev_cpu_idle;
-                        j_cdbs->prev_cpu_idle = cur_idle_time;
-                }
+                idle_time = cur_idle_time - j_cdbs->prev_cpu_idle;
+                j_cdbs->prev_cpu_idle = cur_idle_time;
 
                 if (ignore_nice) {
                         u64 cur_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 30fe323c4551..f502d5b90c25 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -813,6 +813,11 @@ static int core_get_max_pstate(void)
                         if (err)
                                 goto skip_tar;
 
+                        /* For level 1 and 2, bits[23:16] contain the ratio */
+                        if (tdp_ctrl)
+                                tdp_ratio >>= 16;
+
+                        tdp_ratio &= 0xff; /* ratios are only 8 bits long */
                         if (tdp_ratio - 1 == tar) {
                                 max_pstate = tar;
                                 pr_debug("max_pstate=TAC %x\n", max_pstate);