| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190626133617.25959-3-jbrunet@baylibre.com>
Date: Wed, 26 Jun 2019 15:36:17 +0200
From: Jerome Brunet <jbrunet@...libre.com>
To: Mark Brown <broonie@...nel.org>,
Liam Girdwood <lgirdwood@...il.com>,
Kevin Hilman <khilman@...libre.com>
Cc: Jerome Brunet <jbrunet@...libre.com>, alsa-devel@...a-project.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-amlogic@...ts.infradead.org,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: [PATCH 2/2] ASoC: soc-core: support dai_link with platforms_num != 1
Add support platforms_num != 1 in dai_link. Initially, the main purpose of
this change was to make the platform optional in the dai_link, instead of
inserting the dummy platform driver.
This particular case had just been solved by Kuninori Morimoto with
commit 1d7689892878 ("ASoC: soc-core: allow no Platform on dai_link").
However, this change may still be useful for those who need multiple
platform components on a single dai_link (it solves one of the FIXME
note in soc-core)
Cc: Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Signed-off-by: Jerome Brunet <jbrunet@...libre.com>
---
include/sound/soc.h | 6 ++++
sound/soc/soc-core.c | 66 +++++++++++++++++++-------------------------
2 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 64405cdab8bb..4e8071269639 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -997,6 +997,12 @@ struct snd_soc_dai_link {
((i) < link->num_codecs) && ((codec) = &link->codecs[i]); \
(i)++)
+#define for_each_link_platforms(link, i, platform) \
+ for ((i) = 0; \
+ ((i) < link->num_platforms) && \
+ ((platform) = &link->platforms[i]); \
+ (i)++)
+
/*
* Sample 1 : Single CPU/Codec/Platform
*
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 002ddbf4e5a3..3053a4a461b3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -887,7 +887,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link)
{
struct snd_soc_pcm_runtime *rtd;
- struct snd_soc_dai_link_component *codecs;
+ struct snd_soc_dai_link_component *dlc;
struct snd_soc_component *component;
int i;
@@ -917,13 +917,14 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
/* Find CODEC from registered CODECs */
rtd->num_codecs = dai_link->num_codecs;
- for_each_link_codecs(dai_link, i, codecs) {
- rtd->codec_dais[i] = snd_soc_find_dai(codecs);
+ for_each_link_codecs(dai_link, i, dlc) {
+ rtd->codec_dais[i] = snd_soc_find_dai(dlc);
if (!rtd->codec_dais[i]) {
dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n",
- codecs->dai_name);
+ dlc->dai_name);
goto _err_defer;
}
+
snd_soc_rtdcom_add(rtd, rtd->codec_dais[i]->component);
}
@@ -931,12 +932,13 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
rtd->codec_dai = rtd->codec_dais[0];
/* Find PLATFORM from registered PLATFORMs */
- for_each_component(component) {
- if (!snd_soc_is_matching_component(dai_link->platforms,
- component))
- continue;
+ for_each_link_platforms(dai_link, i, dlc) {
+ for_each_component(component) {
+ if (!snd_soc_is_matching_component(dlc, component))
+ continue;
- snd_soc_rtdcom_add(rtd, component);
+ snd_soc_rtdcom_add(rtd, component);
+ }
}
soc_add_pcm_runtime(card, rtd);
@@ -1051,22 +1053,22 @@ static int soc_init_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link *link)
{
int i;
- struct snd_soc_dai_link_component *codec;
+ struct snd_soc_dai_link_component *dlc;
- for_each_link_codecs(link, i, codec) {
+ for_each_link_codecs(link, i, dlc) {
/*
* Codec must be specified by 1 of name or OF node,
* not both or neither.
*/
- if (!!codec->name ==
- !!codec->of_node) {
+ if (!!dlc->name ==
+ !!dlc->of_node) {
dev_err(card->dev, "ASoC: Neither/both codec name/of_node are set for %s\n",
link->name);
return -EINVAL;
}
/* Codec DAI name must be specified */
- if (!codec->dai_name) {
+ if (!dlc->dai_name) {
dev_err(card->dev, "ASoC: codec_dai_name not set for %s\n",
link->name);
return -EINVAL;
@@ -1076,40 +1078,28 @@ static int soc_init_dai_link(struct snd_soc_card *card,
* Defer card registartion if codec component is not added to
* component list.
*/
- if (!soc_find_component(codec))
+ if (!soc_find_component(dlc))
return -EPROBE_DEFER;
}
- /*
- * Platform may be specified by either name or OF node,
- * or no Platform.
- *
- * FIXME
- *
- * We need multi-platform support
- */
- if (link->num_platforms > 0) {
-
- if (link->num_platforms > 1) {
- dev_err(card->dev,
- "ASoC: multi platform is not yet supported %s\n",
- link->name);
- return -EINVAL;
- }
-
- if (link->platforms->name && link->platforms->of_node) {
+ for_each_link_platforms(link, i, dlc) {
+ /*
+ * Platform may be specified by either name or OF node, but it
+ * can be left unspecified, then no components will be inserted
+ * in the rtdcom list
+ */
+ if (!!dlc->name == !!dlc->of_node) {
dev_err(card->dev,
- "ASoC: Both platform name/of_node are set for %s\n",
+ "ASoC: Neither/both platform name/of_node are set for %s\n",
link->name);
return -EINVAL;
}
/*
- * Defer card registartion if platform dai component is not
- * added to component list.
+ * Defer card registartion if platform component is not added to
+ * component list.
*/
- if ((link->platforms->of_node || link->platforms->name) &&
- !soc_find_component(link->platforms))
+ if (!soc_find_component(dlc))
return -EPROBE_DEFER;
}
--
2.21.0
Powered by blists - more mailing lists