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

[Sound-open-firmware] [PATCH] BDW: refine ssp start function
by Rander Wang 04 Jun '18

04 Jun '18

Set Tx|Rx Enable for starting playback|capture Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- test it on Broadwell, no need to test other platforms SOF: master 131a1887631621 kernel: v4.14 d09db67c5a9d6d SOF-tools: master 13b56fa6047c566a --- src/drivers/hsw-ssp.c | 2 ++ src/include/sof/ssp.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/drivers/hsw-ssp.c b/src/drivers/hsw-ssp.c index 43024a4..a68898e 100644 --- a/src/drivers/hsw-ssp.c +++ b/src/drivers/hsw-ssp.c @@ -439,11 +439,13 @@ static void ssp_start(struct dai *dai, int direction) SSCR1_TSRE | SSCR1_EBCEI); ssp_update_bits(dai, SSCR0, SSCR0_SSE, SSCR0_SSE); ssp_update_bits(dai, SSCR0, SSCR0_TIM, 0); + ssp_update_bits(dai, SSTSA, SSTSA_TSEN, SSTSA_TSEN); } else { ssp_update_bits(dai, SSCR1, SSCR1_RSRE | SSCR1_EBCEI, SSCR1_RSRE | SSCR1_EBCEI); ssp_update_bits(dai, SSCR0, SSCR0_SSE, SSCR0_SSE); ssp_update_bits(dai, SSCR0, SSCR0_RIM, 0); + ssp_update_bits(dai, SSRSA, SSRSA_RSEN, SSRSA_RSEN); } /* enable port */ diff --git a/src/include/sof/ssp.h b/src/include/sof/ssp.h index 3a1f6ed..fdcfcac 100644 --- a/src/include/sof/ssp.h +++ b/src/include/sof/ssp.h @@ -198,7 +198,8 @@ extern const struct dai_ops ssp_ops; #define SFIFOTT_TX(x) ((x) - 1) #define SFIFOTT_RX(x) (((x) - 1) << 16) -#if defined CONFIG_APOLLOLAKE || defined CONFIG_CANNONLAKE +#if defined CONFIG_APOLLOLAKE || defined CONFIG_CANNONLAKE ||\ + defined CONFIG_HASWELL || defined CONFIG_BROADWELL #define SSTSA_TSEN BIT(8) #define SSRSA_RSEN BIT(8) -- 2.14.1

2 1

[Sound-open-firmware] [PATCH_V2] BDW: init HW registers at setup time
by Rander Wang 04 Jun '18

04 Jun '18

Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- V2: remove unused code in ssp setting test it on Broadwell, no need to test other platforms SOF: master 131a1887631621 kernel: v4.14 d09db67c5a9d6d SOF-tools: master 13b56fa6047c566a --- src/drivers/hsw-ssp.c | 5 ----- src/platform/haswell/include/platform/shim.h | 3 ++- src/platform/haswell/platform.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/drivers/hsw-ssp.c b/src/drivers/hsw-ssp.c index b2fa99e..43024a4 100644 --- a/src/drivers/hsw-ssp.c +++ b/src/drivers/hsw-ssp.c @@ -102,9 +102,6 @@ static inline int ssp_set_config(struct dai *dai, trace_ssp("cos"); - /* unset free running clock */ - shim_update_bits(SHIM_CSR2, SHIM_CSR2_SFCR_SSP(dai->index), 0); - /* disable clock */ shim_update_bits(SHIM_CLKCTL, SHIM_CLKCTL_EN_SSP(dai->index), 0); @@ -405,8 +402,6 @@ static inline int ssp_set_config(struct dai *dai, /* enable free running clock */ ssp_update_bits(dai, SSCR0, SSCR0_SSE, SSCR0_SSE); ssp_update_bits(dai, SSCR0, SSCR0_SSE, 0); - shim_update_bits(SHIM_CSR2, SHIM_CSR2_SFCR_SSP(dai->index), - SHIM_CSR2_SFCR_SSP(dai->index)); out: spin_unlock(&ssp->lock); diff --git a/src/platform/haswell/include/platform/shim.h b/src/platform/haswell/include/platform/shim.h index 62f047a..fefaec9 100644 --- a/src/platform/haswell/include/platform/shim.h +++ b/src/platform/haswell/include/platform/shim.h @@ -57,10 +57,12 @@ #define SHIM_CSR_STALL (0x1 << 10) #define SHIM_CSR_SDPM0 (0x1 << 11) #define SHIM_CSR_SDPM1 (0x1 << 12) +#define SHIM_CSR_PCE (0x1 << 15) #define SHIM_CSR_SFCR0 (0x1 << 27) #define SHIM_CSR_SFCR1 (0x1 << 28) #define SHIM_CSR_DCS(x) (x << 4) #define SHIM_CSR_DCS_MASK (0x7 << 4) +#define SHIM_CSR_SFCR_SSP(x) (1 << (27 + x)) /* ISRX 0x18 */ #define SHIM_ISRX_BUSY (0x1 << 1) @@ -100,7 +102,6 @@ /* CSR2 / CS2 */ #define SHIM_CSR2_SDFD_SSP0 (1 << 1) #define SHIM_CSR2_SDFD_SSP1 (1 << 2) -#define SHIM_CSR2_SFCR_SSP(x) (1 << (27 + x)) /* LTRC */ #define SHIM_LTRC_VAL(x) (x << 0) diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index 8d8dbc7..81ce67a 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -221,6 +221,23 @@ void platform_interrupt_unmask(uint32_t irq, uint32_t mask) } } +/* init shim registers */ +static void platform_init_shim(void) +{ + /* disable power gate */ + io_reg_update_bits(SHIM_BASE + SHIM_CLKCTL, + SHIM_CLKCTL_DCPLCG, + SHIM_CLKCTL_DCPLCG); + + /* disable parity check */ + io_reg_update_bits(SHIM_BASE + SHIM_CSR, SHIM_CSR_PCE, 0); + + /* enable DMA finsh on ssp ports */ + io_reg_update_bits(SHIM_BASE + SHIM_CSR2, + SHIM_CSR2_SDFD_SSP0 | SHIM_CSR2_SDFD_SSP1, + SHIM_CSR2_SDFD_SSP0 | SHIM_CSR2_SDFD_SSP1); +} + int platform_init(struct sof *sof) { struct dma *dmac0; @@ -234,6 +251,7 @@ int platform_init(struct sof *sof) bzero((void*)MAILBOX_BASE, IPC_MAX_MAILBOX_BYTES); trace_point(TRACE_BOOT_PLATFORM_SHIM); + platform_init_shim(); trace_point(TRACE_BOOT_PLATFORM_CLOCK); init_platform_clocks(); -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] BDW: init HW registers at setup time
by Rander Wang 04 Jun '18

04 Jun '18

Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- test it on Broadwell, no need to test other platforms SOF: master 131a1887631621 kernel: v4.14 d09db67c5a9d6d SOF-tools: master 13b56fa6047c566a --- src/platform/haswell/include/platform/shim.h | 3 ++- src/platform/haswell/platform.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/platform/haswell/include/platform/shim.h b/src/platform/haswell/include/platform/shim.h index 62f047a..fefaec9 100644 --- a/src/platform/haswell/include/platform/shim.h +++ b/src/platform/haswell/include/platform/shim.h @@ -57,10 +57,12 @@ #define SHIM_CSR_STALL (0x1 << 10) #define SHIM_CSR_SDPM0 (0x1 << 11) #define SHIM_CSR_SDPM1 (0x1 << 12) +#define SHIM_CSR_PCE (0x1 << 15) #define SHIM_CSR_SFCR0 (0x1 << 27) #define SHIM_CSR_SFCR1 (0x1 << 28) #define SHIM_CSR_DCS(x) (x << 4) #define SHIM_CSR_DCS_MASK (0x7 << 4) +#define SHIM_CSR_SFCR_SSP(x) (1 << (27 + x)) /* ISRX 0x18 */ #define SHIM_ISRX_BUSY (0x1 << 1) @@ -100,7 +102,6 @@ /* CSR2 / CS2 */ #define SHIM_CSR2_SDFD_SSP0 (1 << 1) #define SHIM_CSR2_SDFD_SSP1 (1 << 2) -#define SHIM_CSR2_SFCR_SSP(x) (1 << (27 + x)) /* LTRC */ #define SHIM_LTRC_VAL(x) (x << 0) diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index 8d8dbc7..81ce67a 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -221,6 +221,23 @@ void platform_interrupt_unmask(uint32_t irq, uint32_t mask) } } +/* init shim registers */ +static void platform_init_shim(void) +{ + /* disable power gate */ + io_reg_update_bits(SHIM_BASE + SHIM_CLKCTL, + SHIM_CLKCTL_DCPLCG, + SHIM_CLKCTL_DCPLCG); + + /* disable parity check */ + io_reg_update_bits(SHIM_BASE + SHIM_CSR, SHIM_CSR_PCE, 0); + + /* enable DMA finsh on ssp ports */ + io_reg_update_bits(SHIM_BASE + SHIM_CSR2, + SHIM_CSR2_SDFD_SSP0 | SHIM_CSR2_SDFD_SSP1, + SHIM_CSR2_SDFD_SSP0 | SHIM_CSR2_SDFD_SSP1); +} + int platform_init(struct sof *sof) { struct dma *dmac0; @@ -234,6 +251,7 @@ int platform_init(struct sof *sof) bzero((void*)MAILBOX_BASE, IPC_MAX_MAILBOX_BYTES); trace_point(TRACE_BOOT_PLATFORM_SHIM); + platform_init_shim(); trace_point(TRACE_BOOT_PLATFORM_CLOCK); init_platform_clocks(); -- 2.14.1

2 1

[Sound-open-firmware] [PATCH v2] SOF:component: fix type in trigger macro ids
by Wu Zhigang 04 Jun '18

04 Jun '18

the trigger macro ids are typed incorrect in the component.h. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- v2: update the patch comments and title. --- 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

2 1

[Sound-open-firmware] [PATCH v2] 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" command will be processed first, then "COMP_TRIGGER_START" command will be processed. If the host dma is not stopped in the first command process, we will hit "eS0" error in the hda_dma_start() function during "COMP_TRIGGER_START" command process. The XRUN recover process will fail. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- v2: correct the typo error. --- 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 not pass all sanity tests. --- 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

3 2

[Sound-open-firmware] FW: [sof-driver-review:topic/sof-upstream 97/98] sound/soc/sof/ops.c:26:6: warning: 'ret' is used uninitialized in this function
by Lin, Mengdong 04 Jun '18

04 Jun '18

-----Original Message----- From: lkp Sent: Monday, June 4, 2018 1:38 PM 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 97/98] sound/soc/sof/ops.c:26:6: warning: 'ret' is used uninitialized in this function tree: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc.git topic/sof-upstream head: 297c56845645fc3b2a94862be301d6e33e81d9e8 commit: d20c0648bb2590f6450f4872aea0ac3ca21f80e5 [97/98] ASoC: SOF: Dont depend on SG buffers for generic SOF core config: arm-at91_dt_defconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (Debian 7.2.0-11) 7.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout d20c0648bb2590f6450f4872aea0ac3ca21f80e5 # save the attached .config to linux build tree make.cross ARCH=arm All warnings (new ones prefixed by >>): sound/soc/sof/ops.c: In function 'snd_sof_pci_update_bits_unlocked': >> sound/soc/sof/ops.c:26:6: warning: 'ret' is used uninitialized in >> this function [-Wuninitialized] u32 ret; ^~~ vim +/ret +26 sound/soc/sof/ops.c cf93ce4c Liam Girdwood 2018-01-08 20 cf93ce4c Liam Girdwood 2018-01-08 21 int snd_sof_pci_update_bits_unlocked(struct snd_sof_dev *sdev, u32 offset, cf93ce4c Liam Girdwood 2018-01-08 22 u32 mask, u32 value) cf93ce4c Liam Girdwood 2018-01-08 23 { cf93ce4c Liam Girdwood 2018-01-08 24 bool change; cf93ce4c Liam Girdwood 2018-01-08 25 unsigned int old, new; cf93ce4c Liam Girdwood 2018-01-08 @26 u32 ret; cf93ce4c Liam Girdwood 2018-01-08 27 cf93ce4c Liam Girdwood 2018-01-08 28 pci_read_config_dword(sdev->pci, offset, &ret); cf93ce4c Liam Girdwood 2018-01-08 29 dev_dbg(sdev->dev, "Debug PCIR: %8.8x at %8.8x\n", cf93ce4c Liam Girdwood 2018-01-08 30 pci_read_config_dword(sdev->pci, offset, &ret), offset); cf93ce4c Liam Girdwood 2018-01-08 31 cf93ce4c Liam Girdwood 2018-01-08 32 old = ret; cf93ce4c Liam Girdwood 2018-01-08 33 new = (old & (~mask)) | (value & mask); cf93ce4c Liam Girdwood 2018-01-08 34 cf93ce4c Liam Girdwood 2018-01-08 35 change = (old != new); cf93ce4c Liam Girdwood 2018-01-08 36 if (change) { cf93ce4c Liam Girdwood 2018-01-08 37 pci_write_config_dword(sdev->pci, offset, new); cf93ce4c Liam Girdwood 2018-01-08 38 dev_dbg(sdev->dev, "Debug PCIW: %8.8x at %8.8x\n", value, cf93ce4c Liam Girdwood 2018-01-08 39 offset); cf93ce4c Liam Girdwood 2018-01-08 40 } cf93ce4c Liam Girdwood 2018-01-08 41 cf93ce4c Liam Girdwood 2018-01-08 42 return change; cf93ce4c Liam Girdwood 2018-01-08 43 } cf93ce4c Liam Girdwood 2018-01-08 44 EXPORT_SYMBOL(snd_sof_pci_update_bits_unlocked); cf93ce4c Liam Girdwood 2018-01-08 45 :::::: The code at line 26 was first introduced by commit :::::: cf93ce4c3c68c907b5508209dd75797576ef1830 ASoC: SOF: Add DSP HW abstraction operations :::::: 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] 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