Skip to contentSkip to conversation

topology: Add API to set a vendor specific version number

PATCH In review [email protected] 4 participants 5 messages Sep 16, 2015 – Sep 23, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 topology: Add API to set a vendor specific version number

From: Mengdong Lin <[email protected]>

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.

---
 include/topology.h     | 8 ++++++++
 src/topology/builder.c | 6 +++---
 src/topology/parser.c  | 7 +++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
include/topology.h +8 -0
index 6ff8c5f..9b84bd9 100644
@@ -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
src/topology/builder.c +3 -3
index 3bccd44..2f01137 100644
@@ -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);
src/topology/parser.c +7 -0
index 7ca244c..c0ab5e4 100644
@@ -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;
Signature · 1 line
1.9.1
#1 lore raw
Quoted 7 lines · On Wed, 16 Sep 2015 11:07:13 +0200, [email protected] wrote:

From: Mengdong Lin <[email protected]>

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.

Quoted 5 lines

The topology ABI version number is still stored in the 'abi' field of block headers.

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

#2 lore raw

+ Vinod

Quoted 12 lines · Takashi Iwai
Quoted 10 lines · On Wed, 16 Sep 2015 11:07:13 +0200, [email protected] wrote:

From: Mengdong Lin <[email protected]>

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.

Quoted 7 lines
Quoted 2 lines

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

Quoted 3 lines

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.

#3 lore raw
In reply to Takashi Iwai
Quoted 22 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Takashi Iwai
Sent: Wednesday, September 23, 2015 4:48 PM
To: Lin, Mengdong
Cc: [email protected]; [email protected]; [email protected]; Prusty, Subhransu S; Girdwood, Liam R
Subject: Re: [alsa-devel] [PATCH] topology: Add API to set a vendor specific version number

Quoted 10 lines · On Wed, 16 Sep 2015 11:07:13 +0200, [email protected] wrote:

From: Mengdong Lin <[email protected]>

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.

Quoted 7 lines
Quoted 2 lines

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

Quoted 6 lines

Takashi
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#4 lore raw
Quoted 2 lines · Mengdong

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.