opp: Enable resources again if they were disabled earlier
[ Upstream commita4501bac0e
] dev_pm_opp_set_rate() can now be called with freq = 0 in order to either drop performance or bandwidth votes or to disable regulators on platforms which support them. In such cases, a subsequent call to dev_pm_opp_set_rate() with the same frequency ends up returning early because 'old_freq == freq' Instead make it fall through and put back the dropped performance and bandwidth votes and/or enable back the regulators. Cc: v5.3+ <stable@vger.kernel.org> # v5.3+ Fixes:cd7ea58286
("opp: Make dev_pm_opp_set_rate() handle freq = 0 to drop performance votes") Reported-by: Sajida Bhanu <sbhanu@codeaurora.org> Reviewed-by: Sibi Sankar <sibis@codeaurora.org> Reported-by: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org> [ Viresh: Don't skip clk_set_rate() and massaged changelog ] Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
52d322f919
commit
10e99c3003
|
@ -843,10 +843,12 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
|
||||||
|
|
||||||
/* Return early if nothing to do */
|
/* Return early if nothing to do */
|
||||||
if (old_freq == freq) {
|
if (old_freq == freq) {
|
||||||
dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n",
|
if (!opp_table->required_opp_tables && !opp_table->regulators) {
|
||||||
__func__, freq);
|
dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n",
|
||||||
ret = 0;
|
__func__, freq);
|
||||||
goto put_opp_table;
|
ret = 0;
|
||||||
|
goto put_opp_table;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_freq = old_freq;
|
temp_freq = old_freq;
|
||||||
|
|
Loading…
Reference in New Issue