Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8bfc116 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Remove cpufreq_frequency_get_table() 



Most of the callers of cpufreq_frequency_get_table() already have the
pointer to a valid 'policy' structure and they don't really need to go
through the per-cpu variable first and then a check to validate the
frequency, in order to find the freq-table for the policy.

Directly use the policy->freq_table field instead for them.

Only one user of that API is left after above changes, cpu_cooling.c and
it accesses the freq_table in a racy way as the policy can get freed in
between.

Fix it by using cpufreq_cpu_get() properly.

Since there are no more users of cpufreq_frequency_get_table() left, get
rid of it.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: Javi Merino <javi.merino@arm.com> (cpu_cooling.c)
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f0f879ba

drivers/cpufreq/cpufreq.c

+14 −24
Original line number Diff line number Diff line
@@ -126,15 +126,6 @@ struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy) 
}

EXPORT_SYMBOL_GPL(get_governor_parent_kobj);



struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu)

{

	struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);



	return policy && !policy_is_inactive(policy) ?

		policy->freq_table : NULL;

}

EXPORT_SYMBOL_GPL(cpufreq_frequency_get_table);



static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)

{

	u64 idle_time;
@@ -1950,7 +1941,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
	if (!cpufreq_driver->target_index)

		return -EINVAL;



	freq_table = cpufreq_frequency_get_table(policy->cpu);

	freq_table = policy->freq_table;

	if (unlikely(!freq_table)) {

		pr_err("%s: Unable to find freq_table\n", __func__);

		return -EINVAL;
@@ -2345,15 +2336,15 @@ static struct notifier_block __refdata cpufreq_cpu_notifier = { 
 *********************************************************************/

static int cpufreq_boost_set_sw(int state)

{

	struct cpufreq_frequency_table *freq_table;

	struct cpufreq_policy *policy;

	int ret = -EINVAL;



	for_each_active_policy(policy) {

		freq_table = cpufreq_frequency_get_table(policy->cpu);

		if (freq_table) {

		if (!policy->freq_table)

			continue;



		ret = cpufreq_frequency_table_cpuinfo(policy,

							freq_table);

						      policy->freq_table);

		if (ret) {

			pr_err("%s: Policy frequency update failed\n",

			       __func__);
@@ -2365,7 +2356,6 @@ static int cpufreq_boost_set_sw(int state) 
		cpufreq_governor_limits(policy);

		up_write(&policy->rwsem);

	}

	}



	return ret;

}

drivers/cpufreq/cpufreq_ondemand.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static void ondemand_powersave_bias_init(struct cpufreq_policy *policy) 
{

	struct od_policy_dbs_info *dbs_info = to_dbs_info(policy->governor_data);



	dbs_info->freq_table = cpufreq_frequency_get_table(policy->cpu);

	dbs_info->freq_table = policy->freq_table;

	dbs_info->freq_lo = 0;

}

drivers/cpufreq/cpufreq_stats.c

+1 −2
Original line number Diff line number Diff line
@@ -157,11 +157,10 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) 
	unsigned int i = 0, count = 0, ret = -ENOMEM;

	struct cpufreq_stats *stats;

	unsigned int alloc_size;

	unsigned int cpu = policy->cpu;

	struct cpufreq_frequency_table *pos, *table;



	/* We need cpufreq table for creating stats table */

	table = cpufreq_frequency_get_table(cpu);

	table = policy->freq_table;

	if (unlikely(!table))

		return;

drivers/cpufreq/freq_table.c

+3 −6
Original line number Diff line number Diff line
@@ -106,12 +106,10 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_verify); 
 */

int cpufreq_generic_frequency_table_verify(struct cpufreq_policy *policy)

{

	struct cpufreq_frequency_table *table =

		cpufreq_frequency_get_table(policy->cpu);

	if (!table)

	if (!policy->freq_table)

		return -ENODEV;



	return cpufreq_frequency_table_verify(policy, table);

	return cpufreq_frequency_table_verify(policy, policy->freq_table);

}

EXPORT_SYMBOL_GPL(cpufreq_generic_frequency_table_verify);
@@ -210,9 +208,8 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_target); 
int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,

		unsigned int freq)

{

	struct cpufreq_frequency_table *pos, *table;

	struct cpufreq_frequency_table *pos, *table = policy->freq_table;



	table = cpufreq_frequency_get_table(policy->cpu);

	if (unlikely(!table)) {

		pr_debug("%s: Unable to find frequency table\n", __func__);

		return -ENOENT;

drivers/cpufreq/ppc_cbe_cpufreq_pmi.c

+1 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int pmi_notifier(struct notifier_block *nb, 
				       unsigned long event, void *data)

{

	struct cpufreq_policy *policy = data;

	struct cpufreq_frequency_table *cbe_freqs;

	struct cpufreq_frequency_table *cbe_freqs = policy->freq_table;

	u8 node;



	/* Should this really be called for CPUFREQ_ADJUST and CPUFREQ_NOTIFY
@@ -103,7 +103,6 @@ static int pmi_notifier(struct notifier_block *nb, 
	if (event == CPUFREQ_START)

		return 0;



	cbe_freqs = cpufreq_frequency_get_table(policy->cpu);

	node = cbe_cpu_to_node(policy->cpu);



	pr_debug("got notified, event=%lu, node=%u\n", event, node);