* [PATCH V2 1/3] opp: Create _of_add_table_indexed() to reduce code duplication @ 2021-01-28 7:00 Viresh Kumar 2021-01-28 7:00 ` [PATCH V2 2/3] opp: Defer acquiring the clk until OPPs are added Viresh Kumar 2021-01-28 7:00 ` [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() Viresh Kumar 0 siblings, 2 replies; 6+ messages in thread From: Viresh Kumar @ 2021-01-28 7:00 UTC (permalink / raw) To: Viresh Kumar, Nishanth Menon, Stephen Boyd Cc: Viresh Kumar, linux-pm, Vincent Guittot, Rafael Wysocki, Dmitry Osipenko, linux-kernel The implementation of dev_pm_opp_of_add_table() and dev_pm_opp_of_add_table_indexed() are almost identical. Create _of_add_table_indexed() to reduce code redundancy. Also remove the duplication of the doc style comments by referring to dev_pm_opp_of_add_table() from dev_pm_opp_of_add_table_indexed(). Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- V2: - No change drivers/opp/of.c | 81 ++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 48 deletions(-) diff --git a/drivers/opp/of.c b/drivers/opp/of.c index d0c0336be39b..c6856dcf4c34 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -956,29 +956,23 @@ static int _of_add_opp_table_v1(struct device *dev, struct opp_table *opp_table) return ret; } -/** - * dev_pm_opp_of_add_table() - Initialize opp table from device tree - * @dev: device pointer used to lookup OPP table. - * - * Register the initial OPP table with the OPP library for given device. - * - * Return: - * 0 On success OR - * Duplicate OPPs (both freq and volt are same) and opp->available - * -EEXIST Freq are same and volt are different OR - * Duplicate OPPs (both freq and volt are same) and !opp->available - * -ENOMEM Memory allocation failure - * -ENODEV when 'operating-points' property is not found or is invalid data - * in device node. - * -ENODATA when empty 'operating-points' property is found - * -EINVAL when invalid entries are found in opp-v2 table - */ -int dev_pm_opp_of_add_table(struct device *dev) +static int _of_add_table_indexed(struct device *dev, int index) { struct opp_table *opp_table; - int ret; + int ret, count; - opp_table = _add_opp_table_indexed(dev, 0); + if (index) { + /* + * If only one phandle is present, then the same OPP table + * applies for all index requests. + */ + count = of_count_phandle_with_args(dev->of_node, + "operating-points-v2", NULL); + if (count == 1) + index = 0; + } + + opp_table = _add_opp_table_indexed(dev, index); if (IS_ERR(opp_table)) return PTR_ERR(opp_table); @@ -996,15 +990,12 @@ int dev_pm_opp_of_add_table(struct device *dev) return ret; } -EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table); /** - * dev_pm_opp_of_add_table_indexed() - Initialize indexed opp table from device tree + * dev_pm_opp_of_add_table() - Initialize opp table from device tree * @dev: device pointer used to lookup OPP table. - * @index: Index number. * - * Register the initial OPP table with the OPP library for given device only - * using the "operating-points-v2" property. + * Register the initial OPP table with the OPP library for given device. * * Return: * 0 On success OR @@ -1017,31 +1008,25 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table); * -ENODATA when empty 'operating-points' property is found * -EINVAL when invalid entries are found in opp-v2 table */ -int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) +int dev_pm_opp_of_add_table(struct device *dev) { - struct opp_table *opp_table; - int ret, count; - - if (index) { - /* - * If only one phandle is present, then the same OPP table - * applies for all index requests. - */ - count = of_count_phandle_with_args(dev->of_node, - "operating-points-v2", NULL); - if (count == 1) - index = 0; - } - - opp_table = _add_opp_table_indexed(dev, index); - if (IS_ERR(opp_table)) - return PTR_ERR(opp_table); - - ret = _of_add_opp_table_v2(dev, opp_table); - if (ret) - dev_pm_opp_put_opp_table(opp_table); + return _of_add_table_indexed(dev, 0); +} +EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table); - return ret; +/** + * dev_pm_opp_of_add_table_indexed() - Initialize indexed opp table from device tree + * @dev: device pointer used to lookup OPP table. + * @index: Index number. + * + * Register the initial OPP table with the OPP library for given device only + * using the "operating-points-v2" property. + * + * Return: Refer to dev_pm_opp_of_add_table() for return values. + */ +int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) +{ + return _of_add_table_indexed(dev, index); } EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_indexed); -- 2.25.0.rc1.19.g042ed3e048af ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2 2/3] opp: Defer acquiring the clk until OPPs are added 2021-01-28 7:00 [PATCH V2 1/3] opp: Create _of_add_table_indexed() to reduce code duplication Viresh Kumar @ 2021-01-28 7:00 ` Viresh Kumar 2021-01-28 7:00 ` [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() Viresh Kumar 1 sibling, 0 replies; 6+ messages in thread From: Viresh Kumar @ 2021-01-28 7:00 UTC (permalink / raw) To: Viresh Kumar, Nishanth Menon, Stephen Boyd Cc: Viresh Kumar, linux-pm, Vincent Guittot, Rafael Wysocki, Dmitry Osipenko, linux-kernel We acquire the clk at the time the OPP table is allocated, though it works fine, it is not the best place to do so. One of the main reason being we may need to acquire it again from dev_pm_opp_set_clkname() if the platform wants another clock to be acquired instead. There is also requirement from some of the platforms where they do not want the OPP core to manage the clock at all. This patch hence defers acquiring the clk until the time we are certain about which clk we need to acquire and if we really need to acquire one. With this commit, the clk will get acquired either from dev_pm_opp_set_clkname() or while we initialize the OPPs within the table. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- V2: - Split the earlier patch into two - Instead of skipping the clk-acquiring in _allocate_opp_table() based on getclk flag, defer it until later and get it only if we need to. drivers/opp/core.c | 73 ++++++++++++++++++++++++++++------------------ drivers/opp/of.c | 8 ++--- drivers/opp/opp.h | 2 +- 3 files changed, 50 insertions(+), 33 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index bf7cdab0ba64..52f4a64926e6 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1158,21 +1158,11 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index) _of_init_opp_table(opp_table, dev, index); - /* Find clk for the device */ - opp_table->clk = clk_get(dev, NULL); - if (IS_ERR(opp_table->clk)) { - ret = PTR_ERR(opp_table->clk); - if (ret == -EPROBE_DEFER) - goto remove_opp_dev; - - dev_dbg(dev, "%s: Couldn't find clock: %d\n", __func__, ret); - } - /* Find interconnect path(s) for the device */ ret = dev_pm_opp_of_find_icc_paths(dev, opp_table); if (ret) { if (ret == -EPROBE_DEFER) - goto put_clk; + goto remove_opp_dev; dev_warn(dev, "%s: Error finding interconnect paths: %d\n", __func__, ret); @@ -1184,9 +1174,6 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index) return opp_table; -put_clk: - if (!IS_ERR(opp_table->clk)) - clk_put(opp_table->clk); remove_opp_dev: _remove_opp_dev(opp_dev, opp_table); err: @@ -1199,6 +1186,33 @@ void _get_opp_table_kref(struct opp_table *opp_table) kref_get(&opp_table->kref); } +static struct opp_table *_update_opp_table_clk(struct device *dev, + struct opp_table *opp_table, + bool getclk) +{ + /* + * Return early if we don't need to get clk or we have already tried it + * earlier. + */ + if (!getclk || IS_ERR(opp_table) || opp_table->clk) + return opp_table; + + /* Find clk for the device */ + opp_table->clk = clk_get(dev, NULL); + if (IS_ERR(opp_table->clk)) { + int ret = PTR_ERR(opp_table->clk); + + if (ret == -EPROBE_DEFER) { + dev_pm_opp_put_opp_table(opp_table); + return ERR_PTR(ret); + } + + dev_dbg(dev, "%s: Couldn't find clock: %d\n", __func__, ret); + } + + return opp_table; +} + /* * We need to make sure that the OPP table for a device doesn't get added twice, * if this routine gets called in parallel with the same device pointer. @@ -1214,7 +1228,8 @@ void _get_opp_table_kref(struct opp_table *opp_table) * uses the opp_tables_busy flag to indicate if another creator is in the middle * of adding an OPP table and others should wait for it to finish. */ -struct opp_table *_add_opp_table_indexed(struct device *dev, int index) +struct opp_table *_add_opp_table_indexed(struct device *dev, int index, + bool getclk) { struct opp_table *opp_table; @@ -1261,12 +1276,12 @@ struct opp_table *_add_opp_table_indexed(struct device *dev, int index) unlock: mutex_unlock(&opp_table_lock); - return opp_table; + return _update_opp_table_clk(dev, opp_table, getclk); } -static struct opp_table *_add_opp_table(struct device *dev) +static struct opp_table *_add_opp_table(struct device *dev, bool getclk) { - return _add_opp_table_indexed(dev, 0); + return _add_opp_table_indexed(dev, 0, getclk); } struct opp_table *dev_pm_opp_get_opp_table(struct device *dev) @@ -1711,7 +1726,7 @@ struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev, { struct opp_table *opp_table; - opp_table = _add_opp_table(dev); + opp_table = _add_opp_table(dev, false); if (IS_ERR(opp_table)) return opp_table; @@ -1773,7 +1788,7 @@ struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name) { struct opp_table *opp_table; - opp_table = _add_opp_table(dev); + opp_table = _add_opp_table(dev, false); if (IS_ERR(opp_table)) return opp_table; @@ -1869,7 +1884,7 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev, struct regulator *reg; int ret, i; - opp_table = _add_opp_table(dev); + opp_table = _add_opp_table(dev, false); if (IS_ERR(opp_table)) return opp_table; @@ -1980,7 +1995,7 @@ struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name) struct opp_table *opp_table; int ret; - opp_table = _add_opp_table(dev); + opp_table = _add_opp_table(dev, false); if (IS_ERR(opp_table)) return opp_table; @@ -1990,9 +2005,11 @@ struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name) goto err; } - /* Already have default clk set, free it */ - if (!IS_ERR(opp_table->clk)) - clk_put(opp_table->clk); + /* clk shouldn't be initialized at this point */ + if (WARN_ON(opp_table->clk)) { + ret = -EBUSY; + goto err; + } /* Find clk for the device */ opp_table->clk = clk_get(dev, name); @@ -2051,7 +2068,7 @@ struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, if (!set_opp) return ERR_PTR(-EINVAL); - opp_table = _add_opp_table(dev); + opp_table = _add_opp_table(dev, false); if (IS_ERR(opp_table)) return opp_table; @@ -2138,7 +2155,7 @@ struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, int index = 0, ret = -EINVAL; const char **name = names; - opp_table = _add_opp_table(dev); + opp_table = _add_opp_table(dev, false); if (IS_ERR(opp_table)) return opp_table; @@ -2306,7 +2323,7 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt) struct opp_table *opp_table; int ret; - opp_table = _add_opp_table(dev); + opp_table = _add_opp_table(dev, true); if (IS_ERR(opp_table)) return PTR_ERR(opp_table); diff --git a/drivers/opp/of.c b/drivers/opp/of.c index c6856dcf4c34..d4b51b2e384f 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -956,7 +956,7 @@ static int _of_add_opp_table_v1(struct device *dev, struct opp_table *opp_table) return ret; } -static int _of_add_table_indexed(struct device *dev, int index) +static int _of_add_table_indexed(struct device *dev, int index, bool getclk) { struct opp_table *opp_table; int ret, count; @@ -972,7 +972,7 @@ static int _of_add_table_indexed(struct device *dev, int index) index = 0; } - opp_table = _add_opp_table_indexed(dev, index); + opp_table = _add_opp_table_indexed(dev, index, getclk); if (IS_ERR(opp_table)) return PTR_ERR(opp_table); @@ -1010,7 +1010,7 @@ static int _of_add_table_indexed(struct device *dev, int index) */ int dev_pm_opp_of_add_table(struct device *dev) { - return _of_add_table_indexed(dev, 0); + return _of_add_table_indexed(dev, 0, true); } EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table); @@ -1026,7 +1026,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table); */ int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) { - return _of_add_table_indexed(dev, index); + return _of_add_table_indexed(dev, index, true); } EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_indexed); diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index ee2593afae0c..6e83855ade1f 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -223,7 +223,7 @@ int _opp_compare_key(struct dev_pm_opp *opp1, struct dev_pm_opp *opp2); int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table, bool rate_not_available); int _opp_add_v1(struct opp_table *opp_table, struct device *dev, unsigned long freq, long u_volt, bool dynamic); void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, int last_cpu); -struct opp_table *_add_opp_table_indexed(struct device *dev, int index); +struct opp_table *_add_opp_table_indexed(struct device *dev, int index, bool getclk); void _put_opp_list_kref(struct opp_table *opp_table); #ifdef CONFIG_OF -- 2.25.0.rc1.19.g042ed3e048af ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() 2021-01-28 7:00 [PATCH V2 1/3] opp: Create _of_add_table_indexed() to reduce code duplication Viresh Kumar 2021-01-28 7:00 ` [PATCH V2 2/3] opp: Defer acquiring the clk until OPPs are added Viresh Kumar @ 2021-01-28 7:00 ` Viresh Kumar 2021-02-01 20:00 ` Dmitry Osipenko 1 sibling, 1 reply; 6+ messages in thread From: Viresh Kumar @ 2021-01-28 7:00 UTC (permalink / raw) To: Viresh Kumar, Nishanth Menon, Stephen Boyd, Rafael J. Wysocki Cc: Viresh Kumar, linux-pm, Vincent Guittot, Dmitry Osipenko, linux-kernel A few drivers have device's clk but they don't want the OPP core to handle that. Add a new helper for them, dev_pm_opp_of_add_table_noclk(). Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- V2: - Split this into a separate patch. drivers/opp/of.c | 18 ++++++++++++++++++ include/linux/pm_opp.h | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/drivers/opp/of.c b/drivers/opp/of.c index d4b51b2e384f..a905497c75f8 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -1030,6 +1030,24 @@ int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) } EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_indexed); +/** + * dev_pm_opp_of_add_table_noclk() - Initialize indexed opp table from device + * tree without getting clk for device. + * @dev: device pointer used to lookup OPP table. + * @index: Index number. + * + * Register the initial OPP table with the OPP library for given device only + * using the "operating-points-v2" property. Do not try to get the clk for the + * device. + * + * Return: Refer to dev_pm_opp_of_add_table() for return values. + */ +int dev_pm_opp_of_add_table_noclk(struct device *dev, int index) +{ + return _of_add_table_indexed(dev, index, false); +} +EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_noclk); + /* CPU device specific helpers */ /** diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 979b208bc4a8..158158620dde 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -395,6 +395,7 @@ static inline int dev_pm_opp_sync_regulators(struct device *dev) #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF) int dev_pm_opp_of_add_table(struct device *dev); int dev_pm_opp_of_add_table_indexed(struct device *dev, int index); +int dev_pm_opp_of_add_table_noclk(struct device *dev, int index); void dev_pm_opp_of_remove_table(struct device *dev); int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask); void dev_pm_opp_of_cpumask_remove_table(const struct cpumask *cpumask); @@ -419,6 +420,11 @@ static inline int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) return -ENOTSUPP; } +static inline int dev_pm_opp_of_add_table_noclk(struct device *dev, int index) +{ + return -ENOTSUPP; +} + static inline void dev_pm_opp_of_remove_table(struct device *dev) { } -- 2.25.0.rc1.19.g042ed3e048af ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() 2021-01-28 7:00 ` [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() Viresh Kumar @ 2021-02-01 20:00 ` Dmitry Osipenko 2021-02-02 5:02 ` Viresh Kumar 0 siblings, 1 reply; 6+ messages in thread From: Dmitry Osipenko @ 2021-02-01 20:00 UTC (permalink / raw) To: Viresh Kumar, Viresh Kumar, Nishanth Menon, Stephen Boyd, Rafael J. Wysocki Cc: linux-pm, Vincent Guittot, linux-kernel 28.01.2021 10:00, Viresh Kumar пишет: > A few drivers have device's clk but they don't want the OPP core to > handle that. Add a new helper for them, dev_pm_opp_of_add_table_noclk(). > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > V2: > - Split this into a separate patch. > > drivers/opp/of.c | 18 ++++++++++++++++++ > include/linux/pm_opp.h | 6 ++++++ > 2 files changed, 24 insertions(+) For the all current/latest OPP patches: Tested-by: Dmitry Osipenko <digetx@gmail.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() 2021-02-01 20:00 ` Dmitry Osipenko @ 2021-02-02 5:02 ` Viresh Kumar 2021-02-02 18:04 ` Dmitry Osipenko 0 siblings, 1 reply; 6+ messages in thread From: Viresh Kumar @ 2021-02-02 5:02 UTC (permalink / raw) To: Dmitry Osipenko Cc: Viresh Kumar, Nishanth Menon, Stephen Boyd, Rafael J. Wysocki, linux-pm, Vincent Guittot, linux-kernel On 01-02-21, 23:00, Dmitry Osipenko wrote: > 28.01.2021 10:00, Viresh Kumar пишет: > > A few drivers have device's clk but they don't want the OPP core to > > handle that. Add a new helper for them, dev_pm_opp_of_add_table_noclk(). > > > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > --- > > V2: > > - Split this into a separate patch. > > > > drivers/opp/of.c | 18 ++++++++++++++++++ > > include/linux/pm_opp.h | 6 ++++++ > > 2 files changed, 24 insertions(+) > > For the all current/latest OPP patches: > > Tested-by: Dmitry Osipenko <digetx@gmail.com> Hmm, I have now added your Tested-by to all the patches that we worked together on.. Thanks. -- viresh ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() 2021-02-02 5:02 ` Viresh Kumar @ 2021-02-02 18:04 ` Dmitry Osipenko 0 siblings, 0 replies; 6+ messages in thread From: Dmitry Osipenko @ 2021-02-02 18:04 UTC (permalink / raw) To: Viresh Kumar Cc: Viresh Kumar, Nishanth Menon, Stephen Boyd, Rafael J. Wysocki, linux-pm, Vincent Guittot, linux-kernel 02.02.2021 08:02, Viresh Kumar пишет: > On 01-02-21, 23:00, Dmitry Osipenko wrote: >> 28.01.2021 10:00, Viresh Kumar пишет: >>> A few drivers have device's clk but they don't want the OPP core to >>> handle that. Add a new helper for them, dev_pm_opp_of_add_table_noclk(). >>> >>> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> >>> --- >>> V2: >>> - Split this into a separate patch. >>> >>> drivers/opp/of.c | 18 ++++++++++++++++++ >>> include/linux/pm_opp.h | 6 ++++++ >>> 2 files changed, 24 insertions(+) >> >> For the all current/latest OPP patches: >> >> Tested-by: Dmitry Osipenko <digetx@gmail.com> > > Hmm, I have now added your Tested-by to all the patches that we worked > together on.. > > Thanks. > That's exactly what I meant, thank you. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-02 18:07 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-01-28 7:00 [PATCH V2 1/3] opp: Create _of_add_table_indexed() to reduce code duplication Viresh Kumar 2021-01-28 7:00 ` [PATCH V2 2/3] opp: Defer acquiring the clk until OPPs are added Viresh Kumar 2021-01-28 7:00 ` [PATCH V2 3/3] opp: Add dev_pm_opp_of_add_table_noclk() Viresh Kumar 2021-02-01 20:00 ` Dmitry Osipenko 2021-02-02 5:02 ` Viresh Kumar 2021-02-02 18:04 ` Dmitry Osipenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).