| Message ID | a8f2ad955aac9e52587beedc1133b3efbe746895.1587968824.git.shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1fecbb71fe0e46b886f84e3b6decca6643c3af6d |
| Headers | show |
| Series | [v2] ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet | expand |
On Mon, Apr 27, 2020 at 02:23:21PM +0800, Shengjiu Wang wrote: > Disable exception interrupt before scheduling tasklet, otherwise if > the tasklet isn't handled immediately, there will be endless xrun > interrupt. > > Fixes: 7ccafa2b3879 ("ASoC: fsl_esai: recover the channel swap after xrun") > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
On Mon, 27 Apr 2020 14:23:21 +0800, Shengjiu Wang wrote: > Disable exception interrupt before scheduling tasklet, otherwise if > the tasklet isn't handled immediately, there will be endless xrun > interrupt. > > Fixes: 7ccafa2b3879 ("ASoC: fsl_esai: recover the channel swap after xrun") > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.7 Thanks! [1/1] ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet commit: 1fecbb71fe0e46b886f84e3b6decca6643c3af6d 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_esai.c b/sound/soc/fsl/fsl_esai.c index c7a49d03463a..84290be778f0 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -87,6 +87,10 @@ static irqreturn_t esai_isr(int irq, void *devid) if ((saisr & (ESAI_SAISR_TUE | ESAI_SAISR_ROE)) && esai_priv->reset_at_xrun) { dev_dbg(&pdev->dev, "reset module for xrun\n"); + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, + ESAI_xCR_xEIE_MASK, 0); + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, + ESAI_xCR_xEIE_MASK, 0); tasklet_schedule(&esai_priv->task); }
Disable exception interrupt before scheduling tasklet, otherwise if the tasklet isn't handled immediately, there will be endless xrun interrupt. Fixes: 7ccafa2b3879 ("ASoC: fsl_esai: recover the channel swap after xrun") Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- changes in v2 - Disable exception interrupt instead of remove tasklet. sound/soc/fsl/fsl_esai.c | 4 ++++ 1 file changed, 4 insertions(+)