From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rajendra Nayak Subject: Re: [PATCH] ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep Date: Fri, 27 Jul 2012 11:13:17 +0530 Message-ID: <50122A75.2030108@ti.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:43675 "EHLO na3sys009aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751783Ab2G0Fnd (ORCPT ); Fri, 27 Jul 2012 01:43:33 -0400 Received: by obbtb18 with SMTP id tb18so4908209obb.35 for ; Thu, 26 Jul 2012 22:43:23 -0700 (PDT) In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jon-hunter@ti.com On Friday 27 July 2012 02:34 AM, Paul Walmsley wrote: > > Commit 4da71ae6 ("OMAP: clockdomain: Arch specific funcs for > clkdm_clk_enable/disable") called the OMAP2xxx-specific functions for > clockdomain wakeup and sleep. This would probably have broken > software-supervised clockdomain wakeup and sleep on OMAP3. Its strange this went unnoticed for so long. Thanks for this fix and sorry about introducing the bug in the first place. Acked-by: Rajendra Nayak > > Signed-off-by: Paul Walmsley > Cc: Rajendra Nayak > Cc: Jon Hunter > --- > arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 50 ++++++++++++++++++++++++++-- > 1 file changed, 48 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c b/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c > index a0d68db..f99e65c 100644 > --- a/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c > +++ b/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c > @@ -241,6 +241,52 @@ static void omap3_clkdm_deny_idle(struct clockdomain *clkdm) > _clkdm_del_autodeps(clkdm); > } > > +static int omap3xxx_clkdm_clk_enable(struct clockdomain *clkdm) > +{ > + bool hwsup = false; > + > + if (!clkdm->clktrctrl_mask) > + return 0; > + > + hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs, > + clkdm->clktrctrl_mask); > + > + if (hwsup) { > + /* Disable HW transitions when we are changing deps */ > + _disable_hwsup(clkdm); > + _clkdm_add_autodeps(clkdm); > + _enable_hwsup(clkdm); > + } else { > + if (clkdm->flags& CLKDM_CAN_FORCE_WAKEUP) > + omap3_clkdm_wakeup(clkdm); > + } > + > + return 0; > +} > + > +static int omap3xxx_clkdm_clk_disable(struct clockdomain *clkdm) > +{ > + bool hwsup = false; > + > + if (!clkdm->clktrctrl_mask) > + return 0; > + > + hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs, > + clkdm->clktrctrl_mask); > + > + if (hwsup) { > + /* Disable HW transitions when we are changing deps */ > + _disable_hwsup(clkdm); > + _clkdm_del_autodeps(clkdm); > + _enable_hwsup(clkdm); > + } else { > + if (clkdm->flags& CLKDM_CAN_FORCE_SLEEP) > + omap3_clkdm_sleep(clkdm); > + } > + > + return 0; > +} > + > struct clkdm_ops omap2_clkdm_operations = { > .clkdm_add_wkdep = omap2_clkdm_add_wkdep, > .clkdm_del_wkdep = omap2_clkdm_del_wkdep, > @@ -267,6 +313,6 @@ struct clkdm_ops omap3_clkdm_operations = { > .clkdm_wakeup = omap3_clkdm_wakeup, > .clkdm_allow_idle = omap3_clkdm_allow_idle, > .clkdm_deny_idle = omap3_clkdm_deny_idle, > - .clkdm_clk_enable = omap2_clkdm_clk_enable, > - .clkdm_clk_disable = omap2_clkdm_clk_disable, > + .clkdm_clk_enable = omap3xxx_clkdm_clk_enable, > + .clkdm_clk_disable = omap3xxx_clkdm_clk_disable, > }; From mboxrd@z Thu Jan 1 00:00:00 1970 From: rnayak@ti.com (Rajendra Nayak) Date: Fri, 27 Jul 2012 11:13:17 +0530 Subject: [PATCH] ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep In-Reply-To: References: Message-ID: <50122A75.2030108@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Friday 27 July 2012 02:34 AM, Paul Walmsley wrote: > > Commit 4da71ae6 ("OMAP: clockdomain: Arch specific funcs for > clkdm_clk_enable/disable") called the OMAP2xxx-specific functions for > clockdomain wakeup and sleep. This would probably have broken > software-supervised clockdomain wakeup and sleep on OMAP3. Its strange this went unnoticed for so long. Thanks for this fix and sorry about introducing the bug in the first place. Acked-by: Rajendra Nayak > > Signed-off-by: Paul Walmsley > Cc: Rajendra Nayak > Cc: Jon Hunter > --- > arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 50 ++++++++++++++++++++++++++-- > 1 file changed, 48 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c b/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c > index a0d68db..f99e65c 100644 > --- a/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c > +++ b/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c > @@ -241,6 +241,52 @@ static void omap3_clkdm_deny_idle(struct clockdomain *clkdm) > _clkdm_del_autodeps(clkdm); > } > > +static int omap3xxx_clkdm_clk_enable(struct clockdomain *clkdm) > +{ > + bool hwsup = false; > + > + if (!clkdm->clktrctrl_mask) > + return 0; > + > + hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs, > + clkdm->clktrctrl_mask); > + > + if (hwsup) { > + /* Disable HW transitions when we are changing deps */ > + _disable_hwsup(clkdm); > + _clkdm_add_autodeps(clkdm); > + _enable_hwsup(clkdm); > + } else { > + if (clkdm->flags& CLKDM_CAN_FORCE_WAKEUP) > + omap3_clkdm_wakeup(clkdm); > + } > + > + return 0; > +} > + > +static int omap3xxx_clkdm_clk_disable(struct clockdomain *clkdm) > +{ > + bool hwsup = false; > + > + if (!clkdm->clktrctrl_mask) > + return 0; > + > + hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs, > + clkdm->clktrctrl_mask); > + > + if (hwsup) { > + /* Disable HW transitions when we are changing deps */ > + _disable_hwsup(clkdm); > + _clkdm_del_autodeps(clkdm); > + _enable_hwsup(clkdm); > + } else { > + if (clkdm->flags& CLKDM_CAN_FORCE_SLEEP) > + omap3_clkdm_sleep(clkdm); > + } > + > + return 0; > +} > + > struct clkdm_ops omap2_clkdm_operations = { > .clkdm_add_wkdep = omap2_clkdm_add_wkdep, > .clkdm_del_wkdep = omap2_clkdm_del_wkdep, > @@ -267,6 +313,6 @@ struct clkdm_ops omap3_clkdm_operations = { > .clkdm_wakeup = omap3_clkdm_wakeup, > .clkdm_allow_idle = omap3_clkdm_allow_idle, > .clkdm_deny_idle = omap3_clkdm_deny_idle, > - .clkdm_clk_enable = omap2_clkdm_clk_enable, > - .clkdm_clk_disable = omap2_clkdm_clk_disable, > + .clkdm_clk_enable = omap3xxx_clkdm_clk_enable, > + .clkdm_clk_disable = omap3xxx_clkdm_clk_disable, > };