| Message ID | 20240813073719.2304633-1-o.rempel@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v1] pse-core: Conditionally set current limit during PI regulator registration | expand |
On Tue, 13 Aug 2024 09:37:19 +0200 Oleksij Rempel <o.rempel@pengutronix.de> wrote: > Fix an issue where `devm_regulator_register()` would fail for PSE > controllers that do not support current limit control, such as simple > GPIO-based controllers like the podl-pse-regulator. The > `REGULATOR_CHANGE_CURRENT` flag and `max_uA` constraint are now > conditionally set only if the `pi_set_current_limit` operation is > supported. This change prevents the regulator registration routine from > attempting to call `pse_pi_set_current_limit()`, which would return > `-EOPNOTSUPP` and cause the registration to fail. Thanks for the fix! Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
On Tue, Aug 13, 2024 at 09:37:19AM +0200, Oleksij Rempel wrote: > Fix an issue where `devm_regulator_register()` would fail for PSE > controllers that do not support current limit control, such as simple > GPIO-based controllers like the podl-pse-regulator. The > `REGULATOR_CHANGE_CURRENT` flag and `max_uA` constraint are now > conditionally set only if the `pi_set_current_limit` operation is > supported. This change prevents the regulator registration routine from > attempting to call `pse_pi_set_current_limit()`, which would return > `-EOPNOTSUPP` and cause the registration to fail. > > Fixes: 4a83abcef5f4f ("net: pse-pd: Add new power limit get and set c33 features") > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/net/pse-pd/pse_core.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/pse-pd/pse_core.c b/drivers/net/pse-pd/pse_core.c > index ec20953e0f825..4f032b16a8a0a 100644 > --- a/drivers/net/pse-pd/pse_core.c > +++ b/drivers/net/pse-pd/pse_core.c > @@ -401,9 +401,14 @@ devm_pse_pi_regulator_register(struct pse_controller_dev *pcdev, > rdesc->ops = &pse_pi_ops; > rdesc->owner = pcdev->owner; > > - rinit_data->constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS | > - REGULATOR_CHANGE_CURRENT; > - rinit_data->constraints.max_uA = MAX_PI_CURRENT; > + rinit_data->constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS; > + > + if (pcdev->ops->pi_set_current_limit) { > + rinit_data->constraints.valid_ops_mask |= > + REGULATOR_CHANGE_CURRENT; > + rinit_data->constraints.max_uA = MAX_PI_CURRENT; > + } > + > rinit_data->supply_regulator = "vpwr"; > > rconfig.dev = pcdev->dev; > -- > 2.39.2 This patch solves the problem I was having with the regulator setup for the tps23881 on my hardware. Great timing, and thanks for the fix! Tested-by: Kyle Swenson <kyle.swenson@est.tech>
On Tue, 13 Aug 2024 09:37:19 +0200 Oleksij Rempel wrote: > Fix an issue where `devm_regulator_register()` would fail for PSE > controllers that do not support current limit control, such as simple > GPIO-based controllers like the podl-pse-regulator. The > `REGULATOR_CHANGE_CURRENT` flag and `max_uA` constraint are now > conditionally set only if the `pi_set_current_limit` operation is > supported. This change prevents the regulator registration routine from > attempting to call `pse_pi_set_current_limit()`, which would return > `-EOPNOTSUPP` and cause the registration to fail. > > Fixes: 4a83abcef5f4f ("net: pse-pd: Add new power limit get and set c33 features") > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> FTR looks like Paolo applied this, thanks!
diff --git a/drivers/net/pse-pd/pse_core.c b/drivers/net/pse-pd/pse_core.c index ec20953e0f825..4f032b16a8a0a 100644 --- a/drivers/net/pse-pd/pse_core.c +++ b/drivers/net/pse-pd/pse_core.c @@ -401,9 +401,14 @@ devm_pse_pi_regulator_register(struct pse_controller_dev *pcdev, rdesc->ops = &pse_pi_ops; rdesc->owner = pcdev->owner; - rinit_data->constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS | - REGULATOR_CHANGE_CURRENT; - rinit_data->constraints.max_uA = MAX_PI_CURRENT; + rinit_data->constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS; + + if (pcdev->ops->pi_set_current_limit) { + rinit_data->constraints.valid_ops_mask |= + REGULATOR_CHANGE_CURRENT; + rinit_data->constraints.max_uA = MAX_PI_CURRENT; + } + rinit_data->supply_regulator = "vpwr"; rconfig.dev = pcdev->dev;
Fix an issue where `devm_regulator_register()` would fail for PSE controllers that do not support current limit control, such as simple GPIO-based controllers like the podl-pse-regulator. The `REGULATOR_CHANGE_CURRENT` flag and `max_uA` constraint are now conditionally set only if the `pi_set_current_limit` operation is supported. This change prevents the regulator registration routine from attempting to call `pse_pi_set_current_limit()`, which would return `-EOPNOTSUPP` and cause the registration to fail. Fixes: 4a83abcef5f4f ("net: pse-pd: Add new power limit get and set c33 features") Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/pse-pd/pse_core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.39.2