diff mbox series

[v3,1/2] ASoC: Intel: avs: Lock substream before snd_pcm_stop()

Message ID 20221116115550.1100398-2-cezary.rojewski@intel.com
State Accepted
Commit c30c8f9d51ec24b36e2c65a6307a5c8cbc5a0ebc
Headers show
Series ASoC: Intel: avs: DSP recovery and resume fixes | expand

Commit Message

Cezary Rojewski Nov. 16, 2022, 11:55 a.m. UTC
snd_pcm_stop() shall be called with stream lock held to prevent any
races between nonatomic streaming operations.

Fixes: 2f1f570cd730 ("ASoC: Intel: avs: Coredump and recovery flow")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---

Changes in v3:
- added a comment why non-_irq() locking is used around snd_pcm_stop()

 sound/soc/intel/avs/ipc.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/sound/soc/intel/avs/ipc.c b/sound/soc/intel/avs/ipc.c
index 152f8d0bdf8e..af8a260093f4 100644
--- a/sound/soc/intel/avs/ipc.c
+++ b/sound/soc/intel/avs/ipc.c
@@ -123,7 +123,10 @@  static void avs_dsp_recovery(struct avs_dev *adev)
 				if (!substream || !substream->runtime)
 					continue;
 
+				/* No need for _irq() as we are in nonatomic context. */
+				snd_pcm_stream_lock(substream);
 				snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);
+				snd_pcm_stream_unlock(substream);
 			}
 		}
 	}