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

Commit 969fceb3 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

PM / OPP: Add light weight _opp_free() routine 



The OPPs which are never successfully added using _opp_add() are not
required to be freed with the _opp_remove() routine, as a simple kfree()
is enough for them.

Introduce a new light weight routine _opp_free(), which will do that.

That also helps us removing the 'notify' parameter to _opp_remove(),
which isn't required anymore.

Note that _opp_free() contains a call to _remove_opp_table() as the OPP
table might have been added for this very OPP only. The
_remove_opp_table() routine returns quickly if there are more OPPs in
the table. This will be simplified in later patches though.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 04a86a84

drivers/base/power/opp/core.c

+11 −9
Original line number Diff line number Diff line
@@ -929,6 +929,12 @@ static void _remove_opp_table(struct opp_table *opp_table) 
		  _kfree_device_rcu);

}



void _opp_free(struct dev_pm_opp *opp, struct opp_table *opp_table)

{

	kfree(opp);

	_remove_opp_table(opp_table);

}



/**

 * _kfree_opp_rcu() - Free OPP RCU handler

 * @head:	RCU head
@@ -944,7 +950,6 @@ static void _kfree_opp_rcu(struct rcu_head *head) 
 * _opp_remove()  - Remove an OPP from a table definition

 * @opp_table:	points back to the opp_table struct this opp belongs to

 * @opp:	pointer to the OPP to remove

 * @notify:	OPP_EVENT_REMOVE notification should be sent or not

 *

 * This function removes an opp definition from the opp table.

 *
@@ -952,16 +957,13 @@ static void _kfree_opp_rcu(struct rcu_head *head) 
 * It is assumed that the caller holds required mutex for an RCU updater

 * strategy.

 */

void _opp_remove(struct opp_table *opp_table, struct dev_pm_opp *opp,

		 bool notify)

static void _opp_remove(struct opp_table *opp_table, struct dev_pm_opp *opp)

{

	/*

	 * Notify the changes in the availability of the operable

	 * frequency/voltage list.

	 */

	if (notify)

		srcu_notifier_call_chain(&opp_table->srcu_head,

					 OPP_EVENT_REMOVE, opp);

	srcu_notifier_call_chain(&opp_table->srcu_head, OPP_EVENT_REMOVE, opp);

	opp_debug_remove_one(opp);

	list_del_rcu(&opp->node);

	call_srcu(&opp_table->srcu_head.srcu, &opp->rcu_head, _kfree_opp_rcu);
@@ -1008,7 +1010,7 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq) 
		goto unlock;

	}



	_opp_remove(opp_table, opp, true);

	_opp_remove(opp_table, opp);

unlock:

	mutex_unlock(&opp_table_lock);

}
@@ -1200,7 +1202,7 @@ int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, 
	return 0;



free_opp:

	_opp_remove(opp_table, new_opp, false);

	_opp_free(new_opp, opp_table);

unlock:

	mutex_unlock(&opp_table_lock);

	return ret;
@@ -1912,7 +1914,7 @@ void _dev_pm_opp_remove_table(struct device *dev, bool remove_all) 
		/* Free static OPPs */

		list_for_each_entry_safe(opp, tmp, &opp_table->opp_list, node) {

			if (remove_all || !opp->dynamic)

				_opp_remove(opp_table, opp, true);

				_opp_remove(opp_table, opp);

		}

	} else {

		_remove_opp_dev(_find_opp_dev(dev, opp_table), opp_table);

drivers/base/power/opp/of.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np) 
	return 0;



free_opp:

	_opp_remove(opp_table, new_opp, false);

	_opp_free(new_opp, opp_table);

unlock:

	mutex_unlock(&opp_table_lock);

	return ret;

drivers/base/power/opp/opp.h

+1 −1
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ struct opp_table *_find_opp_table(struct device *dev); 
struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table);

void _dev_pm_opp_remove_table(struct device *dev, bool remove_all);

struct dev_pm_opp *_opp_allocate(struct device *dev, struct opp_table **opp_table);

void _opp_free(struct dev_pm_opp *opp, struct opp_table *opp_table);

int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table);

void _opp_remove(struct opp_table *opp_table, struct dev_pm_opp *opp, bool notify);

int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, bool dynamic);

void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of);