[PATCH 12/14] nvmem: make the misaligned raw_len non-fatal

srinivas.kandagatla@linaro.org posted 14 patches 11 months, 1 week ago
There is a newer version of this series
[PATCH 12/14] nvmem: make the misaligned raw_len non-fatal
Posted by srinivas.kandagatla@linaro.org 11 months, 1 week ago
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

The commit 11ccaa312111 ("nvmem: core: verify cell's raw_len") enforced
the raw read len being aligned to the NVMEM's word_size. However this
change broke some of the platforms, because those used misaligned
reads. Make this error non-fatal for the drivers that didn't specify
raw_len directly and just increase the raw_len making it aligned.

Fixes: 11ccaa312111 ("nvmem: core: verify cell's raw_len")
Reported-by: Mark Brown <broonie@kernel.org>
Closes: https://lore.kernel.org/linux-arm-msm/Z7Xv9lNc6ckJVtKc@finisterre.sirena.org.uk/
Tested-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/nvmem/core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index b6f8544fd966..e206efc29a00 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -612,7 +612,11 @@ static int nvmem_cell_info_to_nvmem_cell_entry_nodup(struct nvmem_device *nvmem,
 			"cell %s raw len %zd unaligned to nvmem word size %d\n",
 			cell->name ?: "<unknown>", cell->raw_len,
 			nvmem->word_size);
-		return -EINVAL;
+
+		if (info->raw_len)
+			return -EINVAL;
+
+		cell->raw_len = ALIGN(cell->raw_len, nvmem->word_size);
 	}
 
 	return 0;
-- 
2.25.1
Re: [PATCH 12/14] nvmem: make the misaligned raw_len non-fatal
Posted by Dmitry Baryshkov 11 months, 1 week ago
On Fri, 7 Mar 2025 at 18:58, <srinivas.kandagatla@linaro.org> wrote:
>
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> The commit 11ccaa312111 ("nvmem: core: verify cell's raw_len") enforced
> the raw read len being aligned to the NVMEM's word_size. However this
> change broke some of the platforms, because those used misaligned
> reads. Make this error non-fatal for the drivers that didn't specify
> raw_len directly and just increase the raw_len making it aligned.
>
> Fixes: 11ccaa312111 ("nvmem: core: verify cell's raw_len")

This patch does only make sense together with your tree, because it
references a commit from that tree.
As you are reposting them for Greg, commit IDs will change. It might
be easier to fold this patch into the offending commit.

> Reported-by: Mark Brown <broonie@kernel.org>
> Closes: https://lore.kernel.org/linux-arm-msm/Z7Xv9lNc6ckJVtKc@finisterre.sirena.org.uk/
> Tested-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
>  drivers/nvmem/core.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index b6f8544fd966..e206efc29a00 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -612,7 +612,11 @@ static int nvmem_cell_info_to_nvmem_cell_entry_nodup(struct nvmem_device *nvmem,
>                         "cell %s raw len %zd unaligned to nvmem word size %d\n",
>                         cell->name ?: "<unknown>", cell->raw_len,
>                         nvmem->word_size);
> -               return -EINVAL;
> +
> +               if (info->raw_len)
> +                       return -EINVAL;
> +
> +               cell->raw_len = ALIGN(cell->raw_len, nvmem->word_size);
>         }
>
>         return 0;
> --
> 2.25.1
>


-- 
With best wishes
Dmitry