Commit 0fc81f37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap updates from Mark Brown:
 "This is a much quieter release than the past few, there's one small
  API addition that I noticed a user for in ALSA and a bunch of
  cleanups:

   - Provide an interface for determining if a register is present in
     the cache and add a user of it in ALSA.

   - Full support for dynamic allocations, following the temporary
     bodges that were done as fixes in the previous release.

   - Remove the unused and questionably working 64 bit support"

* tag 'regmap-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Fix the type used for a bitmap pointer
  regmap: Remove dynamic allocation warnings for rbtree and maple
  regmap: rbtree: Use alloc_flags for memory allocations
  regmap: maple: Use alloc_flags for memory allocations
  regmap: Reject fast_io regmap configurations with RBTREE and MAPLE caches
  ALSA: hda: Use regcache_reg_cached() rather than open coding
  regmap: Provide test for regcache_reg_present()
  regmap: Let users check if a register is cached
  regmap: Provide user selectable option to enable regmap
  regmap: mmio: Remove unused 64-bit support code
  regmap: cache: Revert "Add 64-bit mode support"
  regmap: Revert "add 64-bit mode support" and Co.
parents c35c486c 5d481ddb

drivers/base/regmap/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# subsystems should select the appropriate symbols.



config REGMAP

	bool "Register Map support" if KUNIT_ALL_TESTS

	bool

	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ || REGMAP_SOUNDWIRE || REGMAP_SOUNDWIRE_MBQ || REGMAP_SCCB || REGMAP_I3C || REGMAP_SPI_AVMM || REGMAP_MDIO || REGMAP_FSI)

	select IRQ_DOMAIN if REGMAP_IRQ

	select MDIO_BUS if REGMAP_MDIO
@@ -23,6 +23,16 @@ config REGMAP_KUNIT 
	default KUNIT_ALL_TESTS

	select REGMAP_RAM



config REGMAP_BUILD

	bool "Enable regmap build"

	depends on KUNIT

	select REGMAP

	help

	  This option exists purely to allow the regmap KUnit tests to

	  be enabled without having to enable some driver that uses

	  regmap due to unfortunate issues with how KUnit tests are

	  normally enabled.



config REGMAP_AC97

	tristate

drivers/base/regmap/regcache-maple.c

+8 −8
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int regcache_maple_write(struct regmap *map, unsigned int reg, 
	rcu_read_unlock();



	entry = kmalloc((last - index + 1) * sizeof(unsigned long),

			GFP_KERNEL);

			map->alloc_flags);

	if (!entry)

		return -ENOMEM;
@@ -92,7 +92,7 @@ static int regcache_maple_write(struct regmap *map, unsigned int reg, 
	mas_lock(&mas);



	mas_set_range(&mas, index, last);

	ret = mas_store_gfp(&mas, entry, GFP_KERNEL);

	ret = mas_store_gfp(&mas, entry, map->alloc_flags);



	mas_unlock(&mas);
@@ -134,7 +134,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min, 


			lower = kmemdup(entry, ((min - mas.index) *

						sizeof(unsigned long)),

					GFP_KERNEL);

					map->alloc_flags);

			if (!lower) {

				ret = -ENOMEM;

				goto out_unlocked;
@@ -148,7 +148,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min, 
			upper = kmemdup(&entry[max + 1],

					((mas.last - max) *

					 sizeof(unsigned long)),

					GFP_KERNEL);

					map->alloc_flags);

			if (!upper) {

				ret = -ENOMEM;

				goto out_unlocked;
@@ -162,7 +162,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min, 
		/* Insert new nodes with the saved data */

		if (lower) {

			mas_set_range(&mas, lower_index, lower_last);

			ret = mas_store_gfp(&mas, lower, GFP_KERNEL);

			ret = mas_store_gfp(&mas, lower, map->alloc_flags);

			if (ret != 0)

				goto out;

			lower = NULL;
@@ -170,7 +170,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min, 


		if (upper) {

			mas_set_range(&mas, upper_index, upper_last);

			ret = mas_store_gfp(&mas, upper, GFP_KERNEL);

			ret = mas_store_gfp(&mas, upper, map->alloc_flags);

			if (ret != 0)

				goto out;

			upper = NULL;
@@ -320,7 +320,7 @@ static int regcache_maple_insert_block(struct regmap *map, int first, 
	unsigned long *entry;

	int i, ret;



	entry = kcalloc(last - first + 1, sizeof(unsigned long), GFP_KERNEL);

	entry = kcalloc(last - first + 1, sizeof(unsigned long), map->alloc_flags);

	if (!entry)

		return -ENOMEM;
@@ -331,7 +331,7 @@ static int regcache_maple_insert_block(struct regmap *map, int first, 


	mas_set_range(&mas, map->reg_defaults[first].reg,

		      map->reg_defaults[last].reg);

	ret = mas_store_gfp(&mas, entry, GFP_KERNEL);

	ret = mas_store_gfp(&mas, entry, map->alloc_flags);



	mas_unlock(&mas);

drivers/base/regmap/regcache-rbtree.c

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct regcache_rbtree_node { 
	/* block of adjacent registers */

	void *block;

	/* Which registers are present */

	long *cache_present;

	unsigned long *cache_present;

	/* base register handled by this block */

	unsigned int base_reg;

	/* number of registers available in the block */
@@ -277,7 +277,7 @@ static int regcache_rbtree_insert_to_block(struct regmap *map, 


	blk = krealloc(rbnode->block,

		       blklen * map->cache_word_size,

		       GFP_KERNEL);

		       map->alloc_flags);

	if (!blk)

		return -ENOMEM;
@@ -286,7 +286,7 @@ static int regcache_rbtree_insert_to_block(struct regmap *map, 
	if (BITS_TO_LONGS(blklen) > BITS_TO_LONGS(rbnode->blklen)) {

		present = krealloc(rbnode->cache_present,

				   BITS_TO_LONGS(blklen) * sizeof(*present),

				   GFP_KERNEL);

				   map->alloc_flags);

		if (!present)

			return -ENOMEM;
@@ -320,7 +320,7 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg) 
	const struct regmap_range *range;

	int i;



	rbnode = kzalloc(sizeof(*rbnode), GFP_KERNEL);

	rbnode = kzalloc(sizeof(*rbnode), map->alloc_flags);

	if (!rbnode)

		return NULL;
@@ -346,13 +346,13 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg) 
	}



	rbnode->block = kmalloc_array(rbnode->blklen, map->cache_word_size,

				      GFP_KERNEL);

				      map->alloc_flags);

	if (!rbnode->block)

		goto err_free;



	rbnode->cache_present = kcalloc(BITS_TO_LONGS(rbnode->blklen),

					sizeof(*rbnode->cache_present),

					GFP_KERNEL);

					map->alloc_flags);

	if (!rbnode->cache_present)

		goto err_free_block;

drivers/base/regmap/regcache.c

+23 −15
Original line number Diff line number Diff line
@@ -558,6 +558,29 @@ void regcache_cache_bypass(struct regmap *map, bool enable) 
}

EXPORT_SYMBOL_GPL(regcache_cache_bypass);



/**

 * regcache_reg_cached - Check if a register is cached

 *

 * @map: map to check

 * @reg: register to check

 *

 * Reports if a register is cached.

 */

bool regcache_reg_cached(struct regmap *map, unsigned int reg)

{

	unsigned int val;

	int ret;



	map->lock(map->lock_arg);



	ret = regcache_read(map, reg, &val);



	map->unlock(map->lock_arg);



	return ret == 0;

}

EXPORT_SYMBOL_GPL(regcache_reg_cached);



void regcache_set_val(struct regmap *map, void *base, unsigned int idx,

		      unsigned int val)

{
@@ -587,14 +610,6 @@ void regcache_set_val(struct regmap *map, void *base, unsigned int idx, 
		cache[idx] = val;

		break;

	}

#ifdef CONFIG_64BIT

	case 8: {

		u64 *cache = base;



		cache[idx] = val;

		break;

	}

#endif

	default:

		BUG();

	}
@@ -627,13 +642,6 @@ unsigned int regcache_get_val(struct regmap *map, const void *base, 


		return cache[idx];

	}

#ifdef CONFIG_64BIT

	case 8: {

		const u64 *cache = base;



		return cache[idx];

	}

#endif

	default:

		BUG();

	}

drivers/base/regmap/regmap-kunit.c

+40 −0
Original line number Diff line number Diff line
@@ -836,6 +836,45 @@ static void cache_drop(struct kunit *test) 
	regmap_exit(map);

}



static void cache_present(struct kunit *test)

{

	struct regcache_types *t = (struct regcache_types *)test->param_value;

	struct regmap *map;

	struct regmap_config config;

	struct regmap_ram_data *data;

	unsigned int val;

	int i;



	config = test_regmap_config;

	config.cache_type = t->type;



	map = gen_regmap(&config, &data);

	KUNIT_ASSERT_FALSE(test, IS_ERR(map));

	if (IS_ERR(map))

		return;



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

		data->read[i] = false;



	/* No defaults so no registers cached. */

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

		KUNIT_ASSERT_FALSE(test, regcache_reg_cached(map, i));



	/* We didn't trigger any reads */

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

		KUNIT_ASSERT_FALSE(test, data->read[i]);



	/* Fill the cache */

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

		KUNIT_EXPECT_EQ(test, 0, regmap_read(map, i, &val));



	/* Now everything should be cached */

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

		KUNIT_ASSERT_TRUE(test, regcache_reg_cached(map, i));



	regmap_exit(map);

}



struct raw_test_types {

	const char *name;
@@ -1177,6 +1216,7 @@ static struct kunit_case regmap_test_cases[] = { 
	KUNIT_CASE_PARAM(cache_sync_readonly, real_cache_types_gen_params),

	KUNIT_CASE_PARAM(cache_sync_patch, real_cache_types_gen_params),

	KUNIT_CASE_PARAM(cache_drop, sparse_cache_types_gen_params),

	KUNIT_CASE_PARAM(cache_present, sparse_cache_types_gen_params),



	KUNIT_CASE_PARAM(raw_read_defaults_single, raw_test_types_gen_params),

	KUNIT_CASE_PARAM(raw_read_defaults, raw_test_types_gen_params),