| Message ID | 20210118005524.27787-7-digetx@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | viresh kumar |
| Headers | show |
| Series | OPP API fixes and improvements | expand |
On 18-01-21, 03:55, Dmitry Osipenko wrote: > Add a ceil version of the dev_pm_opp_find_level(). It's handy to have if > levels don't start from 0 in OPP table and zero usually means a minimal > level. > > Tested-by: Peter Geis <pgwipeout@gmail.com> > Tested-by: Nicolas Chauvet <kwizart@gmail.com> > Tested-by: Matt Merhar <mattmerhar@protonmail.com> > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > --- > drivers/opp/core.c | 49 ++++++++++++++++++++++++++++++++++++++++++ > include/linux/pm_opp.h | 8 +++++++ > 2 files changed, 57 insertions(+) > > diff --git a/drivers/opp/core.c b/drivers/opp/core.c > index 341484d58e6c..df0969002555 100644 > --- a/drivers/opp/core.c > +++ b/drivers/opp/core.c > @@ -449,6 +449,55 @@ struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev, > } > EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_exact); > > +/** > + * dev_pm_opp_find_level_ceil() - search for an rounded up level > + * @dev: device for which we do this operation > + * @level: level to search for > + * > + * Return: Searches for rounded up match in the opp table and returns pointer > + * to the matching opp if found, else returns ERR_PTR in case of error and > + * should be handled using IS_ERR. Error return values can be: > + * EINVAL: for bad pointer > + * ERANGE: no match found for search > + * ENODEV: if device not found in list of registered devices > + * > + * The callers are required to call dev_pm_opp_put() for the returned OPP after > + * use. > + */ > +struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev, > + unsigned int *level) > +{ > + struct opp_table *opp_table; > + struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE); > + > + opp_table = _find_opp_table(dev); > + if (IS_ERR(opp_table)) { > + int r = PTR_ERR(opp_table); > + > + dev_err(dev, "%s: OPP table not found (%d)\n", __func__, r); > + return ERR_PTR(r); > + } > + > + mutex_lock(&opp_table->lock); > + > + list_for_each_entry(temp_opp, &opp_table->opp_list, node) { > + if (temp_opp->available && temp_opp->level >= *level) { > + opp = temp_opp; > + *level = opp->level; > + > + /* 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); > + > + return opp; > +} > +EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_ceil); > + > static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table, > unsigned long *freq) > { > diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h > index f344be844bde..b7dc993487c7 100644 > --- a/include/linux/pm_opp.h > +++ b/include/linux/pm_opp.h > @@ -111,6 +111,8 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, > bool available); > struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev, > unsigned int level); > +struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev, > + unsigned int *level); > > struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, > unsigned long *freq); > @@ -234,6 +236,12 @@ static inline struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev, > return ERR_PTR(-ENOTSUPP); > } > > +static inline struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev, > + unsigned int *level) > +{ > + return ERR_PTR(-ENOTSUPP); > +} > + > static inline struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, > unsigned long *freq) > { Applied. Thanks.
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 341484d58e6c..df0969002555 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -449,6 +449,55 @@ struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev, } EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_exact); +/** + * dev_pm_opp_find_level_ceil() - search for an rounded up level + * @dev: device for which we do this operation + * @level: level to search for + * + * Return: Searches for rounded up match in the opp table and returns pointer + * to the matching opp if found, else returns ERR_PTR in case of error and + * should be handled using IS_ERR. Error return values can be: + * EINVAL: for bad pointer + * ERANGE: no match found for search + * ENODEV: if device not found in list of registered devices + * + * The callers are required to call dev_pm_opp_put() for the returned OPP after + * use. + */ +struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev, + unsigned int *level) +{ + struct opp_table *opp_table; + struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE); + + opp_table = _find_opp_table(dev); + if (IS_ERR(opp_table)) { + int r = PTR_ERR(opp_table); + + dev_err(dev, "%s: OPP table not found (%d)\n", __func__, r); + return ERR_PTR(r); + } + + mutex_lock(&opp_table->lock); + + list_for_each_entry(temp_opp, &opp_table->opp_list, node) { + if (temp_opp->available && temp_opp->level >= *level) { + opp = temp_opp; + *level = opp->level; + + /* 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); + + return opp; +} +EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_ceil); + static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table, unsigned long *freq) { diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index f344be844bde..b7dc993487c7 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -111,6 +111,8 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, bool available); struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev, unsigned int level); +struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev, + unsigned int *level); struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, unsigned long *freq); @@ -234,6 +236,12 @@ static inline struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev, return ERR_PTR(-ENOTSUPP); } +static inline struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev, + unsigned int *level) +{ + return ERR_PTR(-ENOTSUPP); +} + static inline struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, unsigned long *freq) {