Merge branches 'pm-domains' and 'pm-cpufreq'

rafaeljw · rafaeljw · commit d441fe25e7de · 2015-12-04T14:01:42.000+01:00
* pm-domains:
  PM / Domains: Fix bad of_node_put() in failure paths of genpd_dev_pm_attach()
  PM / Domains: Validate cases of a non-bound driver in genpd governor

* pm-cpufreq:
  cpufreq: use last policy after online for drivers with -&gt;setpolicy
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
@@ -1775,10 +1775,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 +1796,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
@@ -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
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
@@ -976,10 +976,14 @@ static int cpufreq_init_policy(struct cpufreq_policy *policy)
 
 	new_policy.governor = gov;
 
-	/* Use the default policy if its valid. */
-	if (cpufreq_driver->setpolicy)
-		cpufreq_parse_governor(gov->name, &new_policy.policy, NULL);
-
+	/* Use the default policy if there is no last_policy. */
+	if (cpufreq_driver->setpolicy) {
+		if (policy->last_policy)
+			new_policy.policy = policy->last_policy;
+		else
+			cpufreq_parse_governor(gov->name, &new_policy.policy,
+					       NULL);
+	}
 	/* set default policy */
 	return cpufreq_set_policy(policy, &new_policy);
 }
@@ -1330,6 +1334,8 @@ static void cpufreq_offline_prepare(unsigned int cpu)
 		if (has_target())
 			strncpy(policy->last_governor, policy->governor->name,
 				CPUFREQ_NAME_LEN);
+		else
+			policy->last_policy = policy->policy;
 	} else if (cpu == policy->cpu) {
 		/* Nominate new CPU */
 		policy->cpu = cpumask_any(policy->cpus);
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
@@ -77,6 +77,7 @@ struct cpufreq_policy {
 	unsigned int		suspend_freq; /* freq to set during suspend */
 
 	unsigned int		policy; /* see above */
+	unsigned int		last_policy; /* policy before unplug */
 	struct cpufreq_governor	*governor; /* see below */
 	void			*governor_data;
 	bool			governor_enabled; /* governor start/stop flag */

Original file line number	Diff line number	Diff line change
`@@ -1775,10 +1775,10 @@ int genpd_dev_pm_attach(struct device *dev)`
`1775`	`1775`	`}`
`1776`	`1776`
`1777`	`1777`	`pd = of_genpd_get_from_provider(&pd_args);`
	`1778`	`+ of_node_put(pd_args.np);`
`1778`	`1779`	`if (IS_ERR(pd)) {`
`1779`	`1780`	`dev_dbg(dev, "%s() failed to find PM domain: %ld\n",`
`1780`	`1781`	`__func__, PTR_ERR(pd));`
`1781`		`- of_node_put(dev->of_node);`
`1782`	`1782`	`return -EPROBE_DEFER;`
`1783`	`1783`	`}`
`1784`	`1784`
`@@ -1796,7 +1796,6 @@ int genpd_dev_pm_attach(struct device *dev)`
`1796`	`1796`	`if (ret < 0) {`
`1797`	`1797`	`dev_err(dev, "failed to add to PM domain %s: %d",`
`1798`	`1798`	`pd->name, ret);`
`1799`		`- of_node_put(dev->of_node);`
`1800`	`1799`	`goto out;`
`1801`	`1800`	`}`
`1802`	`1801`