Remove busy waiting on suspend and self hibernation paths by removing udelays. Decrease the total timer waiting on power transitions to be less than 3 seconds, defined to wait for power transition approx. 200 msecs Change required for: http://android.git.kernel.org/?p=kernel/omap.git;a=commit;h=c8853459b739e5f43da0badc1605a0a0c0c8195d Reported-by: Nishanth Menon <nm@xxxxxx> Signed-off-by: Fernando Guzman Lugo <x0095840@xxxxxx> Signed-off-by: Omar Ramirez Luna <omar.ramirez@xxxxxx> --- drivers/dsp/bridge/wmd/_tiomap_util.h | 6 ++++++ drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 24 +++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/dsp/bridge/wmd/_tiomap_util.h b/drivers/dsp/bridge/wmd/_tiomap_util.h index 47e1e5d..bd1b571 100644 --- a/drivers/dsp/bridge/wmd/_tiomap_util.h +++ b/drivers/dsp/bridge/wmd/_tiomap_util.h @@ -31,6 +31,12 @@ /* Time out Values in uSeconds*/ #define TIHELEN_ACKTIMEOUT 10000 +/* + * Time out for power state transition (in msecs), due to system + * latencies and HZ resolution this timer can vary. + */ +#define PWRSTST_TIMEOUT 200 + /* Time delay for HOM->SAM transition. */ #define WAIT_SAM 1000000 /* in usec (1000 millisec) */ diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index 2d7be1c..da59e4b 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -110,7 +110,7 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) { DSP_STATUS status = DSP_SOK; #ifdef CONFIG_PM - u16 usCount = TIHELEN_ACKTIMEOUT; + u16 usCount = PWRSTST_TIMEOUT / 10; struct CFG_HOSTRES resources; enum HW_PwrState_t pwrState; #ifdef CONFIG_BRIDGE_DVFS @@ -127,10 +127,12 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP, &pwrState); - /* Wait for DSP to move into Off state, how much time should - * we wait? */ + /* Wait for DSP to move into OFF state */ while ((pwrState != HW_PWR_STATE_OFF) && --usCount) { - udelay(500); + if (msleep_interruptible(10)) { + pr_err("Waiting for DSP OFF mode interrupted\n"); + return DSP_EFAIL; + } HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP, &pwrState); } @@ -195,7 +197,7 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, #ifdef CONFIG_BRIDGE_NTFY_PWRERR struct DEH_MGR *hDehMgr; #endif /* CONFIG_BRIDGE_NTFY_PWRERR */ - u16 usCount = TIHELEN_ACKTIMEOUT; + u16 usCount = PWRSTST_TIMEOUT / 10; enum HW_PwrState_t pwrState, targetPwrState; DBG_Trace(DBG_LEVEL7, "SleepDSP- Enter function \n"); @@ -256,12 +258,12 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP, &pwrState); - /* - * Wait for DSP to move into Standby state, how much time - * should we wait? - */ - while ((pwrState != targetPwrState) && --usCount) { - udelay(500); + /* Wait for DSP to move into target power state */ + while ((pwrState != targetPwrState) && usCount--) { + if (msleep_interruptible(10)) { + pr_err("Waiting for DSP to Suspend interrupted\n"); + return DSP_EFAIL; + } HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP, &pwrState); } -- 1.6.2.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
