From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>
Subject: [PATCH 1/5] regmap: Format data for raw write in regmap_bulk_write
Date: Thu, 22 Feb 2018 12:59:10 +0000 [thread overview]
Message-ID: <20180222125914.17016-1-ckeepax@opensource.cirrus.com> (raw)
In the case were the bulk transaction is split up into smaller chunks
data is passed directly to regmap_raw_write. However regmap_bulk_write
uses data in host endian and regmap_raw_write expects data in device
endian. As such if the host and device differ in endian the wrong data
will be written to the device. Correct this issue using a similar
approach to the single raw write case below it, duplicate the data
into a new buffer and use parse_inplace to format the data correctly.
Fixes: adaac459759d ("regmap: Introduce max_raw_read/write for regmap_bulk_read/write")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
drivers/base/regmap/regmap.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index b38ba6fdecbc..8a6de76f89bb 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2005,6 +2005,17 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
int chunk_stride = map->reg_stride;
size_t chunk_size = val_bytes;
size_t chunk_count = val_count;
+ void *wval;
+
+ if (!val_count)
+ return -EINVAL;
+
+ wval = kmemdup(val, val_count * val_bytes, map->alloc_flags);
+ if (!wval)
+ return -ENOMEM;
+
+ for (i = 0; i < val_count * val_bytes; i += val_bytes)
+ map->format.parse_inplace(wval + i);
if (!map->use_single_write) {
chunk_size = map->max_raw_write;
@@ -2019,7 +2030,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
for (i = 0; i < chunk_count; i++) {
ret = _regmap_raw_write(map,
reg + (i * chunk_stride),
- val + (i * chunk_size),
+ wval + (i * chunk_size),
chunk_size);
if (ret)
break;
@@ -2028,10 +2039,12 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
/* Write remaining bytes */
if (!ret && chunk_size * i < total_size) {
ret = _regmap_raw_write(map, reg + (i * chunk_stride),
- val + (i * chunk_size),
+ wval + (i * chunk_size),
total_size - i * chunk_size);
}
map->unlock(map->lock_arg);
+
+ kfree(wval);
} else {
void *wval;
--
2.11.0
next reply other threads:[~2018-02-22 12:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-22 12:59 Charles Keepax [this message]
2018-02-22 12:59 ` [PATCH 2/5] regmap: Remove unnecessary printk for failed allocation Charles Keepax
2018-02-22 12:59 ` [PATCH 3/5] regmap: Move the handling for max_raw_write into regmap_raw_write Charles Keepax
2018-02-26 11:17 ` Applied "regmap: Move the handling for max_raw_write into regmap_raw_write" to the regmap tree Mark Brown
2018-02-22 12:59 ` [PATCH 4/5] regmap: Tidy up regmap_raw_write chunking code Charles Keepax
2018-02-26 11:17 ` Applied "regmap: Tidy up regmap_raw_write chunking code" to the regmap tree Mark Brown
2018-02-22 12:59 ` [PATCH 5/5] regmap: Merge redundant handling in regmap_bulk_write Charles Keepax
2018-02-26 11:17 ` Applied "regmap: Merge redundant handling in regmap_bulk_write" to the regmap tree Mark Brown
2018-02-26 11:18 ` Applied "regmap: Format data for raw write " Mark Brown
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=20180222125914.17016-1-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/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
all inboxes | Powered by JetHome®