| Message ID | 1442394433-31417-1-git-send-email-mengdong.lin@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 16 Sep 2015 11:07:13 +0200, mengdong.lin@intel.com wrote: > > From: Mengdong Lin <mengdong.lin@intel.com> > > This vendor-specific version number is optional. It will be written to > the 'version' field of each block header of the binary toplogy data file. > The vendor driver can check this number for further processing in kernel. > > The topology ABI version number is still stored in the 'abi' field of > block headers. > > Signed-off-by: Mengdong Lin <mengdong.lin@intel.com> > Reviewed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Thanks, applied now. But I have concern about topology ABI/API: have we stabilized it enough? That is, are there any missing patches in the current kernel and alsa-lib/utils git trees that may lead to any API/ABI incompatibilities? Takashi
+ Vinod On Wed, 2015-09-23 at 10:48 +0200, Takashi Iwai wrote: > On Wed, 16 Sep 2015 11:07:13 +0200, > mengdong.lin@intel.com wrote: > > > > From: Mengdong Lin <mengdong.lin@intel.com> > > > > This vendor-specific version number is optional. It will be written to > > the 'version' field of each block header of the binary toplogy data file. > > The vendor driver can check this number for further processing in kernel. > > > > The topology ABI version number is still stored in the 'abi' field of > > block headers. > > > > Signed-off-by: Mengdong Lin <mengdong.lin@intel.com> > > Reviewed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> > > Thanks, applied now. But I have concern about topology ABI/API: have > we stabilized it enough? That is, are there any missing patches in > the current kernel and alsa-lib/utils git trees that may lead to any > API/ABI incompatibilities? There are a couple of patches that are ABI changes afaik for PCM config/capabilities. Mengdong, can you point us to your latest code for alsa-lib and kernel with the ABI updates. We can then review the final changes. Vinod, Subhransu, please shout if there is anything missing from the final ABI updates in Mengdongs alsa-lib/kernel branches. Thanks Liam > > > Takashi --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
> -----Original Message----- > From: alsa-devel-bounces@alsa-project.org > [mailto:alsa-devel-bounces@alsa-project.org] On Behalf Of Takashi Iwai > Sent: Wednesday, September 23, 2015 4:48 PM > To: Lin, Mengdong > Cc: mengdong.lin@linux.intel.com; alsa-devel@alsa-project.org; > broonie@kernel.org; Prusty, Subhransu S; Girdwood, Liam R > Subject: Re: [alsa-devel] [PATCH] topology: Add API to set a vendor specific > version number > > On Wed, 16 Sep 2015 11:07:13 +0200, > mengdong.lin@intel.com wrote: > > > > From: Mengdong Lin <mengdong.lin@intel.com> > > > > This vendor-specific version number is optional. It will be written to > > the 'version' field of each block header of the binary toplogy data file. > > The vendor driver can check this number for further processing in kernel. > > > > The topology ABI version number is still stored in the 'abi' field of > > block headers. > > > > Signed-off-by: Mengdong Lin <mengdong.lin@intel.com> > > Reviewed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> > > Thanks, applied now. But I have concern about topology ABI/API: have we > stabilized it enough? That is, are there any missing patches in the current > kernel and alsa-lib/utils git trees that may lead to any API/ABI > incompatibilities? Thank you, Takashi. We'll upstream some topology ABI/API change soon (in 1 or 2 weeks), for DAI & DAI links. There will be changes in the kernel and alsa-lib. Regards Mengdong > > Takashi > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On Wed, Sep 23, 2015 at 04:13:26PM +0000, Lin, Mengdong wrote: > We'll upstream some topology ABI/API change soon (in 1 or 2 weeks), for DAI & DAI links. > There will be changes in the kernel and alsa-lib. Please bear in mind that we're on -rc2 now and the later it gets the more risk there is with getting things merged.
diff --git a/include/topology.h b/include/topology.h index 6ff8c5f..9b84bd9 100644 --- a/include/topology.h +++ b/include/topology.h @@ -690,6 +690,14 @@ int snd_tplg_build(snd_tplg_t *tplg, const char *outfile); */ int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len); +/** + * \brief Set an optional vendor specific version number. + * \param tplg Topology instance. + * \param version Vendor specific version number. + * \return Zero on success, otherwise a negative error code + */ +int snd_tplg_set_version(snd_tplg_t *tplg, unsigned int version); + /* \} */ #ifdef __cplusplus diff --git a/src/topology/builder.c b/src/topology/builder.c index 3bccd44..2f01137 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -89,7 +89,7 @@ static int write_data_block(snd_tplg_t *tplg, int size, int tplg_type, /* write the header for this block */ ret = write_block_header(tplg, tplg_type, 0, - SND_SOC_TPLG_ABI_VERSION, 0, size, 1); + tplg->version, 0, size, 1); if (ret < 0) { SNDERR("error: failed to write %s block %d\n", obj_name, ret); return ret; @@ -125,7 +125,7 @@ static int write_elem_block(snd_tplg_t *tplg, } ret = write_block_header(tplg, tplg_type, vendor_type, - SND_SOC_TPLG_ABI_VERSION, 0, size, count); + tplg->version, 0, size, count); if (ret < 0) { SNDERR("error: failed to write %s block %d\n", obj_name, ret); @@ -243,7 +243,7 @@ static int write_manifest_data(snd_tplg_t *tplg) /* write the header for this block */ ret = write_block_header(tplg, SND_SOC_TPLG_TYPE_MANIFEST, 0, - SND_SOC_TPLG_ABI_VERSION, 0, + tplg->version, 0, sizeof(tplg->manifest) + tplg->manifest.priv.size, 1); if (ret < 0) { SNDERR("error: failed to write manifest block %d\n", ret); diff --git a/src/topology/parser.c b/src/topology/parser.c index 7ca244c..c0ab5e4 100644 --- a/src/topology/parser.c +++ b/src/topology/parser.c @@ -362,6 +362,13 @@ int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len) return 0; } +int snd_tplg_set_version(snd_tplg_t *tplg, unsigned int version) +{ + tplg->version = version; + + return 0; +} + void snd_tplg_verbose(snd_tplg_t *tplg, int verbose) { tplg->verbose = verbose;