Commit 0a819809 authored by Mark Brown's avatar Mark Brown
Browse files

regmap: Simplify the initiation of async I/O 



Rather than passing a flag around through the entire call stack store it
in the regmap struct and read it when required. This minimises the
visibility of the feature through the API, minimising the code updates
needed to use it more widely.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 651e013e

drivers/base/regmap/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct regmap { 
	void *bus_context;

	const char *name;



	bool async;

	spinlock_t async_lock;

	wait_queue_head_t async_waitq;

	struct list_head async_list;
@@ -218,7 +219,7 @@ bool regcache_set_val(struct regmap *map, void *base, unsigned int idx, 
int regcache_lookup_reg(struct regmap *map, unsigned int reg);



int _regmap_raw_write(struct regmap *map, unsigned int reg,

		      const void *val, size_t val_len, bool async);

		      const void *val, size_t val_len);



void regmap_async_complete_cb(struct regmap_async *async, int ret);

drivers/base/regmap/regcache.c

+1 −2
Original line number Diff line number Diff line
@@ -631,8 +631,7 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data, 


	map->cache_bypass = 1;



	ret = _regmap_raw_write(map, base, *data, count * val_bytes,

				false);

	ret = _regmap_raw_write(map, base, *data, count * val_bytes);



	map->cache_bypass = 0;

drivers/base/regmap/regmap.c

+11 −8
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ static int _regmap_select_page(struct regmap *map, unsigned int *reg, 
}



int _regmap_raw_write(struct regmap *map, unsigned int reg,

		      const void *val, size_t val_len, bool async)

		      const void *val, size_t val_len)

{

	struct regmap_range_node *range;

	unsigned long flags;
@@ -1093,7 +1093,7 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, 
			dev_dbg(map->dev, "Writing window %d/%zu\n",

				win_residue, val_len / map->format.val_bytes);

			ret = _regmap_raw_write(map, reg, val, win_residue *

						map->format.val_bytes, async);

						map->format.val_bytes);

			if (ret != 0)

				return ret;
@@ -1126,7 +1126,7 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, 
		val = work_val;

	}



	if (async && map->bus->async_write) {

	if (map->async && map->bus->async_write) {

		struct regmap_async *async;



		trace_regmap_async_write_start(map->dev, reg, val_len);
@@ -1273,7 +1273,7 @@ static int _regmap_bus_raw_write(void *context, unsigned int reg, 
				 map->work_buf +

				 map->format.reg_bytes +

				 map->format.pad_bytes,

				 map->format.val_bytes, false);

				 map->format.val_bytes);

}



static inline void *_regmap_map_get_context(struct regmap *map)
@@ -1365,7 +1365,7 @@ int regmap_raw_write(struct regmap *map, unsigned int reg, 


	map->lock(map->lock_arg);



	ret = _regmap_raw_write(map, reg, val, val_len, false);

	ret = _regmap_raw_write(map, reg, val, val_len);



	map->unlock(map->lock_arg);
@@ -1446,8 +1446,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
				return ret;

		}

	} else {

		ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count,

					false);

		ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);

	}



	if (val_bytes != 1)
@@ -1493,7 +1492,11 @@ int regmap_raw_write_async(struct regmap *map, unsigned int reg, 


	map->lock(map->lock_arg);



	ret = _regmap_raw_write(map, reg, val, val_len, true);

	map->async = true;



	ret = _regmap_raw_write(map, reg, val, val_len);



	map->async = false;



	map->unlock(map->lock_arg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE