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

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

cpufreq: create another field .flags in cpufreq_frequency_table 



Currently cpufreq frequency table has two fields: frequency and driver_data.
driver_data is only for drivers' internal use and cpufreq core shouldn't use
it at all. But with the introduction of BOOST frequencies, this assumption
was broken and we started using it as a flag instead.

There are two problems due to this:
- It is against the description of this field, as driver's data is used by
  the core now.
- if drivers fill it with -3 for any frequency, then those frequencies are
  never considered by cpufreq core as it is exactly same as value of
  CPUFREQ_BOOST_FREQ, i.e. ~2.

The best way to get this fixed is by creating another field flags which
will be used for such flags. This patch does that. Along with that various
drivers need modifications due to the change of struct cpufreq_frequency_table.

Reviewed-by: default avatarGautham R Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 71508a1f

arch/mips/loongson/lemote-2f/clock.c

+10 −10
Original line number Diff line number Diff line
@@ -28,16 +28,16 @@ enum { 
};



struct cpufreq_frequency_table loongson2_clockmod_table[] = {

	{DC_RESV, CPUFREQ_ENTRY_INVALID},

	{DC_ZERO, CPUFREQ_ENTRY_INVALID},

	{DC_25PT, 0},

	{DC_37PT, 0},

	{DC_50PT, 0},

	{DC_62PT, 0},

	{DC_75PT, 0},

	{DC_87PT, 0},

	{DC_DISABLE, 0},

	{DC_RESV, CPUFREQ_TABLE_END},

	{0, DC_RESV, CPUFREQ_ENTRY_INVALID},

	{0, DC_ZERO, CPUFREQ_ENTRY_INVALID},

	{0, DC_25PT, 0},

	{0, DC_37PT, 0},

	{0, DC_50PT, 0},

	{0, DC_62PT, 0},

	{0, DC_75PT, 0},

	{0, DC_87PT, 0},

	{0, DC_DISABLE, 0},

	{0, DC_RESV, CPUFREQ_TABLE_END},

};

EXPORT_SYMBOL_GPL(loongson2_clockmod_table);

drivers/cpufreq/cris-artpec3-cpufreq.c

+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ static struct notifier_block cris_sdram_freq_notifier_block = { 
};



static struct cpufreq_frequency_table cris_freq_table[] = {

	{0x01,	6000},

	{0x02,	200000},

	{0,	CPUFREQ_TABLE_END},

	{0, 0x01, 6000},

	{0, 0x02, 200000},

	{0, 0, CPUFREQ_TABLE_END},

};



static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)

drivers/cpufreq/cris-etraxfs-cpufreq.c

+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ static struct notifier_block cris_sdram_freq_notifier_block = { 
};



static struct cpufreq_frequency_table cris_freq_table[] = {

	{0x01, 6000},

	{0x02, 200000},

	{0, CPUFREQ_TABLE_END},

	{0, 0x01, 6000},

	{0, 0x02, 200000},

	{0, 0, CPUFREQ_TABLE_END},

};



static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)

drivers/cpufreq/elanfreq.c

+9 −9
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ static struct s_elan_multiplier elan_multiplier[] = { 
};



static struct cpufreq_frequency_table elanfreq_table[] = {

	{0,	1000},

	{1,	2000},

	{2,	4000},

	{3,	8000},

	{4,	16000},

	{5,	33000},

	{6,	66000},

	{7,	99000},

	{0,	CPUFREQ_TABLE_END},

	{0, 0,	1000},

	{0, 1,	2000},

	{0, 2,	4000},

	{0, 3,	8000},

	{0, 4,	16000},

	{0, 5,	33000},

	{0, 6,	66000},

	{0, 7,	99000},

	{0, 0,	CPUFREQ_TABLE_END},

};

drivers/cpufreq/exynos4210-cpufreq.c

+6 −6
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ static unsigned int exynos4210_volt_table[] = { 
};



static struct cpufreq_frequency_table exynos4210_freq_table[] = {

	{L0, 1200 * 1000},

	{L1, 1000 * 1000},

	{L2,  800 * 1000},

	{L3,  500 * 1000},

	{L4,  200 * 1000},

	{0, CPUFREQ_TABLE_END},

	{0, L0, 1200 * 1000},

	{0, L1, 1000 * 1000},

	{0, L2,  800 * 1000},

	{0, L3,  500 * 1000},

	{0, L4,  200 * 1000},

	{0, 0, CPUFREQ_TABLE_END},

};



static struct apll_freq apll_freq_4210[] = {