Merge back new PM domains material for v5.15.

[linux-2.6-microblaze.git] / drivers / base / power / domain.c

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index f10688e..5db704f 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2604,6 +2604,12 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off)
 
        dev_dbg(dev, "removing from PM domain %s\n", pd->name);
 
+       /* Drop the default performance state */
+       if (dev_gpd_data(dev)->default_pstate) {
+               dev_pm_genpd_set_performance_state(dev, 0);
+               dev_gpd_data(dev)->default_pstate = 0;
+       }
+
        for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
                ret = genpd_remove_device(pd, dev);
                if (ret != -EAGAIN)
@@ -2643,6 +2649,7 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
 {
        struct of_phandle_args pd_args;
        struct generic_pm_domain *pd;
+       int pstate;
        int ret;
 
        ret = of_parse_phandle_with_args(dev->of_node, "power-domains",
@@ -2681,10 +2688,29 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
                genpd_unlock(pd);
        }
 
-       if (ret)
+       if (ret) {
                genpd_remove_device(pd, dev);
+               return -EPROBE_DEFER;
+       }
 
-       return ret ? -EPROBE_DEFER : 1;
+       /* Set the default performance state */
+       pstate = of_get_required_opp_performance_state(dev->of_node, index);
+       if (pstate < 0 && pstate != -ENODEV && pstate != -EOPNOTSUPP) {
+               ret = pstate;
+               goto err;
+       } else if (pstate > 0) {
+               ret = dev_pm_genpd_set_performance_state(dev, pstate);
+               if (ret)
+                       goto err;
+               dev_gpd_data(dev)->default_pstate = pstate;
+       }
+       return 1;
+
+err:
+       dev_err(dev, "failed to set required performance state for power-domain %s: %d\n",
+               pd->name, ret);
+       genpd_remove_device(pd, dev);
+       return ret;
 }
 
 /**