Commit Graph

3387 Commits

Author SHA1 Message Date
Tomasz Lauda 38f3f3d7ba arch: cleanup includes
Cleanups includes in all architecture files.
Unused headers has been removed and needed
has beed added.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-16 15:02:06 +02:00
Tomasz Lauda 77f94b8ce5 gdb: move xtensa specific defines to arch
Moves xtensa specific defines from generic code
to xtensa arch.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-15 13:29:29 +02:00
Tomasz Lauda a990c611c4 sof: change approach to including arch headers
Further work, but now it's done for remaining arch headers.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-15 13:29:29 +02:00
Tomasz Lauda 0317a7bce5 sof: change approach to including platform headers
Right now we have headers spread across main sof include
directory, arch include directory and platform include
directory. The same header e.g. cpu needs to be included
from sof, arch and platform. This creates long inclusion
lists and often we are missing many headers, but since
they are already included in some other headers, we don't
see the issue. This patch changes the approach to including
platform headers. It allows for inclusion only from main
header e.g. sof/cpu.h will include arch/cpu.h and platform/cpu.h.
If we want to use some cpu functionality we only need to include
sof/cpu.h and don't worry about the rest. If we have platform
header, which is only used inside of platform code, then
it can be directly accessed within.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-15 13:29:29 +02:00
Tomasz Lauda 807815f41b include: cleanup inclusions in ipc, kernel and user headers
Cleanups inclusions in ipc, kernel and user headers.
Some of the headers were missing and some weren't needed.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-15 13:29:29 +02:00
Tomasz Lauda 0648828b2b cavs: allow for header inclusion only from platform code
Adds preprocessor check in cavs headers and throws error,
when they are included from outside of equivalent platform
headers.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-15 13:29:29 +02:00
Tomasz Lauda ceb35857b6 arch: unify include guards naming
Unifies include guards naming in arch headers.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-12 16:12:59 +02:00
Tomasz Lauda 58d3774948 platform: unify include guards naming
Unifies include guards naming in platform headers.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-12 16:12:59 +02:00
Tomasz Lauda c33687544f sof: unify include guards naming
Unifies include guards naming in ipc, kernel, sof
and user headers.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-12 16:12:59 +02:00
Tomasz Lauda 119746d206 common: replace __attribute__((packed)) with __packed
Replaces all occurrences of __attribute__((packed)) with
__packed macro.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-12 16:12:59 +02:00
Tomasz Lauda a46e786aed common: extract common helper macros to separate header
Extracts common helper macros to separate header called
common.h.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-12 16:12:59 +02:00
Tomasz Lauda 2eb5857c77 arch: xtensa: merge UP and SMP architectures
Merges xtensa UP and SMP architectures.
The amount of code which were duplicated by creating
SMP architecture as separate instance is too big
to maintain. I've decided to merge both architectures,
change explicit selection of SMP to be dependent on
configured number of cores (> 1) and add branching in
xtos based on currently used processor configuration.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-12 15:05:57 +02:00
Tomasz Lauda ededbb65fe arch: xtensa: remove deprecated stack defines
Removes deprecated stack defines as they are no longer
needed.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-12 15:05:57 +02:00
Seppo Ingalsuo 4870332719 Topology: Updates for single EQ pipeline definitions
This patch provides needed maintenance. The pipelines
missed the volume ramp tokens and caused topology build fail for
topologies those would use the pipeline macros
pipe-eq-fir-volume-playback.m4 and pipe-eq-iir-volume-playback.m4.

The embedded filter coefficients in these pipelines were replaced
by included default FIR and IIR filter coefficients to fix ABI
incompatibility in the configuration blobs and ease future
maintenance of these pipelines.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-07-12 09:24:51 +02:00
Keyon Jie 09b416bb5a topology: sof-cml-rt5682-max98357a: switch to use kwd pipelines
Switch to use sof-cml-rt5682-kwd.m4 which can support Keyword Detect
feature.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-11 15:32:01 +02:00
Keyon Jie b56fcbc44a topology: sof-cml-rt5682-max98357a: change BE id to align with machine
driver

The BE id for amplifier pipeline should be changed to 6 to align with
machine driver (The commit ASoC: Intel: sof-rt5682: correct naming for
dmic16k).

Cc: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-11 15:32:01 +02:00
Keyon Jie d1ae32a322 topology: sof-cml-rt5682: refining for dmic16k pipeline
Add volume component, change to use 16KHz sample rate, and modify the
PCM ID from 5 to 8, as it is in lower priority comparing with pipelines
like amplifier.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-11 15:32:01 +02:00
Tomasz Lauda 4cbfd88731 platform: cpu: extract core defines to separate headers
Extracts DSP core defines to the separate platform headers.
It was partially done before for cAVS platforms.
It's a step forward towards full header cleanup.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
2019-07-10 07:58:44 +02:00
Seppo Ingalsuo 34d0db94be Cmocka: Volume: Increase test coverage for S24_LE output format
This patch adds check for sample to not exceed S24_LE range that
could happen in int32_t type storage. The existing check for
abs(delta) > 1 does not cover such case if e.g. the reference
volume code would output e.g. INT24_MAX and the FW component
INT24_MAX + 1.

Similar check is added for every reference volume function that
outputs S24_LE format.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2019-07-09 15:15:15 +02:00
Janusz Jankowski 27cdfbdb40 m4: support for ssp bclk_delay token
BCLK delay is optional last value (after quirks),
in SSP_CONFIG_DATA.

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
2019-07-05 11:55:51 +02:00
Janusz Jankowski 098636c098 ssp: bclk delay parameter
Some codecs require BCLK to be on for some time,
before sending any data. It can be achieved with delay between
enabling BCLK and DMA that should be given in topology.

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
2019-07-05 11:55:51 +02:00
Keyon Jie 7e0d2661c7 pipeline: disable FW xrun recovery at the moment to rescue logs
Xrun recover failure will flush all over the memory window that we can't
get the log of the first error, let's disable it before the flag is
moved to kconfig and fw_ready IPC, to rescue logs and debugging.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-05 11:37:44 +02:00
Keyon Jie 40c2b9e80c dw-dma: add more logs when get avail/free data fail
We should not get 0 size from dw_dma_avail_data_size() and
dw_dma_avail_data_size(), if that happened, something might be wrong,
e.g. the dma channel is not enabled, here logging out the channel
enabling status for debugging.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-05 11:37:44 +02:00
Keyon Jie fcd727678e detect-test: refine the detect function
We should use the absolute value for the activation comparing, and no
need to take extra handling to those samples with low enough level.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-04 07:43:34 +01:00
Keyon Jie d2e5c6a78a sof-ctl: split and move ctl_setup out of main()
Move ctl_elem pointers and buffer initialization out of main(), and
replace calling alloca APIs with malloc ones to make they are shareable
between different functions.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie d5f359c0f4 sof-ctl: add '-t' to support specifying the component type
Firmware may use different component specified type in abi header, to
support more than one kcontrols for the same component, here add '-t' to
support specifying this component specified type in the abi header.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie a29032420b sof-ctl: add labels to handle failure paths
Add labels in main() to handle kinds of failure cases, with the code
cleanup together.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie e86ba1dcbf sof-ctl: add '-o' support to dump ctl data to a specified file
Here add '-o' to support output control data to the specified file, in
binary format.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie cc717a539e sof-ctl: add separated function for control set/get
Add a separated function ctl_set_get() for tlv set/get, and call it from
main().

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 5de89ad8c1 sof-ctl: add functions for buffer allocate and free
Split buffer allocating and freeing part from main(), add separated
functions and call them from main().

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie f3bc979112 sof-ctl: add macros for buffer offsets
Add macros for offsets in the ctl_data buffer, and switch to use them.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie fe28746bba sof-ctl: add '-r' to support raw data mode
Using '-r' with '-s' means no abi header for the input file, and asks
for not dumping abi header when using '-r' without '-s'.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 0c2f1a6cdc sof-ctl: add header_init() for abi header initialization
This will be needed for raw data(without abi header) input file.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 89b4df8c6c sof-ctl: add support to dump kcontrol in binary mode
When specified with '-b', let's dump out kcontrol value in 16bit hex
format.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 32b1021080 sof-ctl: add '-b' mode to support binary format input file
Adding support to binary input file, using '-b' to indicate that.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 98794eef79 sof-ctl: add function to get file size
This will be used on large input file scenario, we need to allocate
buffer according to the input file size.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 985f49a786 sof-ctl: create functions for data dumping
We might dump kcontrol values in different format, create data_dump()
and csv_data_dump() for that.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 49c0f91a75 sof-ctl: allocate ctl_data struct and switch to use it
Allocate ctl_data struct, initialize it and switch to use it to replace
the local variables.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie efcda78053 sof-ctl: add ctl_data struct for params sharing between functions
Add a globle struct which will store params and be shared among
functions in the later commits, to make the code more readable.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie e5096aeb85 sof-ctl: fix a print out format
Adding '\n' after "hdr: type" output to make the header dumping more
easier to be read.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 15:29:59 +01:00
Keyon Jie 2762ada65e topology: cml-rt5682-kwd: change to use S24_LE format for CML
As dmic only support 16 bit or 32 bit, we configure dmic dai to be
s32_le, and pipelines to be s24_le.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 14:10:00 +02:00
Keyon Jie 6a9fc3c56e topology: kwd: add volume component after dmic
We need volume component after dmic for either volume change or format
converting, here add volume component between dmic and kpb.

And after this, our kwd can support all s16_le, s24_4le, and s32_le PCM
capabilities.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 14:10:00 +02:00
Jaska Uimonen 528c72baef host: resize host buffer for dma alignment
Depending on the topology, buffer size might not be multiple of dma
transfer size. So, round host buffer size up to nearest dma transfer
size multiple and possibly resize the host buffer.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-07-03 13:55:30 +02:00
Jaska Uimonen 7a857acdd7 buffer: add resize to buffer_set_size function
Add resize function to buffer_set_size. This is useful, because we might
have situations where external parameter like stream sample rate or dma
transfer size is not compatible with buffer size from topology. So this
allows to change the buffer bigger and also to free memory if less space
is needed.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-07-03 13:55:30 +02:00
Janusz Jankowski 084e7d6e79 test: add realloc stubs
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
2019-07-03 13:55:30 +02:00
Jaska Uimonen 54c4076ee4 testbench: add realloc for host testbench
Add rbrealloc and rrealloc for host testbench.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2019-07-03 13:55:30 +02:00
Janusz Jankowski bac917330e ssp: add M/N divider
M/N divider is needed for getting BCLK rates,
that are not dividers of MCLK.
In such a case, FW will try to find set of M, N and SCR values
needed to achieve target BCLK.

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
2019-07-03 13:07:46 +02:00
Janusz Jankowski 5a92c4f370 ssp: SCR comment
Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
2019-07-03 13:07:46 +02:00
ArturX Kloniecki e52ed8d208 Mux: implement comp_reset function.
Mux component was lacking reset function implementation. This is to
address this issue.

Signed-off-by: ArturX Kloniecki <arturx.kloniecki@linux.intel.com>
2019-07-03 12:40:21 +02:00
Keyon Jie 1e295a5d6a detect-test: initial default size buffer for model data
We need initial a default buffer for model data at component new()
stage, and make sure we have non-0 size of this buffer otherwise, the
get_data cmd will fail.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2019-07-03 10:21:17 +02:00