From patchwork Tue Jul 14 18:44:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235545 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3991704ilg; Tue, 14 Jul 2020 11:56:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRGWQqcJmoOPgZgoNPPkLDQCB6z4nQzwZFwLboC1oNDwaikTebJiIFdXyUTvBS2ZD3AM49 X-Received: by 2002:a17:906:6d0e:: with SMTP id m14mr5752035ejr.251.1594753007525; Tue, 14 Jul 2020 11:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753007; cv=none; d=google.com; s=arc-20160816; b=kS2XgBx2AFz9XXxNfvnfvIkm5i1CxYFUAiRW/Kn/7X0csSBOTcOzHjx/3zxsJL4+ks YQOgUqh4IVo8Aw2QmnM31XBcL8iCNExD/Iau+bBMLgOybzRq+d4Xmzm0zHjYYdtxFcW4 sZbUqDIohIdm1jquSixPjUSilUuuwReyesqKyHk6Bp45mjNL4CIjE3rIJR1Ysx1DFKHs yvy/U8P4x8mL4mZ1bODx4fUa04VyuPQSLEwHVW0Wkt9qPwBlgIP2SNocsMAD6bEGFbJD UCD+T8bOdHzKf2ujbS+KdmCVcapa2XC1bYdi/v6IfbQXgujbpn5yWOFie6DXhFL/jSRs BHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AaIDgUShqShL1I6y+96rzReftKH3tY54/z5KcXGmKT4=; b=ySeLir1CVwhp0v48J+SHw7ExqMqlgZjXGRZ7PflVMtmxZJJPBYlq7rKjVBWiBmAeVy SBBxsTv0qx8fLQugkI7xBQFpcxjQBdYvzItt/5rMqIuSW9bCqbJ9p+xDHPlZ3fvHF2Eg yXv0UQYuZs1X6/qqNo/y+coIta6lFRlz1DELvDg5he/1hatZJv4nRVEudKuIkjsSWYc6 zcPGjlc5AFK16/E6IBNsNqTUWXF3XSDCi0GVKQ1Rw1BBHnNRTg/O9DNSBh94jdBVAWxx pY9xBdtp70RaVdn2BVZOI9AKvaMmEoDzZh/HR2mHR7tTWyTgH+4yVI1DdU3rn2L5FgGp fQcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JlPkGaq5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d9si11491648edv.44.2020.07.14.11.56.47; Tue, 14 Jul 2020 11:56:47 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JlPkGaq5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730999AbgGNS4o (ORCPT + 15 others); Tue, 14 Jul 2020 14:56:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:54778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731016AbgGNS4l (ORCPT ); Tue, 14 Jul 2020 14:56:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7997822B2B; Tue, 14 Jul 2020 18:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753000; bh=O55MKtwfA5IXcUbKUaOpt+8HOJH5TjW70tZuZMRkTVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JlPkGaq5Oa6KE72ItYbZpWMIWsH6yvAn5yG39/JPeeo+L3umgFYL/TPi5y22zEcv4 Si2ZtPMexWiAVAoGaKz7airLBQOcaXlB/95TdzBPB6Mi49lQsXAIhIuW+hyE5zOByM JQkoUqKQh/NK1gYxY/JwSgcy+PleGc1E//MUvMug= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Charles Keepax , Vinod Koul , Takashi Iwai , Sasha Levin Subject: [PATCH 5.7 081/166] ALSA: compress: fix partial_drain completion state Date: Tue, 14 Jul 2020 20:44:06 +0200 Message-Id: <20200714184119.729230376@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinod Koul [ Upstream commit f79a732a8325dfbd570d87f1435019d7e5501c6d ] On partial_drain completion we should be in SNDRV_PCM_STATE_RUNNING state, so set that for partially draining streams in snd_compr_drain_notify() and use a flag for partially draining streams While at it, add locks for stream state change in snd_compr_drain_notify() as well. Fixes: f44f2a5417b2 ("ALSA: compress: fix drain calls blocking other compress functions (v6)") Reviewed-by: Srinivas Kandagatla Tested-by: Srinivas Kandagatla Reviewed-by: Charles Keepax Tested-by: Charles Keepax Signed-off-by: Vinod Koul Link: https://lore.kernel.org/r/20200629134737.105993-4-vkoul@kernel.org Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- include/sound/compress_driver.h | 10 +++++++++- sound/core/compress_offload.c | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 6ce8effa0b128..70cbc5095e725 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -66,6 +66,7 @@ struct snd_compr_runtime { * @direction: stream direction, playback/recording * @metadata_set: metadata set flag, true when set * @next_track: has userspace signal next track transition, true when set + * @partial_drain: undergoing partial_drain for stream, true when set * @private_data: pointer to DSP private data * @dma_buffer: allocated buffer if any */ @@ -78,6 +79,7 @@ struct snd_compr_stream { enum snd_compr_direction direction; bool metadata_set; bool next_track; + bool partial_drain; void *private_data; struct snd_dma_buffer dma_buffer; }; @@ -182,7 +184,13 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - stream->runtime->state = SNDRV_PCM_STATE_SETUP; + /* for partial_drain case we are back to running state on success */ + if (stream->partial_drain) { + stream->runtime->state = SNDRV_PCM_STATE_RUNNING; + stream->partial_drain = false; /* clear this flag as well */ + } else { + stream->runtime->state = SNDRV_PCM_STATE_SETUP; + } wake_up(&stream->runtime->sleep); } diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 509290f2efa8e..0e53f6f319167 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -764,6 +764,9 @@ static int snd_compr_stop(struct snd_compr_stream *stream) retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP); if (!retval) { + /* clear flags and stop any drain wait */ + stream->partial_drain = false; + stream->metadata_set = false; snd_compr_drain_notify(stream); stream->runtime->total_bytes_available = 0; stream->runtime->total_bytes_transferred = 0; @@ -921,6 +924,7 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) if (stream->next_track == false) return -EPERM; + stream->partial_drain = true; retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN); if (retval) { pr_debug("Partial drain returned failure\n");