Skip to contentSkip to conversation

OMAP: hwmod: Enable module wakeup if in smartidle

PATCH In review Rajendra Nayak 3 participants 7 messages Sep 21, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP: hwmod: Enable module wakeup if in smartidle

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.

---
 arch/arm/mach-omap2/omap_hwmod.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +4 -2
index cb911d7..d82e7e8 100644
@@ -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);
 }
 
 /**
Signature · 6 lines
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer
#1 lore raw

Hi Rajendra,

Quoted 3 lines · 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.

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

Quoted 3 lines

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

- Paul

From: Rajendra Nayak <[email protected]>
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/[email protected]/msg34212.html

has additional technical information on the rationale of this patch.

---
 arch/arm/mach-omap2/omap_hwmod.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +4 -2
index 8c27923..d3431bf 100644
@@ -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);
 }
 
 /**
Signature · 1 line
1.7.1
Acked-by
#2 lore raw
Quoted 37 lines · Paul Walmsley

Hi Rajendra,

Quoted 3 lines · 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.

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

Quoted 3 lines

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

- Paul

From: Rajendra Nayak <[email protected]>
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/[email protected]/msg34212.html

Quoted 8 lines

has additional technical information on the rationale of this patch.

FWIW

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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#3 lore raw
Quoted 5 lines · Kevin Hilman

FWIW

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

#4 lore raw
Quoted 11 lines · Paul Walmsley
Quoted 5 lines · Kevin Hilman

FWIW

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

maintainer
#5 lore raw
Quoted 10 lines · Kevin Hilman
Quoted 8 lines · Paul Walmsley
Quoted 5 lines · Kevin Hilman

FWIW

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

Quoted 7 lines
Quoted 3 lines

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?

Quoted 7 lines

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

#6 lore raw
Quoted 16 lines · Paul Walmsley
Quoted 14 lines · Kevin Hilman
Quoted 11 lines · Paul Walmsley
Quoted 5 lines · Kevin Hilman

FWIW

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.

Quoted 6 lines
Quoted 3 lines

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