From patchwork Mon Jul 20 15:36:08 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: 237563 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2145039ilg; Mon, 20 Jul 2020 09:46:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwv6wD+8yun/ZFPWxbijJJt2A0l8lq+TqAHzkLBr+Uu/RbXo/W8bxbDwscIcUaQoam8WZb4 X-Received: by 2002:a50:b941:: with SMTP id m59mr21697396ede.321.1595263617595; Mon, 20 Jul 2020 09:46:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595263617; cv=none; d=google.com; s=arc-20160816; b=pdkwkVO4Inl423/Sgr/f/Ft4SAxBUh22p72cHk2m+SaAbPJYKsD3JzRvtRv2NuJPJq HVrlC9ArPxgP3vHYha8b7fXk9ueZa6TmWHW6rRljSbpEoISq74pUaqLCFf7n5DjNeHXX 1RyahUyEt4VvvnD0yJ3fVV5i5d3/dHrqNe4J7UGh6gydhoowftf5njFosv8blYfeyWrp wPqdYYEeGvNAM/Dexi7cffRLZJ2qc+BnF3CUBJxI+/0QP0DfzhZzWS4/e6YNrgwWLLCT 6FU+NBt+gtfiN+Lo2eZsnDBMGfIfeWlfTk1DhQLrUuSrjsNZ3hukT0KqAUWKEGrLxmdY it6g== 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=oq5fdWTTXSj3dSdAKNG8/tagbbIqI8o6tebUPdYU5PI=; b=AN26QS17MXDvhQmY+xZEuFRBvKNC9oALY8Z2pU7yZ02Tl+8PZfKuGJIISJDJVdULw3 Msf0/DNiGJVtckkzJ/TvWzoMxdRyE8uRLtgb/eaxsGfvduiOT0WXgoNekBGFvMqF990i 2Qqq/SYrb7dOe0HdUeg6xMKy/G2uqe5HBFVaoh7QYCD6HAg5eeyYv0nnGRErRe28ZUJl Xp7QtsJBZjlrIkHvu/Om6TEOnRHJEctY40Cms4gYpnJ7UeetfkY/lHBkwUuwj+RkQzHd tZ+MEWMGCwYUoMldzwff1TzLKHM3ohpN8b+tahNwvTPkrlJPQ2pjJ/7RDDj52oTfmp92 26og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="EDP47/em"; 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 d25si10644744eja.521.2020.07.20.09.46.57; Mon, 20 Jul 2020 09:46:57 -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="EDP47/em"; 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 S1728010AbgGTPkF (ORCPT + 15 others); Mon, 20 Jul 2020 11:40:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:59368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728872AbgGTPkE (ORCPT ); Mon, 20 Jul 2020 11:40:04 -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 03AEC22B4E; Mon, 20 Jul 2020 15:40:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259603; bh=YRMjNTQGhNU5JwMX8Bo6/kNLH/gfrVoU7afWPPlGggc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EDP47/emLhl9EtGz7n8wc56sehL4/5OnQMVoHztwX0CxT4E/X1qoq/B4O6lcLQo/i eIxO5iOCrkLOolVoH2j+XTUOVoC4ufPMk2Npkn+NAyYvLpjDdazZd9Ft8VjePCnlgR Ic1pRmJwbknBiFaeyZdMSWcr/frKAJbg2RiGJAhc= 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.9 12/86] ALSA: compress: fix partial_drain completion state Date: Mon, 20 Jul 2020 17:36:08 +0200 Message-Id: <20200720152753.743085089@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152753.138974850@linuxfoundation.org> References: <20200720152753.138974850@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 49482080311a1..b3b06478cf2ba 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -72,6 +72,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 { @@ -83,6 +84,7 @@ struct snd_compr_stream { enum snd_compr_direction direction; bool metadata_set; bool next_track; + bool partial_drain; void *private_data; }; @@ -185,7 +187,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 7ae8e24dc1e61..81624f6e3f330 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");