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

[alsa-devel] usb-audio: capture/playback break (implicit feedback related?)
by Eldad Zack 24 Jul '13

24 Jul '13

Hi, I'm still trying to figure out the issue with the capture and playback breaking with implicit feedback. I've disabled setting the sync ep for my device and did the following: start capture start playback stop playback Now, after a while, capture stops. I sniffed the usb traffic, and saw this: When I stop the traffic, the driver sets the alternate setting to 0 on the playback interface (2 for my device). So far so good. The first iso inbound packet has data in it, but starting from the second packet, it's all zero (in length). After a while, the device stops sending packets completely. The driver still tries, and evetually sets the alternate setting to 0 on the capture interface (3 for my device). Again, there is no implicit feedback involved here. I also ruled out playback interface being put into altsetting 1 (without us knowing it) when the capture was put into altsetting 1 by doing a GET_INTERFACE in set_format(). I am not sure if this an M-Audio issue, just my specific device (Fast Track C400) or maybe it appears in other devices. Anyone has an idea why this happens? I'd appreciate if anyone can test this on other devices. Clemens, since you recently added support for Roland devices that use implicit feedback, would you please test it and see if you get the same results, if you have time? If it helps, I can send the capture. Cheers, Eldad P.S. GET_INTERFACE adapted from drivers/usb/misc/usbtest.c: static int snd_usb_get_interface(struct usb_device *dev, struct usb_interface *iface) { int ret; char buf; ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), USB_REQ_GET_INTERFACE, USB_DIR_IN|USB_RECIP_INTERFACE, 0, iface->altsetting[0].desc.bInterfaceNumber, &buf, sizeof(buf), USB_CTRL_GET_TIMEOUT); if (ret == sizeof(buf)) return buf; return -ERANGE; }

1 0

[alsa-devel] [PATCH] fix error returned by compress_wait()
by Vinod Koul 24 Jul '13

24 Jul '13

From: Eric Laurent <elaurent(a)google.com> oops() expects positive error codes. Signed-off-by: Eric Laurent <elaurent(a)google.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- compress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/compress.c b/compress.c index 734fbbf..0e71c28 100644 --- a/compress.c +++ b/compress.c @@ -623,7 +623,7 @@ int compress_wait(struct compress *compress, int timeout_ms) return 0; } if (fds.revents & POLLERR) { - return oops(compress, -EIO, "poll returned error!"); + return oops(compress, EIO, "poll returned error!"); } return ret; } -- 1.7.0.4

1 0

[alsa-devel] [PATCH 00/27] devm cleanup, part #1, take #3
by Wolfram Sang 24 Jul '13

24 Jul '13

Here is another bit of cleaning up the devm usage. It is again removing the resource check with devm_ioremap_resource, because a) new drivers came in and b) coccinelle had a bug and missed to find a couple of occasions. Unlike last time, I think it is better if these patches go in via the subsystem trees to reduce merge conflicts. And there is one driver which I fixed manually because the original code needed some bigger update. All is based on v3.11-rc2 and the branch can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git devm_no_resource_check Other things which happened: I wanted to get rid of devm_request_and_ioremap, luckily other people are already working on it. Hooray! I already sent a patch series picking another low hanging fruit, i.e. drivers can skip devm_pinctrl handling if they are using only the default pin setup. And not devm related, there is still my proposal to rename INIT_COMPLETION to reinit_completion, that probably needs some more persistence... Yay, so much to clean up \o/ Regards, Wolfram Wolfram Sang (27): arch/mips/lantiq/xway: don't check resource with devm_ioremap_resource drivers/amba: don't check resource with devm_ioremap_resource drivers/cpuidle: don't check resource with devm_ioremap_resource drivers/dma: don't check resource with devm_ioremap_resource drivers/gpu/host1x/drm: don't check resource with devm_ioremap_resource drivers/i2c/busses: don't check resource with devm_ioremap_resource drivers/input/serio: don't check resource with devm_ioremap_resource drivers/iommu: don't check resource with devm_ioremap_resource drivers/media/platform: don't check resource with devm_ioremap_resource drivers/memory: don't check resource with devm_ioremap_resource drivers/mtd/nand: don't check resource with devm_ioremap_resource drivers/net/ethernet/stmicro/stmmac: don't check resource with devm_ioremap_resource drivers/pci/host: don't check resource with devm_ioremap_resource drivers/pinctrl: don't check resource with devm_ioremap_resource drivers/pwm: don't check resource with devm_ioremap_resource drivers/scsi/ufs: don't check resource with devm_ioremap_resource drivers/spi: don't check resource with devm_ioremap_resource drivers/staging/imx-drm: don't check resource with devm_ioremap_resource drivers/usb/phy: don't check resource with devm_ioremap_resource drivers/watchdog: don't check resource with devm_ioremap_resource sound/soc/au1x: don't check resource with devm_ioremap_resource sound/soc/cirrus: don't check resource with devm_ioremap_resource sound/soc/nuc900: don't check resource with devm_ioremap_resource sound/soc/pxa: don't check resource with devm_ioremap_resource sound/soc/tegra: don't check resource with devm_ioremap_resource sound/soc/txx9: don't check resource with devm_ioremap_resource thermal: ti-bandgap: cleanup resource allocation arch/mips/lantiq/xway/dma.c | 4 ---- drivers/amba/tegra-ahb.c | 2 -- drivers/cpuidle/cpuidle-kirkwood.c | 3 --- drivers/dma/mmp_pdma.c | 3 --- drivers/dma/mmp_tdma.c | 3 --- drivers/gpu/host1x/drm/hdmi.c | 3 --- drivers/i2c/busses/i2c-stu300.c | 3 --- drivers/input/serio/olpc_apsp.c | 3 --- drivers/iommu/tegra-smmu.c | 2 -- drivers/media/platform/coda.c | 5 ----- drivers/memory/tegra20-mc.c | 2 -- drivers/memory/tegra30-mc.c | 2 -- drivers/mtd/nand/mxc_nand.c | 5 ----- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 --- drivers/pci/host/pcie-designware.c | 12 ------------ drivers/pinctrl/pinctrl-imx.c | 3 --- drivers/pinctrl/pinctrl-rockchip.c | 5 ----- drivers/pinctrl/pinctrl-u300.c | 3 --- drivers/pwm/pwm-lpc32xx.c | 3 --- drivers/pwm/pwm-renesas-tpu.c | 5 ----- drivers/scsi/ufs/ufshcd-pltfrm.c | 6 ------ drivers/spi/spi-bcm2835.c | 6 ------ drivers/staging/imx-drm/imx-tve.c | 5 ----- drivers/thermal/ti-soc-thermal/ti-bandgap.c | 20 ++++---------------- drivers/usb/phy/phy-rcar-usb.c | 5 ----- drivers/watchdog/nuc900_wdt.c | 5 ----- drivers/watchdog/ts72xx_wdt.c | 10 ---------- sound/soc/au1x/psc-ac97.c | 3 --- sound/soc/cirrus/ep93xx-ac97.c | 3 --- sound/soc/cirrus/ep93xx-i2s.c | 3 --- sound/soc/nuc900/nuc900-ac97.c | 3 --- sound/soc/pxa/mmp-sspa.c | 3 --- sound/soc/tegra/tegra20_ac97.c | 7 ------- sound/soc/txx9/txx9aclc-ac97.c | 3 --- 34 files changed, 4 insertions(+), 152 deletions(-) -- 1.7.10.4

2 12

[alsa-devel] [PATCH 1/5] ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw, enum_virt}()
by Lars-Peter Clausen 24 Jul '13

24 Jul '13

The ALSA core expect the put callback of a control to return 1 if the value of the control changed and 0 if it did not. Both snd_soc_dapm_put_volsw() and snd_soc_dapm_put_enum_virt() currently always returns 0. For both functions we already have a 'change' variable which either contains 1 or 0 depending on whether the value has changed or not, so just return that. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/soc-dapm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index deb1b3d..4097a55 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2703,7 +2703,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, } mutex_unlock(&card->dapm_mutex); - return 0; + return change; } EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw); @@ -2831,7 +2831,6 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol, struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; int change; - int ret = 0; int wi; if (ucontrol->value.enumerated.item[0] >= e->max) @@ -2851,7 +2850,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol, } mutex_unlock(&card->dapm_mutex); - return ret; + return change; } EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt); -- 1.8.0

2 5

[alsa-devel] [PATCH 1/2] ALSA: hda - Fix EAPD GPIO control for Sigmatel codecs
by Takashi Iwai 24 Jul '13

24 Jul '13

The EAPD GPIO is dynamically turned on/off for some machines with Sigmatel codecs, but this didn't work as expected, and it resulted in spontaneous lost of speaker outputs per HP plugging or power-saving. This patch fixes the bug by simply including spec->eapd_mask into spec->gpio_mask and spec->gpio_data bits. Reported-and-tested-by: Eric Shattow <lucent(a)gmail.com> Cc: <stable(a)vger.kernel.org> [v3.9+] Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_sigmatel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index e2f8359..766e567 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -417,9 +417,11 @@ static void stac_update_outputs(struct hda_codec *codec) val &= ~spec->eapd_mask; else val |= spec->eapd_mask; - if (spec->gpio_data != val) + if (spec->gpio_data != val) { + spec->gpio_data = val; stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, val); + } } } @@ -3612,20 +3614,18 @@ static int stac_parse_auto_config(struct hda_codec *codec) static int stac_init(struct hda_codec *codec) { struct sigmatel_spec *spec = codec->spec; - unsigned int gpio; int i; /* override some hints */ stac_store_hints(codec); /* set up GPIO */ - gpio = spec->gpio_data; /* turn on EAPD statically when spec->eapd_switch isn't set. * otherwise, unsol event will turn it on/off dynamically */ if (!spec->eapd_switch) - gpio |= spec->eapd_mask; - stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, gpio); + spec->gpio_data |= spec->eapd_mask; + stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, spec->gpio_data); snd_hda_gen_init(codec); @@ -3915,6 +3915,7 @@ static void stac_setup_gpio(struct hda_codec *codec) { struct sigmatel_spec *spec = codec->spec; + spec->gpio_mask |= spec->eapd_mask; if (spec->gpio_led) { if (!spec->vref_mute_led_nid) { spec->gpio_mask |= spec->gpio_led; -- 1.8.3.1

2 5

[alsa-devel] [PATCHv2] ALSA: usb-audio: hiface: return correct XRUN indication
by Eldad Zack 24 Jul '13

24 Jul '13

Return SNDRV_PCM_POS_XRUN (snd_pcm_uframes_t) instead of SNDRV_PCM_STATE_XRUN (snd_pcm_state_t) from the pointer function of hiface, as expected by snd_pcm_update_hw_ptr0(). Caught by sparse. Cc: Antonio Ospite <ospite(a)studenti.unina.it> Signed-off-by: Eldad Zack <eldad(a)fogrefinery.com> --- * Corrected commit message sound/usb/hiface/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c index 6430ed2..c21a3df 100644 --- a/sound/usb/hiface/pcm.c +++ b/sound/usb/hiface/pcm.c @@ -503,7 +503,7 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub) snd_pcm_uframes_t dma_offset; if (rt->panic || !sub) - return SNDRV_PCM_STATE_XRUN; + return SNDRV_PCM_POS_XRUN; spin_lock_irqsave(&sub->lock, flags); dma_offset = sub->dma_off; -- 1.8.1.5

2 1

[alsa-devel] [GIT PULL] ASoC updates for v3.11
by Mark Brown 24 Jul '13

24 Jul '13

The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b: Linux 3.11-rc2 (2013-07-21 12:05:29 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.11-rc2 for you to fetch changes up to c5ae4dca11523dff15cfb1763b64a71b805976aa: Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus (2013-07-23 19:17:11 +0100) ---------------------------------------------------------------- ASoC: Updates for v3.11 A few small updates again, the sgtl5000 one fixes some newly triggered issues due to some probe ordering changes which were introduced in the last merge window. ---------------------------------------------------------------- Boris BREZILLON (1): ASoC: atmel-ssc: remove clk_disable_unprepare call from critical section Chih-Chung Chang (1): ASoC: max98088 - fix element type of the register cache. Dan Carpenter (1): ASoC: core: double free in snd_soc_add_platform() H Hartley Sweeten (1): ASoC: ep93xx: fix build of ep93xx-ac97.c Mark Brown (6): Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus Merge remote-tracking branch 'asoc/fix/core' into asoc-linus Merge remote-tracking branch 'asoc/fix/ep93xx' into asoc-linus Merge remote-tracking branch 'asoc/fix/max98088' into asoc-linus Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus Richard Zhao (1): ASoC: tegra: correct playback_dma_data setup Shawn Guo (1): ASoC: sgtl5000: defer the probe if clock is not found drivers/misc/atmel-ssc.c | 11 ++++++++--- sound/soc/cirrus/ep93xx-ac97.c | 4 ++-- sound/soc/codecs/max98088.c | 2 +- sound/soc/codecs/sgtl5000.c | 3 +++ sound/soc/soc-core.c | 4 +--- sound/soc/tegra/tegra20_ac97.c | 6 +++--- sound/soc/tegra/tegra20_spdif.c | 4 ++-- 7 files changed, 20 insertions(+), 14 deletions(-)

2 1

[alsa-devel] [PATCH 1/4] ASOC: tegra: move AC97 clock defines to the controller node
by Lucas Stach 24 Jul '13

24 Jul '13

Different from other Tegra sound controllers drivers, the AC97 controller driver uses the tegra asoc utils directly to request the needed clocks, as they are needed at AC97 init time. Move the DT clock defines to the right place. Signed-off-by: Lucas Stach <dev(a)lynxeye.de> --- CC: <alsa-devel(a)alsa-project.org> CC: <broonie(a)kernel.org> --- arch/arm/boot/dts/tegra20-colibri-512.dtsi | 5 ----- arch/arm/boot/dts/tegra20.dtsi | 6 +++++- sound/soc/tegra/tegra20_ac97.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi index 2fcb3f2..fbb52e0 100644 --- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi +++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi @@ -491,11 +491,6 @@ "Mic", "MIC1"; nvidia,ac97-controller = <&ac97>; - - clocks = <&tegra_car TEGRA20_CLK_PLL_A>, - <&tegra_car TEGRA20_CLK_PLL_A_OUT0>, - <&tegra_car TEGRA20_CLK_CDEV1>; - clock-names = "pll_a", "pll_a_out0", "mclk"; }; regulators { diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 9653fd8..ad13f57 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -223,7 +223,11 @@ reg = <0x70002000 0x200>; interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; nvidia,dma-request-selector = <&apbdma 12>; - clocks = <&tegra_car TEGRA20_CLK_AC97>; + clocks = <&tegra_car TEGRA20_CLK_PLL_A>, + <&tegra_car TEGRA20_CLK_PLL_A_OUT0>, + <&tegra_car TEGRA20_CLK_CDEV1>, + <&tegra_car TEGRA20_CLK_AC97>; + clock-names = "pll_a", "pll_a_out0", "mclk", "ac97"; status = "disabled"; }; diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 6c48662..6bbffd1 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -326,7 +326,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, ac97); - ac97->clk_ac97 = devm_clk_get(&pdev->dev, NULL); + ac97->clk_ac97 = devm_clk_get(&pdev->dev, "ac97"); if (IS_ERR(ac97->clk_ac97)) { dev_err(&pdev->dev, "Can't retrieve ac97 clock\n"); ret = PTR_ERR(ac97->clk_ac97); -- 1.8.3.1

3 7

Re: [alsa-devel] [PATCH] ALSA: SoC: Added jack detection kcontrol support
by Mark Brown 24 Jul '13

24 Jul '13

On Fri, Jul 19, 2013 at 05:59:22PM -0700, Felipe F. Tonello wrote: > From: "Felipe F. Tonello" <ftonello(a)cercacor.com> > > It adds soc jack support for alsa kcontrol. > > This support is necessary since the new kcontrol is used by user-space > daemons, such as PulseAudio(>=2.0), to do jack detection. > > Signed-off-by: Felipe F. Tonello <ftonello(a)cercacor.com> > --- > include/sound/soc.h | 1 + > sound/soc/Kconfig | 1 + > sound/soc/soc-jack.c | 22 ++++++++++++++++++++++ > 3 files changed, 24 insertions(+) No, this makes no sense at all as an ASoC specific feature - it should be a standard feature of ALSA jacks. The whole point of having ALSA core infrastructure for jacks is to avoid having to go round doing make work stuff like this. The fact that the kcontrols were introduced as a HDA-specific feature at all is of course a problem here...

3 5

[alsa-devel] question about alsa-lib commit 8c9e4114 (Add struct timeval and timespec definition when _POSIX_C_SOURCE is not defined)
by John Spencer 24 Jul '13

24 Jul '13

the commit http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=8c9e4114a23aad96… was added in 2006 with a FIXME hint that it could cause a build error. this is exactly what happens when using the header with musl libc to build software depending on alsa-lib (for example "sweep"). may i ask what for this hack was added ? i suspect it's for supporting some ancient version of glibc that didnt define those structs. in that case something like #if defined(__GLIBC__) && (__GLIBC__ < 2) would probably make more sense. i could even imagine that the target for the hack is no longer supported anyway, so i think it could simply be removed. the problematic part is that it's the job of the *application* to request the POSIX namespace, not the job of the libc. since sweep's build environment does not set _POSIX_SOURCE, the code gets activated and causes a conflict. --JS p.s. thanks for applying the signal.h patch!

1 0