From f4a471de1a2502a90a231bda3661e1f6ed3d6c36 Mon Sep 17 00:00:00 2001 From: Aditya Bavanari Date: Tue, 19 Feb 2019 17:57:12 +0530 Subject: [PATCH] asoc: codecs: Bail out from clock enable routine during SSR When SSR happens, use dev_up flag in codec to bail out from clock enablement routine. During interrupt processing if clock enable fails during SSR, exit isr routine without disabling clock. Change-Id: Ie2b56521daa70790d6ef53a06c7becc2ee8010a4 Signed-off-by: Aditya Bavanari --- asoc/codecs/bolero/bolero-cdc.c | 5 ++--- asoc/codecs/bolero/bolero-clk-rsc.c | 2 +- soc/swr-mstr-ctrl.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/asoc/codecs/bolero/bolero-cdc.c b/asoc/codecs/bolero/bolero-cdc.c index d805126b2254..45e993684db1 100644 --- a/asoc/codecs/bolero/bolero-cdc.c +++ b/asoc/codecs/bolero/bolero-cdc.c @@ -638,15 +638,14 @@ static void bolero_ssr_disable(struct device *dev, void *data) struct bolero_priv *priv = data; int macro_idx; - if (priv->rsc_clk_cb) - priv->rsc_clk_cb(priv->clk_dev, BOLERO_MACRO_EVT_SSR_DOWN); - bolero_cdc_notifier_call(priv, BOLERO_WCD_EVT_PA_OFF_PRE_SSR); regcache_cache_only(priv->regmap, true); mutex_lock(&priv->clk_lock); priv->dev_up = false; mutex_unlock(&priv->clk_lock); + if (priv->rsc_clk_cb) + priv->rsc_clk_cb(priv->clk_dev, BOLERO_MACRO_EVT_SSR_DOWN); /* call ssr event for supported macros */ for (macro_idx = START_MACRO; macro_idx < MAX_MACRO; macro_idx++) { if (!priv->macro_params[macro_idx].event_handler) diff --git a/asoc/codecs/bolero/bolero-clk-rsc.c b/asoc/codecs/bolero/bolero-clk-rsc.c index 03befde80a27..617d8320af1e 100644 --- a/asoc/codecs/bolero/bolero-clk-rsc.c +++ b/asoc/codecs/bolero/bolero-clk-rsc.c @@ -401,7 +401,7 @@ int bolero_clk_rsc_request_clock(struct device *dev, } mutex_lock(&priv->rsc_clk_lock); - if (!priv->dev_up) { + if (!priv->dev_up && enable) { dev_err_ratelimited(priv->dev, "%s: SSR is in progress..\n", __func__); ret = -EINVAL; diff --git a/soc/swr-mstr-ctrl.c b/soc/swr-mstr-ctrl.c index bddf30a4e882..676e3c3cf39a 100644 --- a/soc/swr-mstr-ctrl.c +++ b/soc/swr-mstr-ctrl.c @@ -241,8 +241,10 @@ static int swrm_clk_request(struct swr_mstr_ctrl *swrm, bool enable) mutex_lock(&swrm->clklock); if (enable) { - if (!swrm->dev_up) + if (!swrm->dev_up) { + ret = -ENODEV; goto exit; + } swrm->clk_ref_count++; if (swrm->clk_ref_count == 1) { ret = swrm->clk(swrm->handle, true); @@ -1274,7 +1276,10 @@ static irqreturn_t swr_mstr_interrupt(int irq, void *dev) } mutex_lock(&swrm->reslock); - swrm_clk_request(swrm, true); + if (swrm_clk_request(swrm, true)) { + mutex_unlock(&swrm->reslock); + goto exit; + } mutex_unlock(&swrm->reslock); intr_sts = swr_master_read(swrm, SWRM_INTERRUPT_STATUS); @@ -1420,6 +1425,7 @@ handle_irq: mutex_lock(&swrm->reslock); swrm_clk_request(swrm, false); mutex_unlock(&swrm->reslock); +exit: swrm_unlock_sleep(swrm); return ret; }