| Message ID | 1624365084-7934-1-git-send-email-shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a7a0a2feb957e446b2bcf732f245ba04fc8b6314 |
| Headers | show |
| Series | ASoC: fsl_spdif: Fix unexpected interrupt after suspend | expand |
On Tue, Jun 22, 2021 at 9:50 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote: > > When system enter suspend, the machine driver suspend callback > function will be called, then the cpu driver trigger callback > (SNDRV_PCM_TRIGGER_SUSPEND) be called, it would disable the > interrupt. > > But the machine driver suspend and cpu dai driver suspend order > maybe changed, the cpu dai driver's suspend callback is called before > machine driver's suppend callback, then the interrupt is not cleared > successfully in trigger callback. > > So need to clear interrupts in cpu dai driver's suspend callback > to avoid such issue. > > Fixes: 9cb2b3796e08 ("ASoC: fsl_spdif: Add pm runtime function") > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
On Tue, 22 Jun 2021 20:31:24 +0800, Shengjiu Wang wrote: > When system enter suspend, the machine driver suspend callback > function will be called, then the cpu driver trigger callback > (SNDRV_PCM_TRIGGER_SUSPEND) be called, it would disable the > interrupt. > > But the machine driver suspend and cpu dai driver suspend order > maybe changed, the cpu dai driver's suspend callback is called before > machine driver's suppend callback, then the interrupt is not cleared > successfully in trigger callback. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: fsl_spdif: Fix unexpected interrupt after suspend commit: a7a0a2feb957e446b2bcf732f245ba04fc8b6314 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index a9c6b930b04a..8ffb1a6048d6 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1467,6 +1467,9 @@ static int fsl_spdif_runtime_suspend(struct device *dev) struct fsl_spdif_priv *spdif_priv = dev_get_drvdata(dev); int i; + /* Disable all the interrupts */ + regmap_update_bits(spdif_priv->regmap, REG_SPDIF_SIE, 0xffffff, 0); + regmap_read(spdif_priv->regmap, REG_SPDIF_SRPC, &spdif_priv->regcache_srpc); regcache_cache_only(spdif_priv->regmap, true);
When system enter suspend, the machine driver suspend callback function will be called, then the cpu driver trigger callback (SNDRV_PCM_TRIGGER_SUSPEND) be called, it would disable the interrupt. But the machine driver suspend and cpu dai driver suspend order maybe changed, the cpu dai driver's suspend callback is called before machine driver's suppend callback, then the interrupt is not cleared successfully in trigger callback. So need to clear interrupts in cpu dai driver's suspend callback to avoid such issue. Fixes: 9cb2b3796e08 ("ASoC: fsl_spdif: Add pm runtime function") Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- sound/soc/fsl/fsl_spdif.c | 3 +++ 1 file changed, 3 insertions(+)