From: Shengjiu Wang <shengjiu.wang@gmail.com>
To: Chancel Liu <chancel.liu@nxp.com>
Cc: alsa-devel@alsa-project.org, Xiubo.Lee@gmail.com,
linuxppc-dev@lists.ozlabs.org, tiwai@suse.com,
lgirdwood@gmail.com, linux-sound@vger.kernel.org, perex@perex.cz,
nicoleotsuka@gmail.com, broonie@kernel.org, festevam@gmail.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ASoC: fsl_xcvr: Improve suspend/resume flow in fsl_xcvr_trigger()
Date: Wed, 3 Jul 2024 17:12:38 +0800 [thread overview]
Message-ID: <CAA+D8APvL_wo_L62M-LD88B9EZ6Sg89jtJrCkt4vuCuH3q9p4A@mail.gmail.com> (raw)
In-Reply-To: <20240628094354.780720-1-chancel.liu@nxp.com>
On Fri, Jun 28, 2024 at 5:44 PM Chancel Liu <chancel.liu@nxp.com> wrote:
>
> In the current flow all interrupts are disabled in runtime suspend
> phase. However interrupts enablement only exists in fsl_xcvr_prepare().
> After resume fsl_xcvr_prepare() may not be called so it will cause all
> interrupts still disabled even if resume from suspend. Interrupts
> should be explictily enabled after resume.
>
> Also, DPATH reset setting only exists in fsl_xcvr_prepare(). After
> resume from suspend DPATH should be reset otherwise there'll be channel
> swap issue.
>
> Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>
Best regards
Shengjiu Wang
> ---
> sound/soc/fsl/fsl_xcvr.c | 43 +++++++++++++++++++++-------------------
> 1 file changed, 23 insertions(+), 20 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
> index 337da46a2f90..bf9a4e90978e 100644
> --- a/sound/soc/fsl/fsl_xcvr.c
> +++ b/sound/soc/fsl/fsl_xcvr.c
> @@ -529,16 +529,6 @@ static int fsl_xcvr_prepare(struct snd_pcm_substream *substream,
> break;
> }
>
> - ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_IER0,
> - FSL_XCVR_IRQ_EARC_ALL, FSL_XCVR_IRQ_EARC_ALL);
> - if (ret < 0) {
> - dev_err(dai->dev, "Error while setting IER0: %d\n", ret);
> - return ret;
> - }
> -
> - /* set DPATH RESET */
> - m_ctl |= FSL_XCVR_EXT_CTRL_DPTH_RESET(tx);
> - v_ctl |= FSL_XCVR_EXT_CTRL_DPTH_RESET(tx);
> ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL, m_ctl, v_ctl);
> if (ret < 0) {
> dev_err(dai->dev, "Error while setting EXT_CTRL: %d\n", ret);
> @@ -679,6 +669,15 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd,
> case SNDRV_PCM_TRIGGER_START:
> case SNDRV_PCM_TRIGGER_RESUME:
> case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
> + /* set DPATH RESET */
> + ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL,
> + FSL_XCVR_EXT_CTRL_DPTH_RESET(tx),
> + FSL_XCVR_EXT_CTRL_DPTH_RESET(tx));
> + if (ret < 0) {
> + dev_err(dai->dev, "Failed to set DPATH RESET: %d\n", ret);
> + return ret;
> + }
> +
> if (tx) {
> switch (xcvr->mode) {
> case FSL_XCVR_MODE_EARC:
> @@ -711,6 +710,13 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd,
> return ret;
> }
>
> + ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_IER0,
> + FSL_XCVR_IRQ_EARC_ALL, FSL_XCVR_IRQ_EARC_ALL);
> + if (ret < 0) {
> + dev_err(dai->dev, "Error while setting IER0: %d\n", ret);
> + return ret;
> + }
> +
> /* clear DPATH RESET */
> ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL,
> FSL_XCVR_EXT_CTRL_DPTH_RESET(tx),
> @@ -733,6 +739,13 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd,
> return ret;
> }
>
> + ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_IER0,
> + FSL_XCVR_IRQ_EARC_ALL, 0);
> + if (ret < 0) {
> + dev_err(dai->dev, "Failed to clear IER0: %d\n", ret);
> + return ret;
> + }
> +
> if (tx) {
> switch (xcvr->mode) {
> case FSL_XCVR_MODE_SPDIF:
> @@ -1411,16 +1424,6 @@ static int fsl_xcvr_runtime_suspend(struct device *dev)
> struct fsl_xcvr *xcvr = dev_get_drvdata(dev);
> int ret;
>
> - /*
> - * Clear interrupts, when streams starts or resumes after
> - * suspend, interrupts are enabled in prepare(), so no need
> - * to enable interrupts in resume().
> - */
> - ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_IER0,
> - FSL_XCVR_IRQ_EARC_ALL, 0);
> - if (ret < 0)
> - dev_err(dev, "Failed to clear IER0: %d\n", ret);
> -
> if (!xcvr->soc_data->spdif_only) {
> /* Assert M0+ reset */
> ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL,
> --
> 2.43.0
>
next prev parent reply other threads:[~2024-07-03 9:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 9:43 [PATCH] ASoC: fsl_xcvr: Improve suspend/resume flow in fsl_xcvr_trigger() Chancel Liu
2024-07-03 9:12 ` Shengjiu Wang [this message]
2024-07-03 16:30 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAA+D8APvL_wo_L62M-LD88B9EZ6Sg89jtJrCkt4vuCuH3q9p4A@mail.gmail.com \
--to=shengjiu.wang@gmail.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=chancel.liu@nxp.com \
--cc=festevam@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=nicoleotsuka@gmail.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).