@@ -1395,8 +1395,8 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
static int __cpufreq_remove_dev_prepare(struct device *dev,
struct subsys_interface *sif)
{
- unsigned int cpu = dev->id, cpus;
- int ret;
+ unsigned int cpu = dev->id;
+ int ret = 0;
struct cpufreq_policy *policy;
pr_debug("%s: unregistering CPU %u\n", __func__, cpu);
@@ -1416,26 +1416,33 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
}
down_write(&policy->rwsem);
- cpus = cpumask_weight(policy->cpus);
+ cpumask_clear_cpu(cpu, policy->cpus);
- if (has_target() && cpus == 1)
- strncpy(policy->last_governor, policy->governor->name,
- CPUFREQ_NAME_LEN);
+ if (policy_is_inactive(policy)) {
+ if (has_target())
+ strncpy(policy->last_governor, policy->governor->name,
+ CPUFREQ_NAME_LEN);
+ } else if (cpu == policy->cpu) {
+ /* Nominate new CPU */
+ policy->cpu = cpumask_any(policy->cpus);
+ }
up_write(&policy->rwsem);
- if (cpu != policy->cpu)
- return 0;
+ /* Start governor again for active policy */
+ if (!policy_is_inactive(policy)) {
+ if (has_target()) {
+ ret = __cpufreq_governor(policy, CPUFREQ_GOV_START);
+ if (!ret)
+ ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
- if (cpus > 1) {
- /* Nominate new CPU */
- down_write(&policy->rwsem);
- policy->cpu = cpumask_any_but(policy->cpus, cpu);
- up_write(&policy->rwsem);
+ if (ret)
+ pr_err("%s: Failed to start governor\n", __func__);
+ }
} else if (cpufreq_driver->stop_cpu) {
cpufreq_driver->stop_cpu(policy);
}
- return 0;
+ return ret;
}
static int __cpufreq_remove_dev_finish(struct device *dev,
@@ -1443,33 +1450,16 @@ static int __cpufreq_remove_dev_finish(struct device *dev,
{
unsigned int cpu = dev->id;
int ret;
- struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu);
+ struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
if (!policy) {
pr_debug("%s: No cpu_data found\n", __func__);
return -EINVAL;
}
- down_write(&policy->rwsem);
- cpumask_clear_cpu(cpu, policy->cpus);
- up_write(&policy->rwsem);
-
- /* Not the last cpu of policy, start governor again ? */
- if (!policy_is_inactive(policy)) {
- if (!has_target())
- return 0;
-
- ret = __cpufreq_governor(policy, CPUFREQ_GOV_START);
- if (!ret)
- ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS);
-
- if (ret) {
- pr_err("%s: Failed to start governor\n", __func__);
- return ret;
- }
-
+ /* Only proceed for inactive policies */
+ if (!policy_is_inactive(policy))
return 0;
- }
/* If cpu is last user of policy, free policy */
if (has_target()) {
On cpu hot-unplug, we don't need to wait for POST_DEAD notification to restart the governor if the policy has atleast one online cpu left. We can restart the governor right from the DOWN_PREPARE notification instead. [ Something similar attempted by Saravana earlier ] Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/cpufreq/cpufreq.c | 58 ++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 34 deletions(-)