From patchwork Tue Jul 14 18:43:58 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: 235549 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4000967ilg; Tue, 14 Jul 2020 12:08:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPGEscU63GBGuELk0JgKOQ3xsswHSD6Uv0EzKqMVVinpVcF1D5FKPZJUwawzLssTdd+Iki X-Received: by 2002:a17:906:29d8:: with SMTP id y24mr5842307eje.212.1594753698658; Tue, 14 Jul 2020 12:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753698; cv=none; d=google.com; s=arc-20160816; b=e0tJzFCOjI2PDsW/3JRiaz+sV3OsjFaHRXL6z2Y8As3BcXP8tJZZ8GM1S4qX1XV/K3 Js4XuzA4i0T1auNlcKhkb/ByKraECdvbOwpqwQ4KWmZHzrnh4BjRzk0aUZrYTvbGvdSM iB9jWvJWVsucd0YKyDw5NByvPkG1Kg8iOzIeFMYQa1lwaPwInLX1xGquKWHLAUeWCLnS ci5OJLiqBeQM0ba30NpWP9dHQLnimKosh5YKzeQVMfmtLCLeIyeyslmv3ALd4PKMgyP7 M6UEaiXKlHwQxQQFdx2xmw6HfeXMObxHs9SzrALHIy5HeKxK/vmq4GHqoIdqwsKV0dN6 7KaA== 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=5MOf27JCioVJmXJIAJ5s4AgGVYdV5tpn9tN7kL1K4jI=; b=hwIxL4FAltqm+mRXkW/pZiYZfGq3q6kIFl7ehrBhqm3qhBtsPdLt+QElcGYWd6RUJZ cbKvm9PKyqjazLtjXc6nBKtdPmtk65RJM2bCuI5IW45Gd+n/NKXNkrRiaefyhtb3BBnT hbPzYe5uBwgRDRBYv0zGqJvM87Jq7vO8BiWsu/qfBaeUuqluN0meO1H/5oDtVn/thBI0 2WOqJtaSZs9CxzEg8G2Y/nNBPtWmhgY8vTlPD5l+m+q4Uv8V8YE2wlZTbnoPgpvOqZk3 JtlbKq0ZuicyonPgZX/Hc/l+ZZSIcKh7vwF53MQ2LIM1Mw5tnQFj+S6615dyDLEO2S0s nlOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vEquVZol; 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 y21si12051077edt.483.2020.07.14.12.08.18; Tue, 14 Jul 2020 12:08:18 -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=vEquVZol; 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 S1729762AbgGNSul (ORCPT + 15 others); Tue, 14 Jul 2020 14:50:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:46842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729793AbgGNSuk (ORCPT ); Tue, 14 Jul 2020 14:50:40 -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 960A022B3B; Tue, 14 Jul 2020 18:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752639; bh=AqmZZ3X3W112huw8ZfyEwiimMTPM/xTB6mf7yAwtT20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vEquVZol2vLD450rKQp6f1L6HFQbgzrfMjGEDFIuwPnca1nGtMTWwoC8Pz++uWyyc OSfBxeHJNh8X5YRIcfZz1TlsBR5CnRynVZfANZNMNAKmjv5Dc/R4EIFDYo1K+LCYKW uCSW/cNsP9tLs0zyTlYpn7IV/eY3mlfGc6v3eqis= 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.4 055/109] ALSA: compress: fix partial_drain completion state Date: Tue, 14 Jul 2020 20:43:58 +0200 Message-Id: <20200714184108.151855114@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@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 bc88d6f964da9..006f019224399 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -59,6 +59,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 { @@ -70,6 +71,7 @@ struct snd_compr_stream { enum snd_compr_direction direction; bool metadata_set; bool next_track; + bool partial_drain; void *private_data; }; @@ -173,7 +175,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 f34ce564d92c4..1afa06b80f06c 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -722,6 +722,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; @@ -879,6 +882,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");