From: Rajendra Nayak <rnayak@ti.com> To: linux-omap@vger.kernel.org Cc: paul@pwsan.com, khilman@ti.com, b-cousson@ti.com, santosh.shilimkar@ti.com, linux-arm-kernel@lists.infradead.org, Rajendra Nayak <rnayak@ti.com> Subject: [PATCH 4/8] OMAP2+: PM: idle clkdms only if already in idle Date: Thu, 9 Jun 2011 16:24:09 +0530 [thread overview] Message-ID: <1307616853-28395-5-git-send-email-rnayak@ti.com> (raw) In-Reply-To: <1307616853-28395-4-git-send-email-rnayak@ti.com> The omap_set_pwrdm_state function forces clockdomains to idle, without checking the existing idle state programmed, instead based solely on the HW capability of the clockdomain to support idle. This is wrong and the clockdomains should be idled post a state_switch *only* if idle transitions on the clockdomain were already enabled. Signed-off-by: Rajendra Nayak <rnayak@ti.com> --- arch/arm/mach-omap2/pm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index d48813f..840b0e1 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -108,6 +108,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) u32 cur_state; int sleep_switch = -1; int ret = 0; + int hwsup = 0; if (pwrdm == NULL || IS_ERR(pwrdm)) return -EINVAL; @@ -127,6 +128,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) (pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) { sleep_switch = LOWPOWERSTATE_SWITCH; } else { + hwsup = clkdm_is_idle(pwrdm->pwrdm_clkdms[0]); clkdm_wakeup(pwrdm->pwrdm_clkdms[0]); pwrdm_wait_transition(pwrdm); sleep_switch = FORCEWAKEUP_SWITCH; @@ -142,7 +144,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) switch (sleep_switch) { case FORCEWAKEUP_SWITCH: - if (pwrdm->pwrdm_clkdms[0]->flags & CLKDM_CAN_ENABLE_AUTO) + if (hwsup) clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]); else clkdm_sleep(pwrdm->pwrdm_clkdms[0]); -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: rnayak@ti.com (Rajendra Nayak) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/8] OMAP2+: PM: idle clkdms only if already in idle Date: Thu, 9 Jun 2011 16:24:09 +0530 [thread overview] Message-ID: <1307616853-28395-5-git-send-email-rnayak@ti.com> (raw) In-Reply-To: <1307616853-28395-4-git-send-email-rnayak@ti.com> The omap_set_pwrdm_state function forces clockdomains to idle, without checking the existing idle state programmed, instead based solely on the HW capability of the clockdomain to support idle. This is wrong and the clockdomains should be idled post a state_switch *only* if idle transitions on the clockdomain were already enabled. Signed-off-by: Rajendra Nayak <rnayak@ti.com> --- arch/arm/mach-omap2/pm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index d48813f..840b0e1 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -108,6 +108,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) u32 cur_state; int sleep_switch = -1; int ret = 0; + int hwsup = 0; if (pwrdm == NULL || IS_ERR(pwrdm)) return -EINVAL; @@ -127,6 +128,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) (pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) { sleep_switch = LOWPOWERSTATE_SWITCH; } else { + hwsup = clkdm_is_idle(pwrdm->pwrdm_clkdms[0]); clkdm_wakeup(pwrdm->pwrdm_clkdms[0]); pwrdm_wait_transition(pwrdm); sleep_switch = FORCEWAKEUP_SWITCH; @@ -142,7 +144,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) switch (sleep_switch) { case FORCEWAKEUP_SWITCH: - if (pwrdm->pwrdm_clkdms[0]->flags & CLKDM_CAN_ENABLE_AUTO) + if (hwsup) clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]); else clkdm_sleep(pwrdm->pwrdm_clkdms[0]); -- 1.7.0.4
next prev parent reply other threads:[~2011-06-09 10:54 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-06-09 10:54 [PATCH 0/8] Fix module-mode enable sequence on OMAP4 Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-09 10:54 ` [PATCH 1/8] OMAP2+: clockdomain: Add an api to read idle mode Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-09 10:54 ` [PATCH 2/8] OMAP2+: clockdomain: Add SoC support for clkdm_is_idle Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-09 10:54 ` [PATCH 3/8] OMAP2+: PM: Initialise sleep_switch to a non-valid value Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak [this message] 2011-06-09 10:54 ` [PATCH 4/8] OMAP2+: PM: idle clkdms only if already in idle Rajendra Nayak 2011-06-09 10:54 ` [PATCH 5/8] OMAP4: PM: TEMP: Prevent l3init from idling/force sleep Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-09 10:54 ` [PATCH 6/8] OMAP2+: hwmod: Follow the recomended PRCM clock enable sequence Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-09 10:54 ` [PATCH 7/8] OMAP: clock: Add flags to identify optional clock nodes Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-09 10:54 ` [PATCH 8/8] OMAP: clock: Enable clockdomain only for optional clocks Rajendra Nayak 2011-06-09 10:54 ` Rajendra Nayak 2011-06-23 15:04 ` [PATCH 5/8] OMAP4: PM: TEMP: Prevent l3init from idling/force sleep Paul Walmsley 2011-06-23 15:04 ` Paul Walmsley 2011-06-23 15:22 ` Russell King - ARM Linux 2011-06-23 15:22 ` Russell King - ARM Linux 2011-07-06 5:30 ` Paul Walmsley 2011-07-06 5:30 ` Paul Walmsley 2011-06-10 0:15 ` [PATCH 4/8] OMAP2+: PM: idle clkdms only if already in idle Todd Poynor 2011-06-10 0:15 ` Todd Poynor 2011-06-10 11:22 ` Rajendra Nayak 2011-06-10 11:22 ` Rajendra Nayak 2011-06-27 6:34 ` Paul Walmsley 2011-06-27 6:34 ` Paul Walmsley 2011-06-27 23:36 ` Rajendra Nayak 2011-06-27 23:36 ` Rajendra Nayak 2011-06-10 0:07 ` [PATCH 1/8] OMAP2+: clockdomain: Add an api to read idle mode Todd Poynor 2011-06-10 0:07 ` Todd Poynor 2011-06-10 11:08 ` Rajendra Nayak 2011-06-10 11:08 ` Rajendra Nayak
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=1307616853-28395-5-git-send-email-rnayak@ti.com \ --to=rnayak@ti.com \ --cc=b-cousson@ti.com \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=paul@pwsan.com \ --cc=santosh.shilimkar@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.