Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

3 files changed, 27 insertions, 16 deletions

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 2804aed3f416..25425d3f2575 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -303,6 +303,10 @@ static int memory_subsys_offline(struct device *dev)
         if (mem->state == MEM_OFFLINE)
                 return 0;
 
+        /* Can't offline block with non-present sections */
+        if (mem->section_count != sections_per_block)
+                return -EINVAL;
+
         return memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE);
 }
 
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index e03b1ad25a90..65f50eccd49b 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -390,6 +390,7 @@ static int pm_genpd_runtime_suspend(struct device *dev)
         struct generic_pm_domain *genpd;
         bool (*stop_ok)(struct device *__dev);
         struct gpd_timing_data *td = &dev_gpd_data(dev)->td;
+        bool runtime_pm = pm_runtime_enabled(dev);
         ktime_t time_start;
         s64 elapsed_ns;
         int ret;
@@ -400,12 +401,19 @@ static int pm_genpd_runtime_suspend(struct device *dev)
         if (IS_ERR(genpd))
                 return -EINVAL;
 
+        /*
+         * A runtime PM centric subsystem/driver may re-use the runtime PM
+         * callbacks for other purposes than runtime PM. In those scenarios
+         * runtime PM is disabled. Under these circumstances, we shall skip
+         * validating/measuring the PM QoS latency.
+         */
         stop_ok = genpd->gov ? genpd->gov->stop_ok : NULL;
-        if (stop_ok && !stop_ok(dev))
+        if (runtime_pm && stop_ok && !stop_ok(dev))
                 return -EBUSY;
 
         /* Measure suspend latency. */
-        time_start = ktime_get();
+        if (runtime_pm)
+                time_start = ktime_get();
 
         ret = genpd_save_dev(genpd, dev);
         if (ret)
@@ -418,13 +426,15 @@ static int pm_genpd_runtime_suspend(struct device *dev)
         }
 
         /* Update suspend latency value if the measured time exceeds it. */
-        elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
-        if (elapsed_ns > td->suspend_latency_ns) {
-                td->suspend_latency_ns = elapsed_ns;
-                dev_dbg(dev, "suspend latency exceeded, %lld ns\n",
-                        elapsed_ns);
-                genpd->max_off_time_changed = true;
-                td->constraint_changed = true;
+        if (runtime_pm) {
+                elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
+                if (elapsed_ns > td->suspend_latency_ns) {
+                        td->suspend_latency_ns = elapsed_ns;
+                        dev_dbg(dev, "suspend latency exceeded, %lld ns\n",
+                                elapsed_ns);
+                        genpd->max_off_time_changed = true;
+                        td->constraint_changed = true;
+                }
         }
 
         /*
@@ -453,6 +463,7 @@ static int pm_genpd_runtime_resume(struct device *dev)
 {
         struct generic_pm_domain *genpd;
         struct gpd_timing_data *td = &dev_gpd_data(dev)->td;
+        bool runtime_pm = pm_runtime_enabled(dev);
         ktime_t time_start;
         s64 elapsed_ns;
         int ret;
@@ -479,14 +490,14 @@ static int pm_genpd_runtime_resume(struct device *dev)
 
  out:
         /* Measure resume latency. */
-        if (timed)
+        if (timed && runtime_pm)
                 time_start = ktime_get();
 
         genpd_start_dev(genpd, dev);
         genpd_restore_dev(genpd, dev);
 
         /* Update resume latency value if the measured time exceeds it. */
-        if (timed) {
+        if (timed && runtime_pm) {
                 elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
                 if (elapsed_ns > td->resume_latency_ns) {
                         td->resume_latency_ns = elapsed_ns;
@@ -1775,10 +1786,10 @@ int genpd_dev_pm_attach(struct device *dev)
         }
 
         pd = of_genpd_get_from_provider(&pd_args);
+        of_node_put(pd_args.np);
         if (IS_ERR(pd)) {
                 dev_dbg(dev, "%s() failed to find PM domain: %ld\n",
                         __func__, PTR_ERR(pd));
-                of_node_put(dev->of_node);
                 return -EPROBE_DEFER;
         }
 
@@ -1796,7 +1807,6 @@ int genpd_dev_pm_attach(struct device *dev)
         if (ret < 0) {
                 dev_err(dev, "failed to add to PM domain %s: %d",
                         pd->name, ret);
-                of_node_put(dev->of_node);
                 goto out;
         }
 
diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c
index e60dd12e23aa..1e937ac5f456 100644
--- a/drivers/base/power/domain_governor.c
+++ b/drivers/base/power/domain_governor.c
@@ -160,9 +160,6 @@ static bool default_power_down_ok(struct dev_pm_domain *pd)
                 struct gpd_timing_data *td;
                 s64 constraint_ns;
 
-                if (!pdd->dev->driver)
-                        continue;
-
                 /*
                  * Check if the device is allowed to be off long enough for the
                  * domain to turn off and on (that's how much time it will