Testbench: Fix topology parse error with volume playback topology#2824
Merged
lgirdwood merged 4 commits intoMay 7, 2020
Merged
Conversation
singalsu
requested review from
a team,
dbaluta,
jajanusz,
lbetlej,
mmaka1,
plbossart and
tlauda
as code owners
singalsu
force-pushed
the
testbench_add_coreid_token
branch
from
bb42192 to
83345d8
Compare
Collaborator
Author
|
I just pushed a new version with improved commit texts. |
ranj063
reviewed
Apr 21, 2020
lgirdwood
requested changes
Apr 21, 2020
lgirdwood
requested changes
Apr 21, 2020
singalsu
force-pushed
the
testbench_add_coreid_token
branch
from
73db142 to
532a67c
Compare
lgirdwood
requested changes
Apr 22, 2020
ranj063
reviewed
Apr 23, 2020
ranj063
reviewed
Apr 23, 2020
This patch adds the token into header file tokens.h. It is used for topology parsing for testbench and fuzzer. The same token has been already defined in topology m4 macros. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
In some topologies there is a component tokens array after buffer tokens array for buffer widget. Since the earlier code version was able to handle only single array and did not skip the remaining it caused the remaining topology parsing to go out of sync and fail. This patch changes the vendor array parsing to be similar as for PCM widget that already had capability to handle several arrays. The core id is retrieved if present in topology and passed via IPC. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
singalsu
force-pushed
the
testbench_add_coreid_token
branch
from
532a67c to
d8e47a7
Compare
This patch replaces the manually set error codes with errno that is set to exact fail reason like ENOMEM etc. by these functions. The missing return code checks for fseek() calls are added. Include of header errno.h is added to topology.c. The order of include statements is fixed. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch adds the missing error codes check to avoid the parsing to continue after a possible file I/O fail. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
singalsu
force-pushed
the
testbench_add_coreid_token
branch
from
d8e47a7 to
b5f1c7c
Compare
Merged
ranj063
approved these changes
Apr 23, 2020
Member
|
SOFCI TEST |
Collaborator
Author
|
This needs more reviews. |
lgirdwood
approved these changes
May 7, 2020
Member
|
CI looks like CI/DUT issue. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This first commit adds define for the SOF_TKN_CORE_ID token that is present in some topologies for buffer widget, e.g. pipe-volume-playback.m4.
The second commit for buffer widget load changes is now changed to quite similar to PCM widget so all the arrays get parsed.
The third commit addresses error codes return. The manually set error code is replaced by -errno with malloc() and fseek() calls.
The fourth commit adds return value checks to tplg_read_array() calls.