Commit add1dc09 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

OPP: Use generic key finding helpers for bandwidth key 



Use the recently added generic key findings helpers to find bandwidth
key values.

Tested-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent c2ab2cb6

drivers/opp/core.c

+15 −68
Original line number Diff line number Diff line
@@ -438,6 +438,11 @@ static unsigned long _read_level(struct dev_pm_opp *opp, int index) 
	return opp->level;

}



static unsigned long _read_bw(struct dev_pm_opp *opp, int index)

{

	return opp->bandwidth[index].peak;

}



/* Generic comparison helpers */

static bool _compare_exact(struct dev_pm_opp **opp, struct dev_pm_opp *temp_opp,

			   unsigned long opp_key, unsigned long key)
@@ -711,42 +716,14 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_ceil); 
 * The callers are required to call dev_pm_opp_put() for the returned OPP after

 * use.

 */

struct dev_pm_opp *dev_pm_opp_find_bw_ceil(struct device *dev,

					   unsigned int *bw, int index)

struct dev_pm_opp *dev_pm_opp_find_bw_ceil(struct device *dev, unsigned int *bw,

					   int index)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);



	if (!dev || !bw) {

		dev_err(dev, "%s: Invalid argument bw=%p\n", __func__, bw);

		return ERR_PTR(-EINVAL);

	}



	opp_table = _find_opp_table(dev);

	if (IS_ERR(opp_table))

		return ERR_CAST(opp_table);



	if (index >= opp_table->path_count)

		return ERR_PTR(-EINVAL);



	mutex_lock(&opp_table->lock);



	list_for_each_entry(temp_opp, &opp_table->opp_list, node) {

		if (temp_opp->available && temp_opp->bandwidth) {

			if (temp_opp->bandwidth[index].peak >= *bw) {

				opp = temp_opp;

				*bw = opp->bandwidth[index].peak;



				/* Increment the reference count of OPP */

				dev_pm_opp_get(opp);

				break;

			}

		}

	}



	mutex_unlock(&opp_table->lock);

	dev_pm_opp_put_opp_table(opp_table);

	unsigned long temp = *bw;

	struct dev_pm_opp *opp;



	opp = _find_key_ceil(dev, &temp, index, true, _read_bw);

	*bw = temp;

	return opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_bw_ceil);
@@ -773,41 +750,11 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_find_bw_ceil); 
struct dev_pm_opp *dev_pm_opp_find_bw_floor(struct device *dev,

					    unsigned int *bw, int index)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);



	if (!dev || !bw) {

		dev_err(dev, "%s: Invalid argument bw=%p\n", __func__, bw);

		return ERR_PTR(-EINVAL);

	}



	opp_table = _find_opp_table(dev);

	if (IS_ERR(opp_table))

		return ERR_CAST(opp_table);



	if (index >= opp_table->path_count)

		return ERR_PTR(-EINVAL);



	mutex_lock(&opp_table->lock);



	list_for_each_entry(temp_opp, &opp_table->opp_list, node) {

		if (temp_opp->available && temp_opp->bandwidth) {

			/* go to the next node, before choosing prev */

			if (temp_opp->bandwidth[index].peak > *bw)

				break;

			opp = temp_opp;

		}

	}



	/* Increment the reference count of OPP */

	if (!IS_ERR(opp))

		dev_pm_opp_get(opp);

	mutex_unlock(&opp_table->lock);

	dev_pm_opp_put_opp_table(opp_table);



	if (!IS_ERR(opp))

		*bw = opp->bandwidth[index].peak;

	unsigned long temp = *bw;

	struct dev_pm_opp *opp;



	opp = _find_key_floor(dev, &temp, index, true, _read_bw);

	*bw = temp;

	return opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_bw_floor);