From: Benjamin Bara <bbara93@gmail.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: support.opensource@diasemi.com,
DLG-Adam.Ward.opensource@dm.renesas.com,
Martin Fuzzey <martin.fuzzey@flowbird.group>,
linux-kernel@vger.kernel.org,
Matti Vaittinen <mazziesaccount@gmail.com>,
Benjamin Bara <benjamin.bara@skidata.com>
Subject: [PATCH RFC v4 10/13] regulator: implement mon_disable_reg_set_{higher,lower}
Date: Tue, 20 Jun 2023 22:03:03 +0200 [thread overview]
Message-ID: <20230419-dynamic-vmon-v4-10-4d3734e62ada@skidata.com> (raw)
In-Reply-To: <20230419-dynamic-vmon-v4-0-4d3734e62ada@skidata.com>
From: Benjamin Bara <benjamin.bara@skidata.com>
The mon_disable_reg_set_{higher,lower} properties disable all dt-enabled
monitors when the value of the regulator is changed to a higher or lower
one.
Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com>
---
drivers/regulator/core.c | 41 +++++++++++++++++++++++++++++++++++++----
1 file changed, 37 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index b37dcafff407..74b9c12d38e9 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3643,6 +3643,7 @@ static int _regulator_call_set_voltage(struct regulator_dev *rdev,
int min_uV, int max_uV,
unsigned *selector)
{
+ const struct regulator_desc *desc = rdev->desc;
struct pre_voltage_change_data data;
int ret;
@@ -3654,7 +3655,18 @@ static int _regulator_call_set_voltage(struct regulator_dev *rdev,
if (ret & NOTIFY_STOP_MASK)
return -EINVAL;
- ret = rdev->desc->ops->set_voltage(rdev, min_uV, max_uV, selector);
+ if (min_uV > data.old_uV || max_uV > data.old_uV) {
+ ret = monitors_disable(rdev, desc->mon_disable_reg_set_higher);
+ if (ret)
+ return ret;
+ }
+ if (min_uV < data.old_uV || max_uV < data.old_uV) {
+ ret = monitors_disable(rdev, desc->mon_disable_reg_set_lower);
+ if (ret)
+ return ret;
+ }
+
+ ret = desc->ops->set_voltage(rdev, min_uV, max_uV, selector);
if (ret >= 0)
return ret;
@@ -3667,6 +3679,7 @@ static int _regulator_call_set_voltage(struct regulator_dev *rdev,
static int _regulator_call_set_voltage_sel(struct regulator_dev *rdev,
int uV, unsigned selector)
{
+ const struct regulator_desc *desc = rdev->desc;
struct pre_voltage_change_data data;
int ret;
@@ -3678,7 +3691,18 @@ static int _regulator_call_set_voltage_sel(struct regulator_dev *rdev,
if (ret & NOTIFY_STOP_MASK)
return -EINVAL;
- ret = rdev->desc->ops->set_voltage_sel(rdev, selector);
+ if (uV > data.old_uV) {
+ ret = monitors_disable(rdev, desc->mon_disable_reg_set_higher);
+ if (ret)
+ return ret;
+ }
+ if (uV < data.old_uV) {
+ ret = monitors_disable(rdev, desc->mon_disable_reg_set_lower);
+ if (ret)
+ return ret;
+ }
+
+ ret = desc->ops->set_voltage_sel(rdev, selector);
if (ret >= 0)
return ret;
@@ -3780,7 +3804,8 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
int best_val = 0;
unsigned int selector;
int old_selector = -1;
- const struct regulator_ops *ops = rdev->desc->ops;
+ const struct regulator_desc *desc = rdev->desc;
+ const struct regulator_ops *ops = desc->ops;
int old_uV = regulator_get_voltage_rdev(rdev);
trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV);
@@ -3819,7 +3844,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
selector = ret;
if (old_selector == selector)
ret = 0;
- else if (rdev->desc->vsel_step)
+ else if (desc->vsel_step)
ret = _regulator_set_voltage_sel_step(
rdev, best_val, selector);
else
@@ -3874,6 +3899,14 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
out:
trace_regulator_set_voltage_complete(rdev_get_name(rdev), best_val);
+ /* if setting voltage failed, ignore monitoring error. */
+ if (ret)
+ monitors_reenable(rdev, desc->mon_disable_reg_set_higher |
+ desc->mon_disable_reg_set_lower);
+ else
+ ret = monitors_reenable(rdev, desc->mon_disable_reg_set_higher |
+ desc->mon_disable_reg_set_lower);
+
return ret;
}
--
2.34.1
next prev parent reply other threads:[~2023-06-20 20:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 20:02 [PATCH RFC v4 00/13] regulator: dynamic voltage monitoring support Benjamin Bara
2023-06-20 20:02 ` [PATCH RFC v4 01/13] regulator: da9063: fix null pointer deref with partial DT config Benjamin Bara
2023-06-20 20:02 ` [PATCH RFC v4 02/13] regulator: add getter for active monitors Benjamin Bara
2023-06-26 13:43 ` Matti Vaittinen
2023-06-26 16:37 ` Mark Brown
2023-06-20 20:02 ` [PATCH RFC v4 03/13] regulator: da9063: implement get_active_protections() Benjamin Bara
2023-06-20 20:02 ` [PATCH RFC v4 04/13] regulator: bd718x7: " Benjamin Bara
2023-06-26 13:45 ` Matti Vaittinen
2023-06-20 20:02 ` [PATCH RFC v4 05/13] regulator: introduce properties for monitoring workarounds Benjamin Bara
2023-06-26 13:47 ` Matti Vaittinen
2023-06-20 20:02 ` [PATCH RFC v4 06/13] regulator: set required ops " Benjamin Bara
2023-06-26 13:49 ` Matti Vaittinen
2023-06-20 20:03 ` [PATCH RFC v4 07/13] regulator: find active protections during initialization Benjamin Bara
2023-06-26 13:56 ` Matti Vaittinen
2023-06-26 16:49 ` Mark Brown
2023-07-03 18:43 ` Benjamin Bara
2023-07-04 13:49 ` Mark Brown
2023-06-20 20:03 ` [PATCH RFC v4 08/13] regulator: move monitor handling into own function Benjamin Bara
2023-06-26 14:04 ` Matti Vaittinen
2023-06-20 20:03 ` [PATCH RFC v4 09/13] regulator: implement mon_disable_reg_disabled Benjamin Bara
2023-07-03 10:31 ` Matti Vaittinen
2023-07-03 18:50 ` Benjamin Bara
2023-06-20 20:03 ` Benjamin Bara [this message]
2023-07-03 10:45 ` [PATCH RFC v4 10/13] regulator: implement mon_disable_reg_set_{higher,lower} Matti Vaittinen
2023-06-20 20:03 ` [PATCH RFC v4 11/13] regulator: implement mon_unsupported_reg_modes Benjamin Bara
2023-07-03 10:49 ` Matti Vaittinen
2023-06-20 20:03 ` [PATCH RFC v4 12/13] regulator: da9063: let the core handle the monitors Benjamin Bara
2023-06-20 20:03 ` [PATCH RFC v4 13/13] regulator: bd718x7: " Benjamin Bara
2023-07-03 11:02 ` Matti Vaittinen
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=20230419-dynamic-vmon-v4-10-4d3734e62ada@skidata.com \
--to=bbara93@gmail.com \
--cc=DLG-Adam.Ward.opensource@dm.renesas.com \
--cc=benjamin.bara@skidata.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.fuzzey@flowbird.group \
--cc=mazziesaccount@gmail.com \
--cc=support.opensource@diasemi.com \
/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).