From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C25B319A86D; Tue, 9 Jul 2024 16:26:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542382; cv=none; b=hSiv8LlOJegeLRl7xxbA4IAFfhUY5CRTZfZEZkY5YAjlTm6FqXSDgO2n/Tq6lTfRLWJiX5uPHp5JVQGvpkuf7NZm/lLb01cpS39B1/7s0baMA11q6dBXLOLZ012wegMV089qruzgIyY3KQRvcWku80ys16aO/b55a4Vhb935lys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542382; c=relaxed/simple; bh=GhiLK/de7HH4vB8L0zlPvYj17jEZNsjODq8v36Q08I8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i+XvQiiV7tFNYJSnLn4hiURPNMw26zH9tVIMD0SK6AREHYismq2xU4cYuxK+lwBvPwno9c4isPUWkx2K3SB2kWf0s6ilf84F77esD9p0+2lzgojG2xlkxE3YzZHFvoRspV6COoBBQ8HK8Y/hMxh9vtcr/Exi8anLEgjjkNIfIqI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R39qTYJy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R39qTYJy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 722F2C32786; Tue, 9 Jul 2024 16:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720542382; bh=GhiLK/de7HH4vB8L0zlPvYj17jEZNsjODq8v36Q08I8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R39qTYJyZToSYUmB12AmBHAQ1WwnZ9fQs7wRwJP16YI3tR6MIOR179Qv2WWFETYdd cfSItJovuS0V8Yhwm+3Zz+CoajijzBAZZLT0ftDW97nwKeVXGHkL18l6jEAnIeaX4O SDa6GaHKZvKp/WFxhrBG/HAhJH/oI1p5hXejN+Dqg/ZWAafumSl6G/q8zgRUBId71+ VM9lO0v684QgzC4xvr14ObgmdFj9E79nbH3zSlBNi1J160ytSDI6oU6V49Lenw1Wpg XykIMQbWnvKRe2/0levQEbl2lQBIPWU0EfJn05AnwU3sKWTDg0RY/X3sAwTkjM4XJU dmsaGH9tnWDUg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jai Luthra , Peter Ujfalusi , Mark Brown , Sasha Levin , lars@metafoo.de, perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 04/14] ALSA: dmaengine: Synchronize dma channel after drop() Date: Tue, 9 Jul 2024 12:25:48 -0400 Message-ID: <20240709162612.32988-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709162612.32988-1-sashal@kernel.org> References: <20240709162612.32988-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.221 Content-Transfer-Encoding: 8bit From: Jai Luthra [ Upstream commit e8343410ddf08fc36a9b9cc7c51a4e53a262d4c6 ] Sometimes the stream may be stopped due to XRUN events, in which case the userspace can call snd_pcm_drop() and snd_pcm_prepare() to stop and start the stream again. In these cases, we must wait for the DMA channel to synchronize before marking the stream as prepared for playback, as the DMA channel gets stopped by drop() without any synchronization. Make sure the ALSA core synchronizes the DMA channel by adding a sync_stop() hook. Reviewed-by: Peter Ujfalusi Signed-off-by: Jai Luthra Link: https://lore.kernel.org/r/20240611-asoc_next-v3-1-fcfd84b12164@ti.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- include/sound/dmaengine_pcm.h | 1 + sound/core/pcm_dmaengine.c | 10 ++++++++++ sound/soc/soc-generic-dmaengine-pcm.c | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 8c5e38180fb04..618405da95b30 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -34,6 +34,7 @@ snd_pcm_uframes_t snd_dmaengine_pcm_pointer_no_residue(struct snd_pcm_substream int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream, struct dma_chan *chan); int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream); +int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream); int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream, dma_filter_fn filter_fn, void *filter_data); diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index be58505889a36..db22294452560 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -342,6 +342,16 @@ int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream, } EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan); +int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream) +{ + struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream); + + dmaengine_synchronize(prtd->dma_chan); + + return 0; +} +EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop); + /** * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream * @substream: PCM substream diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 9ef80a48707eb..d65dc1acff439 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -326,6 +326,12 @@ static int dmaengine_copy_user(struct snd_soc_component *component, return 0; } +static int dmaengine_pcm_sync_stop(struct snd_soc_component *component, + struct snd_pcm_substream *substream) +{ + return snd_dmaengine_pcm_sync_stop(substream); +} + static const struct snd_soc_component_driver dmaengine_pcm_component = { .name = SND_DMAENGINE_PCM_DRV_NAME, .probe_order = SND_SOC_COMP_ORDER_LATE, @@ -335,6 +341,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component = { .trigger = dmaengine_pcm_trigger, .pointer = dmaengine_pcm_pointer, .pcm_construct = dmaengine_pcm_new, + .sync_stop = dmaengine_pcm_sync_stop, }; static const struct snd_soc_component_driver dmaengine_pcm_component_process = { @@ -347,6 +354,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component_process = { .pointer = dmaengine_pcm_pointer, .copy_user = dmaengine_copy_user, .pcm_construct = dmaengine_pcm_new, + .sync_stop = dmaengine_pcm_sync_stop, }; static const char * const dmaengine_pcm_dma_channel_names[] = { -- 2.43.0