January 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: da9055: Partially fix device registration
by Mark Brown 08 Jan '14

08 Jan '14

From: Mark Brown <broonie(a)linaro.org> It has never been possible to even load the da9055 driver since both the MFD and CODEC drivers register the I2C device "da9055". Fix this by using the usual pattern for MFDs with multiple I2C addresses and having the CODEC driver reference an I2C dummy registered by the MFD. Since I don't know which I2C address to use for the CODEC a FIXME has been left in the MFD, this doesn't make anything any worse since the device has never been able to load in the first place. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- drivers/mfd/da9055-core.c | 3 +++ drivers/mfd/da9055-i2c.c | 2 ++ include/linux/mfd/da9055/core.h | 2 +- sound/soc/codecs/da9055.c | 49 ++++++++++++++++++++--------------------- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c index caf8dcffd0ad..fb0284cda4a5 100644 --- a/drivers/mfd/da9055-core.c +++ b/drivers/mfd/da9055-core.c @@ -365,6 +365,9 @@ static const struct mfd_cell da9055_devs[] = { .of_compatible = "dialog,da9055-watchdog", .name = "da9055-watchdog", }, + { + .name = "da9055-codec", + }, }; static struct regmap_irq_chip da9055_regmap_irq_chip = { diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c index 13af7e50021e..4f5e18750e1a 100644 --- a/drivers/mfd/da9055-i2c.c +++ b/drivers/mfd/da9055-i2c.c @@ -39,6 +39,8 @@ static int da9055_i2c_probe(struct i2c_client *i2c, da9055->dev = &i2c->dev; da9055->chip_irq = i2c->irq; + /* FIXME: Should use i2c_add_dummy() for the CODEC */ + i2c_set_clientdata(i2c, da9055); return da9055_device_init(da9055); diff --git a/include/linux/mfd/da9055/core.h b/include/linux/mfd/da9055/core.h index 956afa445998..e293797ded66 100644 --- a/include/linux/mfd/da9055/core.h +++ b/include/linux/mfd/da9055/core.h @@ -42,7 +42,7 @@ struct da9055 { struct regmap *regmap; struct regmap_irq_chip_data *irq_data; struct device *dev; - struct i2c_client *i2c_client; + struct i2c_client *i2c_client, *codec; int irq_base; int chip_irq; diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index 52b79a487ac7..88c1a884aed8 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c @@ -14,10 +14,10 @@ */ #include <linux/delay.h> -#include <linux/i2c.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/mfd/da9055/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -1474,7 +1474,7 @@ static struct snd_soc_codec_driver soc_codec_dev_da9055 = { .num_dapm_routes = ARRAY_SIZE(da9055_audio_map), }; -static const struct regmap_config da9055_regmap_config = { +static const struct regmap_config da9055_codec_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -1484,14 +1484,19 @@ static const struct regmap_config da9055_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int da9055_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int da9055_dev_probe(struct platform_device *pdev) { + struct da9055 *core = dev_get_drvdata(pdev->dev.parent); struct da9055_priv *da9055; - struct da9055_platform_data *pdata = dev_get_platdata(&i2c->dev); + struct da9055_platform_data *pdata = dev_get_platdata(&pdev->dev); int ret; - da9055 = devm_kzalloc(&i2c->dev, sizeof(struct da9055_priv), + if (!core->codec) { + dev_err(&pdev->dev, "No CODEC device registered\n"); + return -ENODEV; + } + + da9055 = devm_kzalloc(&pdev->dev, sizeof(struct da9055_priv), GFP_KERNEL); if (!da9055) return -ENOMEM; @@ -1499,48 +1504,42 @@ static int da9055_i2c_probe(struct i2c_client *i2c, if (pdata) da9055->pdata = pdata; - i2c_set_clientdata(i2c, da9055); + platform_set_drvdata(pdev, da9055); - da9055->regmap = devm_regmap_init_i2c(i2c, &da9055_regmap_config); + da9055->regmap = devm_regmap_init_i2c(core->codec, + &da9055_codec_regmap_config); if (IS_ERR(da9055->regmap)) { ret = PTR_ERR(da9055->regmap); - dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret); + dev_err(&pdev->dev, "regmap_init() failed: %d\n", ret); return ret; } - ret = snd_soc_register_codec(&i2c->dev, + ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_da9055, &da9055_dai, 1); if (ret < 0) { - dev_err(&i2c->dev, "Failed to register da9055 codec: %d\n", + dev_err(&pdev->dev, "Failed to register da9055 codec: %d\n", ret); } return ret; } -static int da9055_remove(struct i2c_client *client) +static int da9055_dev_remove(struct platform_device *pdev) { - snd_soc_unregister_codec(&client->dev); + snd_soc_unregister_codec(&pdev->dev); return 0; } -static const struct i2c_device_id da9055_i2c_id[] = { - { "da9055", 0 }, - { } -}; -MODULE_DEVICE_TABLE(i2c, da9055_i2c_id); - /* I2C codec control layer */ -static struct i2c_driver da9055_i2c_driver = { +static struct platform_driver da9055_codec_driver = { .driver = { - .name = "da9055", + .name = "da9055-codec", .owner = THIS_MODULE, }, - .probe = da9055_i2c_probe, - .remove = da9055_remove, - .id_table = da9055_i2c_id, + .probe = da9055_dev_probe, + .remove = da9055_dev_remove, }; -module_i2c_driver(da9055_i2c_driver); +module_platform_driver(da9055_codec_driver); MODULE_DESCRIPTION("ASoC DA9055 Codec driver"); MODULE_AUTHOR("David Chen, Ashish Chavan"); -- 1.8.5.2

2 1

Re: [alsa-devel] snd-usb: "delay: estimated 0, actual 352"
by Takashi Iwai 08 Jan '14

08 Jan '14

At Thu, 6 Sep 2012 15:17:58 +0200, Markus Trippelsdorf wrote: > > On 2012.09.06 at 15:08 +0200, Takashi Iwai wrote: > > At Thu, 6 Sep 2012 11:43:48 +0200, > > Markus Trippelsdorf wrote: > > > > > > On 2012.09.06 at 10:21 +0200, Takashi Iwai wrote: > > > > At Thu, 06 Sep 2012 09:35:26 +0200, > > > > Takashi Iwai wrote: > > > > > > > > In short, a patch like below may fix the issue (note: completely > > > > untested!) > > > > > > No it doesn't, unfortunately... > > > > OK, I start tracking down the problem a bit more deeply now. > > > > The issue happens when the first two URBs are passed to > > retire_playback_urb(). These are URBs filled before start_endpoints() > > are set, so they contain actually zero size. Even though these are > > a sort of dummy packets, the driver still tries to check with the > > queued delay account, and gives bogus errors. > > > > So, essentially the messages are harmless and nothing to worry too > > much, but surely it doesn't look sexy. > > > > The patch below should fix the problem. Please give it a try. > > Yes, your patch finally fixes the problem. > Thank you Takashi-san. Thanks for your quick test! If Daniel has no objection with that patch, I'm going to merge it. Takashi

3 2

[alsa-devel] [PATCH 1/4] ASoC: max98088: Use params_width() rather than memory format
by Mark Brown 08 Jan '14

08 Jan '14

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/max98088.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 53d7dab4e054..ee660e2d3df3 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -1233,12 +1233,12 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, rate = params_rate(params); - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, M98088_DAI_WS, 0); break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, M98088_DAI_WS, M98088_DAI_WS); break; -- 1.8.5.2

1 3

[alsa-devel] [PATCH 1/2 v2] ASoC: wm_adsp: Factor out ADSP2 boot proceedure
by Charles Keepax 08 Jan '14

08 Jan '14

Move the ADSP2 boot proceedure into a work structure in preparation for running it asynchronously with the reset of the audio path bring up. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 181 +++++++++++++++++++++++++------------------- sound/soc/codecs/wm_adsp.h | 2 + 2 files changed, 105 insertions(+), 78 deletions(-) Changes since v1: - Schedule to the system unbound work queue since it is likely to be a fairly long task. - Move final start signal to the DSP to be an out_drv widget such that the download is overlapped with the output enables. Thanks, Charles diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index fb0c678..41bbac9 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1497,107 +1497,131 @@ static int wm_adsp2_ena(struct wm_adsp *dsp) return 0; } -int wm_adsp2_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) +void wm_adsp2_boot_work(struct work_struct *work) { - struct snd_soc_codec *codec = w->codec; - struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); - struct wm_adsp *dsp = &dsps[w->shift]; - struct wm_adsp_alg_region *alg_region; - struct wm_coeff_ctl *ctl; - unsigned int val; + struct wm_adsp *dsp = container_of(work, + struct wm_adsp, + boot_work); int ret; + unsigned int val; - dsp->card = codec->card; + /* + * For simplicity set the DSP clock rate to be the + * SYSCLK rate rather than making it configurable. + */ + ret = regmap_read(dsp->regmap, ARIZONA_SYSTEM_CLOCK_1, &val); + if (ret != 0) { + adsp_err(dsp, "Failed to read SYSCLK state: %d\n", ret); + return; + } + val = (val & ARIZONA_SYSCLK_FREQ_MASK) + >> ARIZONA_SYSCLK_FREQ_SHIFT; - switch (event) { - case SND_SOC_DAPM_POST_PMU: - /* - * For simplicity set the DSP clock rate to be the - * SYSCLK rate rather than making it configurable. - */ - ret = regmap_read(dsp->regmap, ARIZONA_SYSTEM_CLOCK_1, &val); - if (ret != 0) { - adsp_err(dsp, "Failed to read SYSCLK state: %d\n", - ret); - return ret; - } - val = (val & ARIZONA_SYSCLK_FREQ_MASK) - >> ARIZONA_SYSCLK_FREQ_SHIFT; + ret = regmap_update_bits_async(dsp->regmap, + dsp->base + ADSP2_CLOCKING, + ADSP2_CLK_SEL_MASK, val); + if (ret != 0) { + adsp_err(dsp, "Failed to set clock rate: %d\n", ret); + return; + } - ret = regmap_update_bits_async(dsp->regmap, - dsp->base + ADSP2_CLOCKING, - ADSP2_CLK_SEL_MASK, val); + if (dsp->dvfs) { + ret = regmap_read(dsp->regmap, + dsp->base + ADSP2_CLOCKING, &val); if (ret != 0) { - adsp_err(dsp, "Failed to set clock rate: %d\n", - ret); - return ret; + dev_err(dsp->dev, "Failed to read clocking: %d\n", ret); + return; } - if (dsp->dvfs) { - ret = regmap_read(dsp->regmap, - dsp->base + ADSP2_CLOCKING, &val); + if ((val & ADSP2_CLK_SEL_MASK) >= 3) { + ret = regulator_enable(dsp->dvfs); if (ret != 0) { dev_err(dsp->dev, - "Failed to read clocking: %d\n", ret); - return ret; + "Failed to enable supply: %d\n", + ret); + return; } - if ((val & ADSP2_CLK_SEL_MASK) >= 3) { - ret = regulator_enable(dsp->dvfs); - if (ret != 0) { - dev_err(dsp->dev, - "Failed to enable supply: %d\n", - ret); - return ret; - } - - ret = regulator_set_voltage(dsp->dvfs, - 1800000, - 1800000); - if (ret != 0) { - dev_err(dsp->dev, - "Failed to raise supply: %d\n", - ret); - return ret; - } + ret = regulator_set_voltage(dsp->dvfs, + 1800000, + 1800000); + if (ret != 0) { + dev_err(dsp->dev, + "Failed to raise supply: %d\n", + ret); + return; } } + } - ret = wm_adsp2_ena(dsp); - if (ret != 0) - return ret; + ret = wm_adsp2_ena(dsp); + if (ret != 0) + return; - ret = wm_adsp_load(dsp); - if (ret != 0) - goto err; + ret = wm_adsp_load(dsp); + if (ret != 0) + goto err; - ret = wm_adsp_setup_algs(dsp); - if (ret != 0) - goto err; + ret = wm_adsp_setup_algs(dsp); + if (ret != 0) + goto err; - ret = wm_adsp_load_coeff(dsp); - if (ret != 0) - goto err; + ret = wm_adsp_load_coeff(dsp); + if (ret != 0) + goto err; - /* Initialize caches for enabled and unset controls */ - ret = wm_coeff_init_control_caches(dsp); - if (ret != 0) - goto err; + /* Initialize caches for enabled and unset controls */ + ret = wm_coeff_init_control_caches(dsp); + if (ret != 0) + goto err; - /* Sync set controls */ - ret = wm_coeff_sync_controls(dsp); - if (ret != 0) - goto err; + /* Sync set controls */ + ret = wm_coeff_sync_controls(dsp); + if (ret != 0) + goto err; + + ret = regmap_update_bits_async(dsp->regmap, + dsp->base + ADSP2_CONTROL, + ADSP2_CORE_ENA, + ADSP2_CORE_ENA); + if (ret != 0) + goto err; + + dsp->running = true; + + return; - ret = regmap_update_bits_async(dsp->regmap, - dsp->base + ADSP2_CONTROL, - ADSP2_CORE_ENA | ADSP2_START, - ADSP2_CORE_ENA | ADSP2_START); +err: + regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, + ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0); +} + +int wm_adsp2_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); + struct wm_adsp *dsp = &dsps[w->shift]; + struct wm_adsp_alg_region *alg_region; + struct wm_coeff_ctl *ctl; + int ret; + + dsp->card = codec->card; + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + queue_work(system_unbound_wq, &dsp->boot_work); + flush_work(&dsp->boot_work); + + if (!dsp->running) + return -EIO; + + ret = regmap_update_bits(dsp->regmap, + dsp->base + ADSP2_CONTROL, + ADSP2_START, + ADSP2_START); if (ret != 0) goto err; - - dsp->running = true; break; case SND_SOC_DAPM_PRE_PMD: @@ -1668,6 +1692,7 @@ int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs) INIT_LIST_HEAD(&adsp->alg_regions); INIT_LIST_HEAD(&adsp->ctl_list); + INIT_WORK(&adsp->boot_work, wm_adsp2_boot_work); if (dvfs) { adsp->dvfs = devm_regulator_get(adsp->dev, "DCVDD"); diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index d018dea..b172c1d 100644 --- a/sound/soc/codecs/wm_adsp.h +++ b/sound/soc/codecs/wm_adsp.h @@ -59,6 +59,8 @@ struct wm_adsp { struct regulator *dvfs; struct list_head ctl_list; + + struct work_struct boot_work; }; #define WM_ADSP1(wname, num) \ -- 1.7.2.5

2 2

[alsa-devel] mx6: Audio does not work on linux-next 20140107
by Fabio Estevam 08 Jan '14

08 Jan '14

Hi, Playing audio on a mx6qsabresd board running linux-next 20140107 leads to the following crash: $ aplay clarinet.wav random: nonblocking pool is initialized Playing WAVE 'clarinet.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Mono underrun!!! (at least -477981.433 ms long) underrun!!! (at least -477981.435 ms long) underrun!!! (at least -477981.436 ms long) underrun!!! (at least -477981.435 ms long) underrun!!! (at least -477981.436 ms long) underrun!!! (at least -477981.435 ms long) underrun!!! (at least -477981.436 ms long) underrun!!! (at least -477981.436 ms long) underrun!!! (at least -477981.436 ms long) underrun!!! (at least -477981.436 ms long) Unable to handle kernel NULL pointer dereference at virtual address 00000044 pgd = 80004000 [00000044] *pgd=00000000 Internal error: Oops: 17 [#1] SMP ARM Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.13.0-rc7-next-20140107+ #607 task: 8089fef0 ti: 80894000 task.ti: 80894000 PC is at dmaengine_pcm_dma_complete+0x10/0x50 LR is at sdma_tasklet+0x128/0x130 pc : [<804aee6c>] lr : [<802e6428>] psr: a0000113 sp : 80895df8 ip : 80895e08 fp : 80895e04 r10: 808f64c0 r9 : bfaa41b4 r8 : 00000000 r7 : 8089cd24 r6 : 00000001 r5 : 00000003 r4 : bfaa40e8 r3 : 00000000 r2 : 00000020 r1 : 00000000 r0 : bf15c000 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c53c7d Table: 4eedc04a DAC: 00000017 Process swapper/0 (pid: 0, stack limit = 0x80894240) Stack: (0x80895df8 to 0x80896000) 5de0: 80895e2c 80895e08 5e00: 802e6428 804aee68 bfaa41b0 00000000 80894000 8089cd24 00000000 808f64c0 5e20: 80895e64 80895e30 8002c4b8 802e630c 80062a6c 80890390 00000040 00000000 5e40: 80896098 80894000 80896080 00000006 00000100 00000006 80895eb4 80895e68 5e60: 8002ca38 8002c434 00000022 00000000 bf807a14 00000001 00200000 ffff915f 5e80: 0000000a 00000000 f4000100 80894000 80890ff0 80894000 00000022 00000000 5ea0: 8063350c 808f4abd 80895ecc 80895eb8 8002cf4c 8002c914 00000184 8089cd24 5ec0: 80895ef4 80895ed0 8000f35c 8002cea8 000000a0 f400010c 8089ce80 80895f18 5ee0: f4000100 80894000 80895f14 80895ef8 80008640 8000f310 8000f734 20000113 5f00: ffffffff 80895f4c 80895f6c 80895f18 800130a4 8000861c 00000001 00000001 5f20: 00000000 8089fef0 00000000 8089c99c 8089c938 808f4abd 80894000 8063350c 5f40: 808f4abd 80895f6c 80895f30 80895f60 80062ab0 8000f734 20000113 ffffffff 5f60: 80895f84 80895f70 8006ad14 8000f718 00000000 8181d140 80895fb4 80895f88 5f80: 80624260 8006acb8 00000001 00000000 806241ac 8089ca38 808f4cc0 8089ca38 5fa0: 808f4cc0 ffffffff 80895ff4 80895fb8 80843b40 806241b8 ffffffff ffffffff 5fc0: 808435d0 00000000 00000000 80883970 10c53c7d 8089c928 8088396c 808a1524 5fe0: 1000406a 00000000 00000000 80895ff8 10008074 80843840 00000000 00000000 Backtrace: [<804aee5c>] (dmaengine_pcm_dma_complete) from [<802e6428>] (sdma_tasklet+0x128) [<802e6300>] (sdma_tasklet) from [<8002c4b8>] (tasklet_action+0x90/0x148) r10:808f64c0 r8:00000000 r7:8089cd24 r6:80894000 r5:00000000 r4:bfaa41b0 [<8002c428>] (tasklet_action) from [<8002ca38>] (__do_softirq+0x130/0x278) r10:00000006 r9:00000100 r8:00000006 r7:80896080 r6:80894000 r5:80896098 r4:00000000 [<8002c908>] (__do_softirq) from [<8002cf4c>] (irq_exit+0xb0/0x100) r10:808f4abd r9:8063350c r8:00000000 r7:00000022 r6:80894000 r5:80890ff0 r4:80894000 [<8002ce9c>] (irq_exit) from [<8000f35c>] (handle_IRQ+0x58/0xb8) r4:8089cd24 r3:00000184 [<8000f304>] (handle_IRQ) from [<80008640>] (gic_handle_irq+0x30/0x64) r8:80894000 r7:f4000100 r6:80895f18 r5:8089ce80 r4:f400010c r3:000000a0 [<80008610>] (gic_handle_irq) from [<800130a4>] (__irq_svc+0x44/0x5c) Exception stack(0x80895f18 to 0x80895f60) 5f00: 00000001 00000001 5f20: 00000000 8089fef0 00000000 8089c99c 8089c938 808f4abd 80894000 8063350c 5f40: 808f4abd 80895f6c 80895f30 80895f60 80062ab0 8000f734 20000113 ffffffff r7:80895f4c r6:ffffffff r5:20000113 r4:8000f734 [<8000f70c>] (arch_cpu_idle) from [<8006ad14>] (cpu_startup_entry+0x68/0x150) [<8006acac>] (cpu_startup_entry) from [<80624260>] (rest_init+0xb4/0xdc) r7:8181d140 r3:00000000 [<806241ac>] (rest_init) from [<80843b40>] (start_kernel+0x30c/0x364) r6:ffffffff r5:808f4cc0 r4:8089ca38 [<80843834>] (start_kernel) from [<10008074>] (0x10008074) Code: e1a0c00d e92dd800 e24cb004 e59030c8 (e5931044) ---[ end trace 076f597fb036d850 ]--- Kernel panic - not syncing: Fatal exception in interrupt CPU1: stopping CPU: 1 PID: 0 Comm: swapper/1 Tainted: G D 3.13.0-rc7-next-20140107+ 7 Backtrace: [<8001233c>] (dump_backtrace) from [<800124d8>] (show_stack+0x18/0x1c) r6:80890ff0 r5:8089cd24 r4:00000000 r3:00000000 [<800124c0>] (show_stack) from [<80629fac>] (dump_stack+0x80/0x9c) [<80629f2c>] (dump_stack) from [<80015494>] (handle_IPI+0x148/0x174) r4:00000001 r3:bf87d100 [<8001534c>] (handle_IPI) from [<8000866c>] (gic_handle_irq+0x5c/0x64) r8:bf89c000 r7:f4000100 r6:bf89df70 r5:8089ce80 r4:f400010c r3:bf87d100 [<80008610>] (gic_handle_irq) from [<800130a4>] (__irq_svc+0x44/0x5c) Exception stack(0xbf89df70 to 0xbf89dfb8) df60: 8000f730 bf89df80 00000000 00000000 df80: 00000000 8089c99c 8089c938 808f4abd bf89c000 8063350c 808f4abd bf89dfc4 dfa0: bf89dfa8 bf89dfb8 80062b9c 8000f734 60000113 ffffffff r7:bf89dfa4 r6:ffffffff r5:60000113 r4:8000f734 [<8000f70c>] (arch_cpu_idle) from [<8006ad14>] (cpu_startup_entry+0x68/0x150) [<8006acac>] (cpu_startup_entry) from [<800150e0>] (secondary_start_kernel+0x12) r7:808f4fd0 r3:bf87d100 [<80014fb4>] (secondary_start_kernel) from [<10008704>] (0x10008704) r5:0000001f r4:4f88406a CPU3: stopping CPU: 3 PID: 0 Comm: swapper/3 Tainted: G D 3.13.0-rc7-next-20140107+ 7 Backtrace: [<8001233c>] (dump_backtrace) from [<800124d8>] (show_stack+0x18/0x1c) r6:80890ff0 r5:8089cd24 r4:00000000 r3:00000000 [<800124c0>] (show_stack) from [<80629fac>] (dump_stack+0x80/0x9c) [<80629f2c>] (dump_stack) from [<80015494>] (handle_IPI+0x148/0x174) r4:00000003 r3:bf87e300 [<8001534c>] (handle_IPI) from [<8000866c>] (gic_handle_irq+0x5c/0x64) r8:bf8a0000 r7:f4000100 r6:bf8a1f70 r5:8089ce80 r4:f400010c r3:bf87e300 [<80008610>] (gic_handle_irq) from [<800130a4>] (__irq_svc+0x44/0x5c) Exception stack(0xbf8a1f70 to 0xbf8a1fb8) 1f60: 8000f730 bf8a1f80 00000000 00000000 1f80: 00000000 8089c99c 8089c938 808f4abd bf8a0000 8063350c 808f4abd bf8a1fc4 1fa0: bf8a1fa8 bf8a1fb8 80062b9c 8000f734 60000013 ffffffff r7:bf8a1fa4 r6:ffffffff r5:60000013 r4:8000f734 [<8000f70c>] (arch_cpu_idle) from [<8006ad14>] (cpu_startup_entry+0x68/0x150) [<8006acac>] (cpu_startup_entry) from [<800150e0>] (secondary_start_kernel+0x12) r7:808f4fd0 r3:bf87e300 [<80014fb4>] (secondary_start_kernel) from [<10008704>] (0x10008704) r5:0000001f r4:4f88406a CPU2: stopping CPU: 2 PID: 0 Comm: swapper/2 Tainted: G D 3.13.0-rc7-next-20140107+ 7 Backtrace: [<8001233c>] (dump_backtrace) from [<800124d8>] (show_stack+0x18/0x1c) r6:80890ff0 r5:8089cd24 r4:00000000 r3:00000000 [<800124c0>] (show_stack) from [<80629fac>] (dump_stack+0x80/0x9c) [<80629f2c>] (dump_stack) from [<80015494>] (handle_IPI+0x148/0x174) r4:00000002 r3:bf87da00 [<8001534c>] (handle_IPI) from [<8000866c>] (gic_handle_irq+0x5c/0x64) r8:bf89e000 r7:f4000100 r6:bf89ff70 r5:8089ce80 r4:f400010c r3:bf87da00 [<80008610>] (gic_handle_irq) from [<800130a4>] (__irq_svc+0x44/0x5c) Exception stack(0xbf89ff70 to 0xbf89ffb8) ff60: 8000f730 bf89ff80 00000000 00000000 ff80: 00000000 8089c99c 8089c938 808f4abd bf89e000 8063350c 808f4abd bf89ffc4 ffa0: bf89ffa8 bf89ffb8 80062b9c 8000f734 60000013 ffffffff r7:bf89ffa4 r6:ffffffff r5:60000013 r4:8000f734 [<8000f70c>] (arch_cpu_idle) from [<8006ad14>] (cpu_startup_entry+0x68/0x150) [<8006acac>] (cpu_startup_entry) from [<800150e0>] (secondary_start_kernel+0x12) r7:808f4fd0 r3:bf87da00 [<80014fb4>] (secondary_start_kernel) from [<10008704>] (0x10008704) r5:0000001f r4:4f88406a drm_kms_helper: panic occurred, switching back to text console I haven't started debugging it, but if this looks familiar to someone, please let me know. Regards, Fabio Estevam

3 10

[alsa-devel] [PATCH 1/2] ALSA: Remove memory accounting in memalloc helper
by Takashi Iwai 08 Jan '14

08 Jan '14

It's almost superfluous, and doesn't help much for real uses. Let's reduce the layer size. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/memalloc.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 5e1c7bc73b29..bfaf4f04d91d 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -63,18 +63,6 @@ struct snd_mem_list { * */ -static long snd_allocated_pages; /* holding the number of allocated pages */ - -static inline void inc_snd_pages(int order) -{ - snd_allocated_pages += 1 << order; -} - -static inline void dec_snd_pages(int order) -{ - snd_allocated_pages -= 1 << order; -} - /** * snd_malloc_pages - allocate pages with the given size * @size: the size to allocate in bytes @@ -87,7 +75,6 @@ static inline void dec_snd_pages(int order) void *snd_malloc_pages(size_t size, gfp_t gfp_flags) { int pg; - void *res; if (WARN_ON(!size)) return NULL; @@ -95,9 +82,7 @@ void *snd_malloc_pages(size_t size, gfp_t gfp_flags) return NULL; gfp_flags |= __GFP_COMP; /* compound page lets parts be mapped */ pg = get_order(size); - if ((res = (void *) __get_free_pages(gfp_flags, pg)) != NULL) - inc_snd_pages(pg); - return res; + return (void *) __get_free_pages(gfp_flags, pg); } /** @@ -114,7 +99,6 @@ void snd_free_pages(void *ptr, size_t size) if (ptr == NULL) return; pg = get_order(size); - dec_snd_pages(pg); free_pages((unsigned long) ptr, pg); } @@ -129,7 +113,6 @@ void snd_free_pages(void *ptr, size_t size) static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma) { int pg; - void *res; gfp_t gfp_flags; if (WARN_ON(!dma)) @@ -139,11 +122,7 @@ static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *d | __GFP_COMP /* compound page lets parts be mapped */ | __GFP_NORETRY /* don't trigger OOM-killer */ | __GFP_NOWARN; /* no stack trace print - this call is non-critical */ - res = dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags); - if (res != NULL) - inc_snd_pages(pg); - - return res; + return dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags); } /* free the coherent DMA pages */ @@ -155,7 +134,6 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr, if (ptr == NULL) return; pg = get_order(size); - dec_snd_pages(pg); dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma); } @@ -432,14 +410,11 @@ static struct proc_dir_entry *snd_mem_proc; static int snd_mem_proc_read(struct seq_file *seq, void *offset) { - long pages = snd_allocated_pages >> (PAGE_SHIFT-12); struct snd_mem_list *mem; int devno; static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG" }; mutex_lock(&list_mutex); - seq_printf(seq, "pages : %li bytes (%li pages per %likB)\n", - pages * PAGE_SIZE, pages, PAGE_SIZE / 1024); devno = 0; list_for_each_entry(mem, &mem_list_head, list) { devno++; @@ -581,8 +556,6 @@ static void __exit snd_mem_exit(void) { remove_proc_entry(SND_MEM_PROC_FILE, NULL); free_all_reserved_pages(); - if (snd_allocated_pages > 0) - printk(KERN_ERR "snd-malloc: Memory leak? pages not freed = %li\n", snd_allocated_pages); } -- 1.8.5.2

1 1

[alsa-devel] [PATCH 00/11] ASoC/MFD: twl4030 codec local register cache removal
by Peter Ujfalusi 08 Jan '14

08 Jan '14

Hi, After the twl6040 codec, now it is time for the twl4030 codec driver to loose it's local reg cache and let the MFD core's regmap to take care of the caching. We have different functions behind of the 0x49 i2c address in twl (where the audio registers can be found between 0x01 - 0x49). I mark all non audio registers as volatile for now to avoid any side effect of the caching. Gradually other functionalities can also move their caching to regmap to simplify the code. I have included couple of clean up patches after the local regcache removal to the series to freshen up the code a bit. Regards, Peter --- Peter Ujfalusi (11): MFD: twl-core: Simplify IO wrapper functions by moving common code out MFD: twl-core: API to set the regcache bypass for a given regmap in twl MFD: twl-core: Enable regcache for audio registers ASoC: twl4030: Separate write condition checking from I/O function ASoC: twl4030: Remove check defaults functionality ASoC: twl4030: Remove reset registers functionality ASoC: twl4030: Introduce local ctl register cache ASoC: twl4030: Remove local reg cache ASoC: twl4030: Parameter alignment fixes (for code consistency) ASoC: twl4030: Move the ctl cache update local to twl4030_write() function ASoC: twl4030: Pass the twl4030_priv directly to twl4030_can_write_to_chip() drivers/mfd/twl-core.c | 190 +++++++++++++++++++---- include/linux/i2c/twl.h | 5 +- sound/soc/codecs/twl4030.c | 376 ++++++++++++++++----------------------------- 3 files changed, 300 insertions(+), 271 deletions(-) -- 1.8.5.2

3 21

[alsa-devel] [PATCH] ASoC: ssm2602: add 16kHz sampling rate support
by Andreas Pretzsch 08 Jan '14

08 Jan '14

SSM260x also supports 16kHz with external master clocks of 12.000MHz, 12.288MHz and 18.432MHz. Add matching coefficients, update constraints and announced rates. Signed-off-by: Andreas Pretzsch <apr(a)cn-eng.de> --- patch against topic/ssm2602 of kernel.org/.../broonie/sound.git Values taken from SSM2603 datasheet (2602/2603/2604 identical here). Tested on real hardware with 12.288MHz master clock. Useful e.g. for wideband codecs like G.722. sound/soc/codecs/ssm2602.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index c6dd485..af76bbd 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -194,7 +194,7 @@ static const struct snd_soc_dapm_route ssm2604_routes[] = { }; static const unsigned int ssm2602_rates_12288000[] = { - 8000, 32000, 48000, 96000, + 8000, 16000, 32000, 48000, 96000, }; static struct snd_pcm_hw_constraint_list ssm2602_constraints_12288000 = { @@ -231,6 +231,11 @@ static const struct ssm2602_coeff ssm2602_coeff_table[] = { {18432000, 32000, SSM2602_COEFF_SRATE(0x6, 0x1, 0x0)}, {12000000, 32000, SSM2602_COEFF_SRATE(0x6, 0x0, 0x1)}, + /* 16k */ + {12288000, 16000, SSM2602_COEFF_SRATE(0x5, 0x0, 0x0)}, + {18432000, 16000, SSM2602_COEFF_SRATE(0x5, 0x1, 0x0)}, + {12000000, 16000, SSM2602_COEFF_SRATE(0xa, 0x0, 0x1)}, + /* 8k */ {12288000, 8000, SSM2602_COEFF_SRATE(0x3, 0x0, 0x0)}, {18432000, 8000, SSM2602_COEFF_SRATE(0x3, 0x1, 0x0)}, @@ -473,9 +478,10 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec, return 0; } -#define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_32000 |\ - SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\ - SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) +#define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ + SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\ + SNDRV_PCM_RATE_96000) #define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -- 1.7.10.4

3 2

[alsa-devel] [PATCH v3 0/5] ASoC: add CSR SiRFSoC sound drivers
by RongJun Ying 08 Jan '14

08 Jan '14

From: Rongjun Ying <rongjun.ying(a)csr.com> This patchset adds CSR SiRFSoC sound drivers including: 1. the platform DMA driver which will be shard by all DAI 2. the I2S CPU DAI driver 3. the USP-based PCM CPU DAI driver 4. CPU DAI and Codec driver for internal chip codec 5. the mach driver for EVB board using internal codec -v3: 1. Use devm_* API for driver 2. Remove the extcon stuff code 3. Calculated automatically the div vaule at runtime based on the sample rate 4. Automatically discovering the configuration of pcm hardware from the dmaengine driver 5. Add binding documents Rongjun Ying (5): ASoC: sirf: add sirf platform driver which provides DMA ASoC: sirf: add I2S CPU DAI driver ASoC: usp-pcm: add CPU DAI driver for PCM simulated from USP ASoC: sirf-soc-inner: add drivers for both CPU and Codec DAIs ASoC: sirf-inner: add mach driver for SiRFSoC internal codec .../bindings/sound/sirf,inner-audio-codec.txt | 41 ++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/sirf/Kconfig | 18 + sound/soc/sirf/Makefile | 11 + sound/soc/sirf/sirf-audio.h | 268 ++++++++ sound/soc/sirf/sirf-i2s.c | 435 +++++++++++++ sound/soc/sirf/sirf-inner.c | 155 +++++ sound/soc/sirf/sirf-pcm.c | 68 ++ sound/soc/sirf/sirf-soc-inner.c | 653 ++++++++++++++++++++ sound/soc/sirf/sirf-usp.c | 463 ++++++++++++++ sound/soc/sirf/sirf-usp.h | 276 +++++++++ 12 files changed, 2390 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sirf,inner-audio-codec.txt create mode 100644 sound/soc/sirf/Kconfig create mode 100644 sound/soc/sirf/Makefile create mode 100644 sound/soc/sirf/sirf-audio.h create mode 100644 sound/soc/sirf/sirf-i2s.c create mode 100644 sound/soc/sirf/sirf-inner.c create mode 100644 sound/soc/sirf/sirf-pcm.c create mode 100644 sound/soc/sirf/sirf-soc-inner.c create mode 100644 sound/soc/sirf/sirf-usp.c create mode 100644 sound/soc/sirf/sirf-usp.h -- 1.7.5.4

4 14

[alsa-devel] [PATCH] ASoC: fsl-sai: Clean up the code
by Xiubo Li 08 Jan '14

08 Jan '14

Makes the code slightly shorter. Signed-off-by: Xiubo Li <Li.Xiubo(a)freescale.com> --- sound/soc/fsl/fsl_sai.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 5d38a67..cdd3fa8 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -62,26 +62,25 @@ static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai, reg_cr2 = FSL_SAI_RCR2; val_cr2 = sai_readl(sai, sai->base + reg_cr2); + val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; + switch (clk_id) { case FSL_SAI_CLK_BUS: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_BUS; break; case FSL_SAI_CLK_MAST1: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_MCLK1; break; case FSL_SAI_CLK_MAST2: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_MCLK2; break; case FSL_SAI_CLK_MAST3: - val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK; val_cr2 |= FSL_SAI_CR2_MSEL_MCLK3; break; default: return -EINVAL; } + sai_writel(sai, val_cr2, sai->base + reg_cr2); return 0; -- 1.8.4

2 1