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

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

cpufreq: add 'freq_table' in struct cpufreq_policy 



freq table is not per CPU but per policy, so it makes more sense to
keep it within struct cpufreq_policy instead of a per-cpu variable.

This patch does it. Over that, there is no need to set policy->freq_table
to NULL in ->exit(), as policy structure is going to be freed soon.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e837f9b5

drivers/cpufreq/acpi-cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -855,7 +855,6 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy) 
	pr_debug("acpi_cpufreq_cpu_exit\n");



	if (data) {

		cpufreq_frequency_table_put_attr(policy->cpu);

		per_cpu(acfreq_data, policy->cpu) = NULL;

		acpi_processor_unregister_performance(data->acpi_data,

						      policy->cpu);

drivers/cpufreq/arm_big_little.c

+0 −1
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy) 
		return -ENODEV;

	}



	cpufreq_frequency_table_put_attr(policy->cpu);

	put_cluster_clk_and_freq_table(cpu_dev);

	dev_dbg(cpu_dev, "%s: Exited, cpu: %d\n", __func__, policy->cpu);

drivers/cpufreq/cpufreq.c

+6 −1
Original line number Diff line number Diff line
@@ -191,6 +191,12 @@ unsigned int cpufreq_generic_get(unsigned int cpu) 
}

EXPORT_SYMBOL_GPL(cpufreq_generic_get);



/* Only for cpufreq core internal use */

struct cpufreq_policy *cpufreq_cpu_get_raw(unsigned int cpu)

{

	return per_cpu(cpufreq_cpu_data, cpu);

}



struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)

{

	struct cpufreq_policy *policy = NULL;
@@ -1031,7 +1037,6 @@ static void update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu) 


	up_write(&policy->rwsem);



	cpufreq_frequency_table_update_policy_cpu(policy);

	blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

			CPUFREQ_UPDATE_POLICY_CPU, policy);

}

drivers/cpufreq/e_powersaver.c

+0 −1
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ static int eps_cpu_exit(struct cpufreq_policy *policy) 
	unsigned int cpu = policy->cpu;



	/* Bye */

	cpufreq_frequency_table_put_attr(policy->cpu);

	kfree(eps_cpu[cpu]);

	eps_cpu[cpu] = NULL;

	return 0;

drivers/cpufreq/freq_table.c

+8 −38
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, 
EXPORT_SYMBOL_GPL(cpufreq_frequency_table_verify);



/*

 * Generic routine to verify policy & frequency table, requires driver to call

 * cpufreq_frequency_table_get_attr() prior to it.

 * Generic routine to verify policy & frequency table, requires driver to set

 * policy->freq_table prior to it.

 */

int cpufreq_generic_frequency_table_verify(struct cpufreq_policy *policy)

{
@@ -203,8 +203,6 @@ int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy, 
}

EXPORT_SYMBOL_GPL(cpufreq_frequency_table_get_index);



static DEFINE_PER_CPU(struct cpufreq_frequency_table *, cpufreq_show_table);



/**

 * show_available_freqs - show available frequencies for the specified CPU

 */
@@ -212,15 +210,12 @@ static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf, 
				    bool show_boost)

{

	unsigned int i = 0;

	unsigned int cpu = policy->cpu;

	ssize_t count = 0;

	struct cpufreq_frequency_table *table;

	struct cpufreq_frequency_table *table = policy->freq_table;



	if (!per_cpu(cpufreq_show_table, cpu))

	if (!table)

		return -ENODEV;



	table = per_cpu(cpufreq_show_table, cpu);



	for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {

		if (table[i].frequency == CPUFREQ_ENTRY_INVALID)

			continue;
@@ -283,49 +278,24 @@ struct freq_attr *cpufreq_generic_attr[] = { 
};

EXPORT_SYMBOL_GPL(cpufreq_generic_attr);



/*

 * if you use these, you must assure that the frequency table is valid

 * all the time between get_attr and put_attr!

 */

void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table,

				      unsigned int cpu)

{

	pr_debug("setting show_table for cpu %u to %p\n", cpu, table);

	per_cpu(cpufreq_show_table, cpu) = table;

}

EXPORT_SYMBOL_GPL(cpufreq_frequency_table_get_attr);



void cpufreq_frequency_table_put_attr(unsigned int cpu)

{

	pr_debug("clearing show_table for cpu %u\n", cpu);

	per_cpu(cpufreq_show_table, cpu) = NULL;

}

EXPORT_SYMBOL_GPL(cpufreq_frequency_table_put_attr);



int cpufreq_table_validate_and_show(struct cpufreq_policy *policy,

				      struct cpufreq_frequency_table *table)

{

	int ret = cpufreq_frequency_table_cpuinfo(policy, table);



	if (!ret)

		cpufreq_frequency_table_get_attr(table, policy->cpu);

		policy->freq_table = table;



	return ret;

}

EXPORT_SYMBOL_GPL(cpufreq_table_validate_and_show);



void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy)

{

	pr_debug("Updating show_table for new_cpu %u from last_cpu %u\n",

			policy->cpu, policy->last_cpu);

	per_cpu(cpufreq_show_table, policy->cpu) = per_cpu(cpufreq_show_table,

			policy->last_cpu);

	per_cpu(cpufreq_show_table, policy->last_cpu) = NULL;

}

struct cpufreq_policy *cpufreq_cpu_get_raw(unsigned int cpu);



struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu)

{

	return per_cpu(cpufreq_show_table, cpu);

	struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu);

	return policy ? policy->freq_table : NULL;

}

EXPORT_SYMBOL_GPL(cpufreq_frequency_get_table);