leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'opp/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm

Browse Source 
Pull operating performance points (OPP) framework fixes for 5.9-rc2
from Viresh Kumar:

"This contains the following fixes for 5.9:

 - Fix re-enabling of resources (Rajendra Nayak).

 - Put OPP table references (Stephen Boyd)."

* 'opp/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  opp: Enable resources again if they were disabled earlier
  opp: Put opp table in dev_pm_opp_set_rate() if _set_opp_bw() fails
  opp: Put opp table in dev_pm_opp_set_rate() for empty tables
This commit is contained in:
Rafael J. Wysocki 2020-08-20 18:13:45 +02:00
commit cc15fd9892
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/opp/core.c
View File

@ -893,8 +893,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
* have OPP table for the device, while others don't and * have OPP table for the device, while others don't and
* opp_set_rate() just needs to behave like clk_set_rate(). * opp_set_rate() just needs to behave like clk_set_rate().
*/ */
if (!_get_opp_count(opp_table)) if (!_get_opp_count(opp_table)) {
return 0; ret = 0;
goto put_opp_table;
}
if (!opp_table->required_opp_tables && !opp_table->regulators && if (!opp_table->required_opp_tables && !opp_table->regulators &&
!opp_table->paths) { !opp_table->paths) {
@ -905,7 +907,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
ret = _set_opp_bw(opp_table, NULL, dev, true); ret = _set_opp_bw(opp_table, NULL, dev, true);
if (ret) if (ret)
return ret; goto put_opp_table;
if (opp_table->regulator_enabled) { if (opp_table->regulator_enabled) {
regulator_disable(opp_table->regulators[0]); regulator_disable(opp_table->regulators[0]);
@ -932,11 +934,14 @@ 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) {
if (!opp_table->required_opp_tables && !opp_table->regulators &&
!opp_table->paths) {
dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n", dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n",
__func__, freq); __func__, freq);
ret = 0; ret = 0;
goto put_opp_table; goto put_opp_table;
} }
}
/* /*
* For IO devices which require an OPP on some platforms/SoCs * For IO devices which require an OPP on some platforms/SoCs