From: Greg Kroah-Hartman Date: Wed, 7 Jun 2023 12:52:14 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.14.317~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01d4e56497abcfea5263e4a6002f5c7299ee5bf5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: regmap-account-for-register-length-when-chunking.patch --- diff --git a/queue-5.4/regmap-account-for-register-length-when-chunking.patch b/queue-5.4/regmap-account-for-register-length-when-chunking.patch new file mode 100644 index 00000000000..ed1422a9dc4 --- /dev/null +++ b/queue-5.4/regmap-account-for-register-length-when-chunking.patch @@ -0,0 +1,46 @@ +From 3981514180c987a79ea98f0ae06a7cbf58a9ac0f Mon Sep 17 00:00:00 2001 +From: Jim Wylder +Date: Wed, 17 May 2023 10:20:11 -0500 +Subject: regmap: Account for register length when chunking + +From: Jim Wylder + +commit 3981514180c987a79ea98f0ae06a7cbf58a9ac0f upstream. + +Currently, when regmap_raw_write() splits the data, it uses the +max_raw_write value defined for the bus. For any bus that includes +the target register address in the max_raw_write value, the chunked +transmission will always exceed the maximum transmission length. +To avoid this problem, subtract the length of the register and the +padding from the maximum transmission. + +Signed-off-by: Jim Wylder +--- + drivers/base/regmap/regmap.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/base/regmap/regmap.c ++++ b/drivers/base/regmap/regmap.c +@@ -1850,6 +1850,8 @@ int _regmap_raw_write(struct regmap *map + size_t val_count = val_len / val_bytes; + size_t chunk_count, chunk_bytes; + size_t chunk_regs = val_count; ++ size_t max_data = map->max_raw_write - map->format.reg_bytes - ++ map->format.pad_bytes; + int ret, i; + + if (!val_count) +@@ -1857,8 +1859,8 @@ int _regmap_raw_write(struct regmap *map + + 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 (map->max_raw_write && val_len > max_data) ++ chunk_regs = max_data / val_bytes; + + chunk_count = val_count / chunk_regs; + chunk_bytes = chunk_regs * val_bytes; diff --git a/queue-5.4/series b/queue-5.4/series index dcbc4c27eca..6432e34239a 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -89,3 +89,4 @@ ext4-disallow-ea_inodes-with-extended-attributes.patch ext4-add-lockdep-annotations-for-i_data_sem-for-ea_inode-s.patch fbcon-fix-null-ptr-deref-in-soft_cursor.patch test_firmware-fix-the-memory-leak-of-the-allocated-firmware-buffer.patch +regmap-account-for-register-length-when-chunking.patch