Skip to contentSkip to conversation

regulator: Don't error out fixed regulator in regulator_sync_voltage()

PATCH Superseded Dmitry Osipenko 2 participants 5 messages Oct 21, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: Don't error out fixed regulator in regulator_sync_voltage()

Fixed regulator can't change voltage and regulator_sync_voltage() returns -EINVAL in this case. Make regulator_sync_voltage() to succeed for a fixed regulator.

On NVIDIA Tegra power management driver needs to sync voltage and we have one device (Trimslice) that uses fixed regulator which is getting synced. The syncing error isn't treated as fatal, but produces a noisy error message. This patch silences that error.

---
 drivers/regulator/core.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/regulator/core.c +3 -0
index 26bee444fc70..e1324edb3f8d 100644
@@ -4249,6 +4249,9 @@ int regulator_sync_voltage(struct regulator *regulator)
 	struct regulator_voltage *voltage = &regulator->voltage[PM_SUSPEND_ON];
 	int ret, min_uV, max_uV;
 
+	if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1)
+		return 0;
+
 	regulator_lock(rdev);
 
 	if (!rdev->desc->ops->set_voltage &&
Signature · 1 line
2.32.0
maintainer
#1 lore raw

drivers/regulator/core.c int regulator_sync_voltage(struct regulator *regulator) · line 4255

Quoted 13 lines · Dmitry Osipenko

Fixed regulator can't change voltage and regulator_sync_voltage() returns -EINVAL in this case. Make regulator_sync_voltage() to succeed for a fixed regulator.

+++ b/drivers/regulator/core.c

drivers/regulator/core.c +3 -0
@@ -4249,6 +4249,9 @@ int regulator_sync_voltage(struct regulator *regulator)
 	struct regulator_voltage *voltage = &regulator->voltage[PM_SUSPEND_ON];
 	int ret, min_uV, max_uV;
 
+	if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1)
+		return 0;
+
 	regulator_lock(rdev);

It's unclear why this is checking both fixed_uV and n_voltages. TBH this feels like a higher level issue - with normal voltage configuration we would have noticed that our constraints prevent the voltage changing and not go as far as trying to actually apply a new configuration. I would expect a similar thing to be happening here.

#2 lore raw

21.10.2021 16:12, Mark Brown пишет:

Quoted 11 lines · Dmitry Osipenko
Quoted 10 lines

Fixed regulator can't change voltage and regulator_sync_voltage() returns -EINVAL in this case. Make regulator_sync_voltage() to succeed for a fixed regulator.

+++ b/drivers/regulator/core.c

drivers/regulator/core.c +0 -0
@@ -4249,6 +4249,9 @@ int regulator_sync_voltage(struct regulator *regulator)
 	struct regulator_voltage *voltage = &regulator->voltage[PM_SUSPEND_ON];
 	int ret, min_uV, max_uV;
 
Quoted 6 lines

drivers/regulator/core.c int regulator_sync_voltage(struct regulator *regulator) · line 4255

Quoted 4 lines
drivers/regulator/core.c +3 -0
+	if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1)
+		return 0;
+
 	regulator_lock(rdev);

It's unclear why this is checking both fixed_uV and n_voltages.

It's unclear to me either. I borrowed this variant from the preexisting code [1][2].

[1]
https://elixir.bootlin.com/linux/v5.15-rc6/source/drivers/regulator/core.c#L3075

[2]
https://elixir.bootlin.com/linux/v5.15-rc6/source/drivers/regulator/core.c#L4319

Quoted 6 lines

TBH
this feels like a higher level issue - with normal voltage configuration we would have noticed that our constraints prevent the voltage changing and not go as far as trying to actually apply a new configuration. I would expect a similar thing to be happening here.

This works for a normal regulator_set_voltage() because it checks whether current voltage equals to the requested and then succeeds [3]. The higher level code relies on this behaviour of the regulator core, in particular OPP core won't work without it and that's why voltage changes work for a fixed regulator.

[3]
https://elixir.bootlin.com/linux/v5.15-rc6/source/drivers/regulator/core.c#L3619

This doesn't work for the regulator_sync_voltage() because it uses a different code path and the whole point is to re-apply the current voltage. Hence the extra check is actually needed for the fixed regulators in order to be consistent with the behaviour of regulator_set_voltage().

#3 lore raw

21.10.2021 16:46, Dmitry Osipenko пишет:

Quoted 19 lines

21.10.2021 16:12, Mark Brown пишет:

Quoted 11 lines · Dmitry Osipenko
Quoted 10 lines

Fixed regulator can't change voltage and regulator_sync_voltage() returns -EINVAL in this case. Make regulator_sync_voltage() to succeed for a fixed regulator.

+++ b/drivers/regulator/core.c

drivers/regulator/core.c +0 -0
@@ -4249,6 +4249,9 @@ int regulator_sync_voltage(struct regulator *regulator)
 	struct regulator_voltage *voltage = &regulator->voltage[PM_SUSPEND_ON];
 	int ret, min_uV, max_uV;
 
Quoted 6 lines

drivers/regulator/core.c int regulator_sync_voltage(struct regulator *regulator) · line 4255

Quoted 4 lines
drivers/regulator/core.c +3 -0
+	if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1)
+		return 0;
+
 	regulator_lock(rdev);

It's unclear why this is checking both fixed_uV and n_voltages.

Quoted 8 lines

It's unclear to me either. I borrowed this variant from the preexisting code [1][2].

[1]
https://elixir.bootlin.com/linux/v5.15-rc6/source/drivers/regulator/core.c#L3075

[2]
https://elixir.bootlin.com/linux/v5.15-rc6/source/drivers/regulator/core.c#L4319

The alternative could be to check regulator's capabilities:

if (!regulator_ops_is_valid(rdev, REGULATOR_CHANGE_VOLTAGE))

	return 0;

This looks like a better variant, actually.

Quoted 22 lines
Quoted 6 lines

TBH
this feels like a higher level issue - with normal voltage configuration we would have noticed that our constraints prevent the voltage changing and not go as far as trying to actually apply a new configuration. I would expect a similar thing to be happening here.

This works for a normal regulator_set_voltage() because it checks whether current voltage equals to the requested and then succeeds [3]. The higher level code relies on this behaviour of the regulator core, in particular OPP core won't work without it and that's why voltage changes work for a fixed regulator.

[3]
https://elixir.bootlin.com/linux/v5.15-rc6/source/drivers/regulator/core.c#L3619

This doesn't work for the regulator_sync_voltage() because it uses a different code path and the whole point is to re-apply the current voltage. Hence the extra check is actually needed for the fixed regulators in order to be consistent with the behaviour of regulator_set_voltage().

maintainer
#4 lore raw
Quoted 6 lines · Dmitry Osipenko

The alternative could be to check regulator's capabilities:

if (!regulator_ops_is_valid(rdev, REGULATOR_CHANGE_VOLTAGE))

	return 0;

This looks like a better variant, actually.

Yes, that should be more robust.