Merge cpufreq fixes going into v4.6.

* pm-cpufreq-fixes:
  intel_pstate: Fix intel_pstate_get()
  cpufreq: intel_pstate: Fix HWP on boot CPU after system resume
  cpufreq: st: enable selective initialization based on the platform
  cpufreq: intel_pstate: Fix processing for turbo activation ratio

1 files changed, 15 insertions, 11 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index a48b998b3304..035513b012ee 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1631,21 +1631,25 @@ void cpufreq_suspend(void)
         if (!cpufreq_driver)
                 return;
 
-        if (!has_target())
+        if (!has_target() && !cpufreq_driver->suspend)
                 goto suspend;
 
         pr_debug("%s: Suspending Governors\n", __func__);
 
         for_each_active_policy(policy) {
-                down_write(&policy->rwsem);
-                ret = cpufreq_governor(policy, CPUFREQ_GOV_STOP);
-                up_write(&policy->rwsem);
+                if (has_target()) {
+                        down_write(&policy->rwsem);
+                        ret = cpufreq_governor(policy, CPUFREQ_GOV_STOP);
+                        up_write(&policy->rwsem);
 
-                if (ret)
-                        pr_err("%s: Failed to stop governor for policy: %p\n",
-                                __func__, policy);
-                else if (cpufreq_driver->suspend
-                    && cpufreq_driver->suspend(policy))
+                        if (ret) {
+                                pr_err("%s: Failed to stop governor for policy: %p\n",
+                                        __func__, policy);
+                                continue;
+                        }
+                }
+
+                if (cpufreq_driver->suspend && cpufreq_driver->suspend(policy))
                         pr_err("%s: Failed to suspend driver: %p\n", __func__,
                                 policy);
         }
@@ -1670,7 +1674,7 @@ void cpufreq_resume(void)
 
         cpufreq_suspended = false;
 
-        if (!has_target())
+        if (!has_target() && !cpufreq_driver->resume)
                 return;
 
         pr_debug("%s: Resuming Governors\n", __func__);
@@ -1679,7 +1683,7 @@ void cpufreq_resume(void)
                 if (cpufreq_driver->resume && cpufreq_driver->resume(policy)) {
                         pr_err("%s: Failed to resume driver: %p\n", __func__,
                                 policy);
-                } else {
+                } else if (has_target()) {
                         down_write(&policy->rwsem);
                         ret = cpufreq_start_governor(policy);
                         up_write(&policy->rwsem);