Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8987bf8 authored by Viresh Kumar's avatar Viresh Kumar Committed by Alex Shi
Browse files

PM / OPP: Hold dev_opp_list_lock for writers 



Writers need to update OPP device and their list with dev_opp_list_lock
mutex held, which was missed at few places. Fix it.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: 4.3 <stable@vger.kernel.org> # 4.3
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 4a3a1353a84796f93d389694e3b87ede533953fe)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent c9d830b6

drivers/base/power/opp/core.c

+9 −0
Original line number Diff line number Diff line
@@ -1175,13 +1175,17 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np) 
	struct device_opp *dev_opp;

	int ret = 0, count = 0;



	mutex_lock(&dev_opp_list_lock);



	dev_opp = _managed_opp(opp_np);

	if (dev_opp) {

		/* OPPs are already managed */

		if (!_add_list_dev(dev, dev_opp))

			ret = -ENOMEM;

		mutex_unlock(&dev_opp_list_lock);

		return ret;

	}

	mutex_unlock(&dev_opp_list_lock);



	/* We have opp-list node now, iterate over it and add OPPs */

	for_each_available_child_of_node(opp_np, np) {
@@ -1199,15 +1203,20 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np) 
	if (WARN_ON(!count))

		return -ENOENT;



	mutex_lock(&dev_opp_list_lock);



	dev_opp = _find_device_opp(dev);

	if (WARN_ON(IS_ERR(dev_opp))) {

		ret = PTR_ERR(dev_opp);

		mutex_unlock(&dev_opp_list_lock);

		goto free_table;

	}



	dev_opp->np = opp_np;

	dev_opp->shared_opp = of_property_read_bool(opp_np, "opp-shared");



	mutex_unlock(&dev_opp_list_lock);



	return 0;



free_table: