From: Robin van der Gracht <robin@protonic.nl>
To: barebox@lists.infradead.org
Cc: michiel.schelfhout@protonic.nl, Robin van der Gracht <robin@protonic.nl>
Subject: [PATCH v2] nvmem: regmap: Fix nvmem size
Date: Wed, 20 Dec 2023 09:29:08 +0100 [thread overview]
Message-ID: <20231220082908.360302-1-robin@protonic.nl> (raw)
We should add 1 to the max_register index since counting is zero based.
i.e. the stm32mp151 bsec has registers 0 - 95 with reg_stride 4.
Size should be (95 + 1) * 4 = 384 bytes otherwise we can't access bsec
register 95 (last one).
regmap_size_bytes() does take the +1 into account so we can use that.
Signed-off-by: Robin van der Gracht <robin@protonic.nl>
---
v2: Fix the size calculation in nvmem_regmap_read() as well.
drivers/nvmem/regmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/nvmem/regmap.c b/drivers/nvmem/regmap.c
index fa5405d7a8..b923c5787d 100644
--- a/drivers/nvmem/regmap.c
+++ b/drivers/nvmem/regmap.c
@@ -38,7 +38,7 @@ static int nvmem_regmap_read(void *ctx, unsigned offset, void *buf, size_t bytes
skip_bytes = offset & (stride - 1);
rbytes = roundup(bytes + skip_bytes, stride);
- if (roffset + rbytes > stride * regmap_get_max_register(map))
+ if (roffset + rbytes > regmap_size_bytes(map) * stride)
return -EINVAL;
for (i = roffset; i < roffset + rbytes; i += stride) {
@@ -78,7 +78,7 @@ nvmem_regmap_register_with_pp(struct regmap *map, const char *name,
config.priv = map;
config.stride = 1;
config.word_size = 1;
- config.size = regmap_get_max_register(map) * regmap_get_reg_stride(map);
+ config.size = regmap_size_bytes(map) * regmap_get_reg_stride(map);
config.cell_post_process = cell_post_process;
config.reg_write = nvmem_regmap_write;
config.reg_read = nvmem_regmap_read;
--
2.40.1
next reply other threads:[~2023-12-20 8:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-20 8:29 Robin van der Gracht [this message]
2023-12-20 9:00 ` Ahmad Fatoum
2023-12-20 12:38 ` Robin van der Gracht
2023-12-21 14:02 ` Ahmad Fatoum
2024-01-02 17:03 ` Ahmad Fatoum
2024-01-02 10:31 ` Sascha Hauer
2024-01-02 10:53 ` Sascha Hauer
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=20231220082908.360302-1-robin@protonic.nl \
--to=robin@protonic.nl \
--cc=barebox@lists.infradead.org \
--cc=michiel.schelfhout@protonic.nl \
/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