[PATCH 1/2] PM / Domains: Restore alignment of slaves in debugfs output

[PATCH 1/2] PM / Domains: Restore alignment of slaves in debugfs output

[Geert Uytterhoeven]

The slave domains are no longer aligned with the table header in the
/sys/kernel/debug/pm_genpd/pm_genpd_summary output. Worse, the alignment
differs depending on the actual name of the state.

Format the state name and index into a buffer, and print that like
before to restore alignment.

Use "%u" for unsigned int while we're at it.

Fixes: fc5cbf0c94b6f7fd ("PM / Domains: Support for multiple states")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/base/power/domain.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index e8ca290dbf9d5ea6..01015d85ab6493fc 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1882,6 +1882,7 @@ static int pm_genpd_summary_one(struct seq_file *s,
 	struct pm_domain_data *pm_data;
 	const char *kobj_path;
 	struct gpd_link *link;
+	char state[16];
 	int ret;
 
 	ret = mutex_lock_interruptible(&genpd->lock);
@@ -1890,12 +1891,13 @@ static int pm_genpd_summary_one(struct seq_file *s,
 
 	if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))
 		goto exit;
-	seq_printf(s, "%-30s  %s", genpd->name, status_lookup[genpd->status]);
-
 	if (genpd->status == GPD_STATE_POWER_OFF)
-		seq_printf(s, " %-13d ", genpd->state_idx);
+		snprintf(state, sizeof(state), "%s %u",
+			 status_lookup[genpd->status], genpd->state_idx);
 	else
-		seq_printf(s, " %-15s ", "");
+		snprintf(state, sizeof(state), "%s",
+			 status_lookup[genpd->status]);
+	seq_printf(s, "%-30s  %-15s ", genpd->name, state);
 
 	/*
 	 * Modifications on the list require holding locks on both
-- 
1.9.1

[PATCH 2/2] [RFC] PM / Domains: Join state name and index in debugfs output

[Geert Uytterhoeven]

For low-power states, the state index is part of the state, hence join
them with a hyphen in the /sys/kernel/debug/pm_genpd/pm_genpd_summary
output. E.g. "off 0" becomes "off-0".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Alternative separators could be ":" or "/".
---
 drivers/base/power/domain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 01015d85ab6493fc..9e59543d314c4b0b 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1892,7 +1892,7 @@ static int pm_genpd_summary_one(struct seq_file *s,
 	if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))
 		goto exit;
 	if (genpd->status == GPD_STATE_POWER_OFF)
-		snprintf(state, sizeof(state), "%s %u",
+		snprintf(state, sizeof(state), "%s-%u",
 			 status_lookup[genpd->status], genpd->state_idx);
 	else
 		snprintf(state, sizeof(state), "%s",
-- 
1.9.1

Re: [PATCH 1/2] PM / Domains: Restore alignment of slaves in debugfs output

[Axel Haslam]

Hi Geert,

On Tue, Feb 23, 2016 at 5:49 PM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
>
> The slave domains are no longer aligned with the table header in the
> /sys/kernel/debug/pm_genpd/pm_genpd_summary output. Worse, the alignment
> differs depending on the actual name of the state.
>
> Format the state name and index into a buffer, and print that like
> before to restore alignment.
>
> Use "%u" for unsigned int while we're at it.
>
> Fixes: fc5cbf0c94b6f7fd ("PM / Domains: Support for multiple states")

Thanks for fixing this. My power domains had all equal size names and
i had not noticed the unaligned columns on the summary.

Regards
Axel

>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  drivers/base/power/domain.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index e8ca290dbf9d5ea6..01015d85ab6493fc 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -1882,6 +1882,7 @@ static int pm_genpd_summary_one(struct seq_file *s,
>         struct pm_domain_data *pm_data;
>         const char *kobj_path;
>         struct gpd_link *link;
> +       char state[16];
>         int ret;
>
>         ret = mutex_lock_interruptible(&genpd->lock);
> @@ -1890,12 +1891,13 @@ static int pm_genpd_summary_one(struct seq_file *s,
>
>         if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))
>                 goto exit;
> -       seq_printf(s, "%-30s  %s", genpd->name, status_lookup[genpd->status]);
> -
>         if (genpd->status == GPD_STATE_POWER_OFF)
> -               seq_printf(s, " %-13d ", genpd->state_idx);
> +               snprintf(state, sizeof(state), "%s %u",
> +                        status_lookup[genpd->status], genpd->state_idx);
>         else
> -               seq_printf(s, " %-15s ", "");
> +               snprintf(state, sizeof(state), "%s",
> +                        status_lookup[genpd->status]);
> +       seq_printf(s, "%-30s  %-15s ", genpd->name, state);
>
>         /*
>          * Modifications on the list require holding locks on both
> --
> 1.9.1
>

Re: [PATCH 1/2] PM / Domains: Restore alignment of slaves in debugfs output

[Ulf Hansson]

On 23 February 2016 at 17:49, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
> The slave domains are no longer aligned with the table header in the
> /sys/kernel/debug/pm_genpd/pm_genpd_summary output. Worse, the alignment
> differs depending on the actual name of the state.
>
> Format the state name and index into a buffer, and print that like
> before to restore alignment.
>
> Use "%u" for unsigned int while we're at it.
>
> Fixes: fc5cbf0c94b6f7fd ("PM / Domains: Support for multiple states")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

> ---
>  drivers/base/power/domain.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index e8ca290dbf9d5ea6..01015d85ab6493fc 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -1882,6 +1882,7 @@ static int pm_genpd_summary_one(struct seq_file *s,
>         struct pm_domain_data *pm_data;
>         const char *kobj_path;
>         struct gpd_link *link;
> +       char state[16];
>         int ret;
>
>         ret = mutex_lock_interruptible(&genpd->lock);
> @@ -1890,12 +1891,13 @@ static int pm_genpd_summary_one(struct seq_file *s,
>
>         if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))
>                 goto exit;
> -       seq_printf(s, "%-30s  %s", genpd->name, status_lookup[genpd->status]);
> -
>         if (genpd->status == GPD_STATE_POWER_OFF)
> -               seq_printf(s, " %-13d ", genpd->state_idx);
> +               snprintf(state, sizeof(state), "%s %u",
> +                        status_lookup[genpd->status], genpd->state_idx);
>         else
> -               seq_printf(s, " %-15s ", "");
> +               snprintf(state, sizeof(state), "%s",
> +                        status_lookup[genpd->status]);
> +       seq_printf(s, "%-30s  %-15s ", genpd->name, state);
>
>         /*
>          * Modifications on the list require holding locks on both
> --
> 1.9.1
>

Re: [PATCH 2/2] [RFC] PM / Domains: Join state name and index in debugfs output

[Ulf Hansson]

On 23 February 2016 at 17:49, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
> For low-power states, the state index is part of the state, hence join
> them with a hyphen in the /sys/kernel/debug/pm_genpd/pm_genpd_summary
> output. E.g. "off 0" becomes "off-0".
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

> ---
> Alternative separators could be ":" or "/".
> ---
>  drivers/base/power/domain.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index 01015d85ab6493fc..9e59543d314c4b0b 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -1892,7 +1892,7 @@ static int pm_genpd_summary_one(struct seq_file *s,
>         if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))
>                 goto exit;
>         if (genpd->status == GPD_STATE_POWER_OFF)
> -               snprintf(state, sizeof(state), "%s %u",
> +               snprintf(state, sizeof(state), "%s-%u",
>                          status_lookup[genpd->status], genpd->state_idx);
>         else
>                 snprintf(state, sizeof(state), "%s",
> --
> 1.9.1
>

Re: [PATCH 1/2] PM / Domains: Restore alignment of slaves in debugfs output

[Kevin Hilman]

Geert Uytterhoeven <geert+renesas@glider.be> writes:

> The slave domains are no longer aligned with the table header in the
> /sys/kernel/debug/pm_genpd/pm_genpd_summary output. Worse, the alignment
> differs depending on the actual name of the state.
>
> Format the state name and index into a buffer, and print that like
> before to restore alignment.
>
> Use "%u" for unsigned int while we're at it.
>
> Fixes: fc5cbf0c94b6f7fd ("PM / Domains: Support for multiple states")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Tested-by: Kevin Hilman <khilman@baylibre.com>

Re: [PATCH 2/2] [RFC] PM / Domains: Join state name and index in debugfs output

[Kevin Hilman]

Geert Uytterhoeven <geert+renesas@glider.be> writes:

> For low-power states, the state index is part of the state, hence join
> them with a hyphen in the /sys/kernel/debug/pm_genpd/pm_genpd_summary
> output. E.g. "off 0" becomes "off-0".
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Tested-by: Kevin Hilman <khilman@baylibre.com>

Re: [PATCH 1/2] PM / Domains: Restore alignment of slaves in debugfs output

[Rafael J. Wysocki]

On Tuesday, February 23, 2016 05:49:17 PM Geert Uytterhoeven wrote:
> The slave domains are no longer aligned with the table header in the
> /sys/kernel/debug/pm_genpd/pm_genpd_summary output. Worse, the alignment
> differs depending on the actual name of the state.
> 
> Format the state name and index into a buffer, and print that like
> before to restore alignment.
> 
> Use "%u" for unsigned int while we're at it.
> 
> Fixes: fc5cbf0c94b6f7fd ("PM / Domains: Support for multiple states")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Both this one and the [2/2] applied, thanks!

Rafael