Skip to content

ASoC: SOF: topology: add abi checking #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Apr 11, 2019
Merged

ASoC: SOF: topology: add abi checking #797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions sound/soc/sof/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
#define TLV_STEP 1
#define TLV_MUTE 2

/* size of tplg abi in byte */
#define SOF_TPLG_ABI_SIZE 3

/* send pcm params ipc */
static int ipc_pcm_params(struct snd_sof_widget *swidget, int dir)
{
Expand Down Expand Up @@ -3046,8 +3049,28 @@ static void sof_complete(struct snd_soc_component *scomp)
static int sof_manifest(struct snd_soc_component *scomp, int index,
struct snd_soc_tplg_manifest *man)
{
/* not currently parsed */
return 0;
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

/* backward compatible with tplg without ABI info */
if (!man->priv.size) {
dev_dbg(sdev->dev, "No topology ABI info\n");
return 0;
}

if (man->priv.size == SOF_TPLG_ABI_SIZE) {
dev_info(sdev->dev,
"Topology: ABI %d:%d:%d Kernel ABI %d:%d:%d\n",
man->priv.data[0], man->priv.data[1],
man->priv.data[2], SOF_ABI_MAJOR, SOF_ABI_MINOR,
SOF_ABI_PATCH);
if (SOF_ABI_VER(man->priv.data[0], man->priv.data[1],
man->priv.data[2]) <= SOF_ABI_VERSION)
return 0;
Comment thread
plbossart marked this conversation as resolved.
Outdated
}
dev_err(sdev->dev,
"error: Incompatible ABI version %d:%d:%d\n",
man->priv.data[0], man->priv.data[1], man->priv.data[2]);
return -EINVAL;
}

/* vendor specific kcontrol handlers available for binding */
Expand Down