From patchwork Tue Jul 14 18:44:04 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: 235551 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4003866ilg; Tue, 14 Jul 2020 12:12:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJBHHfd96GOfSxwE9cS7477R1M2zmGJ8yoFkEmk3cYKSNy72PeSvaGJ8b1R17V5xexoyNk X-Received: by 2002:a17:906:3e54:: with SMTP id t20mr5788376eji.471.1594753920731; Tue, 14 Jul 2020 12:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753920; cv=none; d=google.com; s=arc-20160816; b=rTMq9/aphVex3g9hyV/TM5rI57IvGBHe6Oi5Vv5cyVN9NGhqcBRQFssQQMF5jDeHmF UE+xvALD4tV2UjP+RryrsFZHdPa7eYFWhc/poozvLPDbCpe5ZcUxwYboQmt4GU1hpOpo w6DDGyCMo8CYha2xQapSQSb348OJl6XJQ/3kL/BT8IFnNLFqY9l/AowSz3twW5aE1nTu kzrH62gfQw8RrHzWO4zWKzUiaPMWF7WitaeSIvewzXe6vtt/ypWJFxDD3LeAxw/Rmysk 8TU+IFoVtEogdLBklg1QQixPvEBLPDrJTsc3djLZLM9D+VyGiKAo/iGrHWYN7uFU4BB5 jOpw== 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=JqTPnNt+HFjTLaO+jKk83t00AR0pDNF09XWElE1xclo=; b=Ij56R20YECVUaJDdTm8ts9AgRwwokLk1Ys8+NScbIpJsq4ij+P7EDKac0TX8WIPh/M MJuP2w+u11jN1m50K8j+GSbuiBzs4CtVRlNz5U6nl2ARICuiQ0FywR40TSlT/3Ma+3Ch hyT5bERY4mjlDKjNmGBKdswNRJ00lf/58hS1XX+RdZl+hCLthjvQ4EIEa7r3NYsw+/+A Ze67TuXYLAECwtu5zkKCosbKFJyXbBwmPwN3d+WqNegIENc7qQ8UfEb80sy79ZKKmrek szA5wkafd/xpP6BU7TlaRUCx5rlWV6wZhcHeH1CUHHATSzXFASfhksvW3bU/EEF9t804 C2jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xQPwMzzZ; 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 o19si11568948ejb.144.2020.07.14.12.12.00; Tue, 14 Jul 2020 12:12:00 -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=xQPwMzzZ; 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 S1729897AbgGNSsM (ORCPT + 15 others); Tue, 14 Jul 2020 14:48:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:43470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729891AbgGNSsJ (ORCPT ); Tue, 14 Jul 2020 14:48:09 -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 8511822AAA; Tue, 14 Jul 2020 18:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752489; bh=UfXNsBsfnQgCDV33rI/M8yD/l2RhfKKPlSjWyT9d7M8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xQPwMzzZJB8xC60B5+8GXM/qml7dTD/30LhdEuRGIWVntqDbOnPwnjNVLVTD5TdT7 KdxyH6+5232j+h2GmFVbYdYwv730k3K7aYv2/ElQEQ1WwWQUAvv2V0N5uVBEqIZTyl MsRNEl6r/GREignNqLaq+J7gTZ4Pt6Nf7JDfCx5s= 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 4.19 31/58] ALSA: compress: fix partial_drain completion state Date: Tue, 14 Jul 2020 20:44:04 +0200 Message-Id: <20200714184057.680149937@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184056.149119318@linuxfoundation.org> References: <20200714184056.149119318@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 127c2713b543a..99855d1c74766 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -57,6 +57,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 */ struct snd_compr_stream { @@ -68,6 +69,7 @@ struct snd_compr_stream { enum snd_compr_direction direction; bool metadata_set; bool next_track; + bool partial_drain; void *private_data; }; @@ -171,7 +173,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 509038d6bccdb..68f016e4929ac 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -723,6 +723,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; @@ -880,6 +883,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");