lkml.org 
[lkml]   [2022]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 12/38] ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 455c5653f50e10b4f460ef24e99f0044fbe3401c upstream.

    This is essentially a revert of the commit dc865fb9e7c2 ("ASoC: sti:
    Use snd_pcm_stop_xrun() helper"), which converted the manual
    snd_pcm_stop() calls with snd_pcm_stop_xrun().

    The commit above introduced a deadlock as snd_pcm_stop_xrun() itself
    takes the PCM stream lock while the caller already holds it. Since
    the conversion was done only for consistency reason and the open-call
    with snd_pcm_stop() to the XRUN state is a correct usage, let's revert
    the commit back as the fix.

    Fixes: dc865fb9e7c2 ("ASoC: sti: Use snd_pcm_stop_xrun() helper")
    Reported-by: Daniel Palmer <daniel@0x0f.com>
    Cc: Arnaud POULIQUEN <arnaud.pouliquen@st.com>
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20220315091319.3351522-1-daniel@0x0f.com
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
    Link: https://lore.kernel.org/r/20220315164158.19804-1-tiwai@suse.de
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/sti/uniperif_player.c | 6 +++---
    sound/soc/sti/uniperif_reader.c | 2 +-
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/sound/soc/sti/uniperif_player.c
    +++ b/sound/soc/sti/uniperif_player.c
    @@ -91,7 +91,7 @@ static irqreturn_t uni_player_irq_handle
    SET_UNIPERIF_ITM_BCLR_FIFO_ERROR(player);

    /* Stop the player */
    - snd_pcm_stop_xrun(player->substream);
    + snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);
    }

    ret = IRQ_HANDLED;
    @@ -105,7 +105,7 @@ static irqreturn_t uni_player_irq_handle
    SET_UNIPERIF_ITM_BCLR_DMA_ERROR(player);

    /* Stop the player */
    - snd_pcm_stop_xrun(player->substream);
    + snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);

    ret = IRQ_HANDLED;
    }
    @@ -138,7 +138,7 @@ static irqreturn_t uni_player_irq_handle
    dev_err(player->dev, "Underflow recovery failed\n");

    /* Stop the player */
    - snd_pcm_stop_xrun(player->substream);
    + snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);

    ret = IRQ_HANDLED;
    }
    --- a/sound/soc/sti/uniperif_reader.c
    +++ b/sound/soc/sti/uniperif_reader.c
    @@ -65,7 +65,7 @@ static irqreturn_t uni_reader_irq_handle
    if (unlikely(status & UNIPERIF_ITS_FIFO_ERROR_MASK(reader))) {
    dev_err(reader->dev, "FIFO error detected\n");

    - snd_pcm_stop_xrun(reader->substream);
    + snd_pcm_stop(reader->substream, SNDRV_PCM_STATE_XRUN);

    ret = IRQ_HANDLED;
    }

    \
     
     \ /
      Last update: 2022-03-25 16:15    [W:4.398 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site