|
@@ -918,11 +918,19 @@ static struct kobj_type ktype_cpufreq = {
|
|
.release = cpufreq_sysfs_release,
|
|
.release = cpufreq_sysfs_release,
|
|
};
|
|
};
|
|
|
|
|
|
-static int add_cpu_dev_symlink(struct cpufreq_policy *policy,
|
|
|
|
- struct device *dev)
|
|
|
|
|
|
+static void add_cpu_dev_symlink(struct cpufreq_policy *policy, unsigned int cpu)
|
|
{
|
|
{
|
|
|
|
+ struct device *dev = get_cpu_device(cpu);
|
|
|
|
+
|
|
|
|
+ if (!dev)
|
|
|
|
+ return;
|
|
|
|
+
|
|
|
|
+ if (cpumask_test_and_set_cpu(cpu, policy->real_cpus))
|
|
|
|
+ return;
|
|
|
|
+
|
|
dev_dbg(dev, "%s: Adding symlink\n", __func__);
|
|
dev_dbg(dev, "%s: Adding symlink\n", __func__);
|
|
- return sysfs_create_link(&dev->kobj, &policy->kobj, "cpufreq");
|
|
|
|
|
|
+ if (sysfs_create_link(&dev->kobj, &policy->kobj, "cpufreq"))
|
|
|
|
+ dev_err(dev, "cpufreq symlink creation failed\n");
|
|
}
|
|
}
|
|
|
|
|
|
static void remove_cpu_dev_symlink(struct cpufreq_policy *policy,
|
|
static void remove_cpu_dev_symlink(struct cpufreq_policy *policy,
|
|
@@ -1180,10 +1188,10 @@ static int cpufreq_online(unsigned int cpu)
|
|
policy->user_policy.min = policy->min;
|
|
policy->user_policy.min = policy->min;
|
|
policy->user_policy.max = policy->max;
|
|
policy->user_policy.max = policy->max;
|
|
|
|
|
|
- write_lock_irqsave(&cpufreq_driver_lock, flags);
|
|
|
|
- for_each_cpu(j, policy->related_cpus)
|
|
|
|
|
|
+ for_each_cpu(j, policy->related_cpus) {
|
|
per_cpu(cpufreq_cpu_data, j) = policy;
|
|
per_cpu(cpufreq_cpu_data, j) = policy;
|
|
- write_unlock_irqrestore(&cpufreq_driver_lock, flags);
|
|
|
|
|
|
+ add_cpu_dev_symlink(policy, j);
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
policy->min = policy->user_policy.min;
|
|
policy->min = policy->user_policy.min;
|
|
policy->max = policy->user_policy.max;
|
|
policy->max = policy->user_policy.max;
|
|
@@ -1275,13 +1283,15 @@ out_exit_policy:
|
|
|
|
|
|
if (cpufreq_driver->exit)
|
|
if (cpufreq_driver->exit)
|
|
cpufreq_driver->exit(policy);
|
|
cpufreq_driver->exit(policy);
|
|
|
|
+
|
|
|
|
+ for_each_cpu(j, policy->real_cpus)
|
|
|
|
+ remove_cpu_dev_symlink(policy, get_cpu_device(j));
|
|
|
|
+
|
|
out_free_policy:
|
|
out_free_policy:
|
|
cpufreq_policy_free(policy);
|
|
cpufreq_policy_free(policy);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
-static int cpufreq_offline(unsigned int cpu);
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* cpufreq_add_dev - the cpufreq interface for a CPU device.
|
|
* cpufreq_add_dev - the cpufreq interface for a CPU device.
|
|
* @dev: CPU device.
|
|
* @dev: CPU device.
|
|
@@ -1303,16 +1313,10 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
|
|
|
|
|
|
/* Create sysfs link on CPU registration */
|
|
/* Create sysfs link on CPU registration */
|
|
policy = per_cpu(cpufreq_cpu_data, cpu);
|
|
policy = per_cpu(cpufreq_cpu_data, cpu);
|
|
- if (!policy || cpumask_test_and_set_cpu(cpu, policy->real_cpus))
|
|
|
|
- return 0;
|
|
|
|
|
|
+ if (policy)
|
|
|
|
+ add_cpu_dev_symlink(policy, cpu);
|
|
|
|
|
|
- ret = add_cpu_dev_symlink(policy, dev);
|
|
|
|
- if (ret) {
|
|
|
|
- cpumask_clear_cpu(cpu, policy->real_cpus);
|
|
|
|
- cpufreq_offline(cpu);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return ret;
|
|
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int cpufreq_offline(unsigned int cpu)
|
|
static int cpufreq_offline(unsigned int cpu)
|