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

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

cpufreq: Return index from cpufreq_frequency_table_target() 



This routine can't fail unless the frequency table is invalid and
doesn't contain any valid entries.

Make it return the index and WARN() in case it is used for an invalid
table.

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

Documentation/cpu-freq/cpu-drivers.txt

+3 −4
Original line number Diff line number Diff line
@@ -245,12 +245,11 @@ policy->max, and all other criteria are met. This is helpful for the 


int cpufreq_frequency_table_target(struct cpufreq_policy *policy,

                                   unsigned int target_freq,

                                   unsigned int relation,

                                   unsigned int *index);

                                   unsigned int relation);



is the corresponding frequency table helper for the ->target

stage. Just pass the values to this function, and the unsigned int

index returns the number of the frequency table entry which contains

stage. Just pass the values to this function, and this function

returns the number of the frequency table entry which contains

the frequency the CPU shall be set to.



The following macros can be used as iterators over cpufreq_frequency_table:

drivers/cpufreq/amd_freq_sensitivity.c

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy, 
		else {

			unsigned int index;



			cpufreq_frequency_table_target(policy,

				policy->cur - 1, CPUFREQ_RELATION_H, &index);

			index = cpufreq_frequency_table_target(policy,

				policy->cur - 1, CPUFREQ_RELATION_H);

			freq_next = policy->freq_table[index].frequency;

		}

drivers/cpufreq/cpufreq.c

+2 −7
Original line number Diff line number Diff line
@@ -1914,7 +1914,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
			    unsigned int relation)

{

	unsigned int old_target_freq = target_freq;

	int index, retval;

	int index;



	if (cpufreq_disabled())

		return -ENODEV;
@@ -1943,12 +1943,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
	if (!cpufreq_driver->target_index)

		return -EINVAL;



	retval = cpufreq_frequency_table_target(policy, target_freq, relation,

						&index);

	if (unlikely(retval)) {

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

		return retval;

	}

	index = cpufreq_frequency_table_target(policy, target_freq, relation);



	return __target_index(policy, index);

}

drivers/cpufreq/cpufreq_ondemand.c

+6 −8
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy, 
{

	unsigned int freq_req, freq_reduc, freq_avg;

	unsigned int freq_hi, freq_lo;

	unsigned int index = 0;

	unsigned int index;

	unsigned int delay_hi_us;

	struct policy_dbs_info *policy_dbs = policy->governor_data;

	struct od_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs);
@@ -79,19 +79,17 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy, 
		return freq_next;

	}



	cpufreq_frequency_table_target(policy, freq_next, relation, &index);

	index = cpufreq_frequency_table_target(policy, freq_next, relation);

	freq_req = freq_table[index].frequency;

	freq_reduc = freq_req * od_tuners->powersave_bias / 1000;

	freq_avg = freq_req - freq_reduc;



	/* Find freq bounds for freq_avg in freq_table */

	index = 0;

	cpufreq_frequency_table_target(policy, freq_avg, CPUFREQ_RELATION_H,

				       &index);

	index = cpufreq_frequency_table_target(policy, freq_avg,

					       CPUFREQ_RELATION_H);

	freq_lo = freq_table[index].frequency;

	index = 0;

	cpufreq_frequency_table_target(policy, freq_avg, CPUFREQ_RELATION_L,

				       &index);

	index = cpufreq_frequency_table_target(policy, freq_avg,

					       CPUFREQ_RELATION_L);

	freq_hi = freq_table[index].frequency;



	/* Find out how long we have to be in hi and lo freqs */

drivers/cpufreq/freq_table.c

+13 −11
Original line number Diff line number Diff line
@@ -115,8 +115,7 @@ EXPORT_SYMBOL_GPL(cpufreq_generic_frequency_table_verify); 


int cpufreq_frequency_table_target(struct cpufreq_policy *policy,

				    unsigned int target_freq,

				   unsigned int relation,

				   unsigned int *index)

				    unsigned int relation)

{

	struct cpufreq_frequency_table optimal = {

		.driver_data = ~0,
@@ -129,6 +128,7 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy, 
	struct cpufreq_frequency_table *pos;

	struct cpufreq_frequency_table *table = policy->freq_table;

	unsigned int freq, diff, i = 0;

	int index;



	pr_debug("request for target %u kHz (relation: %u) for cpu %u\n",

					target_freq, relation, policy->cpu);
@@ -192,16 +192,18 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy, 
		}

	}

	if (optimal.driver_data > i) {

		if (suboptimal.driver_data > i)

			return -EINVAL;

		*index = suboptimal.driver_data;

	} else

		*index = optimal.driver_data;

		if (suboptimal.driver_data > i) {

			WARN(1, "Invalid frequency table: %d\n", policy->cpu);

			return 0;

		}



	pr_debug("target index is %u, freq is:%u kHz\n", *index,

		 table[*index].frequency);

		index = suboptimal.driver_data;

	} else

		index = optimal.driver_data;



	return 0;

	pr_debug("target index is %u, freq is:%u kHz\n", index,

		 table[index].frequency);

	return index;

}

EXPORT_SYMBOL_GPL(cpufreq_frequency_table_target);