Skip to content

Commit

Permalink
cpufreq: OMAP: fix freq_table leak
Browse files Browse the repository at this point in the history
We use a single frequency table for multiple CPUs. But, with
OMAP4, since we have multiple CPUs, the cpu_init call for CPU1
causes freq_table previously allocated for CPU0 to be overwritten.
In addition, we dont free the table on exit path.

We solve this by maintaining an atomic type counter to ensure
just a single table exists at a given time.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
  • Loading branch information
Nishanth Menon authored and Kevin Hilman committed Nov 8, 2011
1 parent 11e04fd commit 1c78217
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions drivers/cpufreq/omap-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ static struct lpj_info global_lpj_ref;
#endif

static struct cpufreq_frequency_table *freq_table;
static atomic_t freq_table_users = ATOMIC_INIT(0);
static struct clk *mpu_clk;
static char *mpu_clk_name;
static struct device *mpu_dev;
Expand Down Expand Up @@ -150,6 +151,12 @@ static int omap_target(struct cpufreq_policy *policy,
return ret;
}

static inline void freq_table_free(void)
{
if (atomic_dec_and_test(&freq_table_users))
opp_free_cpufreq_table(mpu_dev, &freq_table);
}

static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
{
int result = 0;
Expand All @@ -164,7 +171,9 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
}

policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu);
result = opp_init_cpufreq_table(mpu_dev, &freq_table);

if (atomic_inc_return(&freq_table_users) == 1)
result = opp_init_cpufreq_table(mpu_dev, &freq_table);

if (result) {
dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n",
Expand All @@ -173,10 +182,10 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
}

result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
if (!result)
cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
else
goto fail_ck;
if (result)
goto fail_table;

cpufreq_frequency_table_get_attr(freq_table, policy->cpu);

policy->min = policy->cpuinfo.min_freq;
policy->max = policy->cpuinfo.max_freq;
Expand All @@ -199,13 +208,16 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)

return 0;

fail_table:
freq_table_free();
fail_ck:
clk_put(mpu_clk);
return result;
}

static int omap_cpu_exit(struct cpufreq_policy *policy)
{
freq_table_free();
clk_put(mpu_clk);
return 0;
}
Expand Down

0 comments on commit 1c78217

Please sign in to comment.