PM: domains: create debugfs nodes when adding power domains
Subsystems (4)
PATCH v2 1/1 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.
---
v2: fix forward declaration and genpd_debugfs_dir being NULL - Ulf
drivers/base/power/domain.c | 83 ++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 28 deletions(-)
drivers/base/power/domain.c +55 -28
@@ -24,6 +24,16 @@#include "power.h" +#ifdef CONFIG_DEBUG_FS +#include <linux/pm.h> +#include <linux/device.h> +#include <linux/debugfs.h> +#include <linux/seq_file.h>4 +#include <linux/init.h> +#include <linux/kobject.h> +static struct dentry *genpd_debugfs_dir; +#endif +#define GENPD_RETRY_MAX_MS 250/* Approximate */ #define GENPD_DEV_CALLBACK (genpd, type, callback, dev) \
@@ -1880,6 +1890,21 @@ static void genpd_lock_init(struct generic_pm_domain *genpd) } } +#ifdef CONFIG_DEBUG_FS +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); +} +#else +static void genpd_debug_add (struct generic_pm_domain *genpd) {} +static void genpd_debug_remove (struct generic_pm_domain *genpd) {} +#endif +/** * pm_genpd_init - Initialize a generic I/O PM domain object. * @genpd: PM domain object to initialize.
@@ -1954,6 +1979,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 +2013,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 +2920,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,9 +3196,34 @@ 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; + +if (!genpd_debugfs_dir) +return ; + + d =debugfs_create_dir (genpd->name, genpd_debugfs_dir); + +debugfs_create_file ("current_state" ,0444 , + d, genpd, &status_fops); +debugfs_create_file ("sub_domains" ,0444 , + d, genpd, &sub_domains_fops); +debugfs_create_file ("idle_states" ,0444 , + d, genpd, &idle_states_fops); +debugfs_create_file ("active_time" ,0444 , + d, genpd, &active_time_fops); +debugfs_create_file ("total_idle_time" ,0444 , + d, genpd, &total_idle_time_fops); +debugfs_create_file ("devices" ,0444 , + d, genpd, &devices_fops); +if (genpd->set_performance_state) +debugfs_create_file ("perf_state" ,0444 , + 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 );
@@ -3187,25 +3231,8 @@ static int __init genpd_debug_init(void)debugfs_create_file ("pm_genpd_summary" ,S_IRUGO , genpd_debugfs_dir,NULL , &summary_fops); -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 , - d, genpd, &status_fops); -debugfs_create_file ("sub_domains" ,0444 , - d, genpd, &sub_domains_fops); -debugfs_create_file ("idle_states" ,0444 , - d, genpd, &idle_states_fops); -debugfs_create_file ("active_time" ,0444 , - d, genpd, &active_time_fops); -debugfs_create_file ("total_idle_time" ,0444 , - d, genpd, &total_idle_time_fops); -debugfs_create_file ("devices" ,0444 , - d, genpd, &devices_fops); -if (genpd->set_performance_state) -debugfs_create_file ("perf_state" ,0444 , - d, genpd, &perf_state_fops); - } +list_for_each_entry (genpd, &gpd_list, gpd_list_node) +genpd_debug_add (genpd);return 0 ; }
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Thierry,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on pm/linux-next]
[also build test WARNING on v5.10-rc6 next-20201204]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thierry-Strudel/PM-domains-create-debugfs-nodes-when-adding-power-domains/20201205-024734 base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next config: arm-randconfig-r014-20201204 (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/71df5f7c4c82d542710387ca7872ca90d29ee42d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thierry-Strudel/PM-domains-create-debugfs-nodes-when-adding-power-domains/20201205-024734 git checkout 71df5f7c4c82d542710387ca7872ca90d29ee42d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/base/power/domain.c:31:28: warning: extra tokens at end of #include directive
31 | #include <linux/seq_file.h>4
| ^vim +31 drivers/base/power/domain.c
26
27 #ifdef CONFIG_DEBUG_FS
28 #include <linux/pm.h>
29 #include <linux/device.h>
30 #include <linux/debugfs.h>
> 31 #include <linux/seq_file.h>4
32 #include <linux/init.h>
33 #include <linux/kobject.h>
34 static struct dentry *genpd_debugfs_dir;
35 #endif
36 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org