PM / domains: Add pd_ignore_unused to keep power domains enabled

[mirror_ubuntu-artful-kernel.git] / drivers / base / power / domain.c

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index bfb8955c406c5ef02d819d4d5fa02d709f0a6ec0..ae098a261fcdb29262e778036ad5e9712841f221 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -6,7 +6,6 @@
  * This file is released under the GPLv2.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
@@ -42,7 +41,7 @@
        struct gpd_timing_data *__td = &dev_gpd_data(dev)->td;                  \
        if (!__retval && __elapsed > __td->field) {                             \
                __td->field = __elapsed;                                        \
-               dev_warn(dev, name " latency exceeded, new value %lld ns\n",    \
+               dev_dbg(dev, name " latency exceeded, new value %lld ns\n",     \
                        __elapsed);                                             \
                genpd->max_off_time_changed = true;                             \
                __td->constraint_changed = true;                                \
@@ -706,6 +705,14 @@ static int pm_genpd_runtime_resume(struct device *dev)
        return 0;
 }
 
+static bool pd_ignore_unused;
+static int __init pd_ignore_unused_setup(char *__unused)
+{
+       pd_ignore_unused = true;
+       return 1;
+}
+__setup("pd_ignore_unused", pd_ignore_unused_setup);
+
 /**
  * pm_genpd_poweroff_unused - Power off all PM domains with no devices in use.
  */
@@ -713,6 +720,11 @@ void pm_genpd_poweroff_unused(void)
 {
        struct generic_pm_domain *genpd;
 
+       if (pd_ignore_unused) {
+               pr_warn("genpd: Not disabling unused power domains\n");
+               return;
+       }
+
        mutex_lock(&gpd_list_lock);
 
        list_for_each_entry(genpd, &gpd_list, gpd_list_node)