From: Rajendra Nayak <rnayak@codeaurora.org>
To: Viresh Kumar <viresh.kumar@linaro.org>,
Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: linux-pm@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Rafael Wysocki <rjw@rjwysocki.net>,
mka@chromium.org, sibis@codeaurora.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/4] opp: Reused enabled flag and remove regulator_enabled
Date: Tue, 18 Aug 2020 12:40:10 +0530 [thread overview]
Message-ID: <e232d06c-f19f-a806-637b-8f0ffed19594@codeaurora.org> (raw)
In-Reply-To: <359b588928b7e58b009f786b17ddc088c6a7d18b.1597292833.git.viresh.kumar@linaro.org>
On 8/13/2020 9:59 AM, Viresh Kumar wrote:
> The common "enabled" flag can be used here instead of
> "regulator_enabled" now.
>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
> drivers/opp/core.c | 13 +++----------
> drivers/opp/opp.h | 2 --
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/opp/core.c b/drivers/opp/core.c
> index e8882e7fd8a5..5f5da257f58a 100644
> --- a/drivers/opp/core.c
> +++ b/drivers/opp/core.c
> @@ -703,12 +703,10 @@ static int _generic_set_opp_regulator(struct opp_table *opp_table,
> * Enable the regulator after setting its voltages, otherwise it breaks
> * some boot-enabled regulators.
> */
> - if (unlikely(!opp_table->regulator_enabled)) {
> + if (unlikely(!opp_table->enabled)) {
> ret = regulator_enable(reg);
> if (ret < 0)
> dev_warn(dev, "Failed to enable regulator: %d", ret);
> - else
> - opp_table->regulator_enabled = true;
> }
>
> return 0;
> @@ -905,10 +903,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
> if (ret)
> goto put_opp_table;
>
> - if (opp_table->regulator_enabled) {
> - regulator_disable(opp_table->regulators[0]);
> - opp_table->regulator_enabled = false;
> - }
> + regulator_disable(opp_table->regulators[0]);
unconditionally calling regulator_disable() here based on the common
'enabled' flag results in a crash on platforms without regulators
associated with the opp table.
>
> ret = _set_required_opps(dev, opp_table, NULL);
> if (!ret)
> @@ -1795,11 +1790,9 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)
> /* Make sure there are no concurrent readers while updating opp_table */
> WARN_ON(!list_empty(&opp_table->opp_list));
>
> - if (opp_table->regulator_enabled) {
> + if (opp_table->enabled) {
> for (i = opp_table->regulator_count - 1; i >= 0; i--)
> regulator_disable(opp_table->regulators[i]);
> -
> - opp_table->regulator_enabled = false;
> }
>
> for (i = opp_table->regulator_count - 1; i >= 0; i--)
> diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h
> index bd35802acc6e..0c3de3f6db5c 100644
> --- a/drivers/opp/opp.h
> +++ b/drivers/opp/opp.h
> @@ -147,7 +147,6 @@ enum opp_table_access {
> * @clk: Device's clock handle
> * @regulators: Supply regulators
> * @regulator_count: Number of power supply regulators. Its value can be -1
> - * @regulator_enabled: Set to true if regulators were previously enabled.
> * (uninitialized), 0 (no opp-microvolt property) or > 0 (has opp-microvolt
> * property).
> * @paths: Interconnect path handles
> @@ -196,7 +195,6 @@ struct opp_table {
> struct clk *clk;
> struct regulator **regulators;
> int regulator_count;
> - bool regulator_enabled;
> struct icc_path **paths;
> unsigned int path_count;
> bool enabled;
>
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2020-08-18 7:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 7:06 [PATCH] opp: Fix dev_pm_opp_set_rate() to not return early Rajendra Nayak
2020-08-10 10:41 ` Sibi Sankar
2020-08-11 17:12 ` Matthias Kaehlcke
2020-08-12 4:30 ` Rajendra Nayak
2020-08-11 21:09 ` Stephen Boyd
2020-08-13 4:29 ` Viresh Kumar
2020-08-16 12:30 ` Rajendra Nayak
2020-08-13 4:28 ` [PATCH V2 1/4] opp: Enable resources again if they were disabled earlier Viresh Kumar
2020-08-13 4:28 ` [PATCH 2/4] opp: Track device's resources configuration status Viresh Kumar
2020-08-15 8:03 ` Stephen Boyd
2020-08-17 5:05 ` Viresh Kumar
2020-08-13 4:29 ` [PATCH 3/4] opp: Reused enabled flag and remove regulator_enabled Viresh Kumar
2020-08-15 7:55 ` Stephen Boyd
2020-08-20 7:19 ` Viresh Kumar
2020-08-18 7:10 ` Rajendra Nayak [this message]
2020-08-13 4:29 ` [PATCH 4/4] opp: Split out _opp_set_rate_zero() 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=e232d06c-f19f-a806-637b-8f0ffed19594@codeaurora.org \
--to=rnayak@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mka@chromium.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=sboyd@kernel.org \
--cc=sibis@codeaurora.org \
--cc=vincent.guittot@linaro.org \
--cc=viresh.kumar@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).