3 files changed, 32 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 0ce356f351a3..c18f7f2f19bc 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -385,6 +385,11 @@ static int pwrdm_dbg_show_counter(struct powerdomain *pwrdm, void *user)
                 seq_printf(s, ",%s:%d", pwrdm_state_names[i],
                         pwrdm->state_counter[i]);
 
+        seq_printf(s, ",RET-LOGIC-OFF:%d", pwrdm->ret_logic_off_counter);
+        for (i = 0; i < pwrdm->banks; i++)
+                seq_printf(s, ",RET-MEMBANK%d-OFF:%d", i + 1,
+                                pwrdm->ret_mem_off_counter[i]);
+
         seq_printf(s, "\n");
 
         return 0;
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index e9eeaa4fbd47..9a0fb385622b 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -125,6 +125,10 @@ static int _pwrdm_register(struct powerdomain *pwrdm)
         for (i = 0; i < PWRDM_MAX_PWRSTS; i++)
                 pwrdm->state_counter[i] = 0;
 
+        pwrdm->ret_logic_off_counter = 0;
+        for (i = 0; i < pwrdm->banks; i++)
+                pwrdm->ret_mem_off_counter[i] = 0;
+
         pwrdm_wait_transition(pwrdm);
         pwrdm->state = pwrdm_read_pwrst(pwrdm);
         pwrdm->state_counter[pwrdm->state] = 1;
@@ -134,6 +138,25 @@ static int _pwrdm_register(struct powerdomain *pwrdm)
         return 0;
 }
 
+static void _update_logic_membank_counters(struct powerdomain *pwrdm)
+{
+        int i;
+        u8 prev_logic_pwrst, prev_mem_pwrst;
+
+        prev_logic_pwrst = pwrdm_read_prev_logic_pwrst(pwrdm);
+        if ((pwrdm->pwrsts_logic_ret == PWRSTS_OFF_RET) &&
+            (prev_logic_pwrst == PWRDM_POWER_OFF))
+                pwrdm->ret_logic_off_counter++;
+
+        for (i = 0; i < pwrdm->banks; i++) {
+                prev_mem_pwrst = pwrdm_read_prev_mem_pwrst(pwrdm, i);
+
+                if ((pwrdm->pwrsts_mem_ret[i] == PWRSTS_OFF_RET) &&
+                    (prev_mem_pwrst == PWRDM_POWER_OFF))
+                        pwrdm->ret_mem_off_counter[i]++;
+        }
+}
+
 static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
 {
 
@@ -153,6 +176,8 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
                 prev = pwrdm_read_prev_pwrst(pwrdm);
                 if (pwrdm->state != prev)
                         pwrdm->state_counter[prev]++;
+                if (prev == PWRDM_POWER_RET)
+                        _update_logic_membank_counters(pwrdm);
                 break;
         default:
                 return -EINVAL;
diff --git a/arch/arm/plat-omap/include/plat/powerdomain.h b/arch/arm/plat-omap/include/plat/powerdomain.h
index 6657ff2dfb6e..d82b2c00d4f1 100644
--- a/arch/arm/plat-omap/include/plat/powerdomain.h
+++ b/arch/arm/plat-omap/include/plat/powerdomain.h
@@ -100,6 +100,8 @@ struct powerdomain {
         struct list_head node;
         int state;
         unsigned state_counter[PWRDM_MAX_PWRSTS];
+        unsigned ret_logic_off_counter;
+        unsigned ret_mem_off_counter[PWRDM_MAX_MEM_BANKS];
 
 #ifdef CONFIG_PM_DEBUG
         s64 timer;