[PATCH 00/10] ARM: OMAP2+: second set of PM fixes and cleanup for 3.9

Several more OMAP2+ power management fixes, optimizations, and
cleanup, intended for 3.9.  This series is also a prerequisite for the
functional powerdomain conversion series.

I'll plan to bundle these patches together into a pull request with the first
set of 3.9 PM patches, sent earlier.

- Paul

---

vmlinux object size
(delta in bytes from TEST_pm_cleanup_fixes_a_3.9 (8f5e20850396fc60fd4ee01f586705033902bb53)):
   text     data      bss    total  kernel
   +460     -368        0      +92  am33xx_only
   +200     -464        0     -264  n800_multi_omap2xxx
   +192     -144        0      +48  n800_only_a
      0        0        0        0  omap1_defconfig
      0        0        0        0  omap1_defconfig_1510innovator_only
      0        0        0        0  omap1_defconfig_5912osk_only
   +296    -1816        0    -1520  omap2plus_defconfig
   +272     -176        0      +96  omap2plus_defconfig_2430sdp_only
   +232    -1816        0    -1584  omap2plus_defconfig_cpupm
   +280    -1520        0    -1240  omap2plus_defconfig_no_pm
  +4388    -1016        0    +3372  omap2plus_defconfig_omap2_4_only
   +468     -952        0     -484  omap2plus_defconfig_omap3_4_only
   +700     -584     -144      -28  rmk_omap3430_ldp_allnoconfig
   +452     -648        0     -196  rmk_omap3430_ldp_oldconfig
   +700     -584     -144      -28  rmk_omap4430_sdp_allnoconfig
   +424     -328        0      +96  rmk_omap4430_sdp_oldconfig

Boot-time memory difference
(delta in bytes from TEST_pm_cleanup_fixes_a_3.9 (8f5e20850396fc60fd4ee01f586705033902bb53))
  avail  rsrvd   high  freed  board          kconfig
     4k    -4k      .      .  2430sdp        omap2plus_defconfig
     4k    -4k      .      .  3517evm        omap2plus_defconfig
     4k    -4k      .      .  3530es3beagle  omap2plus_defconfig
     4k    -4k      .      .  3730beaglexm   omap2plus_defconfig
     4k    -4k      .      .  37xxevm        omap2plus_defconfig
     4k    -4k      .      .  4430es2panda   omap2plus_defconfig
     4k    -4k      .      .  cmt3517        omap2plus_defconfig

Paul Walmsley (10):
      ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings
      ARM: OMAP2+: clockdomain: add pwrdm_state_switch() call to clkdm_sleep()
      ARM: OMAP2xxx: PM: clean up some crufty powerstate programming code
      ARM: OMAP2: PM/powerdomain: drop unnecessary pwrdm_wait_transition()
      ARM: OMAP2+: PM/powerdomain: move omap_set_pwrdm_state() to powerdomain code
      ARM: OMAP2+: powerdomain/clockdomain: add a per-powerdomain spinlock
      ARM: OMAP2xxx: CM: remove autodep handling
      ARM: OMAP2+: clockdomain: work on wkdep/sleepdep functions
      ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints
      ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments


 arch/arm/mach-omap2/clockdomain-powerdomain.h    |   22 +
 arch/arm/mach-omap2/clockdomain.c                |  550 +++++++++++++++-------
 arch/arm/mach-omap2/clockdomain.h                |   17 -
 arch/arm/mach-omap2/cm2xxx.c                     |   33 -
 arch/arm/mach-omap2/cm3xxx.c                     |   14 -
 arch/arm/mach-omap2/cminst44xx.c                 |    2 
 arch/arm/mach-omap2/cpuidle34xx.c                |   14 -
 arch/arm/mach-omap2/cpuidle44xx.c                |   28 +
 arch/arm/mach-omap2/pm-debug.c                   |    6 
 arch/arm/mach-omap2/pm.c                         |   65 ---
 arch/arm/mach-omap2/pm.h                         |    1 
 arch/arm/mach-omap2/pm24xx.c                     |   30 -
 arch/arm/mach-omap2/powerdomain-clockdomain.h    |   27 +
 arch/arm/mach-omap2/powerdomain.c                |  176 +++++--
 arch/arm/mach-omap2/powerdomain.h                |   42 +-
 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c |    4 
 arch/arm/mach-omap2/powerdomains2xxx_data.c      |    8 
 arch/arm/mach-omap2/powerdomains3xxx_data.c      |   44 +-
 arch/arm/mach-omap2/prm2xxx_3xxx.c               |    3 
 19 files changed, 661 insertions(+), 425 deletions(-)
 create mode 100644 arch/arm/mach-omap2/clockdomain-powerdomain.h
 create mode 100644 arch/arm/mach-omap2/powerdomain-clockdomain.h

In clkdm_sleep(), the powerdomain should be eligible to switch power
states right after the call to the low-level clockdomain sleep
function.  We should have been tracking that with the
pwrdm_state_switch() code, but we weren't, for whatever reason.  Fix that.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
 arch/arm/mach-omap2/clockdomain.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index 64e5046..18f65fd 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c

@@ -763,6 +763,7 @@ int clkdm_sleep(struct clockdomain *clkdm)
 	spin_lock_irqsave(&clkdm->lock, flags);
 	clkdm->_flags &= ~_CLKDM_FLAG_HWSUP_ENABLED;
 	ret = arch_clkdm->clkdm_sleep(clkdm);
+	ret |= pwrdm_state_switch(clkdm->pwrdm.ptr);
 	spin_unlock_irqrestore(&clkdm->lock, flags);
 	return ret;
 }

Fix the following sparse warnings in the OMAP3/4 CPUIdle code:

arch/arm/mach-omap2/cpuidle34xx.c:272:1: warning: symbol 'omap3_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle34xx.c:274:23: warning: symbol 'omap3_idle_driver' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:164:1: warning: symbol 'omap4_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:166:23: warning: symbol 'omap4_idle_driver' was not declared. Should it be static?

Also fix the following checkpatch warnings:

WARNING: please, no space before tabs
#44: FILE: arch/arm/mach-omap2/cpuidle34xx.c:105:
+^I.name = ^I"omap3_idle",$

WARNING: please, no space before tabs
#45: FILE: arch/arm/mach-omap2/cpuidle34xx.c:106:
+^I.owner = ^ITHIS_MODULE,$

ERROR: code indent should use tabs where possible
#211: FILE: arch/arm/mach-omap2/cpuidle44xx.c:74:
+                        /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */$


Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <redacted>
---
 arch/arm/mach-omap2/cpuidle34xx.c |   14 +++++++++-----
 arch/arm/mach-omap2/cpuidle44xx.c |   28 ++++++++++++++++------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index ad70220..e6215b5 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c

@@ -53,6 +53,8 @@ struct omap3_idle_statedata {
  */
 #define OMAP_CPUIDLE_CX_NO_CLKDM_IDLE		BIT(0)
 
+static struct powerdomain *mpu_pd, *core_pd, *per_pd, *cam_pd;
+
 /*
  * Prevent PER OFF if CORE is not in RETention or OFF as this would
  * disable PER wakeups completely.

@@ -97,7 +99,7 @@ static struct omap3_idle_statedata omap3_idle_data[] = {
 	},
 };
 
-static struct powerdomain *mpu_pd, *core_pd, *per_pd, *cam_pd;
+/* Private functions */
 
 static int __omap3_enter_idle(struct cpuidle_device *dev,
 				struct cpuidle_driver *drv,

@@ -269,11 +271,11 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
 	return ret;
 }
 
-DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
+static DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
 
-struct cpuidle_driver omap3_idle_driver = {
-	.name = 	"omap3_idle",
-	.owner = 	THIS_MODULE,
+static struct cpuidle_driver omap3_idle_driver = {
+	.name =		"omap3_idle",
+	.owner =	THIS_MODULE,
 	.states = {
 		{
 			.enter		  = omap3_enter_idle_bm,

@@ -336,6 +338,8 @@ struct cpuidle_driver omap3_idle_driver = {
 	.safe_state_index = 0,
 };
 
+/* Public functions */
+
 /**
  * omap3_idle_init - Init routine for OMAP3 idle
  *

diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index 288bee6..d639aef 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c

@@ -54,6 +54,8 @@ static struct clockdomain *cpu_clkdm[NR_CPUS];
 static atomic_t abort_barrier;
 static bool cpu_done[NR_CPUS];
 
+/* Private functions */
+
 /**
  * omap4_enter_idle_coupled_[simple/coupled] - OMAP4 cpuidle entry functions
  * @dev: cpuidle device

@@ -161,9 +163,19 @@ fail:
 	return index;
 }
 
-DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);
+/*
+ * For each cpu, setup the broadcast timer because local timers
+ * stops for the states above C1.
+ */
+static void omap_setup_broadcast_timer(void *arg)
+{
+	int cpu = smp_processor_id();
+	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
+}
+
+static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);
 
-struct cpuidle_driver omap4_idle_driver = {
+static struct cpuidle_driver omap4_idle_driver = {
 	.name				= "omap4_idle",
 	.owner				= THIS_MODULE,
 	.en_core_tk_irqen		= 1,

@@ -178,7 +190,7 @@ struct cpuidle_driver omap4_idle_driver = {
 			.desc = "MPUSS ON"
 		},
 		{
-                        /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
+			/* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
 			.exit_latency = 328 + 440,
 			.target_residency = 960,
 			.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,

@@ -200,15 +212,7 @@ struct cpuidle_driver omap4_idle_driver = {
 	.safe_state_index = 0,
 };
 
-/*
- * For each cpu, setup the broadcast timer because local timers
- * stops for the states above C1.
- */
-static void omap_setup_broadcast_timer(void *arg)
-{
-	int cpu = smp_processor_id();
-	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
+/* Public functions */
 
 /**
  * omap4_idle_init - Init routine for OMAP4 idle

On 12/9/2012 6:53 AM, Paul Walmsley wrote:

Fix the following sparse warnings in the OMAP3/4 CPUIdle code:

arch/arm/mach-omap2/cpuidle34xx.c:272:1: warning: symbol 'omap3_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle34xx.c:274:23: warning: symbol 'omap3_idle_driver' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:164:1: warning: symbol 'omap4_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:166:23: warning: symbol 'omap4_idle_driver' was not declared. Should it be static?

Also fix the following checkpatch warnings:

WARNING: please, no space before tabs
#44: FILE: arch/arm/mach-omap2/cpuidle34xx.c:105:
+^I.name = ^I"omap3_idle",$

WARNING: please, no space before tabs
#45: FILE: arch/arm/mach-omap2/cpuidle34xx.c:106:
+^I.owner = ^ITHIS_MODULE,$

ERROR: code indent should use tabs where possible
#211: FILE: arch/arm/mach-omap2/cpuidle44xx.c:74:
+                        /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */$

Paul,

I am using your "paul-linux-pwrdm_post_fpwrst_devel_a_3.9" branch, where
all the patches which you have posted are present (I believe so) and I
am getting following sparse warning -


  CHECK   arch/arm/mach-omap2/powerdomain.c
arch/arm/mach-omap2/powerdomain.c:811:2: warning: context imbalance in
'pwrdm_lock': unexpected unlock
arch/arm/mach-omap2/powerdomain.c:811:2:    default context: wanted 1, got 0
include/linux/spinlock.h:340:2: warning: context problem in
'pwrdm_unlock': '_raw_spin_unlock_irqrestore' expected different context
include/linux/spinlock.h:340:2:    context 'lock': wanted >= 1, got 0
arch/arm/mach-omap2/powerdomain.c:1130:14: warning: context problem in
'pwrdm_state_switch': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1130:14:    default context: wanted >=
1, got 0
arch/arm/mach-omap2/powerdomain.c:1295:14: warning: context problem in
'pwrdm_set_next_fpwrst': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1295:14:    default context: wanted >=
1, got 0
arch/arm/mach-omap2/powerdomain.c:1317:14: warning: context problem in
'pwrdm_read_next_fpwrst': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1317:14:    default context: wanted >=
1, got 0
arch/arm/mach-omap2/powerdomain.c:1382:14: warning: context problem in
'pwrdm_set_fpwrst': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1382:14:    default context: wanted >=
1, got 0
arch/arm/mach-omap2/powerdomain.c:1407:14: warning: context problem in
'pwrdm_read_fpwrst': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1407:14:    default context: wanted >=
1, got 0
arch/arm/mach-omap2/powerdomain.c:1432:14: warning: context problem in
'pwrdm_read_prev_fpwrst': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1432:14:    default context: wanted >=
1, got 0
arch/arm/mach-omap2/powerdomain.c:1505:14: warning: context problem in
'pwrdm_dbg_show_counter': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1505:14:    default context: wanted >=
1, got 0
arch/arm/mach-omap2/powerdomain.c:1542:14: warning: context problem in
'pwrdm_dbg_show_timer': 'pwrdm_unlock' expected different context
arch/arm/mach-omap2/powerdomain.c:1542:14:    default context: wanted >=
1, got 0
  CC      arch/arm/mach-omap2/powerdomain.o



On the other hand, I have boot tested it on BeagleBone platform.

Thanks,
Vaibhav

On Wed, 12 Dec 2012, Vaibhav Hiremath wrote:

I am using your "paul-linux-pwrdm_post_fpwrst_devel_a_3.9" branch, where
all the patches which you have posted are present (I believe so) and I
am getting following sparse warning -

The branch name to use is:

"TEST_pwrdm_post_fpwrst_devel_a_3.9"


- Paul

On Thu, Dec 13, 2012 at 11:11:49, Paul Walmsley wrote:

On Wed, 12 Dec 2012, Vaibhav Hiremath wrote:

quoted

I am using your "paul-linux-pwrdm_post_fpwrst_devel_a_3.9" branch, where
all the patches which you have posted are present (I believe so) and I
am getting following sparse warning -

The branch name to use is:

"TEST_pwrdm_post_fpwrst_devel_a_3.9"

If I am correct, it only includes one additional patch (merge commit), 
right???

commit d94831e0005fee743cefd28f4c20b7c435c71236
Merge: 3e885c6 80ab3b2
Author: Paul Walmsley [off-list ref]
Date:   Sun Dec 9 13:06:51 2012 -0700

    build fixes



Does this also fix sparse warnings? 

Thanks,
Vaibhav

- Paul

On Thu, 13 Dec 2012, Hiremath, Vaibhav wrote:

On Thu, Dec 13, 2012 at 11:11:49, Paul Walmsley wrote:

quoted

The branch name to use is:

"TEST_pwrdm_post_fpwrst_devel_a_3.9"

If I am correct, it only includes one additional patch (merge commit), 
right???

commit d94831e0005fee743cefd28f4c20b7c435c71236
Merge: 3e885c6 80ab3b2
Author: Paul Walmsley [off-list ref]
Date:   Sun Dec 9 13:06:51 2012 -0700

    build fixes



Does this also fix sparse warnings? 

Just ran a quick sparse check on mach-omap2 at 3e885c6 and d94831e with 
'make -j4 C=2 arch/arm/mach-omap2', and no warnings showed up.  There were 
some sparse issues that got fixed at an earlier point, though, so perhaps 
you have an older copy of the branches somehow?


- Paul

paul at dusk:/kernel/kernel/current$ git log -1
commit d94831e0005fee743cefd28f4c20b7c435c71236
Merge: 3e885c6 80ab3b2
Author: Paul Walmsley [off-list ref]
Date:   Sun Dec 9 13:06:51 2012 -0700

    build fixes
paul at dusk:/kernel/kernel/current$ make C=2 -j4 arch/arm/mach-omap2/
  CHK     include/generated/uapi/linux/version.h
  CHECK   scripts/mod/empty.c
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date.
  CC      kernel/bounds.s
  GEN     include/generated/bounds.h
  CC      arch/arm/kernel/asm-offsets.s
  GEN     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CHECK   arch/arm/mach-omap2/id.c
  CHECK   arch/arm/mach-omap2/io.c
  CHECK   arch/arm/mach-omap2/control.c
  CHECK   arch/arm/mach-omap2/mux.c
  CC      arch/arm/mach-omap2/id.o
  CC      arch/arm/mach-omap2/control.o
  CC      arch/arm/mach-omap2/io.o
  CC      arch/arm/mach-omap2/mux.o
  CHECK   arch/arm/mach-omap2/devices.c
  CHECK   arch/arm/mach-omap2/serial.c
  CHECK   arch/arm/mach-omap2/gpmc.c
  CC      arch/arm/mach-omap2/devices.o
  CC      arch/arm/mach-omap2/serial.o
  CC      arch/arm/mach-omap2/gpmc.o
  CHECK   arch/arm/mach-omap2/timer.c
  CHECK   arch/arm/mach-omap2/pm.c
  CC      arch/arm/mach-omap2/timer.o
  CC      arch/arm/mach-omap2/pm.o
  CHECK   arch/arm/mach-omap2/common.c
  CC      arch/arm/mach-omap2/common.o
  CHECK   arch/arm/mach-omap2/gpio.c
  CC      arch/arm/mach-omap2/gpio.o
  CHECK   arch/arm/mach-omap2/dma.c
  CC      arch/arm/mach-omap2/dma.o
  CHECK   arch/arm/mach-omap2/wd_timer.c
  CHECK   arch/arm/mach-omap2/display.c
  CHECK   arch/arm/mach-omap2/i2c.c
  CC      arch/arm/mach-omap2/wd_timer.o
  CC      arch/arm/mach-omap2/i2c.o
  CC      arch/arm/mach-omap2/display.o
  CHECK   arch/arm/mach-omap2/hdq1w.c
  CC      arch/arm/mach-omap2/hdq1w.o
  CHECK   arch/arm/mach-omap2/omap_hwmod.c
  CHECK   arch/arm/mach-omap2/omap_device.c
  CC      arch/arm/mach-omap2/omap_hwmod.o
  CC      arch/arm/mach-omap2/omap_device.o
  CHECK   arch/arm/mach-omap2/irq.c
  CHECK   arch/arm/mach-omap2/omap_hwmod_common_data.c
  CC      arch/arm/mach-omap2/irq.o
  CC      arch/arm/mach-omap2/omap_hwmod_common_data.o
  CHECK   arch/arm/mach-omap2/omap-secure.c
  CC      arch/arm/mach-omap2/omap-secure.o
  CHECK   arch/arm/mach-omap2/prm44xx.c
  CHECK   arch/arm/mach-omap2/mcbsp.c
  CC      arch/arm/mach-omap2/prm44xx.o
  CC      arch/arm/mach-omap2/mcbsp.o
  CHECK   arch/arm/mach-omap2/omap_twl.c
  CC      arch/arm/mach-omap2/omap_twl.o
  CHECK   arch/arm/mach-omap2/sdrc.c
  CC      arch/arm/mach-omap2/sdrc.o
  CHECK   arch/arm/mach-omap2/omap-smp.c
  CHECK   arch/arm/mach-omap2/omap-hotplug.c
  CC      arch/arm/mach-omap2/omap-smp.o
  CC      arch/arm/mach-omap2/omap-hotplug.o
  CHECK   arch/arm/mach-omap2/omap4-common.c
  CC      arch/arm/mach-omap2/omap4-common.o
  CHECK   arch/arm/mach-omap2/omap-wakeupgen.c
  AS      arch/arm/mach-omap2/sram242x.o
  AS      arch/arm/mach-omap2/sram243x.o
  CC      arch/arm/mach-omap2/omap-wakeupgen.o
  AS      arch/arm/mach-omap2/sram34xx.o
  CHECK   arch/arm/mach-omap2/omap2-restart.c
  CHECK   arch/arm/mach-omap2/omap3-restart.c
  CC      arch/arm/mach-omap2/omap2-restart.o
  CC      arch/arm/mach-omap2/omap3-restart.o
  CHECK   arch/arm/mach-omap2/mux2420.c
  CC      arch/arm/mach-omap2/mux2420.o
  CHECK   arch/arm/mach-omap2/mux2430.c
  CHECK   arch/arm/mach-omap2/mux34xx.c
  CHECK   arch/arm/mach-omap2/mux44xx.c
  CC      arch/arm/mach-omap2/mux2430.o
  CC      arch/arm/mach-omap2/mux34xx.o
  CC      arch/arm/mach-omap2/mux44xx.o
  CHECK   arch/arm/mach-omap2/sdrc2xxx.c
  CHECK   arch/arm/mach-omap2/opp.c
  CC      arch/arm/mach-omap2/sdrc2xxx.o
  CC      arch/arm/mach-omap2/opp.o
  CHECK   arch/arm/mach-omap2/opp3xxx_data.c
  CHECK   arch/arm/mach-omap2/opp4xxx_data.c
  CC      arch/arm/mach-omap2/opp3xxx_data.o
  CC      arch/arm/mach-omap2/opp4xxx_data.o
  CHECK   arch/arm/mach-omap2/pm24xx.c
  AS      arch/arm/mach-omap2/sleep24xx.o
  CHECK   arch/arm/mach-omap2/pm34xx.c
  AS      arch/arm/mach-omap2/sleep34xx.o
  CHECK   arch/arm/mach-omap2/pm44xx.c
  CC      arch/arm/mach-omap2/pm24xx.o
  CHECK   arch/arm/mach-omap2/omap-mpuss-lowpower.c
  CC      arch/arm/mach-omap2/pm34xx.o
  CC      arch/arm/mach-omap2/pm44xx.o
  CC      arch/arm/mach-omap2/omap-mpuss-lowpower.o
  CHECK   arch/arm/mach-omap2/pm-debug.c
  CHECK   arch/arm/mach-omap2/prm_common.c
  CC      arch/arm/mach-omap2/pm-debug.o
  CHECK   arch/arm/mach-omap2/cm_common.c
  CC      arch/arm/mach-omap2/prm_common.o
  CC      arch/arm/mach-omap2/cm_common.o
  CHECK   arch/arm/mach-omap2/prm2xxx_3xxx.c
  CC      arch/arm/mach-omap2/prm2xxx_3xxx.o
  CHECK   arch/arm/mach-omap2/prm2xxx.c
  CHECK   arch/arm/mach-omap2/cm2xxx.c
  CC      arch/arm/mach-omap2/prm2xxx.o
  CC      arch/arm/mach-omap2/cm2xxx.o
  CHECK   arch/arm/mach-omap2/prm3xxx.c
  CC      arch/arm/mach-omap2/prm3xxx.o
  CHECK   arch/arm/mach-omap2/cm3xxx.c
  CC      arch/arm/mach-omap2/cm3xxx.o
  CHECK   arch/arm/mach-omap2/vc3xxx_data.c
  CHECK   arch/arm/mach-omap2/vp3xxx_data.c
  CC      arch/arm/mach-omap2/vc3xxx_data.o
  CC      arch/arm/mach-omap2/vp3xxx_data.o
  CHECK   arch/arm/mach-omap2/prm33xx.c
  CC      arch/arm/mach-omap2/prm33xx.o
  CHECK   arch/arm/mach-omap2/cm33xx.c
  CHECK   arch/arm/mach-omap2/cminst44xx.c
  CC      arch/arm/mach-omap2/cm33xx.o
  CC      arch/arm/mach-omap2/cminst44xx.o
  CHECK   arch/arm/mach-omap2/cm44xx.c
  CC      arch/arm/mach-omap2/cm44xx.o
  CHECK   arch/arm/mach-omap2/prcm_mpu44xx.c
  CC      arch/arm/mach-omap2/prcm_mpu44xx.o
  CHECK   arch/arm/mach-omap2/prminst44xx.c
  CHECK   arch/arm/mach-omap2/vc44xx_data.c
  CC      arch/arm/mach-omap2/prminst44xx.o
  CHECK   arch/arm/mach-omap2/vp44xx_data.c
  CC      arch/arm/mach-omap2/vc44xx_data.o
  CHECK   arch/arm/mach-omap2/voltage.c
  CC      arch/arm/mach-omap2/vp44xx_data.o
  CC      arch/arm/mach-omap2/voltage.o
  CHECK   arch/arm/mach-omap2/vc.c
  CC      arch/arm/mach-omap2/vc.o
  CHECK   arch/arm/mach-omap2/vp.c
  CHECK   arch/arm/mach-omap2/voltagedomains2xxx_data.c
  CC      arch/arm/mach-omap2/voltagedomains2xxx_data.o
  CC      arch/arm/mach-omap2/vp.o
  CHECK   arch/arm/mach-omap2/voltagedomains3xxx_data.c
  CC      arch/arm/mach-omap2/voltagedomains3xxx_data.o
  CHECK   arch/arm/mach-omap2/voltagedomains44xx_data.c
  CHECK   arch/arm/mach-omap2/voltagedomains33xx_data.c
  CC      arch/arm/mach-omap2/voltagedomains33xx_data.o
  CC      arch/arm/mach-omap2/voltagedomains44xx_data.o
  CHECK   arch/arm/mach-omap2/powerdomain.c
  CC      arch/arm/mach-omap2/powerdomain.o
  CHECK   arch/arm/mach-omap2/powerdomain-common.c
  CC      arch/arm/mach-omap2/powerdomain-common.o
  CHECK   arch/arm/mach-omap2/powerdomains2xxx_data.c
  CC      arch/arm/mach-omap2/powerdomains2xxx_data.o
  CHECK   arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
  CC      arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.o
  CHECK   arch/arm/mach-omap2/powerdomains3xxx_data.c
  CHECK   arch/arm/mach-omap2/powerdomains44xx_data.c
  CC      arch/arm/mach-omap2/powerdomains3xxx_data.o
  CHECK   arch/arm/mach-omap2/powerdomains33xx_data.c
  CC      arch/arm/mach-omap2/powerdomains33xx_data.o
  CC      arch/arm/mach-omap2/powerdomains44xx_data.o
  CHECK   arch/arm/mach-omap2/clockdomain.c
  CC      arch/arm/mach-omap2/clockdomain.o
  CHECK   arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
  CC      arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.o
  CHECK   arch/arm/mach-omap2/clockdomains2420_data.c
  CHECK   arch/arm/mach-omap2/clockdomains2430_data.c
  CC      arch/arm/mach-omap2/clockdomains2420_data.o
  CC      arch/arm/mach-omap2/clockdomains2430_data.o
  CHECK   arch/arm/mach-omap2/clockdomains3xxx_data.c
  CHECK   arch/arm/mach-omap2/clockdomains44xx_data.c
  CC      arch/arm/mach-omap2/clockdomains3xxx_data.o
  CHECK   arch/arm/mach-omap2/clockdomains33xx_data.c
  CC      arch/arm/mach-omap2/clockdomains44xx_data.o
  CC      arch/arm/mach-omap2/clockdomains33xx_data.o
  CHECK   arch/arm/mach-omap2/clock.c
  CHECK   arch/arm/mach-omap2/clock_common_data.c
  CC      arch/arm/mach-omap2/clock_common_data.o
  CC      arch/arm/mach-omap2/clock.o
  CHECK   arch/arm/mach-omap2/clkt_dpll.c
  CHECK   arch/arm/mach-omap2/clkt_clksel.c
  CC      arch/arm/mach-omap2/clkt_dpll.o
  CHECK   arch/arm/mach-omap2/clock2xxx.c
  CC      arch/arm/mach-omap2/clkt_clksel.o
  CC      arch/arm/mach-omap2/clock2xxx.o
  CHECK   arch/arm/mach-omap2/clkt2xxx_sys.c
  CC      arch/arm/mach-omap2/clkt2xxx_sys.o
  CHECK   arch/arm/mach-omap2/clkt2xxx_dpllcore.c
  CC      arch/arm/mach-omap2/clkt2xxx_dpllcore.o
  CHECK   arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
  CC      arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.o
  CHECK   arch/arm/mach-omap2/clkt2xxx_apll.c
  CC      arch/arm/mach-omap2/clkt2xxx_apll.o
  CHECK   arch/arm/mach-omap2/clkt2xxx_osc.c
  CC      arch/arm/mach-omap2/clkt2xxx_osc.o
  CHECK   arch/arm/mach-omap2/clkt2xxx_dpll.c
  CC      arch/arm/mach-omap2/clkt2xxx_dpll.o
  CHECK   arch/arm/mach-omap2/clkt_iclk.c
  CC      arch/arm/mach-omap2/clkt_iclk.o
  CHECK   arch/arm/mach-omap2/clock2420_data.c
  CHECK   arch/arm/mach-omap2/clock2430.c
  CHECK   arch/arm/mach-omap2/clock2430_data.c
  CC      arch/arm/mach-omap2/clock2430.o
  CC      arch/arm/mach-omap2/clock2420_data.o
  CC      arch/arm/mach-omap2/clock2430_data.o
  CHECK   arch/arm/mach-omap2/clock3xxx.c
  CC      arch/arm/mach-omap2/clock3xxx.o
  CHECK   arch/arm/mach-omap2/clock34xx.c
  CC      arch/arm/mach-omap2/clock34xx.o
  CHECK   arch/arm/mach-omap2/clkt34xx_dpll3m2.c
  CHECK   arch/arm/mach-omap2/clock3517.c
  CHECK   arch/arm/mach-omap2/clock36xx.c
  CC      arch/arm/mach-omap2/clock3517.o
  CC      arch/arm/mach-omap2/clkt34xx_dpll3m2.o
  CC      arch/arm/mach-omap2/clock36xx.o
  CHECK   arch/arm/mach-omap2/dpll3xxx.c
  CC      arch/arm/mach-omap2/dpll3xxx.o
  CHECK   arch/arm/mach-omap2/clock3xxx_data.c
  CHECK   arch/arm/mach-omap2/clock44xx_data.c
  CHECK   arch/arm/mach-omap2/dpll44xx.c
  CC      arch/arm/mach-omap2/clock3xxx_data.o
  CC      arch/arm/mach-omap2/dpll44xx.o
  CC      arch/arm/mach-omap2/clock44xx_data.o
  CHECK   arch/arm/mach-omap2/clock33xx_data.c
  CHECK   arch/arm/mach-omap2/opp2420_data.c
  CC      arch/arm/mach-omap2/opp2420_data.o
  CHECK   arch/arm/mach-omap2/opp2430_data.c
  CHECK   arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
  CC      arch/arm/mach-omap2/clock33xx_data.o
  CC      arch/arm/mach-omap2/opp2430_data.o
  CHECK   arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
  CC      arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.o
  CC      arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.o
  CHECK   arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
  CC      arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.o
  CHECK   arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
  CHECK   arch/arm/mach-omap2/omap_hwmod_2420_data.c
  CHECK   arch/arm/mach-omap2/omap_hwmod_2430_data.c
  CC      arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.o
  CC      arch/arm/mach-omap2/omap_hwmod_2420_data.o
  CC      arch/arm/mach-omap2/omap_hwmod_2430_data.o
  CHECK   arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
  CC      arch/arm/mach-omap2/omap_hwmod_3xxx_data.o
  CHECK   arch/arm/mach-omap2/omap_hwmod_33xx_data.c
  CHECK   arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  CHECK   arch/arm/mach-omap2/pmu.c
  CC      arch/arm/mach-omap2/omap_hwmod_33xx_data.o
  CC      arch/arm/mach-omap2/omap_hwmod_44xx_data.o
  CC      arch/arm/mach-omap2/pmu.o
  CHECK   arch/arm/mach-omap2/msdi.c
  CC      arch/arm/mach-omap2/msdi.o
  CHECK   arch/arm/mach-omap2/board-generic.c
  CHECK   arch/arm/mach-omap2/board-h4.c
  CC      arch/arm/mach-omap2/board-generic.o
  CHECK   arch/arm/mach-omap2/board-2430sdp.c
  CC      arch/arm/mach-omap2/board-h4.o
  CC      arch/arm/mach-omap2/board-2430sdp.o
  CHECK   arch/arm/mach-omap2/board-apollon.c
  CHECK   arch/arm/mach-omap2/board-omap3beagle.c
  CC      arch/arm/mach-omap2/board-apollon.o
  CC      arch/arm/mach-omap2/board-omap3beagle.o
  CHECK   arch/arm/mach-omap2/board-devkit8000.c
  CC      arch/arm/mach-omap2/board-devkit8000.o
  CHECK   arch/arm/mach-omap2/board-ldp.c
  CHECK   arch/arm/mach-omap2/board-omap3logic.c
  CC      arch/arm/mach-omap2/board-ldp.o
  CC      arch/arm/mach-omap2/board-omap3logic.o
  CHECK   arch/arm/mach-omap2/board-overo.c
  CC      arch/arm/mach-omap2/board-overo.o
  CHECK   arch/arm/mach-omap2/board-omap3evm.c
  CC      arch/arm/mach-omap2/board-omap3evm.o
  CHECK   arch/arm/mach-omap2/board-omap3pandora.c
  CHECK   arch/arm/mach-omap2/board-3430sdp.c
  CC      arch/arm/mach-omap2/board-omap3pandora.o
  CC      arch/arm/mach-omap2/board-3430sdp.o
  CHECK   arch/arm/mach-omap2/board-n8x0.c
  CC      arch/arm/mach-omap2/board-n8x0.o
  CHECK   arch/arm/mach-omap2/board-rm680.c
  CC      arch/arm/mach-omap2/board-rm680.o
  CHECK   arch/arm/mach-omap2/sdram-nokia.c
  CHECK   arch/arm/mach-omap2/board-rx51.c
  CC      arch/arm/mach-omap2/sdram-nokia.o
  CC      arch/arm/mach-omap2/board-rx51.o
  CHECK   arch/arm/mach-omap2/board-rx51-peripherals.c
  CC      arch/arm/mach-omap2/board-rx51-peripherals.o
  CHECK   arch/arm/mach-omap2/board-rx51-video.c
  CC      arch/arm/mach-omap2/board-rx51-video.o
  CHECK   arch/arm/mach-omap2/board-zoom-peripherals.c
  CHECK   arch/arm/mach-omap2/board-zoom.c
  CC      arch/arm/mach-omap2/board-zoom.o
  CC      arch/arm/mach-omap2/board-zoom-peripherals.o
  CHECK   arch/arm/mach-omap2/board-zoom-display.c
  CHECK   arch/arm/mach-omap2/board-zoom-debugboard.c
  CC      arch/arm/mach-omap2/board-zoom-display.o
  CC      arch/arm/mach-omap2/board-zoom-debugboard.o
  CHECK   arch/arm/mach-omap2/board-3630sdp.c
  CHECK   arch/arm/mach-omap2/board-cm-t35.c
  CC      arch/arm/mach-omap2/board-3630sdp.o
  CHECK   arch/arm/mach-omap2/board-cm-t3517.c
  CC      arch/arm/mach-omap2/board-cm-t35.o
  CC      arch/arm/mach-omap2/board-cm-t3517.o
  CHECK   arch/arm/mach-omap2/board-igep0020.c
  CHECK   arch/arm/mach-omap2/board-omap3touchbook.c
  CC      arch/arm/mach-omap2/board-igep0020.o
  CC      arch/arm/mach-omap2/board-omap3touchbook.o
  CHECK   arch/arm/mach-omap2/board-4430sdp.c
  CHECK   arch/arm/mach-omap2/board-omap4panda.c
  CC      arch/arm/mach-omap2/board-4430sdp.o
  CC      arch/arm/mach-omap2/board-omap4panda.o
  CHECK   arch/arm/mach-omap2/board-am3517evm.c
  CHECK   arch/arm/mach-omap2/board-omap3stalker.c
  CC      arch/arm/mach-omap2/board-am3517evm.o
  CC      arch/arm/mach-omap2/board-omap3stalker.o
  CHECK   arch/arm/mach-omap2/board-ti8168evm.c
  CC      arch/arm/mach-omap2/board-ti8168evm.o
  CHECK   arch/arm/mach-omap2/board-flash.c
  CC      arch/arm/mach-omap2/board-flash.o
  CHECK   arch/arm/mach-omap2/hsmmc.c
  CHECK   arch/arm/mach-omap2/usb-musb.c
  CC      arch/arm/mach-omap2/hsmmc.o
  CHECK   arch/arm/mach-omap2/omap_phy_internal.c
  CC      arch/arm/mach-omap2/usb-musb.o
  CC      arch/arm/mach-omap2/omap_phy_internal.o
  CHECK   arch/arm/mach-omap2/usb-tusb6010.c
  CHECK   arch/arm/mach-omap2/usb-host.c
  CC      arch/arm/mach-omap2/usb-tusb6010.o
  CC      arch/arm/mach-omap2/usb-host.o
  CHECK   arch/arm/mach-omap2/gpmc-onenand.c
  CC      arch/arm/mach-omap2/gpmc-onenand.o
  CHECK   arch/arm/mach-omap2/gpmc-nand.c
  CHECK   arch/arm/mach-omap2/gpmc-smc91x.c
  CC      arch/arm/mach-omap2/gpmc-smc91x.o
  CC      arch/arm/mach-omap2/gpmc-nand.o
  CHECK   arch/arm/mach-omap2/gpmc-smsc911x.c
  CC      arch/arm/mach-omap2/gpmc-smsc911x.o
  CHECK   arch/arm/mach-omap2/common-board-devices.c
  CHECK   arch/arm/mach-omap2/twl-common.c
  CC      arch/arm/mach-omap2/common-board-devices.o
  CC      arch/arm/mach-omap2/twl-common.o
  LD      arch/arm/mach-omap2/built-in.o
paul at dusk:/kernel/kernel/current$ 

On Thu, Dec 13, 2012 at 12:59:49, Paul Walmsley wrote:

On Thu, 13 Dec 2012, Hiremath, Vaibhav wrote:

quoted

On Thu, Dec 13, 2012 at 11:11:49, Paul Walmsley wrote:

quoted

The branch name to use is:

"TEST_pwrdm_post_fpwrst_devel_a_3.9"

If I am correct, it only includes one additional patch (merge commit), 
right???

commit d94831e0005fee743cefd28f4c20b7c435c71236
Merge: 3e885c6 80ab3b2
Author: Paul Walmsley [off-list ref]
Date:   Sun Dec 9 13:06:51 2012 -0700

    build fixes



Does this also fix sparse warnings? 

Just ran a quick sparse check on mach-omap2 at 3e885c6 and d94831e with 
'make -j4 C=2 arch/arm/mach-omap2', and no warnings showed up.  There were 
some sparse issues that got fixed at an earlier point, though, so perhaps 
you have an older copy of the branches somehow?

Ignore my earlier comment on sparse warning, it was my wrong sparse tool 
which was culprit here. I am working on remote server, which has sparse 
present inside /usr/bin, and somehow my default config using that one 
instead of what I was building.

I fixed this by changing the PATH, and now I do not see any issues/warnings.

Thanks,
Vaibhav

On Sunday 09 December 2012 02:23 AM, Paul Walmsley wrote:

Fix the following sparse warnings in the OMAP3/4 CPUIdle code:

arch/arm/mach-omap2/cpuidle34xx.c:272:1: warning: symbol 'omap3_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle34xx.c:274:23: warning: symbol 'omap3_idle_driver' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:164:1: warning: symbol 'omap4_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:166:23: warning: symbol 'omap4_idle_driver' was not declared. Should it be static?

Also fix the following checkpatch warnings:

WARNING: please, no space before tabs
#44: FILE: arch/arm/mach-omap2/cpuidle34xx.c:105:
+^I.name = ^I"omap3_idle",$

WARNING: please, no space before tabs
#45: FILE: arch/arm/mach-omap2/cpuidle34xx.c:106:
+^I.owner = ^ITHIS_MODULE,$

ERROR: code indent should use tabs where possible
#211: FILE: arch/arm/mach-omap2/cpuidle44xx.c:74:
+                        /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */$


Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <redacted>
---

Acked-by: Santosh Shilimkar at ti.com

Don't attempt to put clockdomains to sleep; this should be handled by the
clock framework.  It should be enough to program the next-power-state,
and then let the code in omap_pm_clkdms_setup() deal with the rest.

Start out by programming the MPU and CORE powerdomains to stay ON.
Then control the MPU and CORE powerdomain states directly in
omap2_enter_full_retention() and omap2_enter_mpu_retention().  Not the
most optimal way to do it, but certainly is the most conservative until
OMAP2xxx PM is working again.

Get rid of the open-coded PM_PWSTCTRL_MPU writes in
omap2_enter_mpu_retention(); use the powerdomain code instead.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <redacted>
---
 arch/arm/mach-omap2/pm24xx.c |   30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 83815dd..4c06d8a 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c

@@ -89,11 +89,7 @@ static int omap2_enter_full_retention(void)
 	omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP24XX_PM_WKST2);
 	omap2_prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST);
 
-	/*
-	 * Set MPU powerdomain's next power state to RETENTION;
-	 * preserve logic state during retention
-	 */
-	pwrdm_set_logic_retst(mpu_pwrdm, PWRDM_POWER_RET);
+	pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_RET);
 	pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET);
 
 	/* Workaround to kill USB */

@@ -136,6 +132,9 @@ no_sleep:
 	/* Mask future PRCM-to-MPU interrupts */
 	omap2_prm_write_mod_reg(0x0, OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
 
+	pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
+	pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_ON);
+
 	return 0;
 }
 

@@ -185,17 +184,16 @@ static void omap2_enter_mpu_retention(void)
 		omap2_prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST);
 
 		/* Try to enter MPU retention */
-		omap2_prm_write_mod_reg((0x01 << OMAP_POWERSTATE_SHIFT) |
-				  OMAP_LOGICRETSTATE_MASK,
-				  MPU_MOD, OMAP2_PM_PWSTCTRL);
+		pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET);
+
 	} else {
 		/* Block MPU retention */
-
-		omap2_prm_write_mod_reg(OMAP_LOGICRETSTATE_MASK, MPU_MOD,
-						 OMAP2_PM_PWSTCTRL);
+		pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
 	}
 
 	omap2_sram_idle();
+
+	pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
 }
 
 static int omap2_can_sleep(void)

@@ -250,25 +248,17 @@ static void __init prcm_setup_regs(void)
 	for (i = 0; i < num_mem_banks; i++)
 		pwrdm_set_mem_retst(core_pwrdm, i, PWRDM_POWER_RET);
 
-	/* Set CORE powerdomain's next power state to RETENTION */
-	pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_RET);
+	pwrdm_set_logic_retst(core_pwrdm, PWRDM_POWER_RET);
 
-	/*
-	 * Set MPU powerdomain's next power state to RETENTION;
-	 * preserve logic state during retention
-	 */
 	pwrdm_set_logic_retst(mpu_pwrdm, PWRDM_POWER_RET);
-	pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET);
 
 	/* Force-power down DSP, GFX powerdomains */
 
 	pwrdm = clkdm_get_pwrdm(dsp_clkdm);
 	pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_OFF);
-	clkdm_sleep(dsp_clkdm);
 
 	pwrdm = clkdm_get_pwrdm(gfx_clkdm);
 	pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_OFF);
-	clkdm_sleep(gfx_clkdm);
 
 	/* Enable hardware-supervised idle for all clkdms */
 	clkdm_for_each(omap_pm_clkdms_setup, NULL);

Drop an unnecessary pwrdm_wait_transition() from mach-omap2/pm.c -
it's called by the subsequent pwrdm_state_switch().

Also get rid of pwrdm_wait_transition() in the powerdomain code - there's
no longer any need to export this function.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <redacted>
---
 arch/arm/mach-omap2/pm.c          |    1 -
 arch/arm/mach-omap2/powerdomain.c |   30 +++++-------------------------
 arch/arm/mach-omap2/powerdomain.h |    2 --
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 331478f..cc8ed0f 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c

@@ -139,7 +139,6 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 pwrst)
 		break;
 	case LOWPOWERSTATE_SWITCH:
 		pwrdm_set_lowpwrstchange(pwrdm);
-		pwrdm_wait_transition(pwrdm);
 		pwrdm_state_switch(pwrdm);
 		break;
 	}

diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 92388c0..97b3881 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c

@@ -112,7 +112,7 @@ static int _pwrdm_register(struct powerdomain *pwrdm)
 	for (i = 0; i < pwrdm->banks; i++)
 		pwrdm->ret_mem_off_counter[i] = 0;
 
-	pwrdm_wait_transition(pwrdm);
+	arch_pwrdm->pwrdm_wait_transition(pwrdm);
 	pwrdm->state = pwrdm_read_pwrst(pwrdm);
 	pwrdm->state_counter[pwrdm->state] = 1;
 

@@ -950,34 +950,14 @@ int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)
 	return ret;
 }
 
-/**
- * pwrdm_wait_transition - wait for powerdomain power transition to finish
- * @pwrdm: struct powerdomain * to wait for
- *
- * If the powerdomain @pwrdm is in the process of a state transition,
- * spin until it completes the power transition, or until an iteration
- * bailout value is reached. Returns -EINVAL if the powerdomain
- * pointer is null, -EAGAIN if the bailout value was reached, or
- * returns 0 upon success.
- */
-int pwrdm_wait_transition(struct powerdomain *pwrdm)
-{
-	int ret = -EINVAL;
-
-	if (!pwrdm)
-		return -EINVAL;
-
-	if (arch_pwrdm && arch_pwrdm->pwrdm_wait_transition)
-		ret = arch_pwrdm->pwrdm_wait_transition(pwrdm);
-
-	return ret;
-}
-
 int pwrdm_state_switch(struct powerdomain *pwrdm)
 {
 	int ret;
 
-	ret = pwrdm_wait_transition(pwrdm);
+	if (!pwrdm || !arch_pwrdm)
+		return -EINVAL;
+
+	ret = arch_pwrdm->pwrdm_wait_transition(pwrdm);
 	if (!ret)
 		ret = _pwrdm_state_switch(pwrdm, PWRDM_STATE_NOW);
 

diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h
index 5277d56eb..7c1534b 100644
--- a/arch/arm/mach-omap2/powerdomain.h
+++ b/arch/arm/mach-omap2/powerdomain.h

@@ -225,8 +225,6 @@ int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm);
 int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm);
 bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm);
 
-int pwrdm_wait_transition(struct powerdomain *pwrdm);
-
 int pwrdm_state_switch(struct powerdomain *pwrdm);
 int pwrdm_pre_transition(struct powerdomain *pwrdm);
 int pwrdm_post_transition(struct powerdomain *pwrdm);

Move omap_set_pwrdm_state() from the PM code to the powerdomain code,
and refactor it to split it up into several functions.  A subsequent patch
will rename it to conform with the existing powerdomain function names.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jean Pihet <redacted>
Cc: Kevin Hilman <redacted>
---
 arch/arm/mach-omap2/pm.c          |   61 --------------------
 arch/arm/mach-omap2/pm.h          |    1 
 arch/arm/mach-omap2/powerdomain.c |  112 +++++++++++++++++++++++++++----------
 arch/arm/mach-omap2/powerdomain.h |    3 +
 4 files changed, 85 insertions(+), 92 deletions(-)

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index cc8ed0f..2e2a897 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c

@@ -76,10 +76,6 @@ static void __init omap2_init_processor_devices(void)
 	}
 }
 
-/* Types of sleep_switch used in omap_set_pwrdm_state */
-#define FORCEWAKEUP_SWITCH	0
-#define LOWPOWERSTATE_SWITCH	1
-
 int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused)
 {
 	if ((clkdm->flags & CLKDM_CAN_ENABLE_AUTO) &&

@@ -92,63 +88,6 @@ int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused)
 }
 
 /*
- * This sets pwrdm state (other than mpu & core. Currently only ON &
- * RET are supported.
- */
-int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 pwrst)
-{
-	u8 curr_pwrst, next_pwrst;
-	int sleep_switch = -1, ret = 0, hwsup = 0;
-
-	if (!pwrdm || IS_ERR(pwrdm))
-		return -EINVAL;
-
-	while (!(pwrdm->pwrsts & (1 << pwrst))) {
-		if (pwrst == PWRDM_POWER_OFF)
-			return ret;
-		pwrst--;
-	}
-
-	next_pwrst = pwrdm_read_next_pwrst(pwrdm);
-	if (next_pwrst == pwrst)
-		return ret;
-
-	curr_pwrst = pwrdm_read_pwrst(pwrdm);
-	if (curr_pwrst < PWRDM_POWER_ON) {
-		if ((curr_pwrst > pwrst) &&
-			(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) {
-			sleep_switch = LOWPOWERSTATE_SWITCH;
-		} else {
-			hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
-			clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
-			sleep_switch = FORCEWAKEUP_SWITCH;
-		}
-	}
-
-	ret = pwrdm_set_next_pwrst(pwrdm, pwrst);
-	if (ret)
-		pr_err("%s: unable to set power state of powerdomain: %s\n",
-		       __func__, pwrdm->name);
-
-	switch (sleep_switch) {
-	case FORCEWAKEUP_SWITCH:
-		if (hwsup)
-			clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
-		else
-			clkdm_sleep(pwrdm->pwrdm_clkdms[0]);
-		break;
-	case LOWPOWERSTATE_SWITCH:
-		pwrdm_set_lowpwrstchange(pwrdm);
-		pwrdm_state_switch(pwrdm);
-		break;
-	}
-
-	return ret;
-}
-
-
-
-/*
  * This API is to be called during init to set the various voltage
  * domains to the voltage as per the opp table. Typically we boot up
  * at the nominal voltage. So this function finds out the rate of

diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 686137d..707e9cb 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h

@@ -33,7 +33,6 @@ static inline int omap4_idle_init(void)
 extern void *omap3_secure_ram_storage;
 extern void omap3_pm_off_mode_enable(int);
 extern void omap_sram_idle(void);
-extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
 extern int omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused);
 extern int (*omap_pm_suspend)(void);
 

diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 97b3881..05f00660 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c

@@ -921,35 +921,6 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm)
 	return (pwrdm && pwrdm->flags & PWRDM_HAS_HDWR_SAR) ? 1 : 0;
 }
 
-/**
- * pwrdm_set_lowpwrstchange - Request a low power state change
- * @pwrdm: struct powerdomain *
- *
- * Allows a powerdomain to transtion to a lower power sleep state
- * from an existing sleep state without waking up the powerdomain.
- * Returns -EINVAL if the powerdomain pointer is null or if the
- * powerdomain does not support LOWPOWERSTATECHANGE, or returns 0
- * upon success.
- */
-int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)
-{
-	int ret = -EINVAL;
-
-	if (!pwrdm)
-		return -EINVAL;
-
-	if (!(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE))
-		return -EINVAL;
-
-	pr_debug("powerdomain: %s: setting LOWPOWERSTATECHANGE bit\n",
-		 pwrdm->name);
-
-	if (arch_pwrdm && arch_pwrdm->pwrdm_set_lowpwrstchange)
-		ret = arch_pwrdm->pwrdm_set_lowpwrstchange(pwrdm);
-
-	return ret;
-}
-
 int pwrdm_state_switch(struct powerdomain *pwrdm)
 {
 	int ret;

@@ -984,6 +955,89 @@ int pwrdm_post_transition(struct powerdomain *pwrdm)
 	return 0;
 }
 
+/* Types of sleep_switch used in omap_set_pwrdm_state */
+#define ALREADYACTIVE_SWITCH	0
+#define FORCEWAKEUP_SWITCH	1
+#define LOWPOWERSTATE_SWITCH	2
+
+static u8 _pwrdm_save_clkdm_state_and_activate(struct powerdomain *pwrdm,
+					       u8 pwrst, bool *hwsup)
+{
+	u8 curr_pwrst, sleep_switch;
+
+	curr_pwrst = pwrdm_read_pwrst(pwrdm);
+	if (curr_pwrst < PWRDM_POWER_ON) {
+		if (curr_pwrst > pwrst &&
+		    pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE &&
+		    arch_pwrdm->pwrdm_set_lowpwrstchange) {
+			sleep_switch = LOWPOWERSTATE_SWITCH;
+		} else {
+			*hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
+			clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
+			sleep_switch = FORCEWAKEUP_SWITCH;
+		}
+	} else {
+		sleep_switch = ALREADYACTIVE_SWITCH;
+	}
+
+	return sleep_switch;
+}
+
+static void _pwrdm_restore_clkdm_state(struct powerdomain *pwrdm,
+				       u8 sleep_switch, bool hwsup)
+{
+	switch (sleep_switch) {
+	case FORCEWAKEUP_SWITCH:
+		if (hwsup)
+			clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
+		else
+			clkdm_sleep(pwrdm->pwrdm_clkdms[0]);
+		break;
+	case LOWPOWERSTATE_SWITCH:
+		if (pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE &&
+		    arch_pwrdm->pwrdm_set_lowpwrstchange)
+			arch_pwrdm->pwrdm_set_lowpwrstchange(pwrdm);
+		pwrdm_state_switch(pwrdm);
+		break;
+	}
+}
+
+/*
+ * This sets pwrdm state (other than mpu & core. Currently only ON &
+ * RET are supported.
+ */
+int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 pwrst)
+{
+	u8 next_pwrst, sleep_switch;
+	int ret = 0;
+	bool hwsup = false;
+
+	if (!pwrdm || IS_ERR(pwrdm))
+		return -EINVAL;
+
+	while (!(pwrdm->pwrsts & (1 << pwrst))) {
+		if (pwrst == PWRDM_POWER_OFF)
+			return ret;
+		pwrst--;
+	}
+
+	next_pwrst = pwrdm_read_next_pwrst(pwrdm);
+	if (next_pwrst == pwrst)
+		return ret;
+
+	sleep_switch = _pwrdm_save_clkdm_state_and_activate(pwrdm, pwrst,
+							    &hwsup);
+
+	ret = pwrdm_set_next_pwrst(pwrdm, pwrst);
+	if (ret)
+		pr_err("%s: unable to set power state of powerdomain: %s\n",
+		       __func__, pwrdm->name);
+
+	_pwrdm_restore_clkdm_state(pwrdm, sleep_switch, hwsup);
+
+	return ret;
+}
+
 /**
  * pwrdm_get_context_loss_count - get powerdomain's context loss count
  * @pwrdm: struct powerdomain * to wait for

diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h
index 7c1534b..1edb3b7 100644
--- a/arch/arm/mach-omap2/powerdomain.h
+++ b/arch/arm/mach-omap2/powerdomain.h

@@ -228,10 +228,11 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm);
 int pwrdm_state_switch(struct powerdomain *pwrdm);
 int pwrdm_pre_transition(struct powerdomain *pwrdm);
 int pwrdm_post_transition(struct powerdomain *pwrdm);
-int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm);
 int pwrdm_get_context_loss_count(struct powerdomain *pwrdm);
 bool pwrdm_can_ever_lose_context(struct powerdomain *pwrdm);
 
+extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 state);
+
 extern void omap242x_powerdomains_init(void);
 extern void omap243x_powerdomains_init(void);
 extern void omap3xxx_powerdomains_init(void);

Hi Paul,

On Sun, Dec 9, 2012 at 2:23 AM, Paul Walmsley [off-list ref] wrote:

Move omap_set_pwrdm_state() from the PM code to the powerdomain code,
and refactor it to split it up into several functions.  A subsequent patch
will rename it to conform with the existing powerdomain function names.

Glad to see this rather cryptic function getting a rewrite. It had never
been clear what the function is doing so I think it owes some more comments.

More comments below.

Can this kerneldoc be reused in the new code?

-int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)

Could you add some more documentation here?
What is the goal of the function, what does it return etc. ?

+
+static u8 _pwrdm_save_clkdm_state_and_activate(struct powerdomain *pwrdm,
+                                              u8 pwrst, bool *hwsup)

+{

+       u8 curr_pwrst, sleep_switch;
+
+       curr_pwrst = pwrdm_read_pwrst(pwrdm);
+       if (curr_pwrst < PWRDM_POWER_ON) {
+               if (curr_pwrst > pwrst &&
+                   pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE &&
+                   arch_pwrdm->pwrdm_set_lowpwrstchange) {
+                       sleep_switch = LOWPOWERSTATE_SWITCH;
+               } else {
+                       *hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
+                       clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
+                       sleep_switch = FORCEWAKEUP_SWITCH;
+               }
+       } else {
+               sleep_switch = ALREADYACTIVE_SWITCH;
+       }
+
+       return sleep_switch;
+}
+

Same here

+static void _pwrdm_restore_clkdm_state(struct powerdomain *pwrdm,
+                                      u8 sleep_switch, bool hwsup)
+{
+       switch (sleep_switch) {
+       case FORCEWAKEUP_SWITCH:
+               if (hwsup)
+                       clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
+               else
+                       clkdm_sleep(pwrdm->pwrdm_clkdms[0]);
+               break;
+       case LOWPOWERSTATE_SWITCH:
+               if (pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE &&
+                   arch_pwrdm->pwrdm_set_lowpwrstchange)
+                       arch_pwrdm->pwrdm_set_lowpwrstchange(pwrdm);
+               pwrdm_state_switch(pwrdm);
+               break;
+       }
+}
+
+/*
+ * This sets pwrdm state (other than mpu & core. Currently only ON &
+ * RET are supported.
+ */

Same here.
Is this one correct?

Regards,
Jean

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121212/3e4e3a15/attachment-0001.html>

Hi,

(redacted irrelevant code sections)

On Wed, 12 Dec 2012, Jean Pihet wrote:

On Sun, Dec 9, 2012 at 2:23 AM, Paul Walmsley [off-list ref] wrote:

quoted

-/**
- * pwrdm_set_lowpwrstchange - Request a low power state change
- * @pwrdm: struct powerdomain *
- *
- * Allows a powerdomain to transtion to a lower power sleep state
- * from an existing sleep state without waking up the powerdomain.
- * Returns -EINVAL if the powerdomain pointer is null or if the
- * powerdomain does not support LOWPOWERSTATECHANGE, or returns 0
- * upon success.
- */

Can this kerneldoc be reused in the new code?

Not directly, since the function is being removed.  But I've added some 
LOWPOWERSTATECHANGE-related documentation  in powerdomain.h in the updated 
patch (below).

quoted

@@ -984,6 +955,89 @@ int pwrdm_post_transition(struct powerdomain *pwrdm)
        return 0;
 }

+/* Types of sleep_switch used in omap_set_pwrdm_state */
+#define ALREADYACTIVE_SWITCH   0
+#define FORCEWAKEUP_SWITCH     1
+#define LOWPOWERSTATE_SWITCH   2

Could you add some more documentation here?
What is the goal of the function, what does it return etc. ?

I've added some related kerneldoc to omap_set_pwrdm_state().

quoted

+
+static u8 _pwrdm_save_clkdm_state_and_activate(struct powerdomain *pwrdm,
+                                              u8 pwrst, bool *hwsup)

Same here

quoted

+static void _pwrdm_restore_clkdm_state(struct powerdomain *pwrdm,
+                                      u8 sleep_switch, bool hwsup)

Same here.

I've added kerneldoc for both of these functions.

quoted

+/*
+ * This sets pwrdm state (other than mpu & core. Currently only ON &
+ * RET are supported.
+ */

Is this one correct?

This is just a cut and paste from the previous comments in the file.  I 
agree that it is not helpful, so I've added kerneldoc for 
omap_set_pwrdm_state().

The updated patch follows.


- Paul

From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 29 Jan 2013 13:45:09 -0700
Subject: [PATCH] ARM: OMAP2+: PM/powerdomain: move omap_set_pwrdm_state() to
 powerdomain code

Move omap_set_pwrdm_state() from the PM code to the powerdomain code,
and refactor it to split it up into several functions.  A subsequent patch
will rename it to conform with the existing powerdomain function names.

This version includes some additional documentation, based on a
suggestion from Jean Pihet.  It also modifies omap_set_pwrdm_state()
to not bail out early unless both the powerdomain current power state
and the next power state are equal.  (Previously it would terminate
early if the next power state was equal to the target power state,
which was insufficiently rigorous.)

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jean Pihet <redacted>
Cc: Kevin Hilman <redacted>
Cc: Tero Kristo <redacted>
---
 arch/arm/mach-omap2/pm.c          |   61 --------------
 arch/arm/mach-omap2/pm.h          |    1 -
 arch/arm/mach-omap2/powerdomain.c |  161 ++++++++++++++++++++++++++++++-------
 arch/arm/mach-omap2/powerdomain.h |   13 ++-
 4 files changed, 144 insertions(+), 92 deletions(-)

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index f18afc9..48d6d5d 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c

@@ -108,10 +108,6 @@ static void __init omap2_init_processor_devices(void)
 	}
 }
 
-/* Types of sleep_switch used in omap_set_pwrdm_state */
-#define FORCEWAKEUP_SWITCH	0
-#define LOWPOWERSTATE_SWITCH	1
-
 int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused)
 {
 	if ((clkdm->flags & CLKDM_CAN_ENABLE_AUTO) &&

@@ -124,63 +120,6 @@ int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused)
 }
 
 /*
- * This sets pwrdm state (other than mpu & core. Currently only ON &
- * RET are supported.
- */
-int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 pwrst)
-{
-	u8 curr_pwrst, next_pwrst;
-	int sleep_switch = -1, ret = 0, hwsup = 0;
-
-	if (!pwrdm || IS_ERR(pwrdm))
-		return -EINVAL;
-
-	while (!(pwrdm->pwrsts & (1 << pwrst))) {
-		if (pwrst == PWRDM_POWER_OFF)
-			return ret;
-		pwrst--;
-	}
-
-	next_pwrst = pwrdm_read_next_pwrst(pwrdm);
-	if (next_pwrst == pwrst)
-		return ret;
-
-	curr_pwrst = pwrdm_read_pwrst(pwrdm);
-	if (curr_pwrst < PWRDM_POWER_ON) {
-		if ((curr_pwrst > pwrst) &&
-			(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) {
-			sleep_switch = LOWPOWERSTATE_SWITCH;
-		} else {
-			hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
-			clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
-			sleep_switch = FORCEWAKEUP_SWITCH;
-		}
-	}
-
-	ret = pwrdm_set_next_pwrst(pwrdm, pwrst);
-	if (ret)
-		pr_err("%s: unable to set power state of powerdomain: %s\n",
-		       __func__, pwrdm->name);
-
-	switch (sleep_switch) {
-	case FORCEWAKEUP_SWITCH:
-		if (hwsup)
-			clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
-		else
-			clkdm_sleep(pwrdm->pwrdm_clkdms[0]);
-		break;
-	case LOWPOWERSTATE_SWITCH:
-		pwrdm_set_lowpwrstchange(pwrdm);
-		pwrdm_state_switch(pwrdm);
-		break;
-	}
-
-	return ret;
-}
-
-
-
-/*
  * This API is to be called during init to set the various voltage
  * domains to the voltage as per the opp table. Typically we boot up
  * at the nominal voltage. So this function finds out the rate of

diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index c22503b..7bdd22a 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h

@@ -33,7 +33,6 @@ static inline int omap4_idle_init(void)
 extern void *omap3_secure_ram_storage;
 extern void omap3_pm_off_mode_enable(int);
 extern void omap_sram_idle(void);
-extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
 extern int omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused);
 extern int (*omap_pm_suspend)(void);
 

diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 97b3881..65c3464 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c

@@ -42,6 +42,16 @@ enum {
 	PWRDM_STATE_PREV,
 };
 
+/*
+ * Types of sleep_switch used internally in omap_set_pwrdm_state()
+ * and its associated static functions
+ *
+ * XXX Better documentation is needed here
+ */
+#define ALREADYACTIVE_SWITCH		0
+#define FORCEWAKEUP_SWITCH		1
+#define LOWPOWERSTATE_SWITCH		2
+#define ERROR_SWITCH			3
 
 /* pwrdm_list contains all registered struct powerdomains */
 static LIST_HEAD(pwrdm_list);

@@ -200,6 +210,80 @@ static int _pwrdm_post_transition_cb(struct powerdomain *pwrdm, void *unused)
 	return 0;
 }
 
+/**
+ * _pwrdm_save_clkdm_state_and_activate - prepare for power state change
+ * @pwrdm: struct powerdomain * to operate on
+ * @curr_pwrst: current power state of @pwrdm
+ * @pwrst: power state to switch to
+ * @hwsup: ptr to a bool to return whether the clkdm is hardware-supervised
+ *
+ * Determine whether the powerdomain needs to be turned on before
+ * attempting to switch power states.  Called by
+ * omap_set_pwrdm_state().  NOTE that if the powerdomain contains
+ * multiple clockdomains, this code assumes that the first clockdomain
+ * supports software-supervised wakeup mode - potentially a problem.
+ * Returns the power state switch mode currently in use (see the
+ * "Types of sleep_switch" comment above).
+ */
+static u8 _pwrdm_save_clkdm_state_and_activate(struct powerdomain *pwrdm,
+					       u8 curr_pwrst, u8 pwrst,
+					       bool *hwsup)
+{
+	u8 sleep_switch;
+
+	if (curr_pwrst < 0) {
+		WARN_ON(1);
+		sleep_switch = ERROR_SWITCH;
+	} else if (curr_pwrst < PWRDM_POWER_ON) {
+		if (curr_pwrst > pwrst &&
+		    pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE &&
+		    arch_pwrdm->pwrdm_set_lowpwrstchange) {
+			sleep_switch = LOWPOWERSTATE_SWITCH;
+		} else {
+			*hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
+			clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
+			sleep_switch = FORCEWAKEUP_SWITCH;
+		}
+	} else {
+		sleep_switch = ALREADYACTIVE_SWITCH;
+	}
+
+	return sleep_switch;
+}
+
+/**
+ * _pwrdm_restore_clkdm_state - restore the clkdm hwsup state after pwrst change
+ * @pwrdm: struct powerdomain * to operate on
+ * @sleep_switch: return value from _pwrdm_save_clkdm_state_and_activate()
+ * @hwsup: should @pwrdm's first clockdomain be set to hardware-supervised mode?
+ *
+ * Restore the clockdomain state perturbed by
+ * _pwrdm_save_clkdm_state_and_activate(), and call the power state
+ * bookkeeping code.  Called by omap_set_pwrdm_state().  NOTE that if
+ * the powerdomain contains multiple clockdomains, this assumes that
+ * the first associated clockdomain supports either
+ * hardware-supervised idle control in the register, or
+ * software-supervised sleep.  No return value.
+ */
+static void _pwrdm_restore_clkdm_state(struct powerdomain *pwrdm,
+				       u8 sleep_switch, bool hwsup)
+{
+	switch (sleep_switch) {
+	case FORCEWAKEUP_SWITCH:
+		if (hwsup)
+			clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
+		else
+			clkdm_sleep(pwrdm->pwrdm_clkdms[0]);
+		break;
+	case LOWPOWERSTATE_SWITCH:
+		if (pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE &&
+		    arch_pwrdm->pwrdm_set_lowpwrstchange)
+			arch_pwrdm->pwrdm_set_lowpwrstchange(pwrdm);
+		pwrdm_state_switch(pwrdm);
+		break;
+	}
+}
+
 /* Public functions */
 
 /**

@@ -921,35 +1005,6 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm)
 	return (pwrdm && pwrdm->flags & PWRDM_HAS_HDWR_SAR) ? 1 : 0;
 }
 
-/**
- * pwrdm_set_lowpwrstchange - Request a low power state change
- * @pwrdm: struct powerdomain *
- *
- * Allows a powerdomain to transtion to a lower power sleep state
- * from an existing sleep state without waking up the powerdomain.
- * Returns -EINVAL if the powerdomain pointer is null or if the
- * powerdomain does not support LOWPOWERSTATECHANGE, or returns 0
- * upon success.
- */
-int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)
-{
-	int ret = -EINVAL;
-
-	if (!pwrdm)
-		return -EINVAL;
-
-	if (!(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE))
-		return -EINVAL;
-
-	pr_debug("powerdomain: %s: setting LOWPOWERSTATECHANGE bit\n",
-		 pwrdm->name);
-
-	if (arch_pwrdm && arch_pwrdm->pwrdm_set_lowpwrstchange)
-		ret = arch_pwrdm->pwrdm_set_lowpwrstchange(pwrdm);
-
-	return ret;
-}
-
 int pwrdm_state_switch(struct powerdomain *pwrdm)
 {
 	int ret;

@@ -985,6 +1040,54 @@ int pwrdm_post_transition(struct powerdomain *pwrdm)
 }
 
 /**
+ * omap_set_pwrdm_state - change a powerdomain's current power state
+ * @pwrdm: struct powerdomain * to change the power state of
+ * @pwrst: power state to change to
+ *
+ * Change the current hardware power state of the powerdomain
+ * represented by @pwrdm to the power state represented by @pwrst.
+ * Returns -EINVAL if @pwrdm is null or invalid or if the
+ * powerdomain's current power state could not be read, or returns 0
+ * upon success or if @pwrdm does not support @pwrst or any
+ * lower-power state.  XXX Should not return 0 if the @pwrdm does not
+ * support @pwrst or any lower-power state: this should be an error.
+ */
+int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 pwrst)
+{
+	u8 curr_pwrst, next_pwrst, sleep_switch;
+	int ret = 0;
+	bool hwsup = false;
+
+	if (!pwrdm || IS_ERR(pwrdm))
+		return -EINVAL;
+
+	while (!(pwrdm->pwrsts & (1 << pwrst))) {
+		if (pwrst == PWRDM_POWER_OFF)
+			return ret;
+		pwrst--;
+	}
+
+	curr_pwrst = pwrdm_read_pwrst(pwrdm);
+	next_pwrst = pwrdm_read_next_pwrst(pwrdm);
+	if (curr_pwrst == pwrst && next_pwrst == pwrst)
+		return ret;
+
+	sleep_switch = _pwrdm_save_clkdm_state_and_activate(pwrdm, curr_pwrst,
+							    pwrst, &hwsup);
+	if (sleep_switch == ERROR_SWITCH)
+		return -EINVAL;
+
+	ret = pwrdm_set_next_pwrst(pwrdm, pwrst);
+	if (ret)
+		pr_err("%s: unable to set power state of powerdomain: %s\n",
+		       __func__, pwrdm->name);
+
+	_pwrdm_restore_clkdm_state(pwrdm, sleep_switch, hwsup);
+
+	return ret;
+}
+
+/**
  * pwrdm_get_context_loss_count - get powerdomain's context loss count
  * @pwrdm: struct powerdomain * to wait for
  *

diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h
index 7c1534b..93e7df8 100644
--- a/arch/arm/mach-omap2/powerdomain.h
+++ b/arch/arm/mach-omap2/powerdomain.h

@@ -162,6 +162,16 @@ struct powerdomain {
  * @pwrdm_disable_hdwr_sar: Disable Hardware Save-Restore feature for a pd
  * @pwrdm_set_lowpwrstchange: Enable pd transitions from a shallow to deep sleep
  * @pwrdm_wait_transition: Wait for a pd state transition to complete
+ *
+ * Regarding @pwrdm_set_lowpwrstchange: On the OMAP2 and 3-family
+ * chips, a powerdomain's power state is not allowed to directly
+ * transition from one low-power state (e.g., CSWR) to another
+ * low-power state (e.g., OFF) without first waking up the
+ * powerdomain.  This wastes energy.  So OMAP4 chips support the
+ * ability to transition a powerdomain power state directly from one
+ * low-power state to another.  The function pointed to by
+ * @pwrdm_set_lowpwrstchange is intended to configure the OMAP4
+ * hardware powerdomain state machine to enable this feature.
  */
 struct pwrdm_ops {
 	int	(*pwrdm_set_next_pwrst)(struct powerdomain *pwrdm, u8 pwrst);

@@ -228,10 +238,11 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm);
 int pwrdm_state_switch(struct powerdomain *pwrdm);
 int pwrdm_pre_transition(struct powerdomain *pwrdm);
 int pwrdm_post_transition(struct powerdomain *pwrdm);
-int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm);
 int pwrdm_get_context_loss_count(struct powerdomain *pwrdm);
 bool pwrdm_can_ever_lose_context(struct powerdomain *pwrdm);
 
+extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 state);
+
 extern void omap242x_powerdomains_init(void);
 extern void omap243x_powerdomains_init(void);
 extern void omap3xxx_powerdomains_init(void);

-- 
1.7.10.4

Minor comment below,

On 12/9/2012 6:53 AM, Paul Walmsley wrote:

You can use IS_ERR_OR_NULL here.

Thanks,
Vaibhav