evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clk: msm: clock: Refactor the aggr_sibling_rates logic

Browse source 
Return early if the branch clock does not need the rate
aggregation support. Only take the common branch_clk_lock
when needed; doing so unnecessarily will lead to lock
contention in some cases.

CRs-Fixed: 972426
Change-Id: I00476d1c193df025a1da19aa0d0ddf0f0462b4d0
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
This commit is contained in:
Deepak Katragadda 2016-02-03 14:36:42 -08:00 • committed by David Keitel
parent 1c3a19b61d
commit ff072849f7
1 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/clk/msm/clock-local2.c
View file

@ -647,15 +647,16 @@ static int branch_clk_prepare(struct clk *c)
unsigned long curr_rate; unsigned long curr_rate;
int ret = 0; int ret = 0;
if (!branch->aggr_sibling_rates)
return ret;
mutex_lock(&branch_clk_lock); mutex_lock(&branch_clk_lock);
branch->is_prepared = false; branch->is_prepared = false;
if (branch->aggr_sibling_rates) { curr_rate = branch_clk_aggregate_rate(c->parent);
curr_rate = branch_clk_aggregate_rate(c->parent); if (c->rate > curr_rate) {
if (c->rate > curr_rate) { ret = clk_set_rate(c->parent, c->rate);
ret = clk_set_rate(c->parent, c->rate); if (ret)
if (ret) goto exit;
goto exit;
}
} }
branch->is_prepared = true; branch->is_prepared = true;
exit: exit:
@ -699,14 +700,15 @@ static void branch_clk_unprepare(struct clk *c)
struct branch_clk *branch = to_branch_clk(c); struct branch_clk *branch = to_branch_clk(c);
unsigned long curr_rate, new_rate; unsigned long curr_rate, new_rate;
if (!branch->aggr_sibling_rates)
return;
mutex_lock(&branch_clk_lock); mutex_lock(&branch_clk_lock);
branch->is_prepared = false; branch->is_prepared = false;
if (branch->aggr_sibling_rates) { new_rate = branch_clk_aggregate_rate(c->parent);
new_rate = branch_clk_aggregate_rate(c->parent); curr_rate = max(new_rate, c->rate);
curr_rate = max(new_rate, c->rate); if (new_rate < curr_rate)
if (new_rate < curr_rate) clk_set_rate(c->parent, new_rate);
clk_set_rate(c->parent, new_rate);
}
mutex_unlock(&branch_clk_lock); mutex_unlock(&branch_clk_lock);
} }
@ -764,31 +766,30 @@ static int branch_clk_set_rate(struct clk *c, unsigned long rate)
if (branch->has_sibling) if (branch->has_sibling)
return -EPERM; return -EPERM;
if (!branch->aggr_sibling_rates)
return clk_set_rate(c->parent, rate);
mutex_lock(&branch_clk_lock); mutex_lock(&branch_clk_lock);
if (branch->aggr_sibling_rates) { if (!branch->is_prepared) {
if (!branch->is_prepared) { c->rate = rate;
c->rate = rate;
goto exit;
}
/*
* Get the aggregate rate without this clock's vote and update
* if the new rate is different than the current rate.
*/
list_for_each_entry(clkp, &parent->children, siblings) {
clkh = to_branch_clk(clkp);
if (clkh->is_prepared && clkh != branch)
other_rate = max(clkp->rate, other_rate);
}
curr_rate = max(other_rate, c->rate);
new_rate = max(other_rate, rate);
if (new_rate != curr_rate) {
ret = clk_set_rate(parent, new_rate);
if (!ret)
c->rate = rate;
}
goto exit; goto exit;
} }
ret = clk_set_rate(c->parent, rate); /*
* Get the aggregate rate without this clock's vote and update
* if the new rate is different than the current rate.
*/
list_for_each_entry(clkp, &parent->children, siblings) {
clkh = to_branch_clk(clkp);
if (clkh->is_prepared && clkh != branch)
other_rate = max(clkp->rate, other_rate);
}
curr_rate = max(other_rate, c->rate);
new_rate = max(other_rate, rate);
if (new_rate != curr_rate) {
ret = clk_set_rate(parent, new_rate);
if (!ret)
c->rate = rate;
}
exit: exit:
mutex_unlock(&branch_clk_lock); mutex_unlock(&branch_clk_lock);
return ret; return ret;