Commit 718072ce authored by Thierry Strudel's avatar Thierry Strudel Committed by Rafael J. Wysocki
Browse files

PM: domains: create debugfs nodes when adding power domains 



debugfs nodes were created in genpd_debug_init alled in late_initcall
preventing power domains registered though loadable modules to have
a debugfs entry.

Create/remove debugfs nodes when the power domain is added/removed
to/from the internal gpd_list.

Signed-off-by: default avatarThierry Strudel <tstrudel@google.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a94ef811

drivers/base/power/domain.c

+45 −28
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/suspend.h>

#include <linux/export.h>

#include <linux/cpu.h>

#include <linux/debugfs.h>



#include "power.h"
@@ -210,6 +211,18 @@ static void genpd_sd_counter_inc(struct generic_pm_domain *genpd) 
}



#ifdef CONFIG_DEBUG_FS

static struct dentry *genpd_debugfs_dir;



static void genpd_debug_add(struct generic_pm_domain *genpd);



static void genpd_debug_remove(struct generic_pm_domain *genpd)

{

	struct dentry *d;



	d = debugfs_lookup(genpd->name, genpd_debugfs_dir);

	debugfs_remove(d);

}



static void genpd_update_accounting(struct generic_pm_domain *genpd)

{

	ktime_t delta, now;
@@ -234,6 +247,8 @@ static void genpd_update_accounting(struct generic_pm_domain *genpd) 
	genpd->accounting_time = now;

}

#else

static inline void genpd_debug_add(struct generic_pm_domain *genpd) {}

static inline void genpd_debug_remove(struct generic_pm_domain *genpd) {}

static inline void genpd_update_accounting(struct generic_pm_domain *genpd) {}

#endif
@@ -1954,6 +1969,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd, 


	mutex_lock(&gpd_list_lock);

	list_add(&genpd->gpd_list_node, &gpd_list);

	genpd_debug_add(genpd);

	mutex_unlock(&gpd_list_lock);



	return 0;
@@ -1987,6 +2003,7 @@ static int genpd_remove(struct generic_pm_domain *genpd) 
		kfree(link);

	}



	genpd_debug_remove(genpd);

	list_del(&genpd->gpd_list_node);

	genpd_unlock(genpd);

	cancel_work_sync(&genpd->power_off_work);
@@ -2893,14 +2910,6 @@ core_initcall(genpd_bus_init); 
/***        debugfs support        ***/



#ifdef CONFIG_DEBUG_FS

#include <linux/pm.h>

#include <linux/device.h>

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#include <linux/init.h>

#include <linux/kobject.h>

static struct dentry *genpd_debugfs_dir;



/*

 * TODO: This function is a slightly modified version of rtpm_status_show

 * from sysfs.c, so generalize it.
@@ -3177,17 +3186,13 @@ DEFINE_SHOW_ATTRIBUTE(total_idle_time); 
DEFINE_SHOW_ATTRIBUTE(devices);

DEFINE_SHOW_ATTRIBUTE(perf_state);



static int __init genpd_debug_init(void)

static void genpd_debug_add(struct generic_pm_domain *genpd)

{

	struct dentry *d;

	struct generic_pm_domain *genpd;



	genpd_debugfs_dir = debugfs_create_dir("pm_genpd", NULL);



	debugfs_create_file("pm_genpd_summary", S_IRUGO, genpd_debugfs_dir,

			    NULL, &summary_fops);

	if (!genpd_debugfs_dir)

		return;



	list_for_each_entry(genpd, &gpd_list, gpd_list_node) {

	d = debugfs_create_dir(genpd->name, genpd_debugfs_dir);



	debugfs_create_file("current_state", 0444,
@@ -3207,6 +3212,18 @@ static int __init genpd_debug_init(void) 
				    d, genpd, &perf_state_fops);

}



static int __init genpd_debug_init(void)

{

	struct generic_pm_domain *genpd;



	genpd_debugfs_dir = debugfs_create_dir("pm_genpd", NULL);



	debugfs_create_file("pm_genpd_summary", S_IRUGO, genpd_debugfs_dir,

			    NULL, &summary_fops);



	list_for_each_entry(genpd, &gpd_list, gpd_list_node)

		genpd_debug_add(genpd);



	return 0;

}

late_initcall(genpd_debug_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE