Skip to contentSkip to conversation

regmap: debugfs: Simplify calculation of `c->max_reg'

PATCH Applied Dimitris Papastamos 2 participants 3 messages Feb 20, 2013 – Feb 25, 2013

Subsystems (2)

v2 of 3 Applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 regmap: debugfs: Simplify calculation of `c->max_reg'

We don't need to use any of the file position information to calculate the base and max register of each block. Just use the counter directly.

Set i = base' at the top to avoid GCC flow analysis bugs. The value of i' can never be undefined or 0 in the if (c) { ... }.

---
 drivers/base/regmap/regmap-debugfs.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/base/regmap/regmap-debugfs.c +4 -7
index 78d5f20..e14cb2d 100644
@@ -88,16 +88,15 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map,
 	 * If we don't have a cache build one so we don't have to do a
 	 * linear scan each time.
 	 */
+	i = base;
 	if (list_empty(&map->debugfs_off_cache)) {
-		for (i = base; i <= map->max_register; i += map->reg_stride) {
+		for (; i <= map->max_register; i += map->reg_stride) {
 			/* Skip unprinted registers, closing off cache entry */
 			if (!regmap_readable(map, i) ||
 			    regmap_precious(map, i)) {
 				if (c) {
 					c->max = p - 1;
-					fpos_offset = c->max - c->min;
-					reg_offset = fpos_offset / map->debugfs_tot_len;
-					c->max_reg = c->base_reg + reg_offset;
+					c->max_reg = i - map->reg_stride;
 					list_add_tail(&c->list,
 						      &map->debugfs_off_cache);
 					c = NULL;
@@ -124,9 +123,7 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map,
 	/* Close the last entry off if we didn't scan beyond it */
 	if (c) {
 		c->max = p - 1;
-		fpos_offset = c->max - c->min;
-		reg_offset = fpos_offset / map->debugfs_tot_len;
-		c->max_reg = c->base_reg + reg_offset;
+		c->max_reg = i - map->reg_stride;
 		list_add_tail(&c->list,
 			      &map->debugfs_off_cache);
 	}
Signature · 1 line
1.8.1.3
#1 lore raw

PATCH v2 2/2 regmap: debugfs: Add a registers `range' file

This file lists the register ranges in the register map. The condition to split the range is based on whether the block is readable or not.

Ensure that we lock the debugfs_off_cache' list whenever we access and modify the list. There is a possible race otherwise between the read() operations of the registers' file and the `range' file.

---
Hi,

Moved the locking of the `debugfs_off_cache' list over to this patch. I think this should be the final version of the patch.

 drivers/base/regmap/internal.h       |  1 +
 drivers/base/regmap/regmap-debugfs.c | 83 ++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
drivers/base/regmap/internal.h +1 -0
index 5a22bd3..dc23508 100644
@@ -76,6 +76,7 @@ struct regmap {
 	unsigned int debugfs_tot_len;
 
 	struct list_head debugfs_off_cache;
+	struct mutex cache_lock;
 #endif
 
 	unsigned int max_register;
drivers/base/regmap/regmap-debugfs.c +83 -0

132 lines not on this page · raw message

Signature · 1 line
1.8.1.3
Applied
#2 lore raw
In reply to Dimitris Papastamos
Quoted 3 lines · Dimitris Papastamos

We don't need to use any of the file position information to calculate the base and max register of each block. Just use the counter directly.

Applied both, thanks.