[PATCH] regmap: Account for register length when chunking

[Jim Wylder <jwylder@google.com>]

Currently, when regmap_raw_write() splits the data, it uses the
max_raw_write value calculated from the bus.  For I2C, the actual
transmission will include that data plus the target register.
Since the register length is not included in the calculation of the data
chunk, the transmission will always exceed the maximum transmission
length.

To avoid this problem, add a flag in the regmap_bus structure to declare
that, for a given bus, the register length should be accounted for.  Set
the flag to true for I2C buses, and subtract the length of the register
from the maximum transmission value if the flag is set.

Signed-off-by: Jim Wylder <jwylder@google.com>
---
 drivers/base/regmap/regmap-i2c.c | 1 +
 drivers/base/regmap/regmap.c     | 8 ++++++--
 include/linux/regmap.h           | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index 980e5ce6a3a35..793ff8ea3266d 100644
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -198,6 +198,7 @@ static int regmap_i2c_read(void *context,
 }
 
 static const struct regmap_bus regmap_i2c = {
+	.reg_in_write = true,
 	.write = regmap_i2c_write,
 	.gather_write = regmap_i2c_gather_write,
 	.read = regmap_i2c_read,
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index db7851f0e3b8c..9de5f4b272aee 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2083,14 +2083,18 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
 	size_t chunk_count, chunk_bytes;
 	size_t chunk_regs = val_count;
 	int ret, i;
+	size_t max_raw_write = map->max_raw_write;
 
 	if (!val_count)
 		return -EINVAL;
 
+	if ((map->bus) && (map->bus->reg_in_write))
+		max_raw_write -= map->format.reg_bytes;
+
 	if (map->use_single_write)
 		chunk_regs = 1;
-	else if (map->max_raw_write && val_len > map->max_raw_write)
-		chunk_regs = map->max_raw_write / val_bytes;
+	else if (max_raw_write && val_len > max_raw_write)
+		chunk_regs = max_raw_write / val_bytes;
 
 	chunk_count = val_count / chunk_regs;
 	chunk_bytes = chunk_regs * val_bytes;
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index c2b9cc5db8241..20ac78d8777a3 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -556,6 +556,7 @@ typedef void (*regmap_hw_free_context)(void *context);
  * @val_format_endian_default: Default endianness for formatted register
  *     values. Used when the regmap_config specifies DEFAULT. If this is
  *     DEFAULT, BIG is assumed.
+ * @reg_in_write: Does max_raw_write include register length.
  * @max_raw_read: Max raw read size that can be used on the bus.
  * @max_raw_write: Max raw write size that can be used on the bus.
  */
@@ -576,6 +577,7 @@ struct regmap_bus {
 	u8 read_flag_mask;
 	enum regmap_endian reg_format_endian_default;
 	enum regmap_endian val_format_endian_default;
+	bool reg_in_write;
 	size_t max_raw_read;
 	size_t max_raw_write;
 };

base-commit: ad2fd53a7870a395b8564697bef6c329d017c6c9
-- 
2.40.1.606.ga4b1b128d6-goog