Merge tag 'pm-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix a few issues in the intel_pstate driver, a documetation
  issue, a false-positive compiler warning in the generic power domains
  framework and two problems in the devfreq subsystem. They also update
  the MAINTAINERS entry for devfreq and add a new "compatible" string to
  the generic cpufreq-dt driver.

  Specifics:

   - Fix a few intel_pstate driver issues: add missing locking it two
     places, avoid exposing a useless debugfs interface and keep the
     attribute values in sysfs in sync (Rafael Wysocki).

   - Drop confusing kernel-doc references related to power management
     and ACPI from the driver API manual (Rafael Wysocki).

   - Make a false-positive compiler warning in the generic power domains
     framework go away (Augusto Mecking Caringi).

   - Fix two initialization issues in the devfreq subsystem and update
     the MAINTAINERS entry for it (Chanwoo Choi).

   - Add a new "compatible" string for APM X-Gene 2 to the generic DT
     cpufreq driver (Hoan Tran)"

* tag 'pm-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: dt: Add support for APM X-Gene 2
  PM / devfreq: exynos-bus: Fix the wrong return value
  PM / devfreq: Fix the bug of devfreq_add_device when governor is NULL
  MAINTAINERS: Add myself as reviewer for DEVFREQ subsystem support
  PM / docs: Drop confusing kernel-doc references from infrastructure.rst
  PM / domains: Fix 'may be used uninitialized' build warning
  cpufreq: intel_pstate: Always keep all limits settings in sync
  cpufreq: intel_pstate: Use locking in intel_cpufreq_verify_policy()
  cpufreq: intel_pstate: Use locking in intel_pstate_resume()
  cpufreq: intel_pstate: Do not expose PID parameters in passive mode

7 files changed, 46 insertions, 43 deletions

diff --git a/Documentation/driver-api/infrastructure.rst b/Documentation/driver-api/infrastructure.rst
index 0bb0b5fc9512..6d9ff316b608 100644
--- a/Documentation/driver-api/infrastructure.rst
+++ b/Documentation/driver-api/infrastructure.rst
@@ -55,21 +55,6 @@ Device Drivers DMA Management
 .. kernel-doc:: drivers/base/dma-mapping.c
    :export:
 
-Device Drivers Power Management
--------------------------------
-
-.. kernel-doc:: drivers/base/power/main.c
-   :export:
-
-Device Drivers ACPI Support
----------------------------
-
-.. kernel-doc:: drivers/acpi/scan.c
-   :export:
-
-.. kernel-doc:: drivers/acpi/scan.c
-   :internal:
-
 Device drivers PnP support
 --------------------------
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 9267b8fad791..a136dfbb8eea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3800,6 +3800,7 @@ F:	include/linux/devcoredump.h
 DEVICE FREQUENCY (DEVFREQ)
 M:      MyungJoo Ham <myungjoo.ham@samsung.com>
 M:      Kyungmin Park <kyungmin.park@samsung.com>
+R:      Chanwoo Choi <cw00.choi@samsung.com>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 S:      Maintained
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index a5e1262b964b..2997026b4dfb 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -626,6 +626,7 @@ static int genpd_runtime_resume(struct device *dev)
 
  out:
         /* Measure resume latency. */
+        time_start = 0;
         if (timed && runtime_pm)
                 time_start = ktime_get();
 
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
index bc97b6a4b1cf..7fcaf26e8f81 100644
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@ -26,6 +26,8 @@ static const struct of_device_id machines[] __initconst = {
         { .compatible = "allwinner,sun8i-a83t", },
         { .compatible = "allwinner,sun8i-h3", },
 
+        { .compatible = "apm,xgene-shadowcat", },
+
         { .compatible = "arm,integrator-ap", },
         { .compatible = "arm,integrator-cp", },
 
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 6acbd4af632e..f91c25718d16 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -857,13 +857,13 @@ static struct freq_attr *hwp_cpufreq_attrs[] = {
         NULL,
 };
 
-static void intel_pstate_hwp_set(const struct cpumask *cpumask)
+static void intel_pstate_hwp_set(struct cpufreq_policy *policy)
 {
         int min, hw_min, max, hw_max, cpu, range, adj_range;
         struct perf_limits *perf_limits = limits;
         u64 value, cap;
 
-        for_each_cpu(cpu, cpumask) {
+        for_each_cpu(cpu, policy->cpus) {
                 int max_perf_pct, min_perf_pct;
                 struct cpudata *cpu_data = all_cpu_data[cpu];
                 s16 epp;
@@ -949,7 +949,7 @@ skip_epp:
 static int intel_pstate_hwp_set_policy(struct cpufreq_policy *policy)
 {
         if (hwp_active)
-                intel_pstate_hwp_set(policy->cpus);
+                intel_pstate_hwp_set(policy);
 
         return 0;
 }
@@ -968,19 +968,28 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)
 
 static int intel_pstate_resume(struct cpufreq_policy *policy)
 {
+        int ret;
+
         if (!hwp_active)
                 return 0;
 
+        mutex_lock(&intel_pstate_limits_lock);
+
         all_cpu_data[policy->cpu]->epp_policy = 0;
 
-        return intel_pstate_hwp_set_policy(policy);
+        ret = intel_pstate_hwp_set_policy(policy);
+
+        mutex_unlock(&intel_pstate_limits_lock);
+
+        return ret;
 }
 
-static void intel_pstate_hwp_set_online_cpus(void)
+static void intel_pstate_update_policies(void)
 {
-        get_online_cpus();
-        intel_pstate_hwp_set(cpu_online_mask);
-        put_online_cpus();
+        int cpu;
+
+        for_each_possible_cpu(cpu)
+                cpufreq_update_policy(cpu);
 }
 
 /************************** debugfs begin ************************/
@@ -1018,10 +1027,6 @@ static void __init intel_pstate_debug_expose_params(void)
         struct dentry *debugfs_parent;
         int i = 0;
 
-        if (hwp_active ||
-            pstate_funcs.get_target_pstate == get_target_pstate_use_cpu_load)
-                return;
-
         debugfs_parent = debugfs_create_dir("pstate_snb", NULL);
         if (IS_ERR_OR_NULL(debugfs_parent))
                 return;
@@ -1105,11 +1110,10 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
 
         limits->no_turbo = clamp_t(int, input, 0, 1);
 
-        if (hwp_active)
-                intel_pstate_hwp_set_online_cpus();
-
         mutex_unlock(&intel_pstate_limits_lock);
 
+        intel_pstate_update_policies();
+
         return count;
 }
 
@@ -1134,11 +1138,10 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
                                    limits->max_perf_pct);
         limits->max_perf = div_ext_fp(limits->max_perf_pct, 100);
 
-        if (hwp_active)
-                intel_pstate_hwp_set_online_cpus();
-
         mutex_unlock(&intel_pstate_limits_lock);
 
+        intel_pstate_update_policies();
+
         return count;
 }
 
@@ -1163,11 +1166,10 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,
                                    limits->min_perf_pct);
         limits->min_perf = div_ext_fp(limits->min_perf_pct, 100);
 
-        if (hwp_active)
-                intel_pstate_hwp_set_online_cpus();
-
         mutex_unlock(&intel_pstate_limits_lock);
 
+        intel_pstate_update_policies();
+
         return count;
 }
 
@@ -2153,8 +2155,12 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy)
         if (per_cpu_limits)
                 perf_limits = cpu->perf_limits;
 
+        mutex_lock(&intel_pstate_limits_lock);
+
         intel_pstate_update_perf_limits(policy, perf_limits);
 
+        mutex_unlock(&intel_pstate_limits_lock);
+
         return 0;
 }
 
@@ -2487,7 +2493,10 @@ hwp_cpu_matched:
         if (rc)
                 goto out;
 
-        intel_pstate_debug_expose_params();
+        if (intel_pstate_driver == &intel_pstate && !hwp_active &&
+            pstate_funcs.get_target_pstate != get_target_pstate_use_cpu_load)
+                intel_pstate_debug_expose_params();
+
         intel_pstate_sysfs_expose_params();
 
         if (hwp_active)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index a324801d6a66..47206a21bb90 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -593,11 +593,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
         list_add(&devfreq->node, &devfreq_list);
 
         governor = find_devfreq_governor(devfreq->governor_name);
-        if (!IS_ERR(governor))
-                devfreq->governor = governor;
-        if (devfreq->governor)
-                err = devfreq->governor->event_handler(devfreq,
-                                        DEVFREQ_GOV_START, NULL);
+        if (IS_ERR(governor)) {
+                dev_err(dev, "%s: Unable to find governor for the device\n",
+                        __func__);
+                err = PTR_ERR(governor);
+                goto err_init;
+        }
+
+        devfreq->governor = governor;
+        err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START,
+                                                NULL);
         if (err) {
                 dev_err(dev, "%s: Unable to start governor for the device\n",
                         __func__);
diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index a8ed7792ece2..9af86f46fbec 100644
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@ -497,7 +497,7 @@ passive:
         if (IS_ERR(bus->devfreq)) {
                 dev_err(dev,
                         "failed to add devfreq dev with passive governor\n");
-                ret = -EPROBE_DEFER;
+                ret = PTR_ERR(bus->devfreq);
                 goto err;
         }