September 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: compress: Make sure we trigger STOP before closing the stream.
by Liam Girdwood 26 Sep '13

26 Sep '13

Currently we assume that userspace will shut down the compressed stream correctly. However, if userspcae dies (e.g. cplay & ctrl-C) we dont stop the stream before freeing it. This now checks that the stream is stopped before freeing. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- sound/core/compress_offload.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 99db892..a9ae4f3 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -139,6 +139,18 @@ static int snd_compr_open(struct inode *inode, struct file *f) static int snd_compr_free(struct inode *inode, struct file *f) { struct snd_compr_file *data = f->private_data; + struct snd_compr_runtime *runtime = data->stream.runtime; + + switch (runtime->state) { + case SNDRV_PCM_STATE_RUNNING: + case SNDRV_PCM_STATE_DRAINING: + case SNDRV_PCM_STATE_PAUSED: + data->stream.ops->trigger(&data->stream, SNDRV_PCM_TRIGGER_STOP); + break; + default: + break; + } + data->stream.ops->free(&data->stream); kfree(data->stream.runtime->buffer); kfree(data->stream.runtime); -- 1.8.1.2

4 10

Re: [alsa-devel] [PATCH 4/5] ALSA: Fix assignment of 0/1 to bool variables
by Takashi Iwai 26 Sep '13

26 Sep '13

At Sun, 22 Sep 2013 20:44:12 +0200, Peter Senna Tschudin wrote: > > Convert 0 to false and 1 to true when assigning values to bool > variables. Inspired by commit 3db1cd5c05f35fb43eb134df6f321de4e63141f2. > > The simplified semantic patch that find this problem is as > follows (http://coccinelle.lip6.fr/): > > @@ > bool b; > @@ > ( > -b = 0 > +b = false > | > -b = 1 > +b = true > ) > > Signed-off-by: Peter Senna Tschudin <peter.senna(a)gmail.com> Thanks, applied now. Takashi > > --- > sound/pci/azt3328.c | 14 +++++++------- > sound/usb/mixer.c | 4 ++-- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff -u -p a/sound/usb/mixer.c b/sound/usb/mixer.c > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -1151,14 +1151,14 @@ static void check_no_speaker_on_headset( > const char *names_to_check[] = { > "Headset", "headset", "Headphone", "headphone", NULL}; > const char **s; > - bool found = 0; > + bool found = false; > > if (strcmp("Speaker", kctl->id.name)) > return; > > for (s = names_to_check; *s; s++) > if (strstr(card->shortname, *s)) { > - found = 1; > + found = true; > break; > } > > diff -u -p a/sound/pci/azt3328.c b/sound/pci/azt3328.c > --- a/sound/pci/azt3328.c > +++ b/sound/pci/azt3328.c > @@ -715,14 +715,14 @@ snd_azf3328_mixer_ac97_read(struct snd_a > const struct snd_azf3328 *chip = ac97->private_data; > unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97); > unsigned short reg_val = 0; > - bool unsupported = 0; > + bool unsupported = false; > > snd_azf3328_dbgmixer( > "snd_azf3328_mixer_ac97_read reg_ac97 %u\n", > reg_ac97 > ); > if (reg_azf & AZF_AC97_REG_UNSUPPORTED) > - unsupported = 1; > + unsupported = true; > else { > if (reg_azf & AZF_AC97_REG_REAL_IO_READ) > reg_val = snd_azf3328_mixer_inw(chip, > @@ -759,7 +759,7 @@ snd_azf3328_mixer_ac97_read(struct snd_a > reg_val = azf_emulated_ac97_vendor_id & 0xffff; > break; > default: > - unsupported = 1; > + unsupported = true; > break; > } > } > @@ -776,14 +776,14 @@ snd_azf3328_mixer_ac97_write(struct snd_ > { > const struct snd_azf3328 *chip = ac97->private_data; > unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97); > - bool unsupported = 0; > + bool unsupported = false; > > snd_azf3328_dbgmixer( > "snd_azf3328_mixer_ac97_write reg_ac97 %u val %u\n", > reg_ac97, val > ); > if (reg_azf & AZF_AC97_REG_UNSUPPORTED) > - unsupported = 1; > + unsupported = true; > else { > if (reg_azf & AZF_AC97_REG_REAL_IO_WRITE) > snd_azf3328_mixer_outw( > @@ -808,7 +808,7 @@ snd_azf3328_mixer_ac97_write(struct snd_ > */ > break; > default: > - unsupported = 1; > + unsupported = true; > break; > } > } > @@ -1559,7 +1559,7 @@ snd_azf3328_pcm_trigger(struct snd_pcm_s > struct snd_azf3328_codec_data *codec = runtime->private_data; > int result = 0; > u16 flags1; > - bool previously_muted = 0; > + bool previously_muted = false; > bool is_main_mixer_playback_codec = (AZF_CODEC_PLAYBACK == codec->type); > > snd_azf3328_dbgcalls("snd_azf3328_pcm_trigger cmd %d\n", cmd); >

1 0

[alsa-devel] [PATCH v2] ALSA : hda - not use assigned converters for all unused pins
by mengdong.lin＠intel.com 26 Sep '13

26 Sep '13

From: Mengdong Lin <mengdong.lin(a)intel.com> BIOS can mark a pin as "no physical connection" if the port is used by an integrated display which is not audio capable. And audio driver will overlook such pins. On Haswell, such a disconneted pin will keep muted and connected to the 1st converter by default. But if the 1st convertor is assigned to a connected pin for audio streaming. The muted disconnected pin can make the connected pin no sound output. So this patch avoids using assigned converters for all unused pins for Haswell, including the disconected pins. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 3d8cd044..7ea0245 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1149,32 +1149,43 @@ static int hdmi_choose_cvt(struct hda_codec *codec, } static void haswell_config_cvts(struct hda_codec *codec, - int pin_id, int mux_id) + hda_nid_t pin_nid, int mux_idx) { struct hdmi_spec *spec = codec->spec; - struct hdmi_spec_per_pin *per_pin; - int pin_idx, mux_idx; - int curr; - int err; + hda_nid_t nid, end_nid; + int cvt_idx, curr; + struct hdmi_spec_per_cvt *per_cvt; - for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { - per_pin = get_pin(spec, pin_idx); + /* configure all pins, including "no physical connection" ones */ + end_nid = codec->start_nid + codec->num_nodes; + for (nid = codec->start_nid; nid < end_nid; nid++) { + unsigned int wid_caps = get_wcaps(codec, nid); + unsigned int wid_type = get_wcaps_type(wid_caps); - if (pin_idx == pin_id) + if (wid_type != AC_WID_PIN) continue; - curr = snd_hda_codec_read(codec, per_pin->pin_nid, 0, + if (nid == pin_nid) + continue; + + curr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0); + if (curr != mux_idx) + continue; - /* Choose another unused converter */ - if (curr == mux_id) { - err = hdmi_choose_cvt(codec, pin_idx, NULL, &mux_idx); - if (err < 0) - return; - snd_printdd("HDMI: choose converter %d for pin %d\n", mux_idx, pin_idx); - snd_hda_codec_write_cache(codec, per_pin->pin_nid, 0, + /* choose an unassigned converter. The conveters in the + * connection list are in the same order as in the codec. + */ + for (cvt_idx = 0; cvt_idx < spec->num_cvts; cvt_idx++) { + per_cvt = get_cvt(spec, cvt_idx); + if (!per_cvt->assigned) { + snd_printdd("choose cvt %d for pin nid %d\n", + cvt_idx, nid); + snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, - mux_idx); + cvt_idx); + break; + } } } } @@ -1216,7 +1227,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, /* configure unused pins to choose other converters */ if (is_haswell(codec)) - haswell_config_cvts(codec, pin_idx, mux_idx); + haswell_config_cvts(codec, per_pin->pin_nid, mux_idx); snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid); -- 1.8.1.2

3 2

[alsa-devel] [PATCH] ASoC: sn95031: Convert to regmap
by Mark Brown 25 Sep '13

25 Sep '13

From: Mark Brown <broonie(a)linaro.org> This moves us towards being able to remove the duplicated register I/O functionality in ASoC. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/sn95031.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index dba26e63..13045f2 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -164,30 +164,28 @@ static unsigned int sn95031_get_mic_bias(struct snd_soc_codec *codec) } /*end - adc helper functions */ -static inline unsigned int sn95031_read(struct snd_soc_codec *codec, - unsigned int reg) +static int sn95031_read(void *ctx, unsigned int reg, unsigned int *val) { u8 value = 0; int ret; ret = intel_scu_ipc_ioread8(reg, &value); - if (ret) - pr_err("read of %x failed, err %d\n", reg, ret); - return value; + if (ret == 0) + *val = value; + return ret; } -static inline int sn95031_write(struct snd_soc_codec *codec, - unsigned int reg, unsigned int value) +static int sn95031_write(void *ctx, unsigned int reg, unsigned int value) { - int ret; - - ret = intel_scu_ipc_iowrite8(reg, value); - if (ret) - pr_err("write of %x failed, err %d\n", reg, ret); - return ret; + return intel_scu_ipc_iowrite8(reg, value); } +static const struct regmap_config sn95031_regmap = { + .reg_read = sn95031_read, + .reg_write = sn95031_write, +}; + static int sn95031_set_vaud_bias(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { @@ -827,6 +825,8 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec) { pr_debug("codec_probe called\n"); + snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); + /* PCM interface config * This sets the pcm rx slot conguration to max 6 slots * for max 4 dais (2 stereo and 2 mono) @@ -886,8 +886,6 @@ static int sn95031_codec_remove(struct snd_soc_codec *codec) static struct snd_soc_codec_driver sn95031_codec = { .probe = sn95031_codec_probe, .remove = sn95031_codec_remove, - .read = sn95031_read, - .write = sn95031_write, .set_bias_level = sn95031_set_vaud_bias, .idle_bias_off = true, .dapm_widgets = sn95031_dapm_widgets, @@ -898,7 +896,14 @@ static struct snd_soc_codec_driver sn95031_codec = { static int sn95031_device_probe(struct platform_device *pdev) { + struct regmap *regmap; + pr_debug("codec device probe called for %s\n", dev_name(&pdev->dev)); + + regmap = devm_regmap_init(&pdev->dev, NULL, NULL, &sn95031_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + return snd_soc_register_codec(&pdev->dev, &sn95031_codec, sn95031_dais, ARRAY_SIZE(sn95031_dais)); } -- 1.8.4.rc3

1 0

Re: [alsa-devel] IMX WM8740 I2S support
by Fabio Estevam 25 Sep '13

25 Sep '13

[Please always Cc the mailing list] On Wed, Sep 25, 2013 at 2:05 PM, stéphane cerveau <scerveau(a)gmail.com> wrote: > I'm using an old kernel from a BSP provided by a retailer. This list is about mainline kernel. If you would like to use mainline kernel we could help you here. If you decide to stay with the vendor BSP, then this is not the appropriate place for support.

2 1

[alsa-devel] IMX WM8740 I2S support
by stéphane cerveau 25 Sep '13

25 Sep '13

Dear all, I'm currently working on supporting WM8740 device software configured with imx6q system. For now my driver seems to be configured correctly. The playback is launched but i get: ALSA sound/core/pcm_lib.c:1822 playback write error (DMA or IRQ trouble? write error: Input/output error The imx ssi is not sending me any data on I2S bus( nothing can be seen on the oscillo). I would like to know how do I have to configure my master clock in order to launch the I2S. My master clock is for now 24MHz. Sorry to be confused a bit but i'm quite newbie with this device. Best regards. Stéphane

2 8

[alsa-devel] [PATCH] ASoC: ab8500: Explicitly set I/O up
by Mark Brown 25 Sep '13

25 Sep '13

From: Mark Brown <broonie(a)linaro.org> We do some I/O in probe so we need to ensure the I/O operations are fully set up then. Reported-by: Olof Johansson <olof(a)lixom.net> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/ab8500-codec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index ca500fd..a0394a8 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2473,6 +2473,8 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) dev_dbg(dev, "%s: Enter.\n", __func__); + snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); + /* Setup AB8500 according to board-settings */ pdata = dev_get_platdata(dev->parent); -- 1.8.4.rc3

3 7

[alsa-devel] [PATCH] ASoC: imx-sgtl5000: do not use devres on a foreign device
by Philipp Zabel 25 Sep '13

25 Sep '13

Calling devm_clk_get with any device pointer other than our own confuses devres. Use clk_get instead. This avoids hitting the following warning in the imx-sgtl5000 error path: imx-sgtl5000 sound.12: snd_soc_register_card failed (-517) platform sound.12: Driver imx-sgtl5000 requests probe deferral ------------[ cut here ]------------ WARNING: CPU: 0 PID: 75 at drivers/base/dd.c:272 driver_probe_device+0x194/0x218() Modules linked in: snd_soc_sgtl5000(+) snd_soc_imx_sgtl5000 coda snd_soc_imx_audmux imx_sdma snd_soc_fsl_spdif snd_soc_fsl_ssi CPU: 0 PID: 75 Comm: udevd Not tainted 3.11.0-rc6+ #4682 Backtrace: [<80010bc4>] (dump_backtrace+0x0/0x10c) from [<80010d60>] (show_stack+0x18/0x1c) r6:00000110 r5:00000009 r4:00000000 r3:00000000 [<80010d48>] (show_stack+0x0/0x1c) from [<804f0764>] (dump_stack+0x20/0x28) [<804f0744>] (dump_stack+0x0/0x28) from [<8001a4a4>] (warn_slowpath_common+0x6c/0x8c) [<8001a438>] (warn_slowpath_common+0x0/0x8c) from [<8001a4e8>] (warn_slowpath_null+0x24/0x2c) r8:7f032000 r7:7f02f93c r6:cf8eaa54 r5:cf8eaa20 r4:80728a0c [<8001a4c4>] (warn_slowpath_null+0x0/0x2c) from [<80286bdc>] (driver_probe_device+0x194/0x218) [<80286a48>] (driver_probe_device+0x0/0x218) from [<80286cf4>] (__driver_attach+0x94/0x98) r7:00000000 r6:cf8eaa54 r5:7f02f93c r4:cf8eaa20 [<80286c60>] (__driver_attach+0x0/0x98) from [<802851c8>] (bus_for_each_dev+0x5c/0x90) r6:80286c60 r5:7f02f93c r4:00000000 r3:cf8ef03c [<8028516c>] (bus_for_each_dev+0x0/0x90) from [<80286654>] (driver_attach+0x24/0x28) r6:806d0424 r5:cf16a580 r4:7f02f93c [<80286630>] (driver_attach+0x0/0x28) from [<802861e4>] (bus_add_driver+0xdc/0x234) [<80286108>] (bus_add_driver+0x0/0x234) from [<802871d4>] (driver_register+0x80/0x154) r8:7f032000 r7:00000001 r6:7f02fa68 r5:7f02fa74 r4:7f02f93c [<80287154>] (driver_register+0x0/0x154) from [<8033c278>] (i2c_register_driver+0x34/0xbc) [<8033c244>] (i2c_register_driver+0x0/0xbc) from [<7f032018>] (sgtl5000_i2c_driver_init+0x18/0x24 [snd_soc_sgtl5000]) r5:7f02fa74 r4:cfb7ff48 [<7f032000>] (sgtl5000_i2c_driver_init+0x0/0x24 [snd_soc_sgtl5000]) from [<80008738>] (do_one_initcall+0xf4/0x150) [<80008644>] (do_one_initcall+0x0/0x150) from [<80053f64>] (load_module+0x174c/0x1db4) [<80052818>] (load_module+0x0/0x1db4) from [<800546ac>] (SyS_init_module+0xe0/0xf4) [<800545cc>] (SyS_init_module+0x0/0xf4) from [<8000e540>] (ret_fast_syscall+0x0/0x30) r6:00005b22 r5:00afed68 r4:00000000 ---[ end trace b24c5c3bb145dbdd ]--- Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> --- sound/soc/fsl/imx-sgtl5000.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 46c5b4f..52df7d5 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -128,7 +128,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) goto fail; } - data->codec_clk = devm_clk_get(&codec_dev->dev, NULL); + data->codec_clk = clk_get(&codec_dev->dev, NULL); if (IS_ERR(data->codec_clk)) { ret = PTR_ERR(data->codec_clk); goto fail; @@ -172,6 +172,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) return 0; fail: + if (!IS_ERR(data->codec_clk)) + clk_put(data->codec_clk); if (ssi_np) of_node_put(ssi_np); if (codec_np) @@ -185,6 +187,7 @@ static int imx_sgtl5000_remove(struct platform_device *pdev) struct imx_sgtl5000_data *data = platform_get_drvdata(pdev); snd_soc_unregister_card(&data->card); + clk_put(data->codec_clk); return 0; } -- 1.8.4.rc3

3 5

[alsa-devel] [PATCH 1/3] mfd: mc13xxx: Don't require lock for simple register I/O
by Mark Brown 25 Sep '13

25 Sep '13

From: Mark Brown <broonie(a)linaro.org> Since the conversion to regmap there has been no need for device level locking for I/O as regmap provides locking so remove the locks. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- drivers/mfd/mc13xxx-core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index 2a9b100..dbbf8ee 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c @@ -158,8 +158,6 @@ int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val) { int ret; - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); - if (offset > MC13XXX_NUMREGS) return -EINVAL; @@ -172,8 +170,6 @@ EXPORT_SYMBOL(mc13xxx_reg_read); int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val) { - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); - dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x\n", offset, val); if (offset > MC13XXX_NUMREGS || val > 0xffffff) @@ -186,7 +182,6 @@ EXPORT_SYMBOL(mc13xxx_reg_write); int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset, u32 mask, u32 val) { - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); BUG_ON(val & ~mask); dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x (mask: 0x%06x)\n", offset, val, mask); -- 1.8.4.rc3

2 11

[alsa-devel] [PATCH 1/3] ASoC: tlv320aic26: Convert to table based control init
by Mark Brown 25 Sep '13

25 Sep '13

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/tlv320aic26.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 7b8f3d9..32c6b07 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -377,7 +377,7 @@ static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set); static int aic26_probe(struct snd_soc_codec *codec) { struct aic26 *aic26 = dev_get_drvdata(codec->dev); - int ret, err, i, reg; + int ret, i, reg; aic26->codec = codec; @@ -403,12 +403,6 @@ static int aic26_probe(struct snd_soc_codec *codec) if (ret) dev_info(codec->dev, "error creating sysfs files\n"); - /* register controls */ - dev_dbg(codec->dev, "Registering controls\n"); - err = snd_soc_add_codec_controls(codec, aic26_snd_controls, - ARRAY_SIZE(aic26_snd_controls)); - WARN_ON(err < 0); - return 0; } @@ -418,6 +412,8 @@ static struct snd_soc_codec_driver aic26_soc_codec_dev = { .write = aic26_reg_write, .reg_cache_size = AIC26_NUM_REGS, .reg_word_size = sizeof(u16), + .controls = aic26_snd_controls, + .num_controls = ARRAY_SIZE(aic26_snd_controls), .dapm_widgets = tlv320aic26_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(tlv320aic26_dapm_widgets), .dapm_routes = tlv320aic26_dapm_routes, -- 1.8.4.rc3

1 2