diff options
| author | Cezary Rojewski <cezary.rojewski@intel.com> | 2024-03-08 12:04:59 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-03-25 03:32:38 +0300 |
| commit | 6974857c2b2c7e2d2db59c0e23cc42b0efc58cd8 (patch) | |
| tree | 67d7c7a0cf9cddca9c15c1bff834abbcc59692fb /sound/soc/soc-topology.c | |
| parent | 0cb3b7fd530b8c107443218ce6db5cb6e7b5dbe1 (diff) | |
| download | linux-6974857c2b2c7e2d2db59c0e23cc42b0efc58cd8.tar.xz | |
ASoC: topology: Do not ignore route checks when parsing graphs
One of the framework responsibilities is to ensure that the enumerated
DPCMs are valid i.e.: a valid BE is connected to a valid FE DAI. While
the are checks in soc-core.c and soc-pcm.c that verify this, a component
driver may attempt to workaround this by loading an invalid graph
through the topology file.
Be strict and fail topology loading when invalid graph is encountered.
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240308090502.2136760-3-cezary.rojewski@intel.com
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-topology.c')
| -rw-r--r-- | sound/soc/soc-topology.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index ba4890991f0d..fad9432a10f1 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1083,8 +1083,15 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, break; } - /* add route, but keep going if some fail */ - snd_soc_dapm_add_routes(dapm, route, 1); + ret = snd_soc_dapm_add_routes(dapm, route, 1); + if (ret) { + if (!dapm->card->disable_route_checks) { + dev_err(tplg->dev, "ASoC: dapm_add_routes failed: %d\n", ret); + break; + } + dev_info(tplg->dev, + "ASoC: disable_route_checks set, ignoring dapm_add_routes errors\n"); + } } return ret; |