From: Fernando Guzman Lugo <[email protected]> This patch fixes the BUG schedule/sleep while atomic which was in the IO_DPC function, this function runs as a tasklet and called a function that could be scheduled (OPP change). we use in_interrupt to detect this and handle accordingly
Original Patch by Fernando: http://dev.omapzoom.org/?p=tidspbridge/kernel-dspbridge.git;a=commitdiff;h=2dcd1964a138c85b5545f687f96c96b489fe4a00 Cc: Ameya Palande <[email protected]> Cc: Felipe Contreras <[email protected]> Cc: Hiroshi Doyu <[email protected]> Cc: Nishanth Menon <[email protected]> Cc: Omar Ramirez <[email protected]> Signed-off-by: Fernando Guzman Lugo <[email protected]> Signed-off-by: Deepak Chitriki <[email protected]> --- drivers/dsp/bridge/wmd/_tiomap_pwr.h | 7 +++++++ drivers/dsp/bridge/wmd/io_sm.c | 2 +- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 31 +++++++++++++++++++++++++++++++ drivers/dsp/bridge/wmd/tiomap_sm.c | 13 ++----------- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/drivers/dsp/bridge/wmd/_tiomap_pwr.h b/drivers/dsp/bridge/wmd/_tiomap_pwr.h index da2e7d9..54d7ca4 100644 --- a/drivers/dsp/bridge/wmd/_tiomap_pwr.h +++ b/drivers/dsp/bridge/wmd/_tiomap_pwr.h @@ -89,5 +89,12 @@ DSP_STATUS DSP_PeripheralClocks_Enable(struct WMD_DEV_CONTEXT *pDevContext, */ void DSPClkWakeupEventCtrl(u32 ClkId, bool enable); +/** + * tiomap3430_bump_dsp_opp_level() - bump up opp if required + * + * if the system is at a minimum opp, request for higher opp + */ +DSP_STATUS tiomap3430_bump_dsp_opp_level(void); + #endif /* _TIOMAP_PWR_ */ diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index 79a714a..3481beb 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -1132,7 +1132,7 @@ void IO_Schedule(struct IO_MGR *pIOMgr) spin_lock_irqsave(&pIOMgr->dpc_lock, flags); pIOMgr->dpc_req++; spin_unlock_irqrestore(&pIOMgr->dpc_lock, flags); - + tiomap3430_bump_dsp_opp_level(); /* Schedule DPC */ tasklet_schedule(&pIOMgr->dpc_tasklet); } diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index 94b399f..54cba9f 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -806,3 +806,34 @@ void DSPClkWakeupEventCtrl(u32 ClkId, bool enable) break; } } + +/** + * tiomap3430_bump_dsp_opp_level() - bump up the opp if at minimum + * + * if we need a higher opp index, request for the same + */ +DSP_STATUS tiomap3430_bump_dsp_opp_level(void) +{ +#ifndef CONFIG_BRIDGE_DVFS + u32 opplevel; + + struct dspbridge_platform_data *pdata = + omap_dspbridge_dev->dev.platform_data; + + if (pdata->dsp_get_opp) { + opplevel = (*pdata->dsp_get_opp)(); + + /* + * If OPP is at minimum level, increase it before waking + * up the DSP. + */ + if (opplevel == 1 && pdata->dsp_set_min_opp) { + (*pdata->dsp_set_min_opp)(opp_level + 1); + DBG_Trace(DBG_LEVEL7, "CHNLSM_InterruptDSP: Setting " + "the vdd1 constraint level to %d before " + "waking DSP \n", opp_level + 1); + } + } +#endif + return DSP_SOK; +} diff --git a/drivers/dsp/bridge/wmd/tiomap_sm.c b/drivers/dsp/bridge/wmd/tiomap_sm.c index b04ed6d..1d2e5d7 100644 --- a/drivers/dsp/bridge/wmd/tiomap_sm.c +++ b/drivers/dsp/bridge/wmd/tiomap_sm.c @@ -96,11 +96,6 @@ DSP_STATUS CHNLSM_DisableInterrupt(struct WMD_DEV_CONTEXT *pDevContext) DSP_STATUS CHNLSM_InterruptDSP2(struct WMD_DEV_CONTEXT *pDevContext, u16 wMbVal) { -#ifdef CONFIG_BRIDGE_DVFS - struct dspbridge_platform_data *pdata = - omap_dspbridge_dev->dev.platform_data; - u32 opplevel = 0; -#endif struct CFG_HOSTRES resources; DSP_STATUS status = DSP_SOK; unsigned long timeout; @@ -114,12 +109,8 @@ DSP_STATUS CHNLSM_InterruptDSP2(struct WMD_DEV_CONTEXT *pDevContext, if (pDevContext->dwBrdState == BRD_DSP_HIBERNATION || pDevContext->dwBrdState == BRD_HIBERNATION) { #ifdef CONFIG_BRIDGE_DVFS - if (pdata->dsp_get_opp) - opplevel = (*pdata->dsp_get_opp)(); - if (opplevel == VDD1_OPP1) { - if (pdata->dsp_set_min_opp) - (*pdata->dsp_set_min_opp)(VDD1_OPP2); - } + if (!in_interrupt()) + tiomap3430_bump_dsp_opp_level(); #endif /* Restart the peripheral clocks */ DSP_PeripheralClocks_Enable(pDevContext, NULL); -- 1.6.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
