[V2,06/12] OPP: Don't take OPP table's kref for static OPPs

Message ID 0ad8c623907c27f4b8572d36c4ba73ea103e3108.1537394233.git.viresh.kumar@linaro.org
State New
Headers show
  • [V2,01/12] OPP: Free OPP table properly on performance state irregularities
Related show

Commit Message

Viresh Kumar Sept. 19, 2018, 10:20 p.m.
The reference count is only required to be incremented for every call
that may lead to adding the OPP table. For static OPPs the same should
be done from the parent routine which adds all static OPPs together and
so only one refcount for all static OPPs.

Update code to reflect that.

The refcount is incremented every time a dynamic OPP is created (as that
can lead to creating the OPP table) and the same is dropped when the OPP
is removed.

Tested-by: Niklas Cassel <niklas.cassel@linaro.org>

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

 drivers/opp/core.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)



diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 332748adc262..2a6976265580 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -919,7 +919,6 @@  static void _opp_kref_release(struct kref *kref)
-	dev_pm_opp_put_opp_table(opp_table);
 void dev_pm_opp_get(struct dev_pm_opp *opp)
@@ -963,11 +962,15 @@  void dev_pm_opp_remove(struct device *dev, unsigned long freq)
 	if (found) {
+		/* Drop the reference taken by dev_pm_opp_add() */
+		dev_pm_opp_put_opp_table(opp_table);
 	} else {
 		dev_warn(dev, "%s: Couldn't find OPP with freq: %lu\n",
 			 __func__, freq);
+	/* Drop the reference taken by _find_opp_table() */
@@ -1085,9 +1088,6 @@  int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
 	new_opp->opp_table = opp_table;
-	/* Get a reference to the OPP table */
-	_get_opp_table_kref(opp_table);
 	ret = opp_debug_create_one(new_opp, opp_table);
 	if (ret)
 		dev_err(dev, "%s: Failed to register opp to debugfs (%d)\n",
@@ -1566,8 +1566,9 @@  int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
 		return -ENOMEM;
 	ret = _opp_add_v1(opp_table, dev, freq, u_volt, true);
+	if (ret)
+		dev_pm_opp_put_opp_table(opp_table);
-	dev_pm_opp_put_opp_table(opp_table);
 	return ret;