June 2018 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] FW: [sof-driver-review:topic/sof-upstream 39/98] sound/soc/sof/sof-priv.h:243:33: error: field 'plat_drv' has incomplete type
by Lin, Mengdong 04 Jun '18

04 Jun '18

-----Original Message----- From: lkp Sent: Monday, June 4, 2018 4:28 AM To: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: kbuild-all(a)01.org; Wang, Jia W <jia.w.wang(a)intel.com>; Zhang, Keqiao <keqiao.zhang(a)intel.com>; Lin, Mengdong <mengdong.lin(a)intel.com>; Li, Jocelyn <jocelyn.li(a)intel.com> Subject: [sof-driver-review:topic/sof-upstream 39/98] sound/soc/sof/sof-priv.h:243:33: error: field 'plat_drv' has incomplete type tree: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc.git topic/sof-upstream head: 297c56845645fc3b2a94862be301d6e33e81d9e8 commit: 4dca93f5145f0c6172f81cd7e17e513b5cb63af4 [39/98] ASoC: SOF: Add Build support for SOF core and Intel drivers config: x86_64-acpi-redef (attached as .config) compiler: gcc-7 (Debian 7.3.0-16) 7.3.0 reproduce: git checkout 4dca93f5145f0c6172f81cd7e17e513b5cb63af4 # save the attached .config to linux build tree make ARCH=x86_64 Note: the sof-driver-review/topic/sof-upstream HEAD 297c56845645fc3b2a94862be301d6e33e81d9e8 builds fine. It only hurts bisectibility. All errors (new ones prefixed by >>): In file included from sound/soc/sof/core.c:19:0: >> sound/soc/sof/sof-priv.h:243:33: error: field 'plat_drv' has >> incomplete type struct snd_soc_platform_driver plat_drv; ^~~~~~~~ sound/soc/sof/core.c: In function 'sof_probe': sound/soc/sof/core.c:317:8: error: implicit declaration of function 'snd_soc_register_platform'; did you mean 'snd_soc_register_card'? [-Werror=implicit-function-declaration] ret = snd_soc_register_platform(&pdev->dev, &sdev->plat_drv); ^~~~~~~~~~~~~~~~~~~~~~~~~ snd_soc_register_card sound/soc/sof/core.c: In function 'sof_remove': sound/soc/sof/core.c:360:2: error: implicit declaration of function 'snd_soc_unregister_platform'; did you mean 'snd_soc_unregister_card'? [-Werror=implicit-function-declaration] snd_soc_unregister_platform(&pdev->dev); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ snd_soc_unregister_card cc1: some warnings being treated as errors -- In file included from sound/soc/sof/ops.h:19:0, from sound/soc/sof/ops.c:18: >> sound/soc/sof/sof-priv.h:243:33: error: field 'plat_drv' has >> incomplete type struct snd_soc_platform_driver plat_drv; ^~~~~~~~ -- In file included from sound/soc/sof/pcm.c:27:0: >> sound/soc/sof/sof-priv.h:243:33: error: field 'plat_drv' has >> incomplete type struct snd_soc_platform_driver plat_drv; ^~~~~~~~ sound/soc/sof/pcm.c: In function 'create_page_table': sound/soc/sof/pcm.c:35:3: error: implicit declaration of function 'snd_soc_platform_get_drvdata'; did you mean 'snd_soc_card_get_drvdata'? [-Werror=implicit-function-declaration] snd_soc_platform_get_drvdata(rtd->platform); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ snd_soc_card_get_drvdata >> sound/soc/sof/pcm.c:35:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_hw_params': sound/soc/sof/pcm.c:51:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_hw_free': sound/soc/sof/pcm.c:167:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_trigger': sound/soc/sof/pcm.c:196:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_pointer': sound/soc/sof/pcm.c:249:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_open': sound/soc/sof/pcm.c:274:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_close': sound/soc/sof/pcm.c:343:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_new': sound/soc/sof/pcm.c:378:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_free': sound/soc/sof/pcm.c:470:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: In function 'sof_pcm_dai_link_fixup': sound/soc/sof/pcm.c:497:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/pcm.c: At top level: sound/soc/sof/pcm.c:563:33: warning: 'struct snd_soc_platform' declared inside parameter list will not be visible outside of this definition or declaration static int sof_pcm_probe(struct snd_soc_platform *platform) ^~~~~~~~~~~~~~~~ sound/soc/sof/pcm.c: In function 'sof_pcm_probe': sound/soc/sof/pcm.c:566:3: warning: initialization makes pointer from integer without a cast [-Wint-conversion] snd_soc_platform_get_drvdata(platform); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> sound/soc/sof/pcm.c:567:61: error: dereferencing pointer to incomplete type 'struct snd_soc_platform' struct snd_sof_pdata *plat_data = dev_get_platdata(platform->dev); ^~ sound/soc/sof/pcm.c: At top level: sound/soc/sof/pcm.c:591:34: warning: 'struct snd_soc_platform' declared inside parameter list will not be visible outside of this definition or declaration static int sof_pcm_remove(struct snd_soc_platform *platform) ^~~~~~~~~~~~~~~~ sound/soc/sof/pcm.c: In function 'sof_pcm_remove': sound/soc/sof/pcm.c:593:29: error: dereferencing pointer to incomplete type 'struct snd_soc_platform' pm_runtime_disable(platform->dev); ^~ sound/soc/sof/pcm.c: In function 'snd_sof_new_platform_drv': >> sound/soc/sof/pcm.c:606:4: error: dereferencing pointer to incomplete type 'struct snd_soc_platform_driver' pd->probe = sof_pcm_probe; ^~ cc1: some warnings being treated as errors -- In file included from sound/soc/sof/compressed.c:21:0: >> sound/soc/sof/sof-priv.h:243:33: error: field 'plat_drv' has >> incomplete type struct snd_soc_platform_driver plat_drv; ^~~~~~~~ sound/soc/sof/compressed.c: In function 'sof_compressed_open': sound/soc/sof/compressed.c:27:3: error: implicit declaration of function 'snd_soc_platform_get_drvdata'; did you mean 'snd_soc_card_get_drvdata'? [-Werror=implicit-function-declaration] snd_soc_platform_get_drvdata(rtd->platform); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ snd_soc_card_get_drvdata >> sound/soc/sof/compressed.c:27:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/compressed.c: In function 'sof_compressed_free': sound/soc/sof/compressed.c:40:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/compressed.c: In function 'sof_compressed_set_params': sound/soc/sof/compressed.c:66:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/compressed.c: In function 'sof_compressed_trigger': sound/soc/sof/compressed.c:84:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ sound/soc/sof/compressed.c: In function 'sof_compressed_pointer': sound/soc/sof/compressed.c:122:35: error: 'struct snd_soc_pcm_runtime' has no member named 'platform' snd_soc_platform_get_drvdata(rtd->platform); ^~ cc1: some warnings being treated as errors vim +/plat_drv +243 sound/soc/sof/sof-priv.h 89dc687d Liam Girdwood 2018-01-08 231 89dc687d Liam Girdwood 2018-01-08 232 /* 89dc687d Liam Girdwood 2018-01-08 233 * SOF Device Level. 89dc687d Liam Girdwood 2018-01-08 234 */ 89dc687d Liam Girdwood 2018-01-08 235 struct snd_sof_dev { 89dc687d Liam Girdwood 2018-01-08 236 struct device *dev; 89dc687d Liam Girdwood 2018-01-08 237 struct device *parent; 89dc687d Liam Girdwood 2018-01-08 238 spinlock_t ipc_lock; /* lock for IPC users */ 89dc687d Liam Girdwood 2018-01-08 239 spinlock_t hw_lock; /* lock for HW IO access */ 89dc687d Liam Girdwood 2018-01-08 240 struct pci_dev *pci; 89dc687d Liam Girdwood 2018-01-08 241 89dc687d Liam Girdwood 2018-01-08 242 /* ASoC components */ 89dc687d Liam Girdwood 2018-01-08 @243 struct snd_soc_platform_driver plat_drv; 89dc687d Liam Girdwood 2018-01-08 244 const struct snd_soc_component_driver *cmpnt_drv; 89dc687d Liam Girdwood 2018-01-08 245 struct snd_soc_dai_driver dai_drv; 89dc687d Liam Girdwood 2018-01-08 246 int num_dai; 89dc687d Liam Girdwood 2018-01-08 247 89dc687d Liam Girdwood 2018-01-08 248 /* DSP firmware boot */ 89dc687d Liam Girdwood 2018-01-08 249 wait_queue_head_t boot_wait; 89dc687d Liam Girdwood 2018-01-08 250 bool boot_complete; 89dc687d Liam Girdwood 2018-01-08 251 89dc687d Liam Girdwood 2018-01-08 252 /* DSP HW differentiation */ 89dc687d Liam Girdwood 2018-01-08 253 struct snd_sof_pdata *pdata; 89dc687d Liam Girdwood 2018-01-08 254 const struct snd_sof_dsp_ops *ops; 89dc687d Liam Girdwood 2018-01-08 255 struct sof_intel_hda_dev *hda; /* for HDA based DSP HW */ 89dc687d Liam Girdwood 2018-01-08 256 89dc687d Liam Girdwood 2018-01-08 257 /* IPC */ 89dc687d Liam Girdwood 2018-01-08 258 struct snd_sof_ipc *ipc; 89dc687d Liam Girdwood 2018-01-08 259 struct snd_sof_mailbox dsp_box; /* DSP initiated IPC */ 89dc687d Liam Girdwood 2018-01-08 260 struct snd_sof_mailbox host_box; /* Host initiated IPC */ 89dc687d Liam Girdwood 2018-01-08 261 struct snd_sof_mailbox stream_box; /* Stream position update */ 89dc687d Liam Girdwood 2018-01-08 262 u64 irq_status; 89dc687d Liam Girdwood 2018-01-08 263 int ipc_irq; 89dc687d Liam Girdwood 2018-01-08 264 u32 next_comp_id; /* monotonic - reset during S3 */ 89dc687d Liam Girdwood 2018-01-08 265 89dc687d Liam Girdwood 2018-01-08 266 /* memory bases for mmaped DSPs - set by dsp_init() */ 89dc687d Liam Girdwood 2018-01-08 267 void __iomem *bar[SND_SOF_BARS]; /* DSP base address */ 89dc687d Liam Girdwood 2018-01-08 268 int mmio_bar; 89dc687d Liam Girdwood 2018-01-08 269 int mailbox_bar; 89dc687d Liam Girdwood 2018-01-08 270 size_t dsp_oops_offset; 89dc687d Liam Girdwood 2018-01-08 271 89dc687d Liam Girdwood 2018-01-08 272 /* debug */ 89dc687d Liam Girdwood 2018-01-08 273 struct dentry *debugfs_root; 89dc687d Liam Girdwood 2018-01-08 274 89dc687d Liam Girdwood 2018-01-08 275 /* firmware loader */ 89dc687d Liam Girdwood 2018-01-08 276 int cl_bar; 89dc687d Liam Girdwood 2018-01-08 277 struct snd_dma_buffer dmab; 89dc687d Liam Girdwood 2018-01-08 278 struct sof_ipc_fw_ready fw_ready; 89dc687d Liam Girdwood 2018-01-08 279 89dc687d Liam Girdwood 2018-01-08 280 /* topology */ 89dc687d Liam Girdwood 2018-01-08 281 struct snd_soc_tplg_ops *tplg_ops; 89dc687d Liam Girdwood 2018-01-08 282 struct list_head pcm_list; 89dc687d Liam Girdwood 2018-01-08 283 struct list_head kcontrol_list; 89dc687d Liam Girdwood 2018-01-08 284 struct list_head widget_list; 89dc687d Liam Girdwood 2018-01-08 285 struct list_head dai_list; 89dc687d Liam Girdwood 2018-01-08 286 struct snd_soc_component *component; 89dc687d Liam Girdwood 2018-01-08 287 89dc687d Liam Girdwood 2018-01-08 288 /* FW configuration */ 89dc687d Liam Girdwood 2018-01-08 289 struct sof_ipc_dma_buffer_data *info_buffer; 89dc687d Liam Girdwood 2018-01-08 290 struct sof_ipc_window *info_window; 89dc687d Liam Girdwood 2018-01-08 291 89dc687d Liam Girdwood 2018-01-08 292 /* IPC timeouts in ms */ 89dc687d Liam Girdwood 2018-01-08 293 int ipc_timeout; 89dc687d Liam Girdwood 2018-01-08 294 int boot_timeout; 89dc687d Liam Girdwood 2018-01-08 295 89dc687d Liam Girdwood 2018-01-08 296 /* Wait queue for code loading */ 89dc687d Liam Girdwood 2018-01-08 297 wait_queue_head_t waitq; 89dc687d Liam Girdwood 2018-01-08 298 int code_loading; 89dc687d Liam Girdwood 2018-01-08 299 89dc687d Liam Girdwood 2018-01-08 300 /* DMA for Trace */ 89dc687d Liam Girdwood 2018-01-08 301 struct snd_dma_buffer dmatb; 89dc687d Liam Girdwood 2018-01-08 302 struct snd_dma_buffer dmatp; 89dc687d Liam Girdwood 2018-01-08 303 int dma_trace_pages; 89dc687d Liam Girdwood 2018-01-08 304 wait_queue_head_t trace_sleep; 89dc687d Liam Girdwood 2018-01-08 305 u32 host_offset; 89dc687d Liam Girdwood 2018-01-08 306 bool dtrace_is_enabled; 89dc687d Liam Girdwood 2018-01-08 307 89dc687d Liam Girdwood 2018-01-08 308 void *private; /* core does not touch this */ 89dc687d Liam Girdwood 2018-01-08 309 }; 89dc687d Liam Girdwood 2018-01-08 310 :::::: The code at line 243 was first introduced by commit :::::: 89dc687dcbafe82d1b8f2d4753b6c0a82e620dfc ASoC: SOF: Add Sound Open Firmware driver core :::::: TO: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> :::::: CC: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[Sound-open-firmware] [PATCH] topology: test: Fix tplb-build.sh when did no use XARGS
by Xiuli Pan 04 Jun '18

04 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Miss TFILE when not using XARGS. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- topology/test/tplg-build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index dfdd26b..a48f1d2 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -91,6 +91,12 @@ function simple_test { #if DAI type is SSP, define the SSP specific params if [ $5 == "SSP" ] then + if [ $i == "test-all" ] + then + TFILE="test-ssp$6-${12}-$2-$4-$7-48k-$((${11} / 1000))k-$1" + else + TFILE="$i-ssp$6-${12}-$2-$4-$7-48k-$((${11} / 1000))k-$1" + fi echo "M4 pre-processing test $i -> ${TFILE}" m4 ${M4_FLAGS} \ -DTEST_PIPE_NAME="$2" \ -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] SOF:FIX: During XRUN recover process, host dma should be stopped first.
by Wu Zhigang 04 Jun '18

04 Jun '18

During XRUN recover process (in pipeline_xrun_recover() function), "COMP_TRIGGER_XRUN" cmd will be processed first, then "COMP_TRIGGER_START" cmd will be processed. If the host dma is not stopped in the first cmd process, we will hit "eS0" error in the hda_dma_start() function during "COMP_TRIGGER_START" cmd process. the XRUN recover process will fail. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- Test With: APL-GPMRB with TDF8532 Codec LINUX topic/sof-v4.14: 3ffd39334cb53aced88b8aba17cae3df9ee2736f SOF master: 65ddcddfcc9a20f5b622cf3ba93dc326387a9d5d TOOL master: 07d290c8ac6026af28bada021ac2215e3453fa88 For the known issue(module reload fail), did pass all sanity test. --- src/audio/host.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/audio/host.c b/src/audio/host.c index a0956b3..c0f4e1b 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -463,8 +463,10 @@ static int host_trigger(struct comp_dev *dev, int cmd) switch (cmd) { case COMP_TRIGGER_STOP: - ret = dma_stop(hd->dma, hd->chan); ret = host_stop(dev); + /* fall through */ + case COMP_TRIGGER_XRUN: + ret = dma_stop(hd->dma, hd->chan); break; case COMP_TRIGGER_START: ret = dma_start(hd->dma, hd->chan); -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] SOF:FIX: fix the typo error
by Wu Zhigang 04 Jun '18

04 Jun '18

fix the typo error in the component.h. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- src/include/sof/audio/component.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/sof/audio/component.h b/src/include/sof/audio/component.h index 35ed618..0451b56 100644 --- a/src/include/sof/audio/component.h +++ b/src/include/sof/audio/component.h @@ -77,8 +77,8 @@ #define COMP_TRIGGER_START 1 /* start component stream */ #define COMP_TRIGGER_PAUSE 2 /* pause the component stream */ #define COMP_TRIGGER_RELEASE 3 /* release paused component stream */ -#define COMP_TRIGGER_SUSPEND 5 /* suspend component */ -#define COMP_TRIGGER_RESUME 6 /* resume component */ +#define COMP_TRIGGER_SUSPEND 4 /* suspend component */ +#define COMP_TRIGGER_RESUME 5 /* resume component */ #define COMP_TRIGGER_RESET 6 /* reset component */ #define COMP_TRIGGER_PREPARE 7 /* prepare component */ #define COMP_TRIGGER_XRUN 8 /* XRUN component */ -- 2.14.1

3 2

[Sound-open-firmware] why we define the MACRO's value like this below
by zhigangw 04 Jun '18

04 Jun '18

Hello Liam: I found in the header file "component.h", the macro value defined below show like below, Is there any tricky thing we have to do like this below? The "COMP_TRIGGER_RESUME" and "COMP_TRIGGER_RESET" use the same value. And "4" is not used. I did not find out the reason why define it like this below. Is it a typo error? #define COMP_TRIGGER_STOP 0 /* stop component stream */ #define COMP_TRIGGER_START 1 /* start component stream */ #define COMP_TRIGGER_PAUSE 2 /* pause the component stream */ #define COMP_TRIGGER_RELEASE 3 /* release paused component stream */ #define COMP_TRIGGER_SUSPEND 5 /* suspend component */ #define COMP_TRIGGER_RESUME 6 /* resume component */ #define COMP_TRIGGER_RESET 6 /* reset component */ #define COMP_TRIGGER_PREPARE 7 /* prepare component */ #define COMP_TRIGGER_XRUN 8 /* XRUN component */ thanks br ~zhigang

2 2

[Sound-open-firmware] [PATCH] host: add missing include directories and library dependencies
by Ranjani Sridharan 01 Jun '18

01 Jun '18

This patch adds the missing paths for header files and libraries required for building the host testbench. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/host/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/host/Makefile.am b/src/host/Makefile.am index f3a3343..197f4bb 100644 --- a/src/host/Makefile.am +++ b/src/host/Makefile.am @@ -3,9 +3,9 @@ AUTOMAKE_OPTIONS = subdir-objects SOF_INC = $(prefix)/include/sof DEFINE = -DSOF_INC=\"$(SOF_INC)\" -AM_CPPFLAGS = -I $(SOF_INC) $(SOF_INCDIR) $(DEFINE) +AM_CPPFLAGS = -I $(SOF_INC) $(COMMON_INCDIR) $(DEFINE) AM_CFLAGS = -g -Wall -AM_LDFLAGS = -L$(prefix)/lib +AM_LDFLAGS = -L../ipc -L../audio/.libs bin_PROGRAMS = testbench -- 2.17.0

2 1

[Sound-open-firmware] [RFC PATCH 0/6] Host testbench
by Ranjani Sridharan 01 Jun '18

01 Jun '18

This set of patches introduces the testbench for audio processing components in SOF. The testbench enables functional/quality testing of SOF components. The testbench reads in audio samples from a file and write out the processed samples to the output file. The host directory includes common code with routines for topology parsing and setting up sof ipc, scheduler and processing pipelines. It also includes simpler implementations for SOF features such as tracing. It also includes a new file component that allows reading in or writing out samples from/to a file. The host directory also includes the testbench for setting up pipelines based on a test topology. It reads in input samples from a file , schedules pipeline copy and copies the processed sample to the output file. The output file can be used to perform audio quality tests using matlab/octave. Currently it supports only volume pipelines. Support for other components such as src/eq will be added soon. Ranjani Sridharan (6): host: add host testbench common source and header files host: add new component for file IO host: add testbench program host: include host testbench directory for compilation scripts: add scritps for building host library and invoking the testbench doc: add README for host testbench configure.ac | 1 + doc/README-HOST | 23 + doc/README.host | 23 + scripts/host-testbench.sh | 25 + src/Makefile.am | 2 +- src/host/Makefile.am | 29 + src/host/alloc.c | 63 +++ src/host/common_test.c | 206 +++++++ src/host/file.c | 720 +++++++++++++++++++++++++ src/host/ipc.c | 81 +++ src/host/schedule.c | 98 ++++ src/host/testbench.c | 298 ++++++++++ src/host/topology.c | 954 +++++++++++++++++++++++++++++++++ src/host/trace.c | 181 +++++++ src/include/host/common_test.h | 65 +++ src/include/host/file.h | 77 +++ src/include/host/topology.h | 202 +++++++ src/include/host/trace.h | 49 ++ 18 files changed, 3096 insertions(+), 1 deletion(-) create mode 100644 doc/README-HOST create mode 100644 doc/README.host create mode 100755 scripts/host-testbench.sh create mode 100644 src/host/Makefile.am create mode 100644 src/host/alloc.c create mode 100644 src/host/common_test.c create mode 100644 src/host/file.c create mode 100644 src/host/ipc.c create mode 100644 src/host/schedule.c create mode 100644 src/host/testbench.c create mode 100644 src/host/topology.c create mode 100644 src/host/trace.c create mode 100644 src/include/host/common_test.h create mode 100644 src/include/host/file.h create mode 100644 src/include/host/topology.h create mode 100644 src/include/host/trace.h -- 2.17.0

4 14

[Sound-open-firmware] [PATCH 1/2] topology: bxt: change to use dmac0 for capture
by Keyon Jie 01 Jun '18

01 Jun '18

Otherwise, the channels may be used up when pipeline number > 8. Todo: remove dmac definition from tplg, just allocate them inside firmware. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 3ffd39334cb53aced88b8aba17cae3df9ee2736f SOF master: 48a61423f6c2d2bcf5fad854a9b3d37dfb43b546 Tool master: 7ee114d2ed822a0dbfc0dc3a37fd5c4977e00be8 --- topology/dsps/bxt.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/dsps/bxt.m4 b/topology/dsps/bxt.m4 index df61d1a..472fa88 100644 --- a/topology/dsps/bxt.m4 +++ b/topology/dsps/bxt.m4 @@ -34,7 +34,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "0"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] SSP: refine padding bit setting on Broadwell
by Rander Wang 01 Jun '18

01 Jun '18

merge commit 36f23c6cc3ed ("apl-ssp: fix padding bit issues in I2S/LEFT_J mode") and refine it on Broadwell. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- test it on Broadwell --- src/drivers/hsw-ssp.c | 99 ++++++++++++++++++++++++++++++++++++++++++--------- src/include/sof/ssp.h | 11 +++--- 2 files changed, 87 insertions(+), 23 deletions(-) diff --git a/src/drivers/hsw-ssp.c b/src/drivers/hsw-ssp.c index 7e5ae3d..b2fa99e 100644 --- a/src/drivers/hsw-ssp.c +++ b/src/drivers/hsw-ssp.c @@ -77,11 +77,16 @@ static inline int ssp_set_config(struct dai *dai, uint32_t sscr1; uint32_t sscr2; uint32_t sspsp; + uint32_t sspsp2; uint32_t mdiv; uint32_t bdiv; uint32_t data_size; uint32_t start_delay; + uint32_t frame_end_padding; + uint32_t slot_end_padding; uint32_t frame_len = 0; + uint32_t bdiv_min; + uint32_t format; bool inverted_frame = false; int ret = 0; @@ -130,6 +135,9 @@ static inline int ssp_set_config(struct dai *dai, /* sspsp dynamic settings are SCMODE, SFRMP, DMYSTRT, SFRMWDTH */ sspsp = SSPSP_ETDS; /* make sure SDO line is tri-stated when inactive */ + /* sspsp2 no dynamic setting */ + sspsp2 = 0x0; + ssp->config = *config; ssp->params = config->ssp; @@ -252,29 +260,83 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - /* format */ - switch (config->format & SOF_DAI_FMT_FORMAT_MASK) { - case SOF_DAI_FMT_I2S: - - start_delay = 1; - - /* set asserted frame length */ - frame_len = config->ssp.tdm_slot_width; - - /* handle frame polarity, I2S default is falling/active low */ - sspsp |= SSPSP_SFRMP(!inverted_frame); + bdiv_min = config->ssp.tdm_slots * config->ssp.sample_valid_bits; + if (bdiv < bdiv_min) { + trace_ssp_error("ecc"); + ret = -EINVAL; + goto out; + } - break; + frame_end_padding = bdiv - bdiv_min; + if (frame_end_padding > SSPSP2_FEP_MASK) { + trace_ssp_error("ecd"); + ret = -EINVAL; + goto out; + } + /* format */ + format = config->format & SOF_DAI_FMT_FORMAT_MASK; + switch (format) { + case SOF_DAI_FMT_I2S: case SOF_DAI_FMT_LEFT_J: - start_delay = 0; + if (format == SOF_DAI_FMT_I2S) { + start_delay = 1; + + /* + * handle frame polarity, I2S default is falling/active low, + * non-inverted(inverted_frame=0) -- active low(SFRMP=0), + * inverted(inverted_frame=1) -- rising/active high(SFRMP=1), + * so, we should set SFRMP to inverted_frame. + */ + sspsp |= SSPSP_SFRMP(inverted_frame); + sspsp |= SSPSP_FSRT; + + } else { + start_delay = 0; + + /* + * handle frame polarity, LEFT_J default is rising/active high, + * non-inverted(inverted_frame=0) -- active high(SFRMP=1), + * inverted(inverted_frame=1) -- falling/active low(SFRMP=0), + * so, we should set SFRMP to !inverted_frame. + */ + sspsp |= SSPSP_SFRMP(!inverted_frame); + } - /* set asserted frame length */ - frame_len = config->ssp.tdm_slot_width; + sscr0 |= SSCR0_FRDC(config->ssp.tdm_slots); - /* LEFT_J default is rising/active high, opposite of I2S */ - sspsp |= SSPSP_SFRMP(inverted_frame); + if (bdiv % 2) { + trace_ssp_error("eca"); + ret = -EINVAL; + goto out; + } + + /* set asserted frame length to half frame length */ + frame_len = bdiv / 2; + + /* + * for I2S/LEFT_J, the padding has to happen at the end + * of each slot + */ + if (frame_end_padding % 2) { + trace_ssp_error("ece"); + ret = -EINVAL; + goto out; + } + + slot_end_padding = frame_end_padding / 2; + + if (slot_end_padding > 15) { + /* can't handle padding over 15 bits */ + trace_ssp_error("ecf"); + ret = -EINVAL; + goto out; + } + + sspsp |= SSPSP_DMYSTOP(slot_end_padding & SSPSP_DMYSTOP_MASK); + slot_end_padding >>= SSPSP_DMYSTOP_BITS; + sspsp |= SSPSP_EDMYSTOP(slot_end_padding & SSPSP_EDMYSTOP_MASK); break; case SOF_DAI_FMT_DSP_A: @@ -288,6 +350,7 @@ static inline int ssp_set_config(struct dai *dai, /* handle frame polarity, DSP_A default is rising/active high */ sspsp |= SSPSP_SFRMP(inverted_frame); + sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); break; case SOF_DAI_FMT_DSP_B: @@ -301,6 +364,7 @@ static inline int ssp_set_config(struct dai *dai, /* handle frame polarity, DSP_A default is rising/active high */ sspsp |= SSPSP_SFRMP(inverted_frame); + sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); break; default: @@ -329,6 +393,7 @@ static inline int ssp_set_config(struct dai *dai, ssp_write(dai, SSPSP, sspsp); ssp_write(dai, SSTSA, config->ssp.tx_slots); ssp_write(dai, SSRSA, config->ssp.rx_slots); + ssp_write(dai, SSPSP2, sspsp2); ssp->state[DAI_DIR_PLAYBACK] = COMP_STATE_PREPARE; ssp->state[DAI_DIR_CAPTURE] = COMP_STATE_PREPARE; diff --git a/src/include/sof/ssp.h b/src/include/sof/ssp.h index d34b011..3a1f6ed 100644 --- a/src/include/sof/ssp.h +++ b/src/include/sof/ssp.h @@ -55,12 +55,12 @@ #define SSTSA 0x30 #define SSRSA 0x34 #define SSTSS 0x38 +#define SSCR2 0x40 #if defined CONFIG_BAYTRAIL ||\ defined CONFIG_CHERRYTRAIL ||\ defined CONFIG_BROADWELL ||\ defined CONFIG_HASWELL -#define SSCR2 0x40 #define SFIFOTT 0x6C #define SSCR3 0x70 #define SSCR4 0x74 @@ -159,14 +159,13 @@ extern const struct dai_ops ssp_ops; #define SSPSP_DMYSTOP_BITS 2 #define SSPSP_DMYSTOP_MASK ((0x1 << SSPSP_DMYSTOP_BITS) - 1) #define SSPSP_FSRT (1 << 25) - -#if defined CONFIG_APOLLOLAKE || defined CONFIG_CANNONLAKE #define SSPSP_EDMYSTOP(x) ((x) << 26) #define SSPSP_EDMYSTOP_MASK 0x7 + +#define SSPSP2 0x44 #define SSPSP2_FEP_MASK 0xff -#define SSTSS 0x38 -#define SSCR2 0x40 -#define SSPSP2 0x44 + +#if defined CONFIG_APOLLOLAKE || defined CONFIG_CANNONLAKE #define SSCR3 0x48 #define SSIOC 0x4C -- 2.14.1

3 2

[Sound-open-firmware] [PATCH] DMIC: configure DMIC with parameters from ipc instead of hardcoded params
by Ranjani Sridharan 01 Jun '18

01 Jun '18

This patch makes the following changes to configure DMIC from ipc params: 1. remove redundant hdr member item from struct sof_ipc_dai_dmic_params 2. Rename number_of_pdm_controllers member in the above structure to num_pdm_active to be more representative of the active pdm count. 3. Add an "id" member to struct sof_ipc_dai_dmic_pdm_ctrl 4. Remove hardcoded config params from DMIC set_config function and use ipc params instead. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: Tested with: APL based Up squared board: SOF Kernel: https://github.com/ranj063/sound branch: topic/dmic SOF: master SOFT: https://github.com/ranj063/soft.git branch: topic/dmic src/drivers/dmic.c | 97 +++++++++++++++++++++--------------------- src/include/uapi/ipc.h | 4 +- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index 5c8591c..b66769c 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -49,11 +49,6 @@ */ #define DMIC_FIR_PIPELINE_OVERHEAD 5 -/* Force a 48 kHz config while kernel driver IPC is under construction. Remove - * or undefine when it's available. - */ -#define DMIC_FORCE_CONFIG - struct decim_modes { int16_t clkdiv[DMIC_MAX_MODES]; int16_t mcic[DMIC_MAX_MODES]; @@ -648,7 +643,7 @@ static inline void ipm_helper(int *ipm, int stereo[], int swap[], * left (A) or mono right (B) mode. Mono right mode is setup as channel * swapped mono left. */ - for (i = 0; i < dmic->number_of_pdm_controllers; i++) { + for (i = 0; i < dmic->num_pdm_active; i++) { cnt = 0; if (dmic->pdm[i].enable_mic_a > 0) cnt++; @@ -693,7 +688,7 @@ static inline void source_ipm_helper(int source[], int *ipm, int stereo[], * swapped mono left. The function returns also in array source[] the * indice of enabled pdm controllers to be used for IPM configuration. */ - for (i = 0; i < dmic->number_of_pdm_controllers; i++) { + for (i = 0; i < dmic->num_pdm_active; i++) { if (dmic->pdm[i].enable_mic_a > 0 || dmic->pdm[i].enable_mic_b > 0) { pdm[i] = 1; @@ -719,7 +714,7 @@ static inline void source_ipm_helper(int source[], int *ipm, int stereo[], /* IPM bit field is set to count of active pdm controllers. */ *ipm = pdm[0]; - for (i = 0; i < dmic->number_of_pdm_controllers; i++) + for (i = 0; i < dmic->num_pdm_active; i++) *ipm += pdm[i]; } #endif @@ -782,7 +777,7 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, } /* Sanity checks */ - if (dmic->number_of_pdm_controllers > DMIC_HW_CONTROLLERS) { + if (dmic->num_pdm_active > DMIC_HW_CONTROLLERS) { trace_dmic_error("num"); return -EINVAL; } @@ -1016,45 +1011,40 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) { - struct decim_modes modes_a; - struct decim_modes modes_b; + struct dmic_pdata *dmic = dai_get_drvdata(dai); + struct sof_ipc_dai_dmic_params *prm; struct matched_modes modes_ab; struct dmic_configuration cfg; - int ret; - struct sof_ipc_dai_dmic_params *prm = &config->dmic; - struct dmic_pdata *dmic = dai_get_drvdata(dai); + struct decim_modes modes_a; + struct decim_modes modes_b; + int num_pdm_active = config->dmic.num_pdm_active; + size_t size; + int i, j, ret = 0; trace_dmic("dsc"); -#if defined DMIC_FORCE_CONFIG - /* This is a temporary workaound to set parameters while - * there is no driver and topology scripts support to - * set these. Also the PCM sample format(s) and sample rate(s) - * setting would be better to be common with other DAI types. + /* + * "config" might contain pdm controller params for only + * the active controllers + * "prm" is initialized with default params for all HW controllers */ - prm->driver_ipc_version = 1; - prm->pdmclk_min = 500000; /* Min 500 kHz */ - prm->pdmclk_max = 4800000; /* Max 4.80 MHz */ - prm->fifo_fs_a = 48000; - prm->fifo_fs_b = 0; - prm->fifo_bits_a = 32; - prm->fifo_bits_b = 32; - prm->duty_min = 40; /* Min. 40% */ - prm->duty_max = 60; /* Max. 60% */ - prm->number_of_pdm_controllers = 2; - prm->pdm[0].clk_edge = 0; - prm->pdm[0].enable_mic_a = 1; /* Left */ - prm->pdm[0].enable_mic_b = 1; /* Right */ - prm->pdm[0].polarity_mic_a = 0; - prm->pdm[0].polarity_mic_b = 0; - prm->pdm[0].skew = 0; - prm->pdm[1].clk_edge = 0; - prm->pdm[1].enable_mic_a = 0; /* Left */ - prm->pdm[1].enable_mic_b = 0; /* Right */ - prm->pdm[1].polarity_mic_a = 0; - prm->pdm[1].polarity_mic_b = 0; - prm->pdm[1].skew = 0; -#endif + size = sizeof(*prm) + DMIC_HW_CONTROLLERS + * sizeof(struct sof_ipc_dai_dmic_pdm_ctrl); + prm = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, size); + + /* copy the command DAI config params and DMIC params */ + memcpy(prm, &config->dmic, sizeof(struct sof_ipc_dai_config)); + + /* copy the pdm controller params from ipc */ + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + prm->pdm[i].id = i; + for (j = 0; j < num_pdm_active; j++) { + /* copy the pdm controller params id the id's match */ + if (prm->pdm[i].id == config->dmic.pdm[j].id) + memcpy(&prm->pdm[i], &config->dmic.pdm[j], + sizeof(prm->pdm[i])); + } + } trace_value(prm->driver_ipc_version); trace_value(prm->pdmclk_min); @@ -1065,11 +1055,12 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) trace_value(prm->fifo_bits_b); trace_value(prm->duty_min); trace_value(prm->duty_max); - trace_value(prm->number_of_pdm_controllers); + trace_value(prm->num_pdm_active); if (prm->driver_ipc_version != DMIC_IPC_VERSION) { trace_dmic_error("ver"); - return -EINVAL; + ret = -EINVAL; + goto finish; } /* Match and select optimal decimators configuration for FIFOs A and B @@ -1081,20 +1072,23 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) find_modes(&modes_a, prm, prm->fifo_fs_a); if (modes_a.num_of_modes == 0 && prm->fifo_fs_a > 0) { trace_dmic_error("amo"); - return -EINVAL; + ret = -EINVAL; + goto finish; } find_modes(&modes_b, prm, prm->fifo_fs_b); if (modes_b.num_of_modes == 0 && prm->fifo_fs_b > 0) { trace_dmic_error("bmo"); - return -EINVAL; + ret = -EINVAL; + goto finish; } match_modes(&modes_ab, &modes_a, &modes_b); ret = select_mode(&cfg, &modes_ab); if (ret < 0) { trace_dmic_error("smo"); - return -EINVAL; + ret = -EINVAL; + goto finish; } trace_dmic("cfg"); @@ -1115,12 +1109,17 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) ret = configure_registers(dai, &cfg, prm); if (ret < 0) { trace_dmic_error("cor"); - return -EINVAL; + ret = -EINVAL; + goto finish; } dmic->state = COMP_STATE_PREPARE; - return 0; +finish: + /* free config params */ + rfree(prm); + + return ret; } /* start the DMIC for capture */ diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index b32376d..9b1063f 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -292,6 +292,7 @@ struct sof_ipc_dai_hda_params { * data integrity problems. */ struct sof_ipc_dai_dmic_pdm_ctrl { + uint16_t id; /* PDM controller ID */ uint16_t enable_mic_a; /* Use A (left) channel mic (0 or 1)*/ uint16_t enable_mic_b; /* Use B (right) channel mic (0 or 1)*/ uint16_t polarity_mic_a; /* Optionally invert mic A signal (0 or 1) */ @@ -322,7 +323,6 @@ struct sof_ipc_dai_dmic_pdm_ctrl { * somewhat. */ struct sof_ipc_dai_dmic_params { - struct sof_ipc_hdr hdr; uint32_t driver_ipc_version; /* Version (1..N) */ uint32_t pdmclk_min; /* Minimum microphone clock in Hz (100000..N) */ uint32_t pdmclk_max; /* Maximum microphone clock in Hz (min...N) */ @@ -333,7 +333,7 @@ struct sof_ipc_dai_dmic_params { uint16_t fifo_bits_b; /* FIFO B word length (16 or 24) */ uint16_t duty_min; /* Min. mic clock duty cycle in % (20..80) */ uint16_t duty_max; /* Max. mic clock duty cycle in % (min..80) */ - uint32_t number_of_pdm_controllers; /* Number 2ch controllers (2) */ + uint32_t num_pdm_active; /* Number of active controllers */ struct sof_ipc_dai_dmic_pdm_ctrl pdm[]; } __attribute__((packed)); -- 2.17.0

3 4