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 473A318563F; Tue, 9 Jul 2024 16:24:51 +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=1720542291; cv=none; b=EubnyUFV/XOoOvGgcFWNjongIlDSYSH+8nPELsKk24fQy+6hdIpSc8PfpKVEWt+sI8cWhsxpnL9EutIh+g3CrsHqGMh/Gs0kKpwyS9eZ+jotuYgC6rtkdZc13JsHsjrd9Z7M3BrcToDQsUyjvajssGBcc4072kc1jX4CSY6by1E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542291; c=relaxed/simple; bh=fiiDAM/QxgHfwMHerXyYhOSUr1/+hLhF8DPS43KJCIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V0bZq7h0CdFqLbPSYeDmlgcQG1toMAu8veYn/WRdiETShqFQbdbMx/5zZWpf1etARVeNTu6L6tSfDIKPcMShJqtugmofjsXflZPOweD65Eq6tTNR3L2RK4otb8mr9t95TXcNYp9rgQ0lFYhObN996CeVvQ1uJcA8LXXGr9Q5144= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cSXwAjUn; 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="cSXwAjUn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24BA8C4AF0B; Tue, 9 Jul 2024 16:24:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720542291; bh=fiiDAM/QxgHfwMHerXyYhOSUr1/+hLhF8DPS43KJCIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cSXwAjUn1OG0CtbjuCg5P20/eqYdgJxSiyZcAX7c4gSekaronTLpqdcIOboiQtVTG 002dSMd94ypbsuXk5dPl8u5pRlNUSi2CgHbCgmzLQ4HjLtRI9P1u1IaTE3dXZu8JN2 ETS0psaKZ8R1QHFIZMUtlrNXrkp5dHT9cHoZc0BDH0L1l1ZoJyG+mWz4BywcKLzPhs lWazXQpj4T7flwI5OAPYCisNsWEo2aIcrxJMeT/OOlKGzpLsVruGgUwTujvrPIJ14m nT1gvMbYj0My5LqZxm8txIPm9fTRam4BQV61X/kj0PJIY6f+aDfgtubDJM6ykquYrB Z1hisCZEQkwTg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shengjiu Wang , Takashi Iwai , Sasha Levin , lars@metafoo.de, perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 24/27] ALSA: dmaengine_pcm: terminate dmaengine before synchronize Date: Tue, 9 Jul 2024 12:23:38 -0400 Message-ID: <20240709162401.31946-24-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709162401.31946-1-sashal@kernel.org> References: <20240709162401.31946-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.97 Content-Transfer-Encoding: 8bit From: Shengjiu Wang [ Upstream commit 6a7db25aad8ce6512b366d2ce1d0e60bac00a09d ] When dmaengine supports pause function, in suspend state, dmaengine_pause() is called instead of dmaengine_terminate_async(), In end of playback stream, the runtime->state will go to SNDRV_PCM_STATE_DRAINING, if system suspend & resume happen at this time, application will not resume playback stream, the stream will be closed directly, the dmaengine_terminate_async() will not be called before the dmaengine_synchronize(), which violates the call sequence for dmaengine_synchronize(). This behavior also happens for capture streams, but there is no SNDRV_PCM_STATE_DRAINING state for capture. So use dmaengine_tx_status() to check the DMA status if the status is DMA_PAUSED, then call dmaengine_terminate_async() to terminate dmaengine before dmaengine_synchronize(). Signed-off-by: Shengjiu Wang Link: https://patch.msgid.link/1718851218-27803-1-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/pcm_dmaengine.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index d142609570347..e299e8634751f 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -368,6 +368,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop); int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream) { struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream); + struct dma_tx_state state; + enum dma_status status; + + status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state); + if (status == DMA_PAUSED) + dmaengine_terminate_async(prtd->dma_chan); dmaengine_synchronize(prtd->dma_chan); kfree(prtd); @@ -388,6 +394,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close); int snd_dmaengine_pcm_close_release_chan(struct snd_pcm_substream *substream) { struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream); + struct dma_tx_state state; + enum dma_status status; + + status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state); + if (status == DMA_PAUSED) + dmaengine_terminate_async(prtd->dma_chan); dmaengine_synchronize(prtd->dma_chan); dma_release_channel(prtd->dma_chan); -- 2.43.0