diff options
| author | Rajendra Nayak <rnayak@codeaurora.org> | 2020-08-10 12:36:19 +0530 |
|---|---|---|
| committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2020-08-19 02:29:33 +0300 |
| commit | fa2cb3a6dee60fa68aba84e817809d2c353d21ef (patch) | |
| tree | a829e4b6409d50f636e45af243b06216505f296f | |
| parent | fd4d4a47fd6c32cda70a46ad968405ab3d9c8419 (diff) | |
opp: Fix dev_pm_opp_set_rate() to not return early
dev_pm_opp_set_rate() can now be called with freq = 0 inorder
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.
Fixes: cd7ea582 ("opp: Make dev_pm_opp_set_rate() handle freq = 0 to drop performance votes")
Reported-by: Sajida Bhanu <sbhanu@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
| -rw-r--r-- | drivers/opp/core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 9d7fb45b1786..5dff89afd8f5 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -932,6 +932,9 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) /* Return early if nothing to do */ if (old_freq == freq) { + if (opp_table->required_opp_tables || opp_table->regulators || + opp_table->paths) + goto skip_clk_only; dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n", __func__, freq); ret = 0; @@ -950,6 +953,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) goto put_opp_table; } +skip_clk_only: temp_freq = old_freq; old_opp = _find_freq_ceil(opp_table, &temp_freq); if (IS_ERR(old_opp)) { @@ -985,8 +989,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) IS_ERR(old_opp) ? NULL : old_opp->supplies, opp->supplies); } else { + ret = 0; /* Only frequency scaling */ - ret = _generic_set_opp_clk_only(dev, clk, freq); + if (freq != old_freq) + ret = _generic_set_opp_clk_only(dev, clk, freq); } /* Scaling down? Configure required OPPs after frequency */ |