Commit ae0acef3 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mark Brown

regcache: use map->alloc_flags also for allocating cache

Commit fd4ebc07 ("regmap: Hold the regmap lock when allocating and
freeing the cache") introduced a locking around the allocating and
freeing a regmap cache, so adjust the memory allocation flags to the ones
given in the regmap configuration instead of the hardcoded GFP_KERNEL.

This fixes the "BUG: sleeping function called from invalid context"
introduced by the mentioned commit.

Fixes: fd4ebc07 ("regmap: Hold the regmap lock when allocating and freeing the cache")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://patch.msgid.link/20240828122834.3778031-1-m.szyprowski@samsung.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 290d6e5d
...@@ -27,7 +27,7 @@ static int regcache_flat_init(struct regmap *map) ...@@ -27,7 +27,7 @@ static int regcache_flat_init(struct regmap *map)
return -EINVAL; return -EINVAL;
map->cache = kcalloc(regcache_flat_get_index(map, map->max_register) map->cache = kcalloc(regcache_flat_get_index(map, map->max_register)
+ 1, sizeof(unsigned int), GFP_KERNEL); + 1, sizeof(unsigned int), map->alloc_flags);
if (!map->cache) if (!map->cache)
return -ENOMEM; return -ENOMEM;
......
...@@ -348,7 +348,7 @@ static int regcache_maple_init(struct regmap *map) ...@@ -348,7 +348,7 @@ static int regcache_maple_init(struct regmap *map)
int ret; int ret;
int range_start; int range_start;
mt = kmalloc(sizeof(*mt), GFP_KERNEL); mt = kmalloc(sizeof(*mt), map->alloc_flags);
if (!mt) if (!mt)
return -ENOMEM; return -ENOMEM;
map->cache = mt; map->cache = mt;
......
...@@ -187,7 +187,7 @@ static int regcache_rbtree_init(struct regmap *map) ...@@ -187,7 +187,7 @@ static int regcache_rbtree_init(struct regmap *map)
int i; int i;
int ret; int ret;
map->cache = kmalloc(sizeof *rbtree_ctx, GFP_KERNEL); map->cache = kmalloc(sizeof *rbtree_ctx, map->alloc_flags);
if (!map->cache) if (!map->cache)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment