Re: [PATCH 3/3 v3] ASoC: fsl_sai: Move clock operation to PM runtime

[Viorel Suman]

Hi Daniel,

On Du, 2019-04-21 at 19:39 +0000, Daniel Baluta wrote:
> From: Shengjiu Wang <shengjiu.wang@xxxxxxx>
> 
> Turn off/on clocks when device enters suspend/resume. This
> can help saving power.
> 
> As a further optimization, we turn off/on mclk only when SAI
> is in master mode because otherwise mclk is externally provided.
> 
> Signed-off-by: Shengjiu Wang <shengjiu.wang@xxxxxxx>
> Signed-off-by: Daniel Baluta <daniel.baluta@xxxxxxx>
> ---
> Âsound/soc/fsl/fsl_sai.c | 60 ++++++++++++++++++++++++++++++++++-------
> Â1 file changed, 50 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index 8623b7f882b9..13a462360ed3 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -596,15 +596,8 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream,
> Â{
> Â	struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
> Â	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
> -	struct device *dev = &sai->pdev->dev;
> Â	int ret;
> Â
> -	ret = clk_prepare_enable(sai->bus_clk);
> -	if (ret) {
> -		dev_err(dev, "failed to enable bus clock: %d\n", ret);
> -		return ret;
> -	}
> -
> Â	regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE,
> Â			ÂÂÂFSL_SAI_CR3_TRCE);
> Â
> @@ -621,8 +614,6 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream,
> Â	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
> Â
> Â	regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
> -
> -	clk_disable_unprepare(sai->bus_clk);
> Â}
> Â
> Âstatic const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {
> @@ -932,6 +923,16 @@ static int fsl_sai_runtime_suspend(struct device *dev)
> Â{
> Â	struct fsl_sai *sai = dev_get_drvdata(dev);
> Â
> +	if (!sai->is_slave_mode) {
This check is redundant as the bits inÂsai->mclk_streams are set/unset for master
mode only, please checkÂfsl_sai_hw_params andÂfsl_sai_hw_free functions.

> +		if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE))
> +			clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[0]]);
> +
> +		if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_PLAYBACK))
> +			clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[1]]);
> +	}
> +
> +	clk_disable_unprepare(sai->bus_clk);
> +
> Â	regcache_cache_only(sai->regmap, true);
> Â	regcache_mark_dirty(sai->regmap);
> Â
> @@ -941,6 +942,27 @@ static int fsl_sai_runtime_suspend(struct device *dev)
> Âstatic int fsl_sai_runtime_resume(struct device *dev)
> Â{
> Â	struct fsl_sai *sai = dev_get_drvdata(dev);
> +	int ret;
> +
> +	ret = clk_prepare_enable(sai->bus_clk);
> +	if (ret) {
> +		dev_err(dev, "failed to enable bus clock: %d\n", ret);
> +		return ret;
> +	}
> +
> +	if (!sai->is_slave_mode) {
> +		if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_PLAYBACK)) {
> +			ret = clk_prepare_enable(sai->mclk_clk[sai->mclk_id[1]]);
> +			if (ret)
> +				goto disable_bus_clk;
> +		}
> +
> +		if (sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE)) {
> +			ret = clk_prepare_enable(sai->mclk_clk[sai->mclk_id[0]]);
> +			if (ret)
> +				goto disable_tx_clk;
> +		}
> +	}
> Â
> Â	regcache_cache_only(sai->regmap, false);
> Â	regmap_write(sai->regmap, FSL_SAI_TCSR, FSL_SAI_CSR_SR);
> @@ -948,7 +970,25 @@ static int fsl_sai_runtime_resume(struct device *dev)
> Â	usleep_range(1000, 2000);
> Â	regmap_write(sai->regmap, FSL_SAI_TCSR, 0);
> Â	regmap_write(sai->regmap, FSL_SAI_RCSR, 0);
> -	return regcache_sync(sai->regmap);
> +
> +	ret = regcache_sync(sai->regmap);
> +	if (ret)
> +		goto disable_rx_clk;
> +
> +	return 0;
> +
> +disable_rx_clk:
> +	if (!sai->is_slave_mode &&
> +	ÂÂÂÂ(sai->mclk_streams & BIT(SNDRV_PCM_STREAM_CAPTURE)))
> +		clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[0]]);
> +disable_tx_clk:
> +	if (!sai->is_slave_mode &&
> +	ÂÂÂÂ(sai->mclk_streams & BIT(SNDRV_PCM_STREAM_PLAYBACK)))
> +		clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[1]]);
> +disable_bus_clk:
> +	clk_disable_unprepare(sai->bus_clk);
> +
> +	return ret;
> Â}
> Â#endif /* CONFIG_PM */
> Â
> --Â
> 2.17.1
>