Skip to contentSkip to conversation

FAILED: patch "[PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path" failed to apply to 6.1-stable tree

PATCH [email protected] 2 participants 4 messages Feb 7, 2023

Subsystems (4)
Stable branch Sound ASoC Sound - sound open firmware (SOF) drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path") 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL") 7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From cc755b4377b0520d594ae573497cf0824baea648 Mon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 18 Jan 2023 12:12:55 +0200
Subject: [PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path

The existing code return when a widget doesn't need to prepare/unprepare. This will prevent widgets in the sink path from being prepared/unprepared.

Cc <[email protected]> # 6.1
Link https://github.com/thesofproject/linux/issues/4021
Signed-off-by Bard Liao <[email protected]>
Reviewed-by Ranjani Sridharan <[email protected]>
Reviewed-by Pierre-Louis Bossart <[email protected]>
Reviewed-by Rander Wang <[email protected]>
Signed-off-by Peter Ujfalusi <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Mark Brown <[email protected]>
sound/soc/sof/sof-audio.c +3 -2
index 8c114e6a23c6..ff716bfbcb67 100644
@@ -271,9 +271,9 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg
 	struct snd_sof_widget *swidget = widget->dobj.private;
 	struct snd_soc_dapm_path *p;
 
-	/* return if the widget is in use or if it is already unprepared */
+	/* skip if the widget is in use or if it is already unprepared */
 	if (!swidget || !swidget->prepared || swidget->use_count > 0)
-		return;
+		goto sink_unprepare;
 
 	if (widget_ops[widget->id].ipc_unprepare)
 		/* unprepare the source widget */

@@ -281,6 +281,7 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg
 
 	swidget->prepared = false;
 
+sink_unprepare:
 	/* unprepare all widgets in the sink paths */
 	snd_soc_dapm_widget_for_each_sink_path(widget, p) {
 		if (!p->walking && p->sink->dobj.private) {
author maintainer
#1 lore raw
Quoted 11 lines · On Tue, Feb 07, 2023 at 08:52:14AM +0100, [email protected] wrote:

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path") 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL") 7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")

Oops, nevermind, I got this to work, sorry for the noise.

greg k-h

maintainer
#2 lore raw

Hi Greg,

Quoted 7 lines · Greg KH
Quoted 6 lines · On Tue, Feb 07, 2023 at 08:52:14AM +0100, [email protected] wrote:

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 7 lines
Quoted 5 lines

Possible dependencies:

cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path") 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL") 7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")

Oops, nevermind, I got this to work, sorry for the noise.

I was about to take a look at this to assist you.
Sorry for being late, I guess all is good now?

Signature · 1 line
Péter
author maintainer
#3 lore raw
Quoted 12 lines · Péter Ujfalusi

Hi Greg,

Quoted 9 lines · Greg KH
Quoted 8 lines · On Tue, Feb 07, 2023 at 08:52:14AM +0100, [email protected] wrote:

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path") 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL") 7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")

Oops, nevermind, I got this to work, sorry for the noise.

I was about to take a look at this to assist you.
Sorry for being late, I guess all is good now?

All should be good, see the other emails saying this was applied to verify it please.

thanks,

greg k-h