OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup (b1cbdb00) · Commits · 戴 / test

While using clockdomain force wakeup method, not waiting for powerdomain to be effectively ON may end up locking the clockdomain FSM until a next wakeup event occurs. One such issue was seen on OMAP4430, where L4_PER was periodically getting stuck in in-transition state when transitioning from from OSWR to ON. This issue was reported and investigated by Patrick Titiano <p-titiano@ti.com> Signed-off-by:

Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by:

Rajendra Nayak <rnayak@ti.com> Reported-by:

Patrick Titiano <p-titiano@ti.com> Cc: Kevin Hilman <khilman@ti.com> Cc: Benoit Cousson <b-cousson@ti.com> Cc: Paul Walmsley <paul@pwsan.com> [paul@pwsan.com: updated to apply; added transition wait on clkdm_deny_idle(); remove two superfluous pwrdm_wait_transition() calls] Signed-off-by:

Paul Walmsley <paul@pwsan.com>

arch/arm/mach-omap2/clockdomain.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -747,6 +747,7 @@ int clkdm_wakeup(struct clockdomain *clkdm)
		spin_lock_irqsave(&clkdm->lock, flags);
		clkdm->_flags &= ~_CLKDM_FLAG_HWSUP_ENABLED;
		ret = arch_clkdm->clkdm_wakeup(clkdm);
		ret \|= pwrdm_state_switch(clkdm->pwrdm.ptr);
		spin_unlock_irqrestore(&clkdm->lock, flags);
		return ret;
		}
		@@ -818,6 +819,7 @@ void clkdm_deny_idle(struct clockdomain *clkdm)
		spin_lock_irqsave(&clkdm->lock, flags);
		clkdm->_flags &= ~_CLKDM_FLAG_HWSUP_ENABLED;
		arch_clkdm->clkdm_deny_idle(clkdm);
		pwrdm_state_switch(clkdm->pwrdm.ptr);
		spin_unlock_irqrestore(&clkdm->lock, flags);
		}

arch/arm/mach-omap2/pm.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
		} else {
		hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
		clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
		pwrdm_wait_transition(pwrdm);
		sleep_switch = FORCEWAKEUP_SWITCH;
		}
		}
		@@ -156,7 +155,6 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
		return ret;
		}

		pwrdm_wait_transition(pwrdm);
		pwrdm_state_switch(pwrdm);
		err:
		return ret;

Admin message