From: Paul Walmsley <paul@pwsan.com> To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Tero Kristo <t-kristo@ti.com>, Kevin Hilman <khilman@deeprootsystems.com> Subject: [PATCH 02/12] ARM: OMAP2+: PM/powerdomain: move the power state time tracking into the powerdomain code Date: Sun, 09 Dec 2012 13:03:17 -0700 [thread overview] Message-ID: <20121209200259.3196.84569.stgit@dusk.lan> (raw) In-Reply-To: <20121209200108.3196.12452.stgit@dusk.lan> Move the power state time tracking code into the powerdomain code. This code accesses internal powerdomain state, so this change will allow us to reduce what is exported from the powerdomain code. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Tero Kristo <t-kristo@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> --- arch/arm/mach-omap2/pm-debug.c | 24 ------------------------ arch/arm/mach-omap2/pm.h | 6 ------ arch/arm/mach-omap2/powerdomain.c | 22 +++++++++++++++++++++- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 03da2e3..80c001a 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -53,21 +53,6 @@ enum { DEBUG_FILE_TIMERS, }; -void pm_dbg_update_time(struct powerdomain *pwrdm, int prev) -{ - s64 t; - - if (!pm_dbg_init_done) - return ; - - /* Update timer for previous state */ - t = sched_clock(); - - pwrdm->fpwrst_timer[prev - PWRDM_FPWRST_OFFSET] += t - pwrdm->timer; - - pwrdm->timer = t; -} - static int clkdm_dbg_show_counter(struct clockdomain *clkdm, void *user) { struct seq_file *s = (struct seq_file *)user; @@ -197,17 +182,8 @@ DEFINE_SIMPLE_ATTRIBUTE(pwrdm_suspend_fops, pwrdm_suspend_get, static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir) { - int i; - s64 t; struct dentry *d; - t = sched_clock(); - - for (i = 0; i < PWRDM_FPWRSTS_COUNT; i++) - pwrdm->fpwrst_timer[i] = 0; - - pwrdm->timer = t; - if (strncmp(pwrdm->name, "dpll", 4) == 0) return 0; diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 19ef376..c496f27 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -59,12 +59,6 @@ extern u32 enable_off_mode; #define enable_off_mode 0 #endif -#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) -extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev); -#else -#define pm_dbg_update_time(pwrdm, prev) do {} while (0); -#endif /* CONFIG_PM_DEBUG */ - /* 24xx */ extern void omap24xx_idle_loop_suspend(void); extern unsigned int omap24xx_idle_loop_suspend_sz; diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index b67d721..53bc852 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -20,6 +20,8 @@ #include <linux/errno.h> #include <linux/string.h> #include <linux/spinlock.h> +#include <linux/sched.h> + #include <trace/events/power.h> #include "cm2xxx_3xxx.h" @@ -126,6 +128,9 @@ static int _pwrdm_register(struct powerdomain *pwrdm) arch_pwrdm->pwrdm_wait_transition(pwrdm); pwrdm->fpwrst = pwrdm_read_fpwrst(pwrdm); pwrdm->fpwrst_counter[pwrdm->fpwrst - PWRDM_FPWRST_OFFSET] = 1; +#ifdef CONFIG_PM_DEBUG + pwrdm->timer = sched_clock(); +#endif return 0; } @@ -579,6 +584,21 @@ static int _pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst) return ret; } +/* XXX prev is wrong type */ +/* XXX is sched_clock() correct to use here? */ +/* Update timer for previous state */ +static void _pwrdm_update_pwrst_time(struct powerdomain *pwrdm, int prev) +{ +#ifdef CONFIG_PM_DEBUG + s64 t; + + t = sched_clock(); + + pwrdm->fpwrst_timer[prev - PWRDM_FPWRST_OFFSET] += t - pwrdm->timer; + + pwrdm->timer = t; +#endif +} /* XXX Caller must hold pwrdm->_lock */ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) @@ -617,7 +637,7 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) if (fpwrst != prev) pwrdm->fpwrst_counter[fpwrst - PWRDM_FPWRST_OFFSET]++; - pm_dbg_update_time(pwrdm, prev); + _pwrdm_update_pwrst_time(pwrdm, prev); pwrdm->fpwrst = fpwrst;
WARNING: multiple messages have this Message-ID (diff)
From: paul@pwsan.com (Paul Walmsley) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 02/12] ARM: OMAP2+: PM/powerdomain: move the power state time tracking into the powerdomain code Date: Sun, 09 Dec 2012 13:03:17 -0700 [thread overview] Message-ID: <20121209200259.3196.84569.stgit@dusk.lan> (raw) In-Reply-To: <20121209200108.3196.12452.stgit@dusk.lan> Move the power state time tracking code into the powerdomain code. This code accesses internal powerdomain state, so this change will allow us to reduce what is exported from the powerdomain code. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Tero Kristo <t-kristo@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> --- arch/arm/mach-omap2/pm-debug.c | 24 ------------------------ arch/arm/mach-omap2/pm.h | 6 ------ arch/arm/mach-omap2/powerdomain.c | 22 +++++++++++++++++++++- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 03da2e3..80c001a 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -53,21 +53,6 @@ enum { DEBUG_FILE_TIMERS, }; -void pm_dbg_update_time(struct powerdomain *pwrdm, int prev) -{ - s64 t; - - if (!pm_dbg_init_done) - return ; - - /* Update timer for previous state */ - t = sched_clock(); - - pwrdm->fpwrst_timer[prev - PWRDM_FPWRST_OFFSET] += t - pwrdm->timer; - - pwrdm->timer = t; -} - static int clkdm_dbg_show_counter(struct clockdomain *clkdm, void *user) { struct seq_file *s = (struct seq_file *)user; @@ -197,17 +182,8 @@ DEFINE_SIMPLE_ATTRIBUTE(pwrdm_suspend_fops, pwrdm_suspend_get, static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir) { - int i; - s64 t; struct dentry *d; - t = sched_clock(); - - for (i = 0; i < PWRDM_FPWRSTS_COUNT; i++) - pwrdm->fpwrst_timer[i] = 0; - - pwrdm->timer = t; - if (strncmp(pwrdm->name, "dpll", 4) == 0) return 0; diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 19ef376..c496f27 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -59,12 +59,6 @@ extern u32 enable_off_mode; #define enable_off_mode 0 #endif -#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) -extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev); -#else -#define pm_dbg_update_time(pwrdm, prev) do {} while (0); -#endif /* CONFIG_PM_DEBUG */ - /* 24xx */ extern void omap24xx_idle_loop_suspend(void); extern unsigned int omap24xx_idle_loop_suspend_sz; diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index b67d721..53bc852 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -20,6 +20,8 @@ #include <linux/errno.h> #include <linux/string.h> #include <linux/spinlock.h> +#include <linux/sched.h> + #include <trace/events/power.h> #include "cm2xxx_3xxx.h" @@ -126,6 +128,9 @@ static int _pwrdm_register(struct powerdomain *pwrdm) arch_pwrdm->pwrdm_wait_transition(pwrdm); pwrdm->fpwrst = pwrdm_read_fpwrst(pwrdm); pwrdm->fpwrst_counter[pwrdm->fpwrst - PWRDM_FPWRST_OFFSET] = 1; +#ifdef CONFIG_PM_DEBUG + pwrdm->timer = sched_clock(); +#endif return 0; } @@ -579,6 +584,21 @@ static int _pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst) return ret; } +/* XXX prev is wrong type */ +/* XXX is sched_clock() correct to use here? */ +/* Update timer for previous state */ +static void _pwrdm_update_pwrst_time(struct powerdomain *pwrdm, int prev) +{ +#ifdef CONFIG_PM_DEBUG + s64 t; + + t = sched_clock(); + + pwrdm->fpwrst_timer[prev - PWRDM_FPWRST_OFFSET] += t - pwrdm->timer; + + pwrdm->timer = t; +#endif +} /* XXX Caller must hold pwrdm->_lock */ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) @@ -617,7 +637,7 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) if (fpwrst != prev) pwrdm->fpwrst_counter[fpwrst - PWRDM_FPWRST_OFFSET]++; - pm_dbg_update_time(pwrdm, prev); + _pwrdm_update_pwrst_time(pwrdm, prev); pwrdm->fpwrst = fpwrst;
next prev parent reply other threads:[~2012-12-09 20:05 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-12-09 20:02 [PATCH 00/12] ARM: OMAP2+: powerdomain updates after the functional power state conversion Paul Walmsley 2012-12-09 20:02 ` Paul Walmsley 2012-12-09 20:02 ` [PATCH 01/12] ARM: OMAP2+: powerdomain: consolidate arch_pwrdm check code Paul Walmsley 2012-12-09 20:02 ` Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley [this message] 2012-12-09 20:03 ` [PATCH 02/12] ARM: OMAP2+: PM/powerdomain: move the power state time tracking into the powerdomain code Paul Walmsley 2012-12-09 20:03 ` [PATCH 03/12] ARM: OMAP2+: powerdomain: split pwrdm_state_switch() Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 04/12] ARM: OMAP2+: PM: clean up some debugfs functions Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 05/12] ARM: OMAP2+: powerdomain: remove some redundant checks; add some notes Paul Walmsley 2012-12-09 20:03 ` [PATCH 06/12] ARM: OMAP2+: CM: use the cached copy of the clockdomain's hwsup state Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 07/12] ARM: OMAP2+: powerdomain: cache the powerdomain next power state Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 08/12] ARM: OMAP2+: powerdomain: cache the powerdomain's previous " Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 09/12] ARM: OMAP2+: powerdomain: skip register reads for powerdomains known to be on Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-12 10:22 ` Vaibhav Hiremath 2012-12-12 10:22 ` Vaibhav Hiremath 2012-12-19 21:09 ` Jon Hunter 2012-12-19 21:09 ` Jon Hunter 2012-12-20 17:22 ` Paul Walmsley 2012-12-20 17:22 ` Paul Walmsley 2012-12-21 6:33 ` Santosh Shilimkar 2012-12-21 6:33 ` Santosh Shilimkar 2012-12-26 6:21 ` Bedia, Vaibhav 2012-12-26 6:21 ` Bedia, Vaibhav 2012-12-26 6:31 ` Bedia, Vaibhav 2012-12-26 6:31 ` Bedia, Vaibhav 2012-12-26 20:49 ` Paul Walmsley 2012-12-26 20:49 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 10/12] ARM: OMAP2+: powerdomain: skip previous-power-state read if next_pwrst is ON Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 11/12] ARM: OMAP2xxx: powerdomain: add previous power state tracking Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2012-12-09 20:03 ` [PATCH 12/12] ARM: OMAP2xxx: PM: add pwrdm_(pre|post)_transition() calls to the 2xxx PM code Paul Walmsley 2012-12-09 20:03 ` Paul Walmsley 2013-01-04 14:26 ` [PATCH 00/12] ARM: OMAP2+: powerdomain updates after the functional power state conversion Tero Kristo 2013-01-04 14:26 ` Tero Kristo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20121209200259.3196.84569.stgit@dusk.lan \ --to=paul@pwsan.com \ --cc=khilman@deeprootsystems.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=t-kristo@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.