Commit 30f5f739 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fixes from Mark Brown:
 "The biggest fix here is Lars-Peter's fix for custom locking callbacks
  which is pretty localised but important for those devices that use the
  feature.  Otherwise we've got a couple of fairly small cleanups which
  would have been sent sooner were it not for letting Lars-Peter's patch
  soak for a while"

* tag 'regmap-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: rbtree: Fixed node range check on sync
  regmap: regcache: Fixup locking for custom lock callbacks
  regmap: debugfs: Check return value of regmap_write()
parents 822b4b6f 998a4f2f

drivers/base/regmap/regcache-rbtree.c

+2 −4
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int rbtree_show(struct seq_file *s, void *ignored) 
	int registers = 0;

	int this_registers, average;



	map->lock(map);

	map->lock(map->lock_arg);



	mem_size = sizeof(*rbtree_ctx);

	mem_size += BITS_TO_LONGS(map->cache_present_nbits) * sizeof(long);
@@ -170,7 +170,7 @@ static int rbtree_show(struct seq_file *s, void *ignored) 
	seq_printf(s, "%d nodes, %d registers, average %d registers, used %zu bytes\n",

		   nodes, registers, average, mem_size);



	map->unlock(map);

	map->unlock(map->lock_arg);



	return 0;

}
@@ -391,8 +391,6 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min, 
	for (node = rb_first(&rbtree_ctx->root); node; node = rb_next(node)) {

		rbnode = rb_entry(node, struct regcache_rbtree_node, node);



		if (rbnode->base_reg < min)

			continue;

		if (rbnode->base_reg > max)

			break;

		if (rbnode->base_reg + rbnode->blklen < min)

drivers/base/regmap/regcache.c

+10 −10
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ int regcache_sync(struct regmap *map) 


	BUG_ON(!map->cache_ops || !map->cache_ops->sync);



	map->lock(map);

	map->lock(map->lock_arg);

	/* Remember the initial bypass state */

	bypass = map->cache_bypass;

	dev_dbg(map->dev, "Syncing %s cache\n",
@@ -306,7 +306,7 @@ out: 
	trace_regcache_sync(map->dev, name, "stop");

	/* Restore the bypass state */

	map->cache_bypass = bypass;

	map->unlock(map);

	map->unlock(map->lock_arg);



	return ret;

}
@@ -333,7 +333,7 @@ int regcache_sync_region(struct regmap *map, unsigned int min, 


	BUG_ON(!map->cache_ops || !map->cache_ops->sync);



	map->lock(map);

	map->lock(map->lock_arg);



	/* Remember the initial bypass state */

	bypass = map->cache_bypass;
@@ -352,7 +352,7 @@ out: 
	trace_regcache_sync(map->dev, name, "stop region");

	/* Restore the bypass state */

	map->cache_bypass = bypass;

	map->unlock(map);

	map->unlock(map->lock_arg);



	return ret;

}
@@ -372,11 +372,11 @@ EXPORT_SYMBOL_GPL(regcache_sync_region); 
 */

void regcache_cache_only(struct regmap *map, bool enable)

{

	map->lock(map);

	map->lock(map->lock_arg);

	WARN_ON(map->cache_bypass && enable);

	map->cache_only = enable;

	trace_regmap_cache_only(map->dev, enable);

	map->unlock(map);

	map->unlock(map->lock_arg);

}

EXPORT_SYMBOL_GPL(regcache_cache_only);
@@ -391,9 +391,9 @@ EXPORT_SYMBOL_GPL(regcache_cache_only); 
 */

void regcache_mark_dirty(struct regmap *map)

{

	map->lock(map);

	map->lock(map->lock_arg);

	map->cache_dirty = true;

	map->unlock(map);

	map->unlock(map->lock_arg);

}

EXPORT_SYMBOL_GPL(regcache_mark_dirty);
@@ -410,11 +410,11 @@ EXPORT_SYMBOL_GPL(regcache_mark_dirty); 
 */

void regcache_cache_bypass(struct regmap *map, bool enable)

{

	map->lock(map);

	map->lock(map->lock_arg);

	WARN_ON(map->cache_only && enable);

	map->cache_bypass = enable;

	trace_regmap_cache_bypass(map->dev, enable);

	map->unlock(map);

	map->unlock(map->lock_arg);

}

EXPORT_SYMBOL_GPL(regcache_cache_bypass);

drivers/base/regmap/regmap-debugfs.c

+4 −1
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static ssize_t regmap_map_write_file(struct file *file, 
	char *start = buf;

	unsigned long reg, value;

	struct regmap *map = file->private_data;

	int ret;



	buf_size = min(count, (sizeof(buf)-1));

	if (copy_from_user(buf, user_buf, buf_size))
@@ -282,7 +283,9 @@ static ssize_t regmap_map_write_file(struct file *file, 
	/* Userspace has been fiddling around behind the kernel's back */

	add_taint(TAINT_USER, LOCKDEP_NOW_UNRELIABLE);



	regmap_write(map, reg, value);

	ret = regmap_write(map, reg, value);

	if (ret < 0)

		return ret;

	return buf_size;

}

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE