2021-05-21 20:08:51

by Axel Lin

Subject: [PATCH] regulator: scmi: Fix off-by-one for linear regulators .n_voltages setting

For linear regulators, the .n_voltages is (max_uv - min_uv) / uv_step + 1.

Fixes: 0fbeae70ee7c ("regulator: add SCMI driver")
Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/scmi-regulator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regulator/scmi-regulator.c b/drivers/regulator/scmi-regulator.c
index bbadf72b94e8..1f02f60ad136 100644
--- a/drivers/regulator/scmi-regulator.c
+++ b/drivers/regulator/scmi-regulator.c
@@ -173,7 +173,7 @@ scmi_config_linear_regulator_mappings(struct scmi_regulator *sreg,
sreg->desc.uV_step =
vinfo->levels_uv[SCMI_VOLTAGE_SEGMENT_STEP];
sreg->desc.linear_min_sel = 0;
- sreg->desc.n_voltages = delta_uV / sreg->desc.uV_step;
+ sreg->desc.n_voltages = (delta_uV / sreg->desc.uV_step) + 1;
sreg->desc.ops = &scmi_reg_linear_ops;
}

--
2.25.1

2021-05-21 20:27:43

by Cristian Marussi

Subject: Re: [PATCH] regulator: scmi: Fix off-by-one for linear regulators .n_voltages setting

Hi,

On Fri, May 21, 2021 at 03:30:20PM +0800, Axel Lin wrote:
> For linear regulators, the .n_voltages is (max_uv - min_uv) / uv_step + 1.
>
> Fixes: 0fbeae70ee7c ("regulator: add SCMI driver")
> Signed-off-by: Axel Lin <[email protected]>
> ---

Right. Good catch.

Reviewed-by: Cristian Marussi <[email protected]>

Thanks,
Cristian

> drivers/regulator/scmi-regulator.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/regulator/scmi-regulator.c b/drivers/regulator/scmi-regulator.c
> index bbadf72b94e8..1f02f60ad136 100644
> --- a/drivers/regulator/scmi-regulator.c
> +++ b/drivers/regulator/scmi-regulator.c
> @@ -173,7 +173,7 @@ scmi_config_linear_regulator_mappings(struct scmi_regulator *sreg,
> sreg->desc.uV_step =
> vinfo->levels_uv[SCMI_VOLTAGE_SEGMENT_STEP];
> sreg->desc.linear_min_sel = 0;
> - sreg->desc.n_voltages = delta_uV / sreg->desc.uV_step;
> + sreg->desc.n_voltages = (delta_uV / sreg->desc.uV_step) + 1;
> sreg->desc.ops = &scmi_reg_linear_ops;
> }
>
> --
> 2.25.1
>

2021-05-21 20:28:26

by Mark Brown

Subject: Re: [PATCH] regulator: scmi: Fix off-by-one for linear regulators .n_voltages setting

On Fri, 21 May 2021 15:30:20 +0800, Axel Lin wrote:
> For linear regulators, the .n_voltages is (max_uv - min_uv) / uv_step + 1.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: scmi: Fix off-by-one for linear regulators .n_voltages setting
commit: 36cb555fae0875d5416e8514a84a427bec6e4cda

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark