Commit 8bf9475f authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: topology: add more logs when topology load fails.

Add more dev_err() logs to help trace topology load failures, since we
have multiple error causes (e.g. invalid header or header that could
not be loaded).
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Link: https://lore.kernel.org/r/20200707203749.113883-6-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 952bd937
...@@ -1263,6 +1263,7 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, ...@@ -1263,6 +1263,7 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg,
ret = soc_tplg_add_route(tplg, routes[i]); ret = soc_tplg_add_route(tplg, routes[i]);
if (ret < 0) { if (ret < 0) {
dev_err(tplg->dev, "ASoC: topology: add_route failed: %d\n", ret);
/* /*
* this route was added to the list, it will * this route was added to the list, it will
* be freed in remove_route() so increment the * be freed in remove_route() so increment the
...@@ -2743,15 +2744,21 @@ static int soc_tplg_process_headers(struct soc_tplg *tplg) ...@@ -2743,15 +2744,21 @@ static int soc_tplg_process_headers(struct soc_tplg *tplg)
/* make sure header is valid before loading */ /* make sure header is valid before loading */
ret = soc_valid_header(tplg, hdr); ret = soc_valid_header(tplg, hdr);
if (ret < 0) if (ret < 0) {
dev_err(tplg->dev,
"ASoC: topology: invalid header: %d\n", ret);
return ret; return ret;
else if (ret == 0) } else if (ret == 0) {
break; break;
}
/* load the header object */ /* load the header object */
ret = soc_tplg_load_header(tplg, hdr); ret = soc_tplg_load_header(tplg, hdr);
if (ret < 0) if (ret < 0) {
dev_err(tplg->dev,
"ASoC: topology: could not load header: %d\n", ret);
return ret; return ret;
}
/* goto next header */ /* goto next header */
tplg->hdr_pos += le32_to_cpu(hdr->payload_size) + tplg->hdr_pos += le32_to_cpu(hdr->payload_size) +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment