March 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [baohua:sirf-3.18 2573/2782] sound/soc/sirf/atlas7-iacc.c:168:24: sparse: symbol 'atlas7_iacc_dai_ops' was not declared. Should it be static?
by kbuild test robot 10 Mar '15

10 Mar '15

tree: git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux sirf-3.18 head: d61ca44a1d96f134d35d31522ca8efb19a6e1451 commit: 81aba96393135459ac811ce78fe8f91a8b767b82 [2573/2782] ASoC: sirf: atlas7: Add internal audio codec controller driver reproduce: # apt-get install sparse git checkout 81aba96393135459ac811ce78fe8f91a8b767b82 make ARCH=x86_64 allmodconfig make C=1 CF=-D__CHECK_ENDIAN__ sparse warnings: (new ones prefixed by >>) >> sound/soc/sirf/atlas7-iacc.c:168:24: sparse: symbol 'atlas7_iacc_dai_ops' was not declared. Should it be static? sound/soc/sirf/atlas7-iacc.c:482:27: sparse: incorrect type in initializer (incompatible argument 4 (different address spaces)) sound/soc/sirf/atlas7-iacc.c:482:27: expected int ( *copy )( ... ) sound/soc/sirf/atlas7-iacc.c:482:27: got int ( static [toplevel] *<noident> )( ... ) Please review and possibly fold the followup patch. --- 0-DAY kernel test infrastructure Open Source Technology Center http://lists.01.org/mailman/listinfo/kbuild Intel Corporation

4 4

[alsa-devel] [PATCH 1/8] ASoC: Intel: add function to load firmware image
by han.lu＠intel.com 10 Mar '15

10 Mar '15

From: "Lu, Han" <han.lu(a)intel.com> Add a general method to load firmware image, and apply to base firmware image loading. With the method, the driver will support loading multiple different modules in order to support different features. Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/sound/soc/intel/sst-dsp-priv.h b/sound/soc/intel/sst-dsp-priv.h index b9da030..396d545 100644 --- a/sound/soc/intel/sst-dsp-priv.h +++ b/sound/soc/intel/sst-dsp-priv.h @@ -173,6 +173,16 @@ struct sst_module_runtime_context { }; /* + * Audio DSP Module State + */ +enum sst_module_state { + SST_MODULE_STATE_UNLOADED = 0, /* default state */ + SST_MODULE_STATE_LOADED, + SST_MODULE_STATE_INITIALIZED, /* and inactive */ + SST_MODULE_STATE_ACTIVE, +}; + +/* * Audio DSP Generic Module. * * Each Firmware file can consist of 1..N modules. A module can span multiple @@ -203,6 +213,9 @@ struct sst_module { struct list_head list; /* DSP list of modules */ struct list_head list_fw; /* FW list of modules */ struct list_head runtime_list; /* list of runtime module objects*/ + + /* state */ + enum sst_module_state state; }; /* diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c index 5f71ef6..5e58008 100644 --- a/sound/soc/intel/sst-firmware.c +++ b/sound/soc/intel/sst-firmware.c @@ -498,6 +498,7 @@ struct sst_module *sst_module_new(struct sst_fw *sst_fw, sst_module->scratch_size = template->scratch_size; sst_module->persistent_size = template->persistent_size; sst_module->entry = template->entry; + sst_module->state = SST_MODULE_STATE_UNLOADED; INIT_LIST_HEAD(&sst_module->block_list); INIT_LIST_HEAD(&sst_module->runtime_list); diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c index 402b728..8ad733b 100644 --- a/sound/soc/intel/sst-haswell-dsp.c +++ b/sound/soc/intel/sst-haswell-dsp.c @@ -169,6 +169,7 @@ static int hsw_parse_module(struct sst_dsp *dsp, struct sst_fw *fw, block = (void *)block + sizeof(*block) + block->size; } + mod->state = SST_MODULE_STATE_LOADED; return 0; } diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index 863a9ca..cbd8c00 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -1844,6 +1844,8 @@ int sst_hsw_dsp_runtime_resume(struct sst_hsw *hsw) if (ret < 0) dev_err(dev, "error: audio DSP boot failure\n"); + sst_hsw_init_module_state(hsw); + ret = wait_event_timeout(hsw->boot_wait, hsw->boot_complete, msecs_to_jiffies(IPC_BOOT_MSECS)); if (ret == 0) { @@ -1886,6 +1888,75 @@ struct sst_dsp *sst_hsw_get_dsp(struct sst_hsw *hsw) return hsw->dsp; } +void sst_hsw_init_module_state(struct sst_hsw *hsw) +{ + struct sst_module *module; + enum sst_hsw_module_id id; + + /* the base fw contains several modules */ + for (id = SST_HSW_MODULE_BASE_FW; id < SST_HSW_MAX_MODULE_ID; id++) { + module = sst_module_get_from_id(hsw->dsp, id); + if (module) + module->state = SST_MODULE_STATE_ACTIVE; + } +} + +int sst_hsw_module_load(struct sst_hsw *hsw, + u32 module_id, u32 instance_id, char *name) +{ + int ret = 0; + const struct firmware *fw = NULL; + struct sst_fw *hsw_sst_fw; + struct sst_module *module; + struct device *dev = hsw->dev; + struct sst_dsp *dsp = hsw->dsp; + + dev_dbg(dev, "sst_hsw_module_load id=%d, name='%s'", module_id, name); + + module = sst_module_get_from_id(dsp, module_id); + if (module == NULL) { + /* loading for the first time */ + if (module_id == SST_HSW_MODULE_BASE_FW) { + /* for base module: use fw requested in acpi probe */ + fw = dsp->pdata->fw; + if (!fw) { + dev_err(dev, "request Base fw failed\n"); + return -ENODEV; + } + } else { + /* try and load any other optional modules if they are + * available. Use dev_info instead of dev_err in case + * request firmware failed */ + ret = request_firmware(&fw, name, dev); + if (ret) { + dev_info(dev, "fw image %s not available(%d)\n", + name, ret); + return ret; + } + } + hsw_sst_fw = sst_fw_new(dsp, fw, hsw); + if (hsw_sst_fw == NULL) { + dev_err(dev, "error: failed to load firmware\n"); + ret = -ENOMEM; + goto out; + } + module = sst_module_get_from_id(dsp, module_id); + if (module == NULL) { + dev_err(dev, "error: no module %d in firmware %s\n", + module_id, name); + } + dev_info(dev, "firmware %s loaded successfuly\n", name); + } else + dev_info(dev, "module %d (%s) already loaded\n", + module_id, name); +out: + /* release fw, but base fw should be released by acpi driver */ + if (fw && module_id != SST_HSW_MODULE_BASE_FW) + release_firmware(fw); + + return ret; +} + static struct sst_dsp_device hsw_dev = { .thread = hsw_irq_thread, .ops = &haswell_ops, @@ -1947,12 +2018,10 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata) /* keep the DSP in reset state for base FW loading */ sst_dsp_reset(hsw->dsp); - hsw->sst_fw = sst_fw_new(hsw->dsp, pdata->fw, hsw); - if (hsw->sst_fw == NULL) { - ret = -ENODEV; - dev_err(dev, "error: failed to load firmware\n"); + /* load base module and other modules in base firmware image */ + ret = sst_hsw_module_load(hsw, SST_HSW_MODULE_BASE_FW, 0, "Base"); + if (ret < 0) goto fw_err; - } /* allocate scratch mem regions */ ret = sst_block_alloc_scratch(hsw->dsp); @@ -1971,6 +2040,9 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata) goto boot_err; } + /* init module state after boot */ + sst_hsw_init_module_state(hsw); + /* get the FW version */ sst_hsw_fw_get_version(hsw, &version); @@ -1986,7 +2058,7 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata) boot_err: sst_dsp_reset(hsw->dsp); - sst_fw_free(hsw->sst_fw); + sst_fw_free_all(hsw->dsp); fw_err: dma_free_coherent(hsw->dsp->dma_dev, SST_HSW_DX_CONTEXT_SIZE, hsw->dx_context, hsw->dx_context_paddr); diff --git a/sound/soc/intel/sst-haswell-ipc.h b/sound/soc/intel/sst-haswell-ipc.h index 8580960..e071b3a 100644 --- a/sound/soc/intel/sst-haswell-ipc.h +++ b/sound/soc/intel/sst-haswell-ipc.h @@ -467,6 +467,12 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata); void sst_hsw_dsp_free(struct device *dev, struct sst_pdata *pdata); struct sst_dsp *sst_hsw_get_dsp(struct sst_hsw *hsw); +/* fw module function */ +void sst_hsw_init_module_state(struct sst_hsw *hsw); + +int sst_hsw_module_load(struct sst_hsw *hsw, + u32 module_id, u32 instance_id, char *name); + /* runtime module management */ struct sst_module_runtime *sst_hsw_runtime_module_create(struct sst_hsw *hsw, int mod_id, int offset); -- 1.9.1

3 11

[alsa-devel] About iMX6SL sign extension of SSI Receive Configuration Register (SSIx_SRCR)
by Xuebing Wang 10 Mar '15

10 Mar '15

Hi Nicolin and community, iMX6SL reference manual section "48.9.8 SSI Receive Configuration Register (SSIx_SRCR)" says about sign extension. Below is a quote from iMX6SL reference manual: ------------------------------------------------------------- Receive Data Extension. This control bit allows SSI to store the received data word in sign extended form. This bit affects data storage only in case received data is LSB aligned (SRCR[9]=1) 0 OFF — Sign extension turned off. 1 ON — Sign extension turned on. ------------------------------------------------------------- After I receive data (in the format of S16_LE) from SSI/I2S, I got data like 0x7FFF or 0x77d2. Are they supposed to be 0xFFFF or 0xF7d2? After setting bit 10 (RXEXT) of SSIx_SRCR, I still get 0x7FFF or 0x77d2. -- Note: SRCR[9] is 1. Any suggestions? Thanks. -- Xuebing

2 1

[alsa-devel] [DAPM question] DAPM support for single input multiple outputs
by Qiao Zhou 10 Mar '15

10 Mar '15

Hi Mark, I have one question and need your suggestion. Thanks in advance. In our DSP, one stream path is like this: There is one bit controlling whether a signal A goes to A_out or B_out. That's the reverse case of DAPM_MUX(multiple inputs, single output). One way is to use two switches but it seems not good since two switches control the same bit. It's strange. Do you have any opinion about such requirement support? -- Best Regards Qiao

3 4

[alsa-devel] [PATCH 0/24 v2] ASoC: rsnd: move 2nd DMAC in rsnd driver and subnode dma-name support
by Kuninori Morimoto 10 Mar '15

10 Mar '15

Hi Mark, Arnd, Vinod Cc: Laurent, SH-ML These patches add Audio DMAC peri peri implementation in rsnd driver. I will remove current DMAEngine side Audio DMAC peri peri implement if these are accepted. http://thread.gmane.org/gmane.linux.ports.sh.devel/41063/focus=43829 Arnd, Vinod This series adds subnode DT support for 1st DMAC, and it is based on 1) patch. can you please check it ? Mark Actually, 1) patch has no relationship until 20). I guess this patch-set has merge issue. Can you check 2) - 19) as 1st step ? 1) : export of_dma_request_slave_channel() for 20) 2) - 6) : cleanup / tidyup 7) - 12) : Audio DMAC peri peri implementation 13) - 14) : cleanup. these are no longer needed now 15) - 19) : prepare for 1st DMAC dma-names subnode support 20) : 1st DMAC dma-names subnode subnode 21) - 24) : DT bindings text update Kuninori Morimoto (24): 1) dmaengine: export symbol of of_dma_request_slave_channel() 2) ASoC: rsnd: remove SH-DMA-BASE specific implementation 3) ASoC: rsnd: remove un-needed parameter from rsnd_dma_init() 4) ASoC: rsnd: remove unused rsnd_dma_available() 5) ASoC: rsnd: remove un-needed parameter from rsnd_dma_quit() 6) ASoC: rsnd: tidyup rsnd_dma_to_mod() macro declaration position 7) ASoC: rsnd: enable to get resource by name 8) ASoC: rsnd: add rsnd_gen_get_phy_addr() to get physical address 9) ASoC: rsnd: add dma.c for Audio DMAC / Audio DMAC peri peri 10) ASoC: rsnd: move rsnd_gen_dma_addr() from gen.c to dma.c 11) ASoC: rsnd: enable to care 1st / 2nd DMAC on rsnd_dma_xxx() 12) ASoC: rsnd: add Audio DMAC peri peri support rework 13) ASoC: rsnd: remove rsnd_dma::addr 14) ASoC: rsnd: remove rsnd_dma::dir 15) ASoC: rsnd: use union with rsnd_dmaen / rsnd_dmapp 16) ASoC: rsnd: enable rsnd_ssi_use_busif() for DMA 17) ASoC: rsnd: ssi: add rsnd_ssi_of_node() 18) ASoC: rsnd: src: add rsnd_src_of_node() 19) ASoC: rsnd: dvc: add rsnd_dvc_of_node() 20) ASoC: rsnd: 1st DMAC dma-names cares subnode 21) ASoC: rsnd: add sample code of rcar_sound,src irq 22) ASoC: rsnd: add sample code of missing clocks 23) ASoC: rsnd: add sample code of dma entry 24) ASoC: rsnd: add sample code of reg-names .../devicetree/bindings/sound/renesas,rsnd.txt | 125 +++- drivers/dma/of-dma.c | 1 + include/linux/of_dma.h | 4 +- sound/soc/sh/rcar/Makefile | 2 +- sound/soc/sh/rcar/core.c | 235 +------- sound/soc/sh/rcar/dma.c | 603 ++++++++++++++++++++ sound/soc/sh/rcar/dvc.c | 12 + sound/soc/sh/rcar/gen.c | 145 +---- sound/soc/sh/rcar/rsnd.h | 72 ++- sound/soc/sh/rcar/src.c | 23 +- sound/soc/sh/rcar/ssi.c | 28 +- 11 files changed, 838 insertions(+), 412 deletions(-) Best regards --- Kuninori Morimoto _______________________________________________ Alsa-devel mailing list Alsa-devel(a)alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

4 34

[alsa-devel] [PATCH] ASoC: tlv320aic23: remove incorrect __exit markups
by Dmitry Torokhov 09 Mar '15

09 Mar '15

Even if bus is not hot-pluggable, the devices can be unbound from the driver via sysfs, so we should not be using __exit annotations on remove() methods. The only exception is drivers registered with platform_driver_probe() which specifically disables sysfs bind/unbind attributes. Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> --- sound/soc/codecs/tlv320aic23-i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320aic23-i2c.c b/sound/soc/codecs/tlv320aic23-i2c.c index f137019..78a94af 100644 --- a/sound/soc/codecs/tlv320aic23-i2c.c +++ b/sound/soc/codecs/tlv320aic23-i2c.c @@ -31,7 +31,7 @@ static int tlv320aic23_i2c_probe(struct i2c_client *i2c, return tlv320aic23_probe(&i2c->dev, regmap); } -static int __exit tlv320aic23_i2c_remove(struct i2c_client *i2c) +static int tlv320aic23_i2c_remove(struct i2c_client *i2c) { snd_soc_unregister_codec(&i2c->dev); return 0; @@ -56,7 +56,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = { .of_match_table = of_match_ptr(tlv320aic23_of_match), }, .probe = tlv320aic23_i2c_probe, - .remove = __exit_p(tlv320aic23_i2c_remove), + .remove = tlv320aic23_i2c_remove, .id_table = tlv320aic23_id, }; -- 2.2.0.rc0.207.ga3a616c -- Dmitry

2 1

[alsa-devel] [PATCH] ASoC: wm2200: match wait_for_completion_timeout return type
by Nicholas Mc Guire 09 Mar '15

09 Mar '15

return type of wait_for_completion_timeout is unsigned long not int. An appropriately named unsigned long is added and the assignment fixed up. Signed-off-by: Nicholas Mc Guire <hofrat(a)osadl.org> --- This was only compile tested for exynos_defconfig + CONFIG_COMPILE_TEST=y, SND_SOC_ALL_CODECS=m (implies CONFIG_SND_SOC_WM2200=m) Patch is against 4.0-rc2 linux-next (localversion-next is -next-20150306) sound/soc/codecs/wm2200.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 1559984..b48694a 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1942,6 +1942,7 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source, struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec); struct _fll_div factors; int ret, i, timeout; + unsigned long time_left; if (!Fout) { dev_dbg(codec->dev, "FLL disabled"); @@ -2021,9 +2022,10 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source, /* Poll for the lock; will use the interrupt to exit quickly */ for (i = 0; i < timeout; i++) { if (i2c->irq) { - ret = wait_for_completion_timeout(&wm2200->fll_lock, - msecs_to_jiffies(25)); - if (ret > 0) + time_left = wait_for_completion_timeout( + &wm2200->fll_lock, + msecs_to_jiffies(25)); + if (time_left > 0) break; } else { msleep(1); -- 1.7.10.4

2 1

[alsa-devel] [PATCH] ASoC: arizona: match wait_for_completion_timeout return type
by Nicholas Mc Guire 09 Mar '15

09 Mar '15

return type of wait_for_completion_timeout is unsigned long not int. An appropriately named unsigned long is added and the assignment fixed up. Signed-off-by: Nicholas Mc Guire <hofrat(a)osadl.org> --- Note that the error message "Timed out waiting for lock" might not be that clear in a kernel log message as it could probably be read as relating to a kernel lock "Timed out waiting for FLL lock" might be clearer. This was only compile tested for exynos_defconfig + CONFIG_COMPILE_TEST=y SND_SOC_ALL_CODECS=m, EXTCON_ARIZONA=m, CONFIG_MFD_ARIZONA_SPI=m, CONFIG_MFD_WM5102=y, (implies SND_SOC_ARIZONA=m) Patch is against 4.0-rc2 linux-next (localversion-next is -next-20150306) sound/soc/codecs/arizona.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 95d31d6..57da0ce 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1902,7 +1902,7 @@ static int arizona_is_enabled_fll(struct arizona_fll *fll) static int arizona_enable_fll(struct arizona_fll *fll) { struct arizona *arizona = fll->arizona; - int ret; + unsigned long time_left; bool use_sync = false; int already_enabled = arizona_is_enabled_fll(fll); struct arizona_fll_cfg cfg; @@ -1978,9 +1978,9 @@ static int arizona_enable_fll(struct arizona_fll *fll) regmap_update_bits_async(arizona->regmap, fll->base + 1, ARIZONA_FLL1_FREERUN, 0); - ret = wait_for_completion_timeout(&fll->ok, + time_left = wait_for_completion_timeout(&fll->ok, msecs_to_jiffies(250)); - if (ret == 0) + if (time_left == 0) arizona_fll_warn(fll, "Timed out waiting for lock\n"); return 0; -- 1.7.10.4

3 2

[alsa-devel] [PATCH] ASoC: wm5100: match wait_for_completion_timeout return type
by Nicholas Mc Guire 09 Mar '15

09 Mar '15

return type of wait_for_completion_timeout is unsigned long not int. An appropriately named unsigned long is added and the assignment fixed up. Signed-off-by: Nicholas Mc Guire <hofrat(a)osadl.org> --- This was only compile tested for exynos_defconfig + CONFIG_COMPILE_TEST=y, SND_SOC_ALL_CODECS=m (implies CONFIG_SND_SOC_WM5100=m) Patch is against 4.0-rc2 linux-next (localversion-next is -next-20150306) sound/soc/codecs/wm5100.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index ea09db5..9674037 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -1762,6 +1762,7 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source, struct _fll_div factors; struct wm5100_fll *fll; int ret, base, lock, i, timeout; + unsigned long time_left; switch (fll_id) { case WM5100_FLL1: @@ -1842,9 +1843,9 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source, /* Poll for the lock; will use interrupt when we can test */ for (i = 0; i < timeout; i++) { if (i2c->irq) { - ret = wait_for_completion_timeout(&fll->lock, - msecs_to_jiffies(25)); - if (ret > 0) + time_left = wait_for_completion_timeout(&fll->lock, + msecs_to_jiffies(25)); + if (time_left > 0) break; } else { msleep(1); -- 1.7.10.4

4 5

[alsa-devel] [PATCH 1/2] ASoC: wm8996: match wait_for_completion_timeout return type
by Nicholas Mc Guire 09 Mar '15

09 Mar '15

return type of wait_for_completion_timeout is unsigned long not int. An appropriately named unsigned long is added and the assignment fixed up in case of completion occurring the remaining time is >=1 so ret is set to 1 if no timeout occurred. Signed-off-by: Nicholas Mc Guire <hofrat(a)osadl.org> --- This was only compile tested for exynos_defconfig + CONFIG_COMPILE_TEST=y, SND_SOC_ALL_CODECS=m (implies CONFIG_SND_SOC_WM8996=m) Patch is against 4.0-rc2 linux-next (localversion-next is -next-20150306) sound/soc/codecs/wm8996.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index dc92d5e..24d9705 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2009,7 +2009,7 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source, struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); struct i2c_client *i2c = to_i2c_client(codec->dev); struct _fll_div fll_div; - unsigned long timeout; + unsigned long timeout, time_left; int ret, reg, retry; /* Any change? */ @@ -2113,10 +2113,11 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source, timeout /= 2; for (retry = 0; retry < 10; retry++) { - ret = wait_for_completion_timeout(&wm8996->fll_lock, - timeout); - if (ret != 0) { + time_left = wait_for_completion_timeout(&wm8996->fll_lock, + timeout); + if (time_left != 0) { WARN_ON(!i2c->irq); + ret = 1; break; } -- 1.7.10.4

3 2