hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipq806x: fix uninitialized variable usage in cpufreq-krait 

In krait_cpufreq_probe, both freq and max_cpu_freq are never
initialized, so the max_cpu_freq will have a random value at the end.
Fix this by properly initializing max_cpu_freq to 0 and storing the clk
frequency in freq as well, to make it similar to how it's calculated in
krait_set_target.

Fixes the following warnings:

In file included from include/linux/clk.h:16:0,
                 from drivers/cpufreq/cpufreq-krait.c:13:
drivers/cpufreq/cpufreq-krait.c: In function 'krait_cpufreq_probe':
include/linux/kernel.h:714:24: warning: 'freq' may be used uninitialized in this function [-Wmaybe-uninitialized]
  _max1 > _max2 ? _max1 : _max2; })
                        ^
drivers/cpufreq/cpufreq-krait.c:217:25: note: 'freq' was declared here
  unsigned long freq_Hz, freq, max_cpu_freq;
                         ^
In file included from include/linux/clk.h:16:0,
                 from drivers/cpufreq/cpufreq-krait.c:13:
include/linux/kernel.h:714:24: warning: 'max_cpu_freq' may be used uninitialized in this function [-Wmaybe-uninitialized]
  _max1 > _max2 ? _max1 : _max2; })
                        ^
drivers/cpufreq/cpufreq-krait.c:217:31: note: 'max_cpu_freq' was declared here
  unsigned long freq_Hz, freq, max_cpu_freq;

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46839
owl
Jonas Gorski 2015-09-10 10:09:42 +00:00
parent bebff6364d
commit 82fb27917b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ipq806x/patches-3.18/145-cpufreq-Add-a-cpufreq-krait-based-on-cpufre.patch
View File

@ -270,7 +270,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+ struct device *dev; + struct device *dev;
+ struct clk *clk; + struct clk *clk;
+ struct regulator *core; + struct regulator *core;
+ unsigned long freq_Hz, freq, max_cpu_freq; + unsigned long freq_Hz, freq, max_cpu_freq = 0;
+ struct dev_pm_opp *opp; + struct dev_pm_opp *opp;
+ unsigned long volt, tol; + unsigned long volt, tol;
+ +
@ -341,7 +341,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+ } + }
+ per_cpu(krait_supply_core, cpu) = core; + per_cpu(krait_supply_core, cpu) = core;
+ +
+ freq_Hz = clk_get_rate(clk); + freq = freq_Hz = clk_get_rate(clk);
+ +
+ rcu_read_lock(); + rcu_read_lock();
+ opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_Hz); + opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_Hz);

4
target/linux/ipq806x/patches-4.1/145-cpufreq-Add-a-cpufreq-krait-based-on-cpufre.patch
View File

@ -270,7 +270,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+ struct device *dev; + struct device *dev;
+ struct clk *clk; + struct clk *clk;
+ struct regulator *core; + struct regulator *core;
+ unsigned long freq_Hz, freq, max_cpu_freq; + unsigned long freq_Hz, freq, max_cpu_freq = 0;
+ struct dev_pm_opp *opp; + struct dev_pm_opp *opp;
+ unsigned long volt, tol; + unsigned long volt, tol;
+ +
@ -341,7 +341,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+ } + }
+ per_cpu(krait_supply_core, cpu) = core; + per_cpu(krait_supply_core, cpu) = core;
+ +
+ freq_Hz = clk_get_rate(clk); + freq = freq_Hz = clk_get_rate(clk);
+ +
+ rcu_read_lock(); + rcu_read_lock();
+ opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_Hz); + opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_Hz);