Stable Archive on lore.kernel.org
 help / color / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Charles Keepax <ckeepax@opensource.cirrus.com>,
	Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.9 04/33] ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks
Date: Tue, 13 Aug 2019 22:22:54 -0400
Message-ID: <20190814022323.17111-4-sashal@kernel.org> (raw)
In-Reply-To: <20190814022323.17111-1-sashal@kernel.org>

From: Charles Keepax <ckeepax@opensource.cirrus.com>

[ Upstream commit 8dd26dff00c0636b1d8621acaeef3f6f3a39dd77 ]

DPCM uses snd_soc_dapm_dai_get_connected_widgets to build a
list of the widgets connected to a specific front end DAI so it
can search through this list for available back end DAIs. The
custom_stop_condition was added to is_connected_ep to facilitate this
list not containing more widgets than is necessary. Doing so both
speeds up the DPCM handling as less widgets need to be searched and
avoids issues with CODEC to CODEC links as these would be confused
with back end DAIs if they appeared in the list of available widgets.

custom_stop_condition was implemented by aborting the graph walk
when the condition is triggered, however there is an issue with this
approach. Whilst walking the graph is_connected_ep should update the
endpoints cache on each widget, if the walk is aborted the number
of attached end points is unknown for that sub-graph. When the stop
condition triggered, the original patch ignored the triggering widget
and returned zero connected end points; a later patch updated this
to set the triggering widget's cache to 1 and return that. Both of
these approaches result in inaccurate values being stored in various
end point caches as the values propagate back through the graph,
which can result in later issues with widgets powering/not powering
unexpectedly.

As the original goal was to reduce the size of the widget list passed
to the DPCM code, the simplest solution is to limit the functionality
of the custom_stop_condition to the widget list. This means the rest
of the graph will still be processed resulting in correct end point
caches, but only widgets up to the stop condition will be added to the
returned widget list.

Fixes: 6742064aef7f ("ASoC: dapm: support user-defined stop condition in dai_get_connected_widgets")
Fixes: 5fdd022c2026 ("ASoC: dpcm: play nice with CODEC<->CODEC links")
Fixes: 09464974eaa8 ("ASoC: dapm: Fix to return correct path list in is_connected_ep.")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20190718084333.15598-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 sound/soc/soc-dapm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index ab647f1fe11bd..08bfc91c686f0 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1104,8 +1104,8 @@ static __always_inline int is_connected_ep(struct snd_soc_dapm_widget *widget,
 		list_add_tail(&widget->work_list, list);
 
 	if (custom_stop_condition && custom_stop_condition(widget, dir)) {
-		widget->endpoints[dir] = 1;
-		return widget->endpoints[dir];
+		list = NULL;
+		custom_stop_condition = NULL;
 	}
 
 	if ((widget->is_ep & SND_SOC_DAPM_DIR_TO_EP(dir)) && widget->connected) {
@@ -1142,8 +1142,8 @@ static __always_inline int is_connected_ep(struct snd_soc_dapm_widget *widget,
  *
  * Optionally, can be supplied with a function acting as a stopping condition.
  * This function takes the dapm widget currently being examined and the walk
- * direction as an arguments, it should return true if the walk should be
- * stopped and false otherwise.
+ * direction as an arguments, it should return true if widgets from that point
+ * in the graph onwards should not be added to the widget list.
  */
 static int is_connected_output_ep(struct snd_soc_dapm_widget *widget,
 	struct list_head *list,
-- 
2.20.1


  parent reply index

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-14  2:22 [PATCH AUTOSEL 4.9 01/33] HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT Sasha Levin
2019-08-14  2:22 ` [PATCH AUTOSEL 4.9 02/33] MIPS: kernel: only use i8253 clocksource with periodic clockevent Sasha Levin
2019-08-14  2:22 ` [PATCH AUTOSEL 4.9 03/33] netfilter: ebtables: fix a memory leak bug in compat Sasha Levin
2019-08-14  2:22 ` Sasha Levin [this message]
2019-08-14  2:22 ` [PATCH AUTOSEL 4.9 05/33] bonding: Force slave speed check after link state recovery for 802.3ad Sasha Levin
2019-08-14  2:22 ` [PATCH AUTOSEL 4.9 06/33] can: dev: call netif_carrier_off() in register_candev() Sasha Levin
2019-08-14  2:22 ` [PATCH AUTOSEL 4.9 07/33] ASoC: Fail card instantiation if DAI format setup fails Sasha Levin
2019-08-14  2:22 ` [PATCH AUTOSEL 4.9 08/33] st21nfca_connectivity_event_received: null check the allocation Sasha Levin
2019-08-14  2:22 ` [PATCH AUTOSEL 4.9 09/33] st_nci_hci_connectivity_event_received: " Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 10/33] ASoC: ti: davinci-mcasp: Correct slot_width posed constraint Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 11/33] net: usb: qmi_wwan: Add the BroadMobi BM818 card Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 12/33] isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain() Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 13/33] isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 14/33] perf bench numa: Fix cpu0 binding Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 15/33] Input: kbtab - sanity check for endpoint type Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 16/33] net: usb: pegasus: fix improper read if get_registers() fail Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 17/33] can: sja1000: force the string buffer NULL-terminated Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 18/33] can: peak_usb: " Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 19/33] NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim() Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 20/33] HID: holtek: test for sanity of intfdata Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 21/33] HID: input: fix a4tech horizontal wheel custom usage Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 22/33] HID: hiddev: avoid opening a disconnected device Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 23/33] HID: hiddev: do cleanup in failure of opening a device Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 24/33] Input: iforce - add sanity checks Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 25/33] net: cxgb3_main: Fix a resource leak in a error path in 'init_one()' Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 26/33] net: hisilicon: make hip04_tx_reclaim non-reentrant Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 27/33] net: hisilicon: fix hip04-xmit never return TX_BUSY Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 28/33] net: hisilicon: Fix dma_map_single failed on arm64 Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 29/33] libata: add SG safety checks in SFF pio transfers Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 30/33] x86/lib/cpu: Address missing prototypes warning Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 31/33] drm/vmwgfx: fix memory leak when too many retries have occurred Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 32/33] perf pmu-events: Fix missing "cpu_clk_unhalted.core" event Sasha Levin
2019-08-14  2:23 ` [PATCH AUTOSEL 4.9 33/33] selftests: kvm: Adding config fragments Sasha Levin

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190814022323.17111-4-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=broonie@kernel.org \
    --cc=ckeepax@opensource.cirrus.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Stable Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://lore.kernel.org/stable \
		stable@vger.kernel.org stable@archiver.kernel.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox