[V2,2/2] PM / Domains: Extend generic power domain debugfs.

Message ID 1497385659-2356-3-git-send-email-thara.gopinath@linaro.org
State Superseded
Headers show
Series
  • PM / Domains: Expand generic power domain debugfs.
Related show

Commit Message

Thara Gopinath June 13, 2017, 8:27 p.m.
This patch extends the existing generic power domain debugfs.
Changes involve the following
- Introduce a unique debugfs entry for each generic power domain with the
  following attributes
	- current_state - Displays current state of the domain.
	- devices - Displays the devices associated with this domain.
	- sub_domains - Displays the sub power domains.
	- active_time - Displays the time the domain was in active state
			in ms.
	- total_idle_time - Displays the time the domain was in any of the idle
			states in ms.
	- idle_states - Displays the various idle states and the time
			spent in each idle state in ms.

Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>

---
 drivers/base/power/domain.c | 203 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 195 insertions(+), 8 deletions(-)

-- 
2.1.4

Comments

Geert Uytterhoeven June 14, 2017, 8:01 a.m. | #1
Hi Thara,

On Tue, Jun 13, 2017 at 10:27 PM, Thara Gopinath
<thara.gopinath@linaro.org> wrote:
> This patch extends the existing generic power domain debugfs.

> Changes involve the following

> - Introduce a unique debugfs entry for each generic power domain with the

>   following attributes

>         - current_state - Displays current state of the domain.

>         - devices - Displays the devices associated with this domain.

>         - sub_domains - Displays the sub power domains.

>         - active_time - Displays the time the domain was in active state

>                         in ms.

>         - total_idle_time - Displays the time the domain was in any of the idle

>                         states in ms.

>         - idle_states - Displays the various idle states and the time

>                         spent in each idle state in ms.

>

> Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>


Thanks for your patch!

> --- a/drivers/base/power/domain.c

> +++ b/drivers/base/power/domain.c

> @@ -2322,21 +2322,189 @@ static int pm_genpd_summary_show(struct seq_file *s, void *data)

>         return ret;

>  }

>

> -static int pm_genpd_summary_open(struct inode *inode, struct file *file)

> +static int pm_genpd_status_show(struct seq_file *s, void *data)

>  {

> -       return single_open(file, pm_genpd_summary_show, NULL);

> +       static const char * const status_lookup[] = {

> +               [GPD_STATE_ACTIVE] = "on",

> +               [GPD_STATE_POWER_OFF] = "off"

> +       };

> +

> +       struct generic_pm_domain *genpd = s->private;

> +       int ret = 0;

> +

> +       ret = genpd_lock_interruptible(genpd);

> +       if (ret)

> +               return -ERESTARTSYS;

> +

> +       if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))


WARN_ON_ONCE()?
If this ever triggers, it can be retriggered at will from userspace,
flooding the logs.

> +static int pm_genpd_idle_states_show(struct seq_file *s, void *data)

> +{

> +       struct generic_pm_domain *genpd = s->private;

> +       int i, ret = 0;


unsigned int i;

> +

> +       ret = genpd_lock_interruptible(genpd);

> +       if (ret)

> +               return -ERESTARTSYS;

> +

> +       seq_puts(s, "State          Time Spent(ms)\n");

> +

> +       for (i = 0; i < genpd->state_count; i++) {

> +               ktime_t delta = 0;

> +               s64 msecs;

> +

> +               if ((genpd->status == GPD_STATE_POWER_OFF) &&

> +                               (genpd->state_idx == i))

> +                       delta = ktime_sub(ktime_get(), genpd->accounting_time);

> +

> +               msecs = ktime_to_ms(

> +                       ktime_add(genpd->states[i].idle_time, delta));


The above two lines still fit on a single line, right?

> +static int pm_genpd_total_idle_time_show(struct seq_file *s, void *data)

> +{

> +       struct generic_pm_domain *genpd = s->private;

> +       ktime_t delta = 0, total = 0;

> +       int i, ret = 0;


unsigned int i;


Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Geert Uytterhoeven June 14, 2017, 8:26 a.m. | #2
Hi Thara,

On Tue, Jun 13, 2017 at 10:27 PM, Thara Gopinath
<thara.gopinath@linaro.org> wrote:
> +static int pm_genpd_idle_states_show(struct seq_file *s, void *data)

> +{

> +       struct generic_pm_domain *genpd = s->private;

> +       int i, ret = 0;

> +

> +       ret = genpd_lock_interruptible(genpd);

> +       if (ret)

> +               return -ERESTARTSYS;

> +

> +       seq_puts(s, "State          Time Spent(ms)\n");

> +

> +       for (i = 0; i < genpd->state_count; i++) {

> +               ktime_t delta = 0;

> +               s64 msecs;

> +

> +               if ((genpd->status == GPD_STATE_POWER_OFF) &&

> +                               (genpd->state_idx == i))

> +                       delta = ktime_sub(ktime_get(), genpd->accounting_time);

> +

> +               msecs = ktime_to_ms(

> +                       ktime_add(genpd->states[i].idle_time, delta));

> +               seq_printf(s, "S%-15i %lld\n", i, msecs);

> +       }


The ms values are misaligned by one space, compared to the table header:

    State          Time Spent(ms)
    S0               0

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Patch hide | download patch | download mbox

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 33b4632..c1a0cd1 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2322,21 +2322,189 @@  static int pm_genpd_summary_show(struct seq_file *s, void *data)
 	return ret;
 }
 
-static int pm_genpd_summary_open(struct inode *inode, struct file *file)
+static int pm_genpd_status_show(struct seq_file *s, void *data)
 {
-	return single_open(file, pm_genpd_summary_show, NULL);
+	static const char * const status_lookup[] = {
+		[GPD_STATE_ACTIVE] = "on",
+		[GPD_STATE_POWER_OFF] = "off"
+	};
+
+	struct generic_pm_domain *genpd = s->private;
+	int ret = 0;
+
+	ret = genpd_lock_interruptible(genpd);
+	if (ret)
+		return -ERESTARTSYS;
+
+	if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))
+		goto exit;
+
+	if (genpd->status == GPD_STATE_POWER_OFF)
+		seq_printf(s, "%s-%u\n", status_lookup[genpd->status],
+			genpd->state_idx);
+	else
+		seq_printf(s, "%s\n", status_lookup[genpd->status]);
+exit:
+	genpd_unlock(genpd);
+	return ret;
 }
 
-static const struct file_operations pm_genpd_summary_fops = {
-	.open = pm_genpd_summary_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release,
-};
+static int pm_genpd_sub_domains_show(struct seq_file *s, void *data)
+{
+	struct generic_pm_domain *genpd = s->private;
+	struct gpd_link *link;
+	int ret = 0;
+
+	ret = genpd_lock_interruptible(genpd);
+	if (ret)
+		return -ERESTARTSYS;
+
+	list_for_each_entry(link, &genpd->master_links, master_node) {
+		seq_printf(s, "%s", link->slave->name);
+		if (!list_is_last(&link->master_node, &genpd->master_links))
+			seq_puts(s, ", ");
+	}
+	seq_puts(s, "\n");
+
+	genpd_unlock(genpd);
+	return ret;
+}
+
+static int pm_genpd_idle_states_show(struct seq_file *s, void *data)
+{
+	struct generic_pm_domain *genpd = s->private;
+	int i, ret = 0;
+
+	ret = genpd_lock_interruptible(genpd);
+	if (ret)
+		return -ERESTARTSYS;
+
+	seq_puts(s, "State          Time Spent(ms)\n");
+
+	for (i = 0; i < genpd->state_count; i++) {
+		ktime_t delta = 0;
+		s64 msecs;
+
+		if ((genpd->status == GPD_STATE_POWER_OFF) &&
+				(genpd->state_idx == i))
+			delta = ktime_sub(ktime_get(), genpd->accounting_time);
+
+		msecs = ktime_to_ms(
+			ktime_add(genpd->states[i].idle_time, delta));
+		seq_printf(s, "S%-15i %lld\n", i, msecs);
+	}
+
+	genpd_unlock(genpd);
+	return ret;
+}
+
+static int pm_genpd_active_time_show(struct seq_file *s, void *data)
+{
+	struct generic_pm_domain *genpd = s->private;
+	ktime_t delta = 0;
+	int ret = 0;
+
+	ret = genpd_lock_interruptible(genpd);
+	if (ret)
+		return -ERESTARTSYS;
+
+	if (genpd->status == GPD_STATE_ACTIVE)
+		delta = ktime_sub(ktime_get(), genpd->accounting_time);
+
+	seq_printf(s, "%lld ms\n", ktime_to_ms(
+				ktime_add(genpd->on_time, delta)));
+
+	genpd_unlock(genpd);
+	return ret;
+}
+
+static int pm_genpd_total_idle_time_show(struct seq_file *s, void *data)
+{
+	struct generic_pm_domain *genpd = s->private;
+	ktime_t delta = 0, total = 0;
+	int i, ret = 0;
+
+	ret = genpd_lock_interruptible(genpd);
+	if (ret)
+		return -ERESTARTSYS;
+
+	for (i = 0; i < genpd->state_count; i++) {
+
+		if ((genpd->status == GPD_STATE_POWER_OFF) &&
+				(genpd->state_idx == i))
+			delta = ktime_sub(ktime_get(), genpd->accounting_time);
+
+		total = ktime_add(total, genpd->states[i].idle_time);
+	}
+	total = ktime_add(total, delta);
+
+	seq_printf(s, "%lld ms\n", ktime_to_ms(total));
+
+	genpd_unlock(genpd);
+	return ret;
+}
+
+
+static int pm_genpd_devices_show(struct seq_file *s, void *data)
+{
+	struct generic_pm_domain *genpd = s->private;
+	struct pm_domain_data *pm_data;
+	const char *kobj_path;
+	int ret = 0;
+
+	ret = genpd_lock_interruptible(genpd);
+	if (ret)
+		return -ERESTARTSYS;
+
+	list_for_each_entry(pm_data, &genpd->dev_list, list_node) {
+		kobj_path = kobject_get_path(&pm_data->dev->kobj,
+				genpd_is_irq_safe(genpd) ?
+				GFP_ATOMIC : GFP_KERNEL);
+		if (kobj_path == NULL)
+			continue;
+
+		seq_printf(s, "%s\n", kobj_path);
+		kfree(kobj_path);
+	}
+
+	genpd_unlock(genpd);
+	return ret;
+}
+
+#define define_pm_genpd_open_function(name) \
+static int pm_genpd_##name##_open(struct inode *inode, struct file *file) \
+{ \
+	return single_open(file, pm_genpd_##name##_show, inode->i_private); \
+}
+
+define_pm_genpd_open_function(summary);
+define_pm_genpd_open_function(status);
+define_pm_genpd_open_function(sub_domains);
+define_pm_genpd_open_function(idle_states);
+define_pm_genpd_open_function(active_time);
+define_pm_genpd_open_function(total_idle_time);
+define_pm_genpd_open_function(devices);
+
+#define define_pm_genpd_debugfs_fops(name) \
+static const struct file_operations pm_genpd_##name##_fops = { \
+	.open = pm_genpd_##name##_open, \
+	.read = seq_read, \
+	.llseek = seq_lseek, \
+	.release = single_release, \
+}
+
+define_pm_genpd_debugfs_fops(summary);
+define_pm_genpd_debugfs_fops(status);
+define_pm_genpd_debugfs_fops(sub_domains);
+define_pm_genpd_debugfs_fops(idle_states);
+define_pm_genpd_debugfs_fops(active_time);
+define_pm_genpd_debugfs_fops(total_idle_time);
+define_pm_genpd_debugfs_fops(devices);
 
 static int __init pm_genpd_debug_init(void)
 {
 	struct dentry *d;
+	struct generic_pm_domain *genpd;
 
 	pm_genpd_debugfs_dir = debugfs_create_dir("pm_genpd", NULL);
 
@@ -2348,6 +2516,25 @@  static int __init pm_genpd_debug_init(void)
 	if (!d)
 		return -ENOMEM;
 
+	list_for_each_entry(genpd, &gpd_list, gpd_list_node) {
+		d = debugfs_create_dir(genpd->name, pm_genpd_debugfs_dir);
+		if (!d)
+			return -ENOMEM;
+
+		debugfs_create_file("current_state", 0444,
+				d, genpd, &pm_genpd_status_fops);
+		debugfs_create_file("sub_domains", 0444,
+				d, genpd, &pm_genpd_sub_domains_fops);
+		debugfs_create_file("idle_states", 0444,
+				d, genpd, &pm_genpd_idle_states_fops);
+		debugfs_create_file("active_time", 0444,
+				d, genpd, &pm_genpd_active_time_fops);
+		debugfs_create_file("total_idle_time", 0444,
+				d, genpd, &pm_genpd_total_idle_time_fops);
+		debugfs_create_file("devices", 0444,
+				d, genpd, &pm_genpd_devices_fops);
+	}
+
 	return 0;
 }
 late_initcall(pm_genpd_debug_init);