Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de2d808f authored by Mark Brown's avatar Mark Brown
Browse files

regmap: Support some block operations on cached devices 



Support raw reads if all the registers being read are volatile, the cache
will have no impact for tem.

Support bulk reads either directly (if all the registers are volatile) or
by falling back to iterating over single register reads otherwise.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8528bdd4

drivers/base/regmap/regmap.c

+26 −8
Original line number Original line Diff line number Diff line
@@ -482,8 +482,14 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val, 
		    size_t val_len)

		    size_t val_len)

{

{

	int ret;

	int ret;

	int i;

	bool vol = true;





	WARN_ON(map->cache_type != REGCACHE_NONE);

	for (i = 0; i < val_len / map->format.val_bytes; i++)

		if (!regmap_volatile(map, reg + i))

			vol = false;



	WARN_ON(!vol && map->cache_type != REGCACHE_NONE);





	mutex_lock(&map->lock);

	mutex_lock(&map->lock);
@@ -511,18 +517,30 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, 
{

{

	int ret, i;

	int ret, i;

	size_t val_bytes = map->format.val_bytes;

	size_t val_bytes = map->format.val_bytes;



	bool vol = true;

	WARN_ON(map->cache_type != REGCACHE_NONE);





	if (!map->format.parse_val)

	if (!map->format.parse_val)

		return -EINVAL;

		return -EINVAL;





	/* Is this a block of volatile registers? */

	for (i = 0; i < val_count; i++)

		if (!regmap_volatile(map, reg + i))

			vol = false;



	if (vol || map->cache_type == REGCACHE_NONE) {

		ret = regmap_raw_read(map, reg, val, val_bytes * val_count);

		ret = regmap_raw_read(map, reg, val, val_bytes * val_count);

		if (ret != 0)

		if (ret != 0)

			return ret;

			return ret;





		for (i = 0; i < val_count * val_bytes; i += val_bytes)

		for (i = 0; i < val_count * val_bytes; i += val_bytes)

			map->format.parse_val(val + i);

			map->format.parse_val(val + i);

	} else {

		for (i = 0; i < val_count; i++) {

			ret = regmap_read(map, reg + i, val + (i * val_bytes));

			if (ret != 0)

				return ret;

		}

	}





	return 0;

	return 0;

}

}