UUID tplg support #2919

keyonjie · 2020-05-09T04:07:58Z

This is the series for UUID support -- tplg part, it should be used together with the FW part and kernel part.

keyonjie · 2020-05-09T09:25:27Z

the corresponding Firmware PR: #2920
the corresponding Linux PR: thesofproject/linux#2215

lgirdwood · 2020-05-18T10:40:35Z

tools/topology/m4/muxdemux.m4

+`	tokens "sof_comp_tokens"'
+`	tuples."uuid" {'
+`		SOF_TKN_COMP_UUID'		"c4:b2:68:68:14:30:47:0e:a0:89:15:d1:c7:7f:85:1a"
+`	}'


It's better here to have a uuid.m4 file that contains all UUIDs and is included by all topologies.

# uuid.m4 - set default UUIDs if NOT already set in topology. # allows users to override the UUID if needed. ifndef UUID_SRC define UUID_SRC "blah blah blah" endif # and so on

As discussed, will implement a m4 helper to generate this UUID byte array from the string copied from the firmware source directly.

mmaka1 · 2020-05-22T16:29:57Z

tools/topology/m4/muxdemux.m4

+`SectionVendorTuples."'N_MUXDEMUX($1)`_tuples_uuid" {'
+`	tokens "sof_comp_tokens"'
+`	tuples."uuid" {'
+`		SOF_TKN_COMP_UUID'		"c4:b2:68:68:14:30:47:0e:a0:89:15:d1:c7:7f:85:1a"


Could you document the format used for uuid in this token?
If this is just a byte array, is endianess correct? There are uint32, uint32, uint8.
Example from the fw source code:

/* c4b26868-1430-470e-a089-15d1c77f851a */ DECLARE_SOF_UUID("demux", demux_uuid, 0xc4b26868, 0x1430, 0x470e, 0xa0, 0x89, 0x15, 0xd1, 0xc7, 0x7f, 0x85, 0x1a);

So if it is byte array and little-endian is assumed, it should rather be 68:68:b2:c4:30:14....

You are right, thanks for spotting this.

keyonjie · 2020-05-28T08:53:45Z

@lgirdwood @mmaka1 I want to let this (adding UUID tokens to toplogies) go first, they are verified with the corresponding FW and kernel changes, but the topology changes can go first as they won't be used if driver and FW is not ready yet, no any regression with these changes applied.

keyonjie · 2020-05-28T08:58:15Z

Not all components are covered until now, there will be more commits added for them, e.g. asrc/buffer/dai/dcblock/eq/mixer/pcm/pga/src/tone...

lgirdwood

I guess there is nothing stopping this being merged after kernel token is updated ? i.e. it's not used so wont change anything ?

keyonjie · 2020-05-29T15:27:51Z

I guess there is nothing stopping this being merged after kernel token is updated ? i.e. it's not used so wont change anything ?

Right. We can merge this even before the kernel token is updated, which means we provide those tokens in tplg, but the kernel doesn't parse them so nothing will change to others.

lgirdwood

What's the status of the kernel PR for the new token ID ?

keyonjie · 2020-06-01T14:35:03Z

What's the status of the kernel PR for the new token ID ?

That is the third commit of the driver PR, thesofproject/linux@04a7e7a

@kv2019i @plbossart I think we are all aligned on adding this token on both tplg and driver side?

plbossart · 2020-06-01T16:06:15Z

What's the status of the kernel PR for the new token ID ?

That is the third commit of the driver PR, thesofproject/linux@04a7e7a

@kv2019i @plbossart I think we are all aligned on adding this token on both tplg and driver side?

I am not, there are 4 parallel threads (sof-developers, sof-docs, sof, linux), it's beyond my reviewer ability quite frankly to figure out what the big picture looks like.

kv2019i · 2020-06-01T16:18:54Z

@plbossart wrote:

I am not, there are 4 parallel threads (sof-developers, sof-docs, sof, linux), it's beyond my reviewer ability quite frankly to figure out what the big picture looks like.

I suggest looking at the sof-docs:
thesofproject/sof-docs#245

.. let's all align on that first. If we all approve, then reviewing the others should be easier as they should all comply with the sof-docs. Ok @plbossart @keyonjie @lgirdwood ?

keyonjie · 2020-06-02T05:45:50Z

@plbossart wrote:

I am not, there are 4 parallel threads (sof-developers, sof-docs, sof, linux), it's beyond my reviewer ability quite frankly to figure out what the big picture looks like.

I suggest looking at the sof-docs:
thesofproject/sof-docs#245

.. let's all align on that first. If we all approve, then reviewing the others should be easier as they should all comply with the sof-docs. Ok @plbossart @keyonjie @lgirdwood ?

Good point, ack.

Move the including of utils.m4 to first as it is needed by other component m4 files. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to smart_amp widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to muxdemux widgets for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to detect widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to ch_sel widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to kpb widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to asrc widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to dai widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to dcblock widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to eq_fir widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to eq_iir widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to mixer widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to host widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to volume widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to src widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

Add the uuid token to tone widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

lgirdwood · 2020-08-10T08:39:02Z

@zrombel can you check CI (nothing is showing red) - I'm told by @keyonjie that the test should be passing.
@keyonjie does the CI needs updated for this test to pass now ?

keyonjie · 2020-08-10T08:46:43Z

@zrombel can you check CI (nothing is showing red) - I'm told by @keyonjie that the test should be passing.
@keyonjie does the CI needs updated for this test to pass now ?

I can't see the QB log, instead seeing all SUCCESS while it reports Tools failed. And for the alsa-lib version in CI, yes, let's align using latest version for building.

keyonjie · 2020-08-10T09:40:48Z

@slawblauciak could you help to take a look?

keyonjie · 2020-08-10T15:15:45Z

SOFCI TEST

keyonjie · 2020-08-11T06:18:59Z

@lgirdwood , @xiulipan told me that it is known issue for QB on TGL, so I think we are good to go with this.

keyonjie · 2020-08-11T08:23:45Z

@zrombel please make sure the QB server is using alsa-lib later than v1.2.1

marc-hb · 2020-08-11T17:52:17Z

@zrombel please make sure the QB server is using alsa-lib later than v1.2.1

I have a branch that lets you build 1.2.3.2 .deb files for Ubuntu in two commands:
thesofproject/linux#2211 (comment)

Feedback appreciated there.

keyonjie · 2020-08-13T08:58:27Z

@zrombel forgot to mention, please upgrade both alsa-lib and alsa-utils to the same version v1.2.3.

zrombel · 2020-08-13T11:14:39Z

Process Team is working on updating QB machines with newest alsa-lib and utils. We were able to run one test build on updated machine on this PR and it'a PASS so this PR can be merged. Rest of the machines are still under update. QB should be fully ready at the end of the day.

keyonjie · 2020-08-13T12:00:11Z

Thanks @zrombel . @lgirdwood Let's merge this and then kernel PR will go together.

keyonjie · 2020-08-13T12:01:38Z

SOFCI TEST

zrombel · 2020-08-13T12:56:11Z

QB CI is now fully updated.

keyonjie requested review from dbaluta, jajanusz, lbetlej, lgirdwood, mmaka1, plbossart and tlauda as code owners May 9, 2020 04:07

This was referenced May 9, 2020

UUID Kernel support thesofproject/linux#2090

Closed

UUID Firmware support #2920

Merged

lgirdwood requested changes May 18, 2020

View reviewed changes

mmaka1 reviewed May 22, 2020

View reviewed changes

keyonjie force-pushed the uuid_tplg branch from 27e3759 to 6ef8c6c Compare May 28, 2020 08:50

keyonjie changed the title ~~[RFC]UUID tplg support~~ UUID tplg support May 28, 2020

keyonjie requested a review from lgirdwood May 28, 2020 08:51

lgirdwood approved these changes May 29, 2020

View reviewed changes

keyonjie force-pushed the uuid_tplg branch from 6ef8c6c to 35bf692 Compare June 1, 2020 05:45

lgirdwood approved these changes Jun 1, 2020

View reviewed changes

lgirdwood added the ABI ABI change involved label Jun 1, 2020

keyonjie force-pushed the uuid_tplg branch from 35bf692 to 630f17e Compare June 2, 2020 05:29

keyonjie force-pushed the uuid_tplg branch from 630f17e to 4c5f8ed Compare June 10, 2020 17:28

lgirdwood added this to the ABI-3.17 milestone Jun 12, 2020

keyonjie added 16 commits August 10, 2020 10:20

test: topology: includes utils.m4 first

4690aea

Move the including of utils.m4 to first as it is needed by other component m4 files. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: smart_amp: add uuid token to the widget

212a1ee

Add the uuid token to smart_amp widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: muxdemux: add uuid token support

94fe117

Add the uuid token to muxdemux widgets for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: detect: add uuid token support

4d787ad

Add the uuid token to detect widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: ch_sel: add uuid token support

1415743

Add the uuid token to ch_sel widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: kpbm: add uuid token support

df362ac

Add the uuid token to kpb widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: asrc: add uuid token support

f189fd2

Add the uuid token to asrc widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: dai: add uuid token support

869dd11

Add the uuid token to dai widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: dcblock: add uuid token support

96c9169

Add the uuid token to dcblock widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: eq_fir: add uuid token support

e1a1184

Add the uuid token to eq_fir widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: eq_iir: add uuid token support

5b88244

Add the uuid token to eq_iir widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: mixer: add uuid token support

69bf532

Add the uuid token to mixer widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: pcm: add uuid token support

1590dd7

Add the uuid token to host widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: pga: add uuid token support

f783070

Add the uuid token to volume widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: src: add uuid token support

b92360d

Add the uuid token to src widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

topology: tone: add uuid token support

cb293a6

Add the uuid token to tone widget for the future use. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>

keyonjie merged commit 624faa9 into thesofproject:master Aug 13, 2020

marc-hb mentioned this pull request Aug 28, 2020

update Travis scripts thesofproject/linux#2402

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UUID tplg support #2919

UUID tplg support #2919

keyonjie commented May 9, 2020 •

edited

Loading

keyonjie commented May 9, 2020 •

edited

Loading

lgirdwood May 18, 2020

keyonjie May 28, 2020

mmaka1 May 22, 2020

keyonjie May 28, 2020

keyonjie commented May 28, 2020

keyonjie commented May 28, 2020 •

edited

Loading

lgirdwood left a comment

keyonjie commented May 29, 2020

lgirdwood left a comment •

edited

Loading

keyonjie commented Jun 1, 2020

plbossart commented Jun 1, 2020

kv2019i commented Jun 1, 2020

keyonjie commented Jun 2, 2020

lgirdwood commented Aug 10, 2020

keyonjie commented Aug 10, 2020

keyonjie commented Aug 10, 2020

keyonjie commented Aug 10, 2020

keyonjie commented Aug 11, 2020

keyonjie commented Aug 11, 2020

marc-hb commented Aug 11, 2020

keyonjie commented Aug 13, 2020

zrombel commented Aug 13, 2020

keyonjie commented Aug 13, 2020

keyonjie commented Aug 13, 2020

zrombel commented Aug 13, 2020

UUID tplg support #2919

UUID tplg support #2919

Conversation

keyonjie commented May 9, 2020 • edited Loading

keyonjie commented May 9, 2020 • edited Loading

lgirdwood May 18, 2020

Choose a reason for hiding this comment

keyonjie May 28, 2020

Choose a reason for hiding this comment

mmaka1 May 22, 2020

Choose a reason for hiding this comment

keyonjie May 28, 2020

Choose a reason for hiding this comment

keyonjie commented May 28, 2020

keyonjie commented May 28, 2020 • edited Loading

lgirdwood left a comment

Choose a reason for hiding this comment

keyonjie commented May 29, 2020

lgirdwood left a comment • edited Loading

Choose a reason for hiding this comment

keyonjie commented Jun 1, 2020

plbossart commented Jun 1, 2020

kv2019i commented Jun 1, 2020

keyonjie commented Jun 2, 2020

lgirdwood commented Aug 10, 2020

keyonjie commented Aug 10, 2020

keyonjie commented Aug 10, 2020

keyonjie commented Aug 10, 2020

keyonjie commented Aug 11, 2020

keyonjie commented Aug 11, 2020

marc-hb commented Aug 11, 2020

keyonjie commented Aug 13, 2020

zrombel commented Aug 13, 2020

keyonjie commented Aug 13, 2020

keyonjie commented Aug 13, 2020

zrombel commented Aug 13, 2020

keyonjie commented May 9, 2020 •

edited

Loading

keyonjie commented May 9, 2020 •

edited

Loading

keyonjie commented May 28, 2020 •

edited

Loading

lgirdwood left a comment •

edited

Loading