Commit Graph

83 Commits

Author SHA1 Message Date
Pan Xiuli 6b59f8f698 rimage: Fix some memory leak error
Handle pointers and memory when error happens.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 14:16:15 +00:00
Pan Xiuli 0866b2a13e topology: test: Add test cases for SRC pipe
Add src pipe for test case.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 10:10:59 +00:00
Pan Xiuli 49d1ca9a13 topology: sof: Fix a typo for pipe src capture
Should be src capture here in capture pipe.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-20 10:10:59 +00:00
Liam Girdwood 106192c58c rimage: remove flat file builder.
No longer needed so can be safely removed.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-20 09:04:24 +00:00
Liam Girdwood 2307a6ace2 rimage: update to new SOF driver file format.
Support the SOF driver file format.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-20 09:04:13 +00:00
Liam Girdwood 76d5b55b8a Merge branch '1.0-dev' 2017-12-19 14:51:05 +00:00
Pan Xiuli a0b9292508 topology: test: Add capture and playback only test.
We may need these test for validation, add these tests.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-19 11:11:04 +00:00
Pan Xiuli c3bd862032 topology: m4: Add two macros for one direction PCM
We may need to generate capture only or playback only PCMs.
Add these macros to help generate them.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-19 11:11:04 +00:00
Pan Xiuli 90856416b6 topology: test: Refine name for test generator.
We have 5 critical arguments in the test generator but only used 3 for
the naming, this will make some files be overwritten.
Refine the name method to let these 5 arguments show in the tplg name.
Also we decide the pipe type in one of the argument, test-ssp.m4 and
test-src-ssp.m4 are almost the same, just remove one.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2017-12-19 11:11:04 +00:00
Liam Girdwood c20762ecac topology: test: Add simple component test generator.
Move testing pipelines into a test directory and reuse test scaffolding
so that they can be used to test multiple components on multiple target
with multiples configs.

Test topology scafolding are now pre-processed using a script to generate
the ALSA conf format with the various changes for each test case.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-13 21:08:57 +00:00
Liam Girdwood 8b254b5f3d topology: AIF directions are codec centric wrt PCMs
Commit 0a1a9bbc492e4eb22173ed57c7f5499c8f106289 discovered a bug in
the direction of AIF widgets in relation to PCMs. AIF widgets are codec
centric in ASoC so topology must align.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-13 21:06:27 +00:00
Keyon Jie 88519eee73 topology: fix 2 typos for capture pipeline
1. Widget N_PCMC type should be "aif_in", not "aif_out".
2. Widget W_DAI_IN data should be "N_DAI_IN", not "N_DAI_OUT".

Signed-off-by: Xiuli Pan <xiuli.pan@intel.com>
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2017-12-13 21:06:27 +00:00
Liam Girdwood 19e3240ec7 topology: Add duplex support to 24 bit volume passthrough
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:04:19 +00:00
Liam Girdwood e76aeeb7e9 topology: modify passthrough volume playback for duplex operation
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:03:50 +00:00
Liam Girdwood e094d38e95 topology: Add passthrough volume capture pipe
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:03:24 +00:00
Liam Girdwood 796989d774 topology: Add duplex support to test passthrough pipe
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:02:42 +00:00
Liam Girdwood 83b1704555 topology: Modify passthrough playback pipe for duplex operation
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:00:51 +00:00
Liam Girdwood 475fbdc01e topology: Add passthrough capture pipe
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-11 22:00:18 +00:00
Liam Girdwood 6dbbac5d13 topology: remove unused secondary media pcm
Secondary PCM not used atm for 1.0 release so temporarily remove from standard
topologies.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-07 21:18:15 +00:00
Pierre-Louis Bossart bfe32ee87c soft: topology: fix cht.m4
Not sure why we need these files, but the cht definitions are not
aligned with the others. Fix.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart 627e52bd67 soft: topology: add 16 and 24 bit passthrough for nocodec
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart cd988c514d topology: add files for SSP2-Codec machine drivers
At some point we should have a better way of relying on common parts but
for now add a passthrough shortcut directly usable with machine drivers

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart d72c06143e topology: add support for Dialog, Realtek and Maxim codecs
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart 31c4918ad5 topology: remove stream_name for all DAI definitions
stream_name is not used by any machine drivers, there is no point in
providing the information to topology layers

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Pierre-Louis Bossart df8b473929 topology: remove stream_name parameter from DAI_CONFIG
This value is never set in machine drivers, no point in setting it
here

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-12-07 10:59:46 +00:00
Liam Girdwood f3b486537d topology: add test pass through pipe for 16bit 48kHz on SSP2
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-12-05 16:31:49 +00:00
Liam Girdwood 44bced3781 rmbox: use 64bit trace data
Update trace to align with FW and use 64bit data size.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-10-19 22:24:58 +01:00
Liam Girdwood cd0eb84aca rmbox: move trace into separate parser function to ease future work.
Move trace handler into separate function to make it easier to add new
trace features. Make sure we only support 64 bit timestamps.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-10-13 16:41:29 +01:00
Yan Wang 082b84ac61 Use new output format for 64-bit timestamp.
1. Use [second.microsecond] for 64-bit timestamp.
2. Keep previous format for 32-bit timestamp.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2017-10-13 11:13:39 +01:00
Yan Wang 7f98c95c2a Add option "-t" to process DMA trace event with 64-bit tempstamp.
1. Timestamp is changed to 64-bit width.
2. Trace event is still 32-bit. High 32-bit of 64-bit is ignored.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2017-10-12 22:40:57 +01:00
Liam Girdwood d774609c90 topology: Allows playback and capture pipelines to share same PCM
Add support so that different playback and capture pipelines can share
the same host PCM device.

Modify board configs to use PCM0 for playback and capture.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-10-02 15:28:24 +01:00
Liam Girdwood d3ac267d00 topology: fix capture pipeline ID for SSP DAI
Capture pipeline for SSP DAI should be 2.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-23 23:10:00 +01:00
Pierre-Louis Bossart 086c634817 topology: indent reef-*.m4 files, fix typos
Align parameters on different lines to allow for easier visual
comparison and direct mapping with comments in build.m4

Also fix typo in comments s/priorty/priority/g

No functional change

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-09-14 13:52:31 +01:00
Pierre-Louis Bossart 006fe4ef30 topology: test: fix passthrough 24bit-48k-ssp2
format was missing, not sure how this ever worked.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-09-14 13:52:31 +01:00
Pierre-Louis Bossart 924ac07233 topology: build: fix PIPELINE/DAI_ADD comments
Add a couple of missing parameters in comments, align them logically
to help the rest of us figure out what parameters mean.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2017-09-14 13:52:31 +01:00
Liam Girdwood 81b02a796f topology: SRC testing passthrough pipeline.
The testing pipline for 24 bit SRC 48kHz output.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-11 16:38:14 +01:00
Liam Girdwood 530acaf46a topology: Add test SRC passthrough pipeline
Add a testing SRC passthrough pipeline.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-11 16:12:10 +01:00
Liam Girdwood 30d3d92928 topology: pipeline: Add flag to selcect either timer or IRQ scheduling
Add a flag to specify whether the pipeline processing work can be
scheduled via a timer or an IRQ source. IRQ scheduling will primarily be
used by pipelines that include a DAI.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-11 16:03:57 +01:00
Liam Girdwood 2b41652007 topology: Add support for DAI pipeline ID config
Allow topology to configure the pipeline ID of any DAI specific
pipeline instead of using 0.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-11 15:58:25 +01:00
Liam Girdwood d627f9e135 move test files 2017-09-11 14:53:10 +01:00
Liam Girdwood 19606eb2fc topology: Add support for 32bit data to playback and capture PCMs
Add S32_LE data support to the PCMs

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-08 12:51:25 +01:00
Liam Girdwood 08ccf3380b topology: SRC: Use 4ms for topology scheduling and increase buffers
SRC should be scheduled on at least 4ms tick. Increase buffers to
deal with 2 times output rate.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-07 14:25:18 +01:00
Liam Girdwood 5f53e40c52 topology: byt-rt5640: Fix stream name for BE DAI link
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-04 21:03:44 +01:00
Liam Girdwood f00e8884dd rmbox: check for non printable chars in trace.
Non printable means trace is a value.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-04 16:35:01 +01:00
Liam Girdwood 6cb0fd2806 topology: src: fix src config data by adding ""
SRC config data was missing "". Fixed.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-03 22:15:59 +01:00
Liam Girdwood ea3ff83bdc topology: media: fix media min period size to align with 1ms granularity
Make sure media buffers can align min period size on 1ms granularity.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-03 22:15:59 +01:00
Liam Girdwood 12b1907499 topology: src: fix W_SRC widget argument list order
Put format and data in correct order.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-09-03 22:15:58 +01:00
Liam Girdwood 1bed6ee95d topology: bind kcontrols to PGA widgets.
Add an parameter to bind TLV volume kcontrol to volume widget.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-08-31 23:51:20 +01:00
Liam Girdwood 6bb4da421c rmbox: Add support for floating point clock freq in MHz
Allow timestamp clock frequency to be set in MHz

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-08-30 22:55:57 +01:00
Liam Girdwood 7a1105772d rmbox: fix help output to show all options
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2017-08-30 22:55:57 +01:00