Skip to contentSkip to conversation

regcache: Use a consistent sort for defaults table

PATCH In review Mark Brown 3 participants 4 messages Aug 5 – Aug 6

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

PATCH 1/1 regcache: Use a consistent sort for defaults table

When we look up registers in the defaults table we use a binary search, and we have a regcache_sort_defaults() API to help drivers that constuct their defaults tables on the fly. Unfortunately the lookup and the sort don't use the same comparison function, and to make matters worse the comparison function used during lookups is written for signed register numbers rather than the unsigned ones we actually have so can produce suprising results when some of the addresses have the top bit set.

Standardise on the more explicitly coded function to ensure consistent results.

---
 drivers/base/regmap/regcache.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/base/regmap/regcache.c +1 -9
index aa8f2efed779..480bc76f9a02 100644
@@ -727,14 +727,6 @@ unsigned int regcache_get_val(struct regmap *map, const void *base,
 	return -1;
 }
 
-static int regcache_default_cmp(const void *a, const void *b)
-{
-	const struct reg_default *_a = a;
-	const struct reg_default *_b = b;
-
-	return _a->reg - _b->reg;
-}
-
 int regcache_lookup_reg(struct regmap *map, unsigned int reg)
 {
 	struct reg_default key;
@@ -744,7 +736,7 @@ int regcache_lookup_reg(struct regmap *map, unsigned int reg)
 	key.def = 0;
 
 	r = bsearch(&key, map->reg_defaults, map->num_reg_defaults,
-		    sizeof(struct reg_default), regcache_default_cmp);
+		    sizeof(struct reg_default), regcache_defaults_cmp);
 
 	if (r)
 		return r - map->reg_defaults;

---
base-commit: 075b74841bd0065a3bda3440873c747938e69b68
change-id: 20260805-regmap-regcache-sort-8d144a68bf8d

Best regards,

Signature · 1 line
Mark Brown <[email protected]>
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Mark Brown

When we look up registers in the defaults table we use a binary search, and we have a regcache_sort_defaults() API to help drivers that constuct their defaults tables on the fly. Unfortunately the lookup and the sort don't use the same comparison function, and to make matters worse the comparison function used during lookups is written for signed register numbers rather than the unsigned ones we actually have so can produce suprising results when some of the addresses have the top bit set.

Standardise on the more explicitly coded function to ensure consistent results.

Quoted 43 lines
---
 drivers/base/regmap/regcache.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/base/regmap/regcache.c +1 -10
index aa8f2efed779..480bc76f9a02 100644
@@ -727,14 +727,6 @@ unsigned int regcache_get_val(struct regmap *map, const void *base,
 	return -1;
 }
 
-static int regcache_default_cmp(const void *a, const void *b)
-{
-	const struct reg_default *_a = a;
-	const struct reg_default *_b = b;
-
-	return _a->reg - _b->reg;
-}
-
 int regcache_lookup_reg(struct regmap *map, unsigned int reg)
 {
 	struct reg_default key;
@@ -744,7 +736,7 @@ int regcache_lookup_reg(struct regmap *map, unsigned int reg)
 	key.def = 0;
 
 	r = bsearch(&key, map->reg_defaults, map->num_reg_defaults,
-		    sizeof(struct reg_default), regcache_default_cmp);
+		    sizeof(struct reg_default), regcache_defaults_cmp);
 
 	if (r)
 		return r - map->reg_defaults;
 
---

base-commit: 075b74841bd0065a3bda3440873c747938e69b68
change-id: 20260805-regmap-regcache-sort-8d144a68bf8d

Best regards,

Signature · 1 line
Mark Brown <[email protected]>
Signature · 1 line
Péter
Reviewed-by Tested-by on v1 1/1
#2 lore raw
In reply to Mark Brown
Quoted 8 lines · Mark Brown

When we look up registers in the defaults table we use a binary search, and we have a regcache_sort_defaults() API to help drivers that constuct their defaults tables on the fly. Unfortunately the lookup and the sort don't use the same comparison function, and to make matters worse the comparison function used during lookups is written for signed register numbers rather than the unsigned ones we actually have so can produce suprising results when some of the addresses have the top bit set.

Quoted 5 lines

Standardise on the more explicitly coded function to ensure consistent results.

---

Thanks,
Charles

author maintainer
#3 lore raw
In reply to Mark Brown
Quoted 1 line · Mark Brown

regcache: Use a consistent sort for defaults table

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-7.2

Thanks!

[1/1] regcache: Use a consistent sort for defaults table

      https://git.kernel.org/broonie/regmap/c/9ed3d974a266

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark