On Thu, 23 Mar 2023 at 16:31, Srinivas Kandagatla srinivas.kandagatla@linaro.org wrote:

The order in which clocks are stopped matters as some of the clock like NPL are derived from MCLK.

Without this patch, Dragonboard RB5 DSP would crash with below error: qcom_q6v5_pas 17300000.remoteproc: fatal error received: ABT_dal.c:278:ABTimeout: AHB Bus hang is detected, Number of bus hang detected := 2 , addr0 = 0x3370000 , addr1 = 0x0!!!

Turn off fsgen first, followed by npl and then finally mclk, which is exactly the opposite order of enable sequence.

Tested-by: Amit Pundir amit.pundir@linaro.org CC: stable@vger.kernel.org # v6.1.y

Fixes: 1dc3459009c3 ("ASoC: codecs: lpass: register mclk after runtime pm") Reported-by: Amit Pundir amit.pundir@linaro.org Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org

---

Sorry for noise, resending this one, as I missed the asoc mailing list in my previous send.

sound/soc/codecs/lpass-rx-macro.c | 4 ++-- sound/soc/codecs/lpass-tx-macro.c | 4 ++-- sound/soc/codecs/lpass-wsa-macro.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 9e0a4e8a46c3..372bea8b3525 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3668,9 +3668,9 @@ static int __maybe_unused rx_macro_runtime_suspend(struct device *dev) regcache_cache_only(rx->regmap, true); regcache_mark_dirty(rx->regmap);

•   clk_disable_unprepare(rx->mclk);
  

•   clk_disable_unprepare(rx->npl);
    clk_disable_unprepare(rx->fsgen);
  

•   clk_disable_unprepare(rx->npl);
  

•   clk_disable_unprepare(rx->mclk);
  
    return 0;
  

} diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index b044c9c6f89b..d9318799f6b7 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -2096,9 +2096,9 @@ static int __maybe_unused tx_macro_runtime_suspend(struct device *dev) regcache_cache_only(tx->regmap, true); regcache_mark_dirty(tx->regmap);

•   clk_disable_unprepare(tx->mclk);
  

•   clk_disable_unprepare(tx->npl);
    clk_disable_unprepare(tx->fsgen);
  

•   clk_disable_unprepare(tx->npl);
  

•   clk_disable_unprepare(tx->mclk);
  
    return 0;
  

} diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 728f26d12ab0..6484c335bd5d 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2504,9 +2504,9 @@ static int __maybe_unused wsa_macro_runtime_suspend(struct device *dev) regcache_cache_only(wsa->regmap, true); regcache_mark_dirty(wsa->regmap);

•   clk_disable_unprepare(wsa->mclk);
  

•   clk_disable_unprepare(wsa->npl);
    clk_disable_unprepare(wsa->fsgen);
  

•   clk_disable_unprepare(wsa->npl);
  

•   clk_disable_unprepare(wsa->mclk);
  
    return 0;
  

}

2.21.0