From: Viresh Kumar <viresh.kumar@linaro.org>
To: Dmitry Osipenko <digetx@gmail.com>,
Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
linux-pm@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Rafael Wysocki <rjw@rjwysocki.net>,
Sibi Sankar <sibis@codeaurora.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/13] opp: Split _set_opp() out of dev_pm_opp_set_rate()
Date: Thu, 21 Jan 2021 16:47:44 +0530 [thread overview]
Message-ID: <c6eed208018610123c451d4dd0b2583046c5e294.1611227342.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1611227342.git.viresh.kumar@linaro.org>
The _set_opp() helper will be used for devices which don't change their
frequency (like power domains, etc.) later on, prepare for that by
breaking the generic part out of dev_pm_opp_set_rate().
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/opp/core.c | 126 +++++++++++++++++++++++++--------------------
1 file changed, 71 insertions(+), 55 deletions(-)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 4ee598344e6a..5313dc322bdd 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -992,72 +992,27 @@ static int _disable_opp_table(struct device *dev, struct opp_table *opp_table)
return ret;
}
-/**
- * dev_pm_opp_set_rate() - Configure new OPP based on frequency
- * @dev: device for which we do this operation
- * @target_freq: frequency to achieve
- *
- * This configures the power-supplies to the levels specified by the OPP
- * corresponding to the target_freq, and programs the clock to a value <=
- * target_freq, as rounded by clk_round_rate(). Device wanting to run at fmax
- * provided by the opp, should have already rounded to the target OPP's
- * frequency.
- */
-int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
+static int _set_opp(struct device *dev, struct opp_table *opp_table,
+ struct dev_pm_opp *opp, unsigned long freq)
{
- struct opp_table *opp_table;
- unsigned long freq, old_freq, temp_freq;
- struct dev_pm_opp *old_opp, *opp;
+ struct dev_pm_opp *old_opp;
+ unsigned long old_freq;
int ret;
- opp_table = _find_opp_table(dev);
- if (IS_ERR(opp_table)) {
- dev_err(dev, "%s: device opp doesn't exist\n", __func__);
- return PTR_ERR(opp_table);
- }
-
- if (unlikely(!target_freq)) {
- ret = _disable_opp_table(dev, opp_table);
- goto put_opp_table;
- }
-
- freq = clk_round_rate(opp_table->clk, target_freq);
- if ((long)freq <= 0)
- freq = target_freq;
-
- /*
- * For IO devices which require an OPP on some platforms/SoCs
- * while just needing to scale the clock on some others
- * we look for empty OPP tables with just a clock handle and
- * scale only the clk. This makes dev_pm_opp_set_rate()
- * equivalent to a clk_set_rate()
- */
- if (!_get_opp_count(opp_table)) {
- ret = _generic_set_opp_clk_only(dev, opp_table->clk, freq);
- goto put_opp_table;
- }
+ if (unlikely(!opp))
+ return _disable_opp_table(dev, opp_table);
/* Find the currently set OPP if we don't know already */
if (unlikely(!opp_table->current_opp))
_find_current_opp(dev, opp_table);
- temp_freq = freq;
- opp = _find_freq_ceil(opp_table, &temp_freq);
- if (IS_ERR(opp)) {
- ret = PTR_ERR(opp);
- dev_err(dev, "%s: failed to find OPP for freq %lu (%d)\n",
- __func__, freq, ret);
- goto put_opp_table;
- }
-
old_opp = opp_table->current_opp;
old_freq = old_opp->rate;
/* Return early if nothing to do */
if (opp_table->enabled && old_opp == opp) {
dev_dbg(dev, "%s: OPPs are same, nothing to do\n", __func__);
- ret = 0;
- goto put_opp;
+ return 0;
}
dev_dbg(dev, "%s: switching OPP: %lu Hz --> %lu Hz\n", __func__,
@@ -1067,7 +1022,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
if (freq >= old_freq) {
ret = _set_required_opps(dev, opp_table, opp, true);
if (ret)
- goto put_opp;
+ return ret;
}
if (opp_table->set_opp) {
@@ -1101,8 +1056,69 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
}
}
-put_opp:
- dev_pm_opp_put(opp);
+ return ret;
+}
+
+/**
+ * dev_pm_opp_set_rate() - Configure new OPP based on frequency
+ * @dev: device for which we do this operation
+ * @target_freq: frequency to achieve
+ *
+ * This configures the power-supplies to the levels specified by the OPP
+ * corresponding to the target_freq, and programs the clock to a value <=
+ * target_freq, as rounded by clk_round_rate(). Device wanting to run at fmax
+ * provided by the opp, should have already rounded to the target OPP's
+ * frequency.
+ */
+int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
+{
+ struct opp_table *opp_table;
+ unsigned long freq = 0, temp_freq;
+ struct dev_pm_opp *opp = NULL;
+ int ret;
+
+ opp_table = _find_opp_table(dev);
+ if (IS_ERR(opp_table)) {
+ dev_err(dev, "%s: device's opp table doesn't exist\n", __func__);
+ return PTR_ERR(opp_table);
+ }
+
+ if (target_freq) {
+ /*
+ * For IO devices which require an OPP on some platforms/SoCs
+ * while just needing to scale the clock on some others
+ * we look for empty OPP tables with just a clock handle and
+ * scale only the clk. This makes dev_pm_opp_set_rate()
+ * equivalent to a clk_set_rate()
+ */
+ if (!_get_opp_count(opp_table)) {
+ ret = _generic_set_opp_clk_only(dev, opp_table->clk, target_freq);
+ goto put_opp_table;
+ }
+
+ freq = clk_round_rate(opp_table->clk, target_freq);
+ if ((long)freq <= 0)
+ freq = target_freq;
+
+ /*
+ * The clock driver may support finer resolution of the
+ * frequencies than the OPP table, don't update the frequency we
+ * pass to clk_set_rate() here.
+ */
+ temp_freq = freq;
+ opp = _find_freq_ceil(opp_table, &temp_freq);
+ if (IS_ERR(opp)) {
+ ret = PTR_ERR(opp);
+ dev_err(dev, "%s: failed to find OPP for freq %lu (%d)\n",
+ __func__, freq, ret);
+ goto put_opp_table;
+ }
+ }
+
+ ret = _set_opp(dev, opp_table, opp, freq);
+
+ if (opp)
+ dev_pm_opp_put(opp);
put_opp_table:
dev_pm_opp_put_opp_table(opp_table);
return ret;
--
2.25.0.rc1.19.g042ed3e048af
next prev parent reply other threads:[~2021-01-21 11:58 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 11:17 [PATCH 00/13] opp: Implement dev_pm_opp_set_opp() Viresh Kumar
2021-01-21 11:17 ` [PATCH 01/13] opp: Rename _opp_set_rate_zero() Viresh Kumar
2021-01-21 11:17 ` [PATCH 02/13] opp: No need to check clk for errors Viresh Kumar
2021-01-21 11:17 ` [PATCH 03/13] opp: Keep track of currently programmed OPP Viresh Kumar
2021-01-21 21:41 ` Dmitry Osipenko
2021-01-22 4:45 ` Viresh Kumar
2021-01-22 14:31 ` Dmitry Osipenko
2021-01-25 3:12 ` Viresh Kumar
2021-01-27 16:31 ` Akhil P Oommen
2021-01-28 4:14 ` Viresh Kumar
2021-07-07 10:24 ` Ionela Voinescu
2021-07-08 7:53 ` Viresh Kumar
2021-07-09 8:57 ` Ionela Voinescu
2021-07-12 4:14 ` Viresh Kumar
2021-01-21 11:17 ` Viresh Kumar [this message]
2021-01-21 11:17 ` [PATCH 05/13] opp: Allow _set_opp() to work for non-freq devices Viresh Kumar
2021-01-21 11:17 ` [PATCH 06/13] opp: Allow _generic_set_opp_regulator() " Viresh Kumar
2021-01-21 11:17 ` [PATCH 07/13] opp: Allow _generic_set_opp_clk_only() " Viresh Kumar
2021-01-21 20:26 ` Dmitry Osipenko
2021-01-22 4:35 ` Viresh Kumar
2021-01-25 21:09 ` Dmitry Osipenko
2021-01-27 6:58 ` Viresh Kumar
2021-01-21 11:17 ` [PATCH 08/13] opp: Update parameters of _set_opp_custom() Viresh Kumar
2021-01-21 11:17 ` [PATCH 09/13] opp: Implement dev_pm_opp_set_opp() Viresh Kumar
2021-01-21 11:17 ` [PATCH 10/13] cpufreq: qcom: Migrate to dev_pm_opp_set_opp() Viresh Kumar
2021-01-21 11:17 ` [PATCH 11/13] devfreq: tegra30: " Viresh Kumar
2021-01-21 21:36 ` Dmitry Osipenko
2021-01-22 6:26 ` Viresh Kumar
2021-01-22 15:28 ` Dmitry Osipenko
2021-01-25 3:14 ` Viresh Kumar
2021-01-25 16:00 ` Dmitry Osipenko
2021-01-27 9:10 ` [PATCH V2 " Viresh Kumar
2021-01-27 10:02 ` Viresh Kumar
2021-01-27 15:58 ` Dmitry Osipenko
2021-01-28 7:01 ` Viresh Kumar
2021-02-01 0:21 ` Chanwoo Choi
2021-02-01 19:57 ` Dmitry Osipenko
2021-01-21 11:17 ` [PATCH 12/13] drm: msm: " Viresh Kumar
2021-01-21 11:17 ` [PATCH 13/13] opp: Remove dev_pm_opp_set_bw() Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c6eed208018610123c451d4dd0b2583046c5e294.1611227342.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=digetx@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=sboyd@kernel.org \
--cc=sibis@codeaurora.org \
--cc=vincent.guittot@linaro.org \
--cc=vireshk@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).