Patch "regmap: apply reg_base and reg_downshift for single register ops" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    regmap: apply reg_base and reg_downshift for single register ops

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     regmap-apply-reg_base-and-reg_downshift-for-single-r.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit bb83944aebf2714199d5482834c506350f7e6ce0
Author: Daniel Golle <daniel@xxxxxxxxxxxxxx>
Date:   Mon Jan 30 02:04:57 2023 +0000

    regmap: apply reg_base and reg_downshift for single register ops
    
    [ Upstream commit 697c3892d825fb78f42ec8e53bed065dd728db3e ]
    
    reg_base and reg_downshift currently don't have any effect if used with
    a regmap_bus or regmap_config which only offers single register
    operations (ie. reg_read, reg_write and optionally reg_update_bits).
    
    Fix that and take them into account also for regmap_bus with only
    reg_read and read_write operations by applying reg_base and
    reg_downshift in _regmap_bus_reg_write, _regmap_bus_reg_read.
    
    Also apply reg_base and reg_downshift in _regmap_update_bits, but only
    in case the operation is carried out with a reg_update_bits call
    defined in either regmap_bus or regmap_config.
    
    Fixes: 0074f3f2b1e43d ("regmap: allow a defined reg_base to be added to every address")
    Fixes: 86fc59ef818beb ("regmap: add configurable downshift for addresses")
    Signed-off-by: Daniel Golle <daniel@xxxxxxxxxxxxxx>
    Tested-by: Colin Foster <colin.foster@xxxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/Y9clyVS3tQEHlUhA@xxxxxxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index c6d6d53e8cd3f..7de1f27d0323d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1942,6 +1942,8 @@ static int _regmap_bus_reg_write(void *context, unsigned int reg,
 {
 	struct regmap *map = context;
 
+	reg += map->reg_base;
+	reg >>= map->format.reg_downshift;
 	return map->bus->reg_write(map->bus_context, reg, val);
 }
 
@@ -2840,6 +2842,8 @@ static int _regmap_bus_reg_read(void *context, unsigned int reg,
 {
 	struct regmap *map = context;
 
+	reg += map->reg_base;
+	reg >>= map->format.reg_downshift;
 	return map->bus->reg_read(map->bus_context, reg, val);
 }
 
@@ -3231,6 +3235,8 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,
 		*change = false;
 
 	if (regmap_volatile(map, reg) && map->reg_update_bits) {
+		reg += map->reg_base;
+		reg >>= map->format.reg_downshift;
 		ret = map->reg_update_bits(map->bus_context, reg, mask, val);
 		if (ret == 0 && change)
 			*change = true;