[PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[Rajendra Nayak]

If a module's OCP slave port is programmed to be in smartidle,
its also necessary that they have module level wakeup enabled.
Update _sysc_enable in hwmod framework to do this.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Partha Basak <p-basak2@ti.com>
Signed-off-by: Benoît Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-omap2/omap_hwmod.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index cb911d7..d82e7e8 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -659,8 +659,6 @@ static void _sysc_enable(struct omap_hwmod *oh)
 		_set_module_autoidle(oh, idlemode, &v);
 	}
 
-	/* XXX OCP ENAWAKEUP bit? */
-
 	/*
 	 * XXX The clock framework should handle this, by
 	 * calling into this code.  But this must wait until the
@@ -671,6 +669,10 @@ static void _sysc_enable(struct omap_hwmod *oh)
 		_set_clockactivity(oh, oh->class->sysc->clockact, &v);
 
 	_write_sysconfig(v, oh);
+
+	/* If slave is in SMARTIDLE, also enable wakeup */
+	if ((sf & SYSC_HAS_SIDLEMODE) && !(oh->flags & HWMOD_SWSUP_SIDLE))
+			_enable_wakeup(oh);
 }
 
 /**
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[Paul Walmsley]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2436 bytes --]

Hi Rajendra,

On Tue, 21 Sep 2010, Rajendra Nayak wrote:

> If a module's OCP slave port is programmed to be in smartidle,
> its also necessary that they have module level wakeup enabled.
> Update _sysc_enable in hwmod framework to do this.

Thanks, queued for 2.6.37 with a slightly modified changelog.  One brief 
comment:

> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> Signed-off-by: Partha Basak <p-basak2@ti.com>
> Signed-off-by: Beno????t Cousson <b-cousson@ti.com>

Looks like something in your mail path is mangling 8-bit characters... 
fixed in the queued version.


- Paul


From: Rajendra Nayak <rnayak@ti.com>
Date: Tue, 21 Sep 2010 19:58:30 +0530
Subject: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If a module's OCP slave port is programmed to be in smartidle,
its also necessary that they have module level wakeup enabled.
Update _sysc_enable in hwmod framework to do this.

The thread "[PATCH 7/8] : Hwmod api changes" archived here:

http://www.mail-archive.com/linux-omap@vger.kernel.org/msg34212.html

has additional technical information on the rationale of this patch.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Partha Basak <p-basak2@ti.com>
Signed-off-by: Benoît Cousson <b-cousson@ti.com>
[paul@pwsan.com: revised patch description]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-omap2/omap_hwmod.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 8c27923..d3431bf 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -661,8 +661,6 @@ static void _sysc_enable(struct omap_hwmod *oh)
 		_set_module_autoidle(oh, idlemode, &v);
 	}
 
-	/* XXX OCP ENAWAKEUP bit? */
-
 	/*
 	 * XXX The clock framework should handle this, by
 	 * calling into this code.  But this must wait until the
@@ -673,6 +671,10 @@ static void _sysc_enable(struct omap_hwmod *oh)
 		_set_clockactivity(oh, oh->class->sysc->clockact, &v);
 
 	_write_sysconfig(v, oh);
+
+	/* If slave is in SMARTIDLE, also enable wakeup */
+	if ((sf & SYSC_HAS_SIDLEMODE) && !(oh->flags & HWMOD_SWSUP_SIDLE))
+			_enable_wakeup(oh);
 }
 
 /**
-- 
1.7.1

Re: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[Kevin Hilman]

Paul Walmsley <paul@pwsan.com> writes:

> Hi Rajendra,
>
> On Tue, 21 Sep 2010, Rajendra Nayak wrote:
>
>> If a module's OCP slave port is programmed to be in smartidle,
>> its also necessary that they have module level wakeup enabled.
>> Update _sysc_enable in hwmod framework to do this.
>
> Thanks, queued for 2.6.37 with a slightly modified changelog.  One brief 
> comment:
>
>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>> Signed-off-by: Partha Basak <p-basak2@ti.com>
>> Signed-off-by: Beno????t Cousson <b-cousson@ti.com>
>
> Looks like something in your mail path is mangling 8-bit characters... 
> fixed in the queued version.
>
>
> - Paul
>
>
> From: Rajendra Nayak <rnayak@ti.com>
> Date: Tue, 21 Sep 2010 19:58:30 +0530
> Subject: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> If a module's OCP slave port is programmed to be in smartidle,
> its also necessary that they have module level wakeup enabled.
> Update _sysc_enable in hwmod framework to do this.
>
> The thread "[PATCH 7/8] : Hwmod api changes" archived here:
>
> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg34212.html
>
> has additional technical information on the rationale of this patch.
>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> Signed-off-by: Partha Basak <p-basak2@ti.com>
> Signed-off-by: Benoît Cousson <b-cousson@ti.com>
> [paul@pwsan.com: revised patch description]
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>

FWIW

Acked-by: Kevin Hilman <khilman@deeprootsystems.com>

as I'm using this for testing the various hwmod conversions.

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[Paul Walmsley]

On Tue, 21 Sep 2010, Kevin Hilman wrote:

> FWIW
> 
> Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
> 
> as I'm using this for testing the various hwmod conversions.

Thanks Kevin, added that in.  I know you've been testing some of the other 
patches here too, so please let me know if you would like Tested-by:'s or 
Acked-by:'s there.


- Paul

Re: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[Kevin Hilman]

Paul Walmsley <paul@pwsan.com> writes:

> On Tue, 21 Sep 2010, Kevin Hilman wrote:
>
>> FWIW
>> 
>> Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
>> 
>> as I'm using this for testing the various hwmod conversions.
>
> Thanks Kevin, added that in.  I know you've been testing some of the other 
> patches here too, so please let me know if you would like Tested-by:'s or 
> Acked-by:'s there.

I guess you can put a Tested-by for me on everything in your
hwmod_2.6.37 branch as I've been staging and testing those for a bit
now.

Also, one other thing I noticed in that branch: the locking patch from
me:

   OMAP: hwmod: separate list locking and hwmod hardware locking

has a stray '[PATCH]' in the shortlog which should probably be removed
as well.

Kevin

Re: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[Paul Walmsley]

On Tue, 21 Sep 2010, Kevin Hilman wrote:

> Paul Walmsley <paul@pwsan.com> writes:
> 
> > On Tue, 21 Sep 2010, Kevin Hilman wrote:
> >
> >> FWIW
> >> 
> >> Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
> >> 
> >> as I'm using this for testing the various hwmod conversions.
> >
> > Thanks Kevin, added that in.  I know you've been testing some of the other 
> > patches here too, so please let me know if you would like Tested-by:'s or 
> > Acked-by:'s there.
> 
> I guess you can put a Tested-by for me on everything in your
> hwmod_2.6.37 branch as I've been staging and testing those for a bit
> now.

OK, sounds good.  How about the updated hardreset code - have you given 
that a try?

> Also, one other thing I noticed in that branch: the locking patch from
> me:
> 
>    OMAP: hwmod: separate list locking and hwmod hardware locking
> 
> has a stray '[PATCH]' in the shortlog which should probably be removed
> as well.

Thanks, fixed.


- Paul

Re: [PATCH] OMAP: hwmod: Enable module wakeup if in smartidle

[Kevin Hilman]

Paul Walmsley <paul@pwsan.com> writes:

> On Tue, 21 Sep 2010, Kevin Hilman wrote:
>
>> Paul Walmsley <paul@pwsan.com> writes:
>> 
>> > On Tue, 21 Sep 2010, Kevin Hilman wrote:
>> >
>> >> FWIW
>> >> 
>> >> Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
>> >> 
>> >> as I'm using this for testing the various hwmod conversions.
>> >
>> > Thanks Kevin, added that in.  I know you've been testing some of the other 
>> > patches here too, so please let me know if you would like Tested-by:'s or 
>> > Acked-by:'s there.
>> 
>> I guess you can put a Tested-by for me on everything in your
>> hwmod_2.6.37 branch as I've been staging and testing those for a bit
>> now.
>
> OK, sounds good.  How about the updated hardreset code - have you given 
> that a try?

I just rebased onto your hwmod_2.6.37 branch, so testing it today.

Kevin