Commit Graph

6172 Commits

Author SHA1 Message Date
Liam Girdwood f8107edba0 pipeline: move some static APIs to where they are used.
Certain static inline APIs are only used in one place so move them there.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2021-04-01 21:46:29 +01:00
Liam Girdwood 093589899a pipeline: remove legacy static pipeline support
Statically defined pipelines should be stitched into the FW image as
topology data rather than coded in C. This code was never used after
initial development so can be removed.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2021-04-01 21:46:29 +01:00
Liam Girdwood ba3a241e93 pipeline: split out trace APIs int a separate header
Split out the trace APIs from the core pipeline APIs.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2021-04-01 21:46:29 +01:00
Liam Girdwood 4875c44609 pipeline: split pipeline up by function.
Split the pipeline logic up into stream, params, graph, scheduling and xrun
so that it easier to follow and understand. This is to help on the TSC work
to integrate the codec adaptor into core logic.

This PR is all mechanical code moves. There are NO functional changes. Some
function that were static are now public.

Followup patches will add more documentation updates alongside.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2021-04-01 21:46:29 +01:00
Liam Girdwood 6b39aded15 testbench: remove build warnings when building testbench.
A side effect of the pipeline splitting work means that testbench is
not building. Provide a temporary fix until Zephyr native APIs are used.

/component.c.o   -c /home/lrg/work/sof/sof/src/audio/component.c
/home/lrg/work/sof/sof/src/audio/component.c: In function ‘get_drv’:
/home/lrg/work/sof/sof/src/audio/component.c:41:2: error: ‘flags’ is used uninitialized in this function [-Werror=uninitialized]
   41 |  irq_local_disable(flags);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~
/home/lrg/work/sof/sof/src/audio/component.c: In function ‘comp_register’:
/home/lrg/work/sof/sof/src/audio/component.c:150:2: error: ‘flags’ is used uninitialized in this function [-Werror=uninitialized]
  150 |  irq_local_disable(flags);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~
/home/lrg/work/sof/sof/src/audio/component.c: In function ‘comp_unregister’:
/home/lrg/work/sof/sof/src/audio/component.c:163:2: error: ‘flags’ is used uninitialized in this function [-Werror=uninitialized]
  163 |  irq_local_disable(flags);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2021-04-01 21:46:29 +01:00
Curtis Malainey f0ecc7b68a codec_adapter: fix local buffer prepare
We are only setting the parameters on the allocation of the local buffer
which means if the params change on the next run it will not change and
break things.

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
2021-04-01 16:44:10 +01:00
Daniel Baluta 0277eb8c2d codec_adapter: Update consumed bytes
After commit ed027d045b ("codec_adapter: Differentiate between consumed/produced bytes")
the codec adapter expects codecs to update consumed / produced bytes separately.

This fixes passthrough and waves codecs.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-04-01 16:42:07 +01:00
Daniel Baluta 2b06e80a84 codec_adapter: Add init_process callback
commit e50ae6be8c ("codec_adapter: Initialize processing") uses
the generic function codec_init_process which in turns needs a callback
for each type of codec.

Thus waves and passthrough are broken because there is no .init_process
callback provided. Fix this now.

Notice that the callback is mostly empty, the only thing that needs
to be done is to set codec->cpd.init_done to true.

Fixes: e50ae6be8c ("codec_adapter: Initialize processing")
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-04-01 16:42:07 +01:00
Daniel Baluta 91da843de0 audio: codec_adapter: Use generic init_process
init_process API is used to initialize the processing phase.
(e.g for Cadence: search for valid header, decode header in order
to get parameters).

init_process needs to have access to the input frames so it will be
called by codec adapter copy() function.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-04-01 16:42:07 +01:00
Daniel Baluta 7f975e9c27 codec_adapter: generic: Fail if init_process callback is not provided
In this way we avoid crashing the SOF FW and warn the user that
the callback is missing from the implementation.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-04-01 16:42:07 +01:00
Marc Herbert a5899812b7 version.cmake: don't trust CI to record time and versions and log ourselves
In an ideal world, every CI engine records and shares the most important
CI information:
- current date and time in a well identified timezone
- git version of the pull request
- git version of the moving branch the PR is being merged with

In the real world we have multiple CI solutions and they unfortunately
cannot not all be trusted to perform their most basic job
correctly. Fortunately, they all make at least build logs available so
these very few lines of code adding very few lines of output cost near
zero extra build time and solve the problem once for all. I feel stupid
I didn't do this sooner, this would have saved me hours and hours in
vain requests and discussions and in trying to puzzle that information
together.

Sample output:

-- Preparing Xtensa toolchain
version.cmake starting SOF build at 2021-03-31T18:09:46Z UTC
Building git commit with parent(s):
150fd1e4c968 4249bdb1b305 [other parent if merge] (HEAD -> main) cmake: ...
-- GIT_TAG / GIT_LOG_HASH : v1.7-rc1-174-g150fd1e4c968-dirty / 150fd1e4c968

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-04-01 16:39:20 +01:00
Marc Herbert b5219d844c version.cmake: do not discard stderr from git commands
Never discard stderr.

Also fix my older, misleading comment and add a warning.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-04-01 16:39:20 +01:00
Marc Herbert 9d78c35de9 .gitmodules: use a relative path
Un-hardcoding makes mirroring possible.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-04-01 13:03:01 +01:00
Marc Herbert 3e442f5f31 .gitmodules: use default branch
No need to hardcode to "master" or anything else, submodules
don't even use branches anyway

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-04-01 13:03:01 +01:00
Marc Herbert 588574c000 ll_schedule.c: fix "uninitialized task_take" warning in CONFIG_TRACEV
Looks like no one ever uses tr_dbg()?

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-04-01 12:14:53 +01:00
Marc Herbert 70b9d30414 trace: add Kconfig and trace.h comments
Trying to reduce trial and error.

Pure comments, no functional change.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-04-01 12:14:53 +01:00
Curtis Malainey f9ffa8d3e8 passthrough: fix interface
oops, forgot to update interface so build was silently not linking the
passthrough interface to the adapter

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-04-01 11:59:36 +01:00
Liam Girdwood 7b334d3ee7 memcpy: remove duplicate memcpy and memset definitions in local string.h
Local string.h already includes C library string.h.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2021-04-01 11:58:57 +01:00
Marc Herbert eb459078f3 checkpatch: --ignore C99_COMMENT_TOLERANCE
Let's not waste considerable time in code reviews with silly problems
computers can solve.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-31 16:26:03 +01:00
Marc Herbert fa38c34a7a docker: apt-get install python3-elftools
Required by #3459 / #3975 "elfsize" proof of concept and probably by
other things too in the future - we use both ELF and Python
everywhere; it's surprising they haven't met each other yet.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-31 15:19:14 +01:00
Keyon Jie 65400959ca ll_schedule: add logs about the scheduling point
Add some useful information logs about the task scheduling point with
ll_scheduler, which will help to capture logs once we hit scheduling
issue on some specific task.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2021-03-31 09:21:33 +08:00
Marc Herbert d7c8ccc625 .github/pull-request.yml: watch "main" branch instead of master
Will hopefully fix mysterious CI hangs.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-30 11:35:27 -07:00
Curtis Malainey 15bd472a81 owners: add cujomalainey as owner of codec adapter
Request for owner has gone unacknowledged, ToT adapter is broken
suggesting we likely need additional reviewers given we have no existing
code owner.

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
2021-03-30 11:15:52 +01:00
Marc Herbert 7c08aabbe7 topology/cmake: add missing .m4 dependency, fixes incremental build
There was no [MAIN_]DEPENDS on the .m4 source file, so changes were not
triggering any rebuild.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-26 14:51:33 +00:00
Keyon Jie aee22b07c1 topology: pipe-codec-adapter-playback: fix the blob size
The size of the fallback CA_SETUP_CONTROLBYTES is 20 (0x14), not 0x20,
here correct it.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2021-03-26 10:25:53 +08:00
Keyon Jie b3e4a71ba5 codec_adapter: accept 0 size library config
There could be some codecs which require 0 byte library configure, e.g.
the passthrough one, change to make this possible.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2021-03-26 10:25:53 +08:00
Marc Herbert 041c2ef6de version.cmake: add --dirty to git describe command
For at least two reasons:
  - exposes sneaky change(s) performed by automation if/when any
  - solves the mystery of the Source content hash (printed on the next
    line) changing while the git version does not.

Example, at https://sof-ci.01.org/sofpr/PR3941/build8429/build/bdw_gcc.txt

 -- Found Git: /usr/bin/git (found version "2.17.1")
 -- GIT_TAG / GIT_LOG_HASH : v1.7-rc1-151-g023c4abacde1 / 023c4abac
 -- Source content hash: 91f261ea

whereas at https://github.com/thesofproject/sof/runs/2166298087,
  xtensa-build-all:

 -- Found Git: /usr/bin/git (found version "2.17.1")
 -- GIT_TAG / GIT_LOG_HASH : v1.7-rc1-151-g023c4abacde1 / 023c4abac
 -- Source content hash: 67f31697

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-23 12:17:22 +00:00
Marc Herbert 7e19c42404 .github: replace HAVE_CONFIG KConfig hack with an override
Should make git describe --dirty clean.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-23 12:17:22 +00:00
Iuliana Prodan 0a9262ae4b drivers: imx: esai: set private data after allocation
ESAI allocates private data and retrieves this data using
dai_get_drvdata().
But this is never set using dai_set_drvdata() and sometimes
dai_get_drvdata() returns NULL.
So, after private data is allocated, set it using dai_set_drvdata().

Without this fix, on i.MX8QM, on playback we get:
root@imx8qmmek:~# aplay -Dhw:1,0 -f S16_LE -c 2 -r 48000 -d 5 -t raw /dev/urandom
Playing raw data '/dev/urandom' : Signed 16 bit Little Endian, Rate 48000 Hz, Stereo
[  197.478128] sof-audio-of 556e8000.dsp: error : DSP panic!
[  197.483547] sof-audio-of 556e8000.dsp: error: runtime exception
[  197.489473] sof-audio-of 556e8000.dsp: error: trace point 0dead006
[  197.495658] sof-audio-of 556e8000.dsp: error: panic at :0
[  197.501064] sof-audio-of 556e8000.dsp: error: DSP Firmware Oops
[...]

Fixes: f40222a1ea ("drivers: imx: esai: use rate from topology")
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
2021-03-23 09:45:23 +02:00
Marc Herbert 69985365c6 buffer.h: silences warning "flags may be used uninitialized"
buffer_unlock() does not use flags.

Silences this gcc 8.1.0 (and valid) warning in
src/audio/pipeline.c#pipeline_for_each_comp(). For some strange reason
it shows up only with CONFIG_OPTIMIZE_FOR_DEBUG=y. Heuristics?

In file included from sof/src/include/sof/audio/pipeline.h:16,
                 from sof/src/include/sof/audio/buffer.h:12,
                 from sof/src/audio/pipeline.c:8:
src/audio/pipeline.c: In function 'pipeline_for_each_comp':
src/include/sof/spinlock.h:200:38: error: 'flags' may be used uninitialized in this function [-Werror=maybe-uninitialized]
src/audio/pipeline.c:182:11: note: 'flags' was declared here
  uint32_t flags;
           ^~~~~

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-22 21:26:51 +00:00
Marc Herbert 1f9c91d174 spinlock.h: add # else /* CONFIG_... */ comments
Minor readability fix.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-22 21:26:51 +00:00
Paul Olaru 5ed64a7fe4 scripts: xtensa_build_all: Fix configuration names for i.MX
The configuration names with _2017 are a consequence of the way I did
the internal configuration update. To keep it simple I update these
build scripts.

Signed-off-by: Paul Olaru <paul.olaru@nxp.com>
2021-03-22 20:24:49 +02:00
Cristina Feies (ilie) 6b8ee5c5c7 kwd demo: imx8m: extend kwd functionality by using a neural network for detection
Implement a kwd function based on small
neural network able to detect yes/no
keywords. This represents an alternative
to the default kwd function and is
implemented in a separate file. Enabling
the usage of this kwd nn functionality is
done by enabling KWD_NN_SAMPLE_KEYPHRASE.
The inference function of the neural network
operates on 990 ms which are gathered in the
acquisition input buffer exposed by the detection
component.

Signed-off-by: Cristina Feies (ilie) <cristina.ilie@nxp.com>
2021-03-22 12:31:18 +01:00
Cristina Feies (ilie) fddd1bad46 kwd demo: define & allocate acquisition buffer to gather once more frames necessary to detection algorithms
Define & allocate acquisition buffer where
collecting the necessary amount of input data
required by the detection algorithm. In our
case the kwd_nn detection algorithm requires
~1s of data once which is more than what
the current configuration of  the pipeline
offers once: 20ms of data.

Signed-off-by: Cristina Feies (ilie) <cristina.ilie@nxp.com>
2021-03-22 12:31:18 +01:00
Cristina Feies (ilie) 96496f7f7d kwd demo: implement getters & setters in detection_test to expose variables necessary to other modules
Expose sample_valid_bytes, detected & drain_req
variables from detect_test component necessary
to other detection modules

Signed-off-by: Cristina Feies (ilie) <cristina.ilie@nxp.com>
2021-03-22 12:31:18 +01:00
Cristina Feies (ilie) bcba81611b kwd demo: expose detect_test_notify function for other modules
Expose detect_test_notify function for
other modules which would implement
an alternative of default kwd detection

Signed-off-by: Cristina Feies (ilie) <cristina.ilie@nxp.com>
2021-03-22 12:31:18 +01:00
Liam Girdwood 7f70d99e4a compiler: use libc versions of memset, memcpy for GCC10 onwards
GCC configuration for ct-NG uses newlibc libc versions of common
memcpy() and memset(). Check this in makefile and lib.c so we can use
the correct versions.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
2021-03-20 15:20:57 +00:00
Curtis Malainey f6e6ac5bb1 codec_adapter: remove term "dummy" from adapters
Following move of open source to remove oppressive language from open
source, dummy is one of the terms to avoid. Also the term does a poor
job of describing what the adapter actually does.

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
2021-03-19 14:14:13 +00:00
Marc Herbert 5e971a2f06 CODEOWNERS -= xiulipan
Let's stop spamming Xiuli.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-19 13:41:03 +00:00
Daniel Baluta e50ae6be8c codec_adapter: Initialize processing
During the initialization of a decoder, the initialization task reads the
input stream to discover the parameters of the encoding.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-03-18 15:05:52 +02:00
Daniel Baluta b59e53034b codec_adapter: Introduce codec_init_process api
This function should be called before processing. It searches
for a valid header, does header decoding to get the parameters
and initializes state and configuration structures.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-03-18 15:05:52 +02:00
Daniel Baluta 90831338ad codec_adapter: cadence: Save initialization status to codec_processing_data
We need to save initialization status to a persistent (between calls)
variable in order to check it each time we want to do processing.

Initialization only takes place once before first frames are decoded.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-03-18 15:05:52 +02:00
Daniel Baluta c3b4382c4b codec_adapter: cadence: Fix init process function
Init process function searches for valid header, does header
decoding to get the parameters and initializes state and configuration
structures.

In order for this to work we need to set the input bytes and also
update consumed bytes.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-03-18 15:05:52 +02:00
Daniel Baluta 09ac7f1b72 codec_adapter: cadence: Factor out init process code
Initialization of the processing shouldn't be done in the prepare
function as the decoder needs some input frames in order to figure
out decoding parameters.

First step is to just factour out the init process code into
a function and move it to the proper place later.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-03-18 15:05:52 +02:00
Daniel Baluta ed027d045b codec_adapter: Differentiate between consumed/produced bytes
With decoders, usually, consumed bytes is not equal
with produced bytes. We need to take this into account
in order to copy the entire produced bytes by the processing algorithm.

- consumed bytes -> number of bytes consumed from the input buffer.
- produced bytes -> number of bytes produced into the output buffer.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-03-18 15:05:52 +02:00
Daniel Baluta f305790e51 platform: imx8: Fix clock frequency for i.MX8X
Looking at the timestamps from sof-logger it looks like
the DSP core frequency on i.MX8X is wrong.

Documentation confirms this. It should be 640Mhz.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2021-03-16 12:09:00 +00:00
Cristina Feies (ilie) 25ed49f461 kwd sample: Add IMX platform as a dependency for SAMPLE_KEYPHRASE
This allows i.MX based platforms to use the
samples for the keyphrase detector

Signed-off-by: Cristina Feies (ilie) <cristina.ilie@nxp.com>
2021-03-16 13:47:12 +02:00
Cristina Feies (ilie) 9c499bc1d6 topology: imx8m: add kwd component with wm8960 codec
Adapt the apl KWD topology to imx8m by switching to
SCHEDULE_TIME_DOMAIN_DMA on capture pipeline and
creating a no LP capture file for KFBM component.

Signed-off-by: Cristina Feies (ilie) <cristina.ilie@nxp.com>
2021-03-16 13:47:12 +02:00
Yong Zhi 1c09ccf0e2 config: disable alh in jasperlake_defconfig
Since soundwire is not enabled on any jsl+ product,
it's safe to turn it off by default.

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
2021-03-15 21:28:38 +00:00
Marc Herbert e995bbb575 Dockerfile: apt-get install tree
Required to remove the copy hack introduced in
commit eb4373cb61 (".github: new installer.yml")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-03-15 21:23:32 +00:00