perf/arm-cmn: Improve debugfs pretty-printing for large configs

[ Upstream commit a1083ee717e9bde012268782e084d343314490a4 ]

The debugfs pretty-printer was written for the CMN-600 assumptions of a
maximum 8x8 mesh, but CMN-700 now allows coordinates and ID values up to
12 and 128 respectively, which can overflow the format strings, mess up
the alignment of the table and hurt overall readability. This table does
prove useful for double-checking that the driver is picking up the
topology of new systems correctly and for verifying user expectations,
so tweak the formatting to stay nice and readable with wider values.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/1d1517eadd1bac5992fab679c9dc531b381944da.1702484646.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Stable-dep-of: e79634b53e39 ("perf/arm-cmn: Refactor node ID handling. Again.")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 1c9e42aeb7004fa36a57a318cefc94206e108fe0..3c3a3d3420e121ba667eac606b2088a61ca3b106 100644 (file)
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -493,6 +493,7 @@ static void arm_cmn_show_logid(struct seq_file *s, int x, int y, int p, int d)
 
        for (dn = cmn->dns; dn->type; dn++) {
                struct arm_cmn_nodeid nid = arm_cmn_nid(cmn, dn->id);
+               int pad = dn->logid < 10;
 
                if (dn->type == CMN_TYPE_XP)
                        continue;
@@ -503,7 +504,7 @@ static void arm_cmn_show_logid(struct seq_file *s, int x, int y, int p, int d)
                if (nid.x != x || nid.y != y || nid.port != p || nid.dev != d)
                        continue;
 
-               seq_printf(s, "   #%-2d  |", dn->logid);
+               seq_printf(s, " %*c#%-*d  |", pad + 1, ' ', 3 - pad, dn->logid);
                return;
        }
        seq_puts(s, "        |");
@@ -516,7 +517,7 @@ static int arm_cmn_map_show(struct seq_file *s, void *data)
 
        seq_puts(s, "     X");
        for (x = 0; x < cmn->mesh_x; x++)
-               seq_printf(s, "    %d    ", x);
+               seq_printf(s, "    %-2d   ", x);
        seq_puts(s, "\nY P D+");
        y = cmn->mesh_y;
        while (y--) {
@@ -526,13 +527,13 @@ static int arm_cmn_map_show(struct seq_file *s, void *data)
                for (x = 0; x < cmn->mesh_x; x++)
                        seq_puts(s, "--------+");
 
-               seq_printf(s, "\n%d    |", y);
+               seq_printf(s, "\n%-2d   |", y);
                for (x = 0; x < cmn->mesh_x; x++) {
                        struct arm_cmn_node *xp = cmn->xps + xp_base + x;
 
                        for (p = 0; p < CMN_MAX_PORTS; p++)
                                port[p][x] = arm_cmn_device_connect_info(cmn, xp, p);
-                       seq_printf(s, " XP #%-2d |", xp_base + x);
+                       seq_printf(s, " XP #%-3d|", xp_base + x);
                }
 
                seq_puts(s, "\n     |");