regmap: Return an error if a caller attempts to do an unsupported raw read
Subsystems (2)
PATCH 1/2 regmap: Return an error if a caller attempts to do an unsupported raw read
From: Mark Brown <[email protected]>
regmaps without raw I/O access can't implement raw I/O operations, return an error if someone tries to do that rather than crashing.
--- drivers/base/regmap/regmap.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/base/regmap/regmap.c +3 -0
@@ -2255,6 +2255,9 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,WARN_ON (!map->bus); +if (!map->bus || !map->bus->read) +return -EINVAL ; + range =_regmap_range_lookup (map, reg);if (range) { ret = _regmap_select_page(map, ®, range,
Signature · 1 line
1.9.1
PATCH 2/2 regmap: cache: Fall back to register by register read for cache defaults
From: Mark Brown <[email protected]>
If we are unable to read the cache defaults for a regmap then fall back on attempting to read them word by word. This is going to be painfully slow for large regmaps but might be adequate for smaller ones.
--- drivers/base/regmap/regcache.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-)
drivers/base/regmap/regcache.c +30 -11
@@ -30,7 +30,7 @@ static int regcache_hw_init(struct regmap *map)int i, j;int ret;int count; -unsigned int val; +unsigned int reg, val;void *tmp_buf;if (!map->num_reg_defaults_raw)
@@ -67,27 +67,46 @@ static int regcache_hw_init(struct regmap *map) ret =regmap_raw_read (map,0 , tmp_buf, map->cache_size_raw); map->cache_bypass = cache_bypass; -if (ret <0 ) - goto err_cache_free; - - map->reg_defaults_raw = tmp_buf; - map->cache_free =1 ; +if (ret ==0 ) { + map->reg_defaults_raw = tmp_buf; + map->cache_free =1 ; + }else { +kfree (tmp_buf); + } }/* fill the reg_defaults */ for (i =0 , j =0 ; i < map->num_reg_defaults_raw; i++) { -if (regmap_volatile (map, i * map->reg_stride)) + reg = i * map->reg_stride; + +if (!regmap_readable (map, reg))continue ; - val =regcache_get_val (map, map->reg_defaults_raw, i); - map->reg_defaults[j].reg = i * map->reg_stride; + +if (regmap_volatile (map, reg)) +continue ; + +if (map->reg_defaults_raw) { + val =regcache_get_val (map, map->reg_defaults_raw, i); + }else { +bool cache_bypass = map->cache_bypass; + + map->cache_bypass = true; + ret =regmap_read (map, reg, &val); + map->cache_bypass = cache_bypass; +if (ret !=0 ) { +dev_err (map->dev,"Failed to read %d: %d\n" , + reg, ret); + goto err_free; + } + } + + map->reg_defaults[j].reg = reg; map->reg_defaults[j].def = val; j++; }return 0 ; -err_cache_free: -kfree (tmp_buf); err_free:kfree (map->reg_defaults);
Signature · 1 line
1.9.1
Mark Brown
maintainerQuoted 4 lines · Fabio Estevam
From: Mark Brown <[email protected]>
regmaps without raw I/O access can't implement raw I/O operations, return an error if someone tries to do that rather than crashing.
I dropped this one into -next as soon as I wrote it...