regmap: Hold the regmap lock when allocating and freeing the cache

For the benefit of the maple tree's lockdep checking hold the lock while
creating and exiting the cache.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/20240822-b4-regmap-maple-nolock-v1-2-d5e6dbae3396@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 7ec1ec60533508562caf1ec1ab80a2416a8cdd74..d3659ba3cc1122f55c53c1acd568010cb4d78f4d 100644 (file)
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -195,7 +195,9 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
        if (map->cache_ops->init) {
                dev_dbg(map->dev, "Initializing %s cache\n",
                        map->cache_ops->name);
+               map->lock(map->lock_arg);
                ret = map->cache_ops->init(map);
+               map->unlock(map->lock_arg);
                if (ret)
                        goto err_free;
        }
@@ -223,7 +225,9 @@ void regcache_exit(struct regmap *map)
        if (map->cache_ops->exit) {
                dev_dbg(map->dev, "Destroying %s cache\n",
                        map->cache_ops->name);
+               map->lock(map->lock_arg);
                map->cache_ops->exit(map);
+               map->unlock(map->lock_arg);
        }
 }
 

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index bfc6bc1eb3a4a9245a1d7167aeae4a07750553a4..9ed842d17642b54b7de05676cc659e94c828e2ee 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1445,6 +1445,7 @@ void regmap_exit(struct regmap *map)
        struct regmap_async *async;
 
        regcache_exit(map);
+
        regmap_debugfs_exit(map);
        regmap_range_exit(map);
        if (map->bus && map->bus->free_context)