mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 02:21:52 +09:00
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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7a638f9114
commit
3e66b8c3b2
@@ -485,6 +485,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;
|
||||
@@ -495,7 +496,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, " |");
|
||||
@@ -508,7 +509,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--) {
|
||||
@@ -518,13 +519,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 |");
|
||||
|
||||
Reference in New Issue
Block a user