Commit 5bf75b44 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Mark Brown
Browse files

regmap: Support bulk writes for devices without raw formatting 



When doing a bulk writes from a device which lacks raw I/O support we
fall back to doing register at a time reads but we still use the raw
formatters in order to render the data into the word size used by the
device (since bulk reads still operate on the device word size rather
than unsigned ints).  This means that devices without raw formatting
such as those that provide reg_read() are not supported.  Provide
handling for them by copying the values read into native endian values
of the appropriate size.

This complements commit d5b98eb1 ("regmap: Support bulk reads for
devices without raw formatting").

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1a695a90

drivers/base/regmap/regmap.c

+28 −3
Original line number Diff line number Diff line
@@ -1777,8 +1777,6 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
	size_t val_bytes = map->format.val_bytes;

	size_t total_size = val_bytes * val_count;



	if (map->bus && !map->format.parse_inplace)

		return -EINVAL;

	if (!IS_ALIGNED(reg, map->reg_stride))

		return -EINVAL;
@@ -1789,7 +1787,8 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
	 *

	 * The first if block is used for memory mapped io. It does not allow

	 * val_bytes of 3 for example.

	 * The second one is used for busses which do not have this limitation

	 * The second one is for busses that do not provide raw I/O.

	 * The third one is used for busses which do not have these limitations

	 * and can write arbitrary value lengths.

	 */

	if (!map->bus) {
@@ -1825,6 +1824,32 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
		}

out:

		map->unlock(map->lock_arg);

	} else if (map->bus && !map->format.parse_inplace) {

		const u8 *u8 = val;

		const u16 *u16 = val;

		const u32 *u32 = val;

		unsigned int ival;



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

			switch (map->format.val_bytes) {

			case 4:

				ival = u32[i];

				break;

			case 2:

				ival = u16[i];

				break;

			case 1:

				ival = u8[i];

				break;

			default:

				return -EINVAL;

			}



			ret = regmap_write(map, reg + (i * map->reg_stride),

					   ival);

			if (ret)

				return ret;

		}

	} else if (map->use_single_write ||

		   (map->max_raw_write && map->max_raw_write < total_size)) {

		int chunk_stride = map->reg_stride;

CRA Git | Maintained and supported by SUSTech CRA and CCSE