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

Re: [alsa-devel] [PATCH v2 1/3] ASoC: tegra: add ac97 host driver
by Stephen Warren 09 Jan '13

09 Jan '13

On 01/08/2013 03:22 PM, Lucas Stach wrote: > Am Dienstag, den 08.01.2013, 15:10 -0700 schrieb Stephen Warren: >> On 01/04/2013 06:18 PM, Lucas Stach wrote: >>> This adds the driver for the Tegra 2x AC97 host controller. >>> diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c >>> +static inline void tegra20_ac97_start_playback(struct tegra20_ac97 *ac97) >>> +{ >>> + regmap_update_bits(ac97->regmap, TEGRA20_AC97_FIFO1_SCR, >>> + TEGRA20_AC97_FIFO_SCR_PB_QRT_MT_EN, >>> + TEGRA20_AC97_FIFO_SCR_PB_QRT_MT_EN); >>> + >>> + regmap_update_bits(ac97->regmap, TEGRA20_AC97_CTRL, >>> + TEGRA20_AC97_CTRL_PCM_DAC_EN | >>> + TEGRA20_AC97_CTRL_STM_EN, >>> + TEGRA20_AC97_CTRL_PCM_DAC_EN | >>> + TEGRA20_AC97_CTRL_STM_EN); >>> +} >> >> That sets both PCM_DAC_EN and STM_EN, but ... >> >>> +static inline void tegra20_ac97_stop_playback(struct tegra20_ac97 *ac97) >>> +{ >>> + regmap_update_bits(ac97->regmap, TEGRA20_AC97_FIFO1_SCR, >>> + TEGRA20_AC97_FIFO_SCR_PB_QRT_MT_EN, 0); >>> + >>> + regmap_update_bits(ac97->regmap, TEGRA20_AC97_CTRL, >>> + TEGRA20_AC97_CTRL_PCM_DAC_EN, 0); >>> +} >> >> ... that only clears DAC_EN. Should it clear STM_EN too? >> > To be honest I have no idea what STM really is, seems to be some form of > packed format selection. If not set playback outputs only more or less > random noise. Only PCM_EN controls FIFO and DMA operations though, so > it's ok to just disable this to stop playback. I'd be tempted to just hard-code those bits on in probe() then, but it's not a big deal, so not worth spinning the patch for that. I guess I meant to say, Reviewed-by: Stephen Warren <swarren(a)nvidia.com>

1 0

[alsa-devel] [PATCH 0/3] ALSA: pxa27x: ac97 reset fixes
by Mike Dunn 08 Jan '13

08 Jan '13

AC97 reset is broken on the pxa27x. These patches fix it by addressing multiple problems: - cold reset fails because the GCR register is not set correctly - warm reset fails because some code used to work around a hardware bug is broken - the intent of the work-around code is obfuscated by unfortunate function naming This patch set replaces some earlier individual patches that had some problems. Thanks Robert and Igor. Changelog: v2: - don't specify the LPM flag DRIVE_HIGH in #define for the mfp config - patches 2 and 3 are combined into one patch - mfp level and direction are set only once, during driver initialization Mike Dunn (3): ALSA: pxa2xx: fix ac97 cold reset ALSA: pxa27x: fix ac97 warm reset ALSA: pxa27x: rename pxa27x_assert_ac97reset() arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 3 ++ arch/arm/mach-pxa/pxa27x.c | 24 ++++++++++++------ sound/arm/pxa2xx-ac97-lib.c | 34 +++++++++++++++++++++----- 3 files changed, 46 insertions(+), 15 deletions(-) -- 1.7.8.6

4 9

[alsa-devel] [asoc:topic/adsp 4/4] sound/soc/codecs/wm_adsp.c:664:29: sparse: incorrect type in assignment (different modifiers)
by kbuild test robot 08 Jan '13

08 Jan '13

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/adsp head: 25326bb263894a528288716901bd434372927844 commit: 25326bb263894a528288716901bd434372927844 [4/4] ASoC: wm_adsp: Implement support for algorithm-specific coefficient blocks sparse warnings: + sound/soc/codecs/wm_adsp.c:664:29: sparse: incorrect type in assignment (different modifiers) sound/soc/codecs/wm_adsp.c:664:29: expected struct wm_adsp_region *mem sound/soc/codecs/wm_adsp.c:664:29: got struct wm_adsp_region const * sound/soc/codecs/wm_adsp.c: In function 'wm_adsp_load_coeff': sound/soc/codecs/wm_adsp.c:664:8: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] vim +664 sound/soc/codecs/wm_adsp.c 2159ad93 Mark Brown 2012-10-11 648 case WMFW_NAME_TEXT: 2159ad93 Mark Brown 2012-10-11 649 case WMFW_INFO_TEXT: 2159ad93 Mark Brown 2012-10-11 650 break; 2159ad93 Mark Brown 2012-10-11 651 case WMFW_ABSOLUTE: 2159ad93 Mark Brown 2012-10-11 652 region_name = "register"; 2159ad93 Mark Brown 2012-10-11 653 reg = offset; 2159ad93 Mark Brown 2012-10-11 654 break; 25326bb2 Mark Brown 2013-01-08 655 25326bb2 Mark Brown 2013-01-08 656 case WMFW_ADSP1_DM: 25326bb2 Mark Brown 2013-01-08 657 case WMFW_ADSP1_ZM: 25326bb2 Mark Brown 2013-01-08 658 case WMFW_ADSP2_XM: 25326bb2 Mark Brown 2013-01-08 659 case WMFW_ADSP2_YM: 25326bb2 Mark Brown 2013-01-08 660 adsp_dbg(dsp, "%s.%d: %d bytes in %x for %x\n", 25326bb2 Mark Brown 2013-01-08 661 file, blocks, le32_to_cpu(blk->len), 25326bb2 Mark Brown 2013-01-08 662 type, le32_to_cpu(blk->id)); 25326bb2 Mark Brown 2013-01-08 663 25326bb2 Mark Brown 2013-01-08 @664 mem = wm_adsp_find_region(dsp, type); 25326bb2 Mark Brown 2013-01-08 665 if (!mem) { 25326bb2 Mark Brown 2013-01-08 666 adsp_err(dsp, "No base for region %x\n", type); 25326bb2 Mark Brown 2013-01-08 667 break; 25326bb2 Mark Brown 2013-01-08 668 } 25326bb2 Mark Brown 2013-01-08 669 25326bb2 Mark Brown 2013-01-08 670 reg = 0; 25326bb2 Mark Brown 2013-01-08 671 list_for_each_entry(alg_region, 25326bb2 Mark Brown 2013-01-08 672 &dsp->alg_regions, list) { --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [asoc:topic/adsp 4/4] sound/soc/codecs/wm_adsp.c:664:8: warning: assignment discards 'const' qualifier from pointer target type
by kbuild test robot 08 Jan '13

08 Jan '13

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/adsp head: 25326bb263894a528288716901bd434372927844 commit: 25326bb263894a528288716901bd434372927844 [4/4] ASoC: wm_adsp: Implement support for algorithm-specific coefficient blocks config: make ARCH=x86_64 allmodconfig All warnings: sound/soc/codecs/wm_adsp.c: In function 'wm_adsp_setup_algs': sound/soc/codecs/wm_adsp.c:465:3: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat] sound/soc/codecs/wm_adsp.c:480:3: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'unsigned int' [-Wformat] sound/soc/codecs/wm_adsp.c: In function 'wm_adsp_load_coeff': sound/soc/codecs/wm_adsp.c:664:8: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] vim +/const +664 sound/soc/codecs/wm_adsp.c 2159ad93 Mark Brown 2012-10-11 648 case WMFW_NAME_TEXT: 2159ad93 Mark Brown 2012-10-11 649 case WMFW_INFO_TEXT: 2159ad93 Mark Brown 2012-10-11 650 break; 2159ad93 Mark Brown 2012-10-11 651 case WMFW_ABSOLUTE: 2159ad93 Mark Brown 2012-10-11 652 region_name = "register"; 2159ad93 Mark Brown 2012-10-11 653 reg = offset; 2159ad93 Mark Brown 2012-10-11 654 break; 25326bb2 Mark Brown 2013-01-08 655 25326bb2 Mark Brown 2013-01-08 656 case WMFW_ADSP1_DM: 25326bb2 Mark Brown 2013-01-08 657 case WMFW_ADSP1_ZM: 25326bb2 Mark Brown 2013-01-08 658 case WMFW_ADSP2_XM: 25326bb2 Mark Brown 2013-01-08 659 case WMFW_ADSP2_YM: 25326bb2 Mark Brown 2013-01-08 660 adsp_dbg(dsp, "%s.%d: %d bytes in %x for %x\n", 25326bb2 Mark Brown 2013-01-08 661 file, blocks, le32_to_cpu(blk->len), 25326bb2 Mark Brown 2013-01-08 662 type, le32_to_cpu(blk->id)); 25326bb2 Mark Brown 2013-01-08 663 25326bb2 Mark Brown 2013-01-08 @664 mem = wm_adsp_find_region(dsp, type); 25326bb2 Mark Brown 2013-01-08 665 if (!mem) { 25326bb2 Mark Brown 2013-01-08 666 adsp_err(dsp, "No base for region %x\n", type); 25326bb2 Mark Brown 2013-01-08 667 break; 25326bb2 Mark Brown 2013-01-08 668 } 25326bb2 Mark Brown 2013-01-08 669 25326bb2 Mark Brown 2013-01-08 670 reg = 0; 25326bb2 Mark Brown 2013-01-08 671 list_for_each_entry(alg_region, 25326bb2 Mark Brown 2013-01-08 672 &dsp->alg_regions, list) { --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [asoc:topic/adsp 3/4] sound/soc/codecs/wm_adsp.c:464:3: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t'
by kbuild test robot 08 Jan '13

08 Jan '13

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/adsp head: 25326bb263894a528288716901bd434372927844 commit: 7265971f1bda27fdf97a19db3608ae15e2cdc7d2 [3/4] ASoC: wm_asdp: Validate sanity of algorithm count config: make ARCH=x86_64 allmodconfig All warnings: sound/soc/codecs/wm_adsp.c: In function 'wm_adsp_setup_algs': sound/soc/codecs/wm_adsp.c:464:3: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat] sound/soc/codecs/wm_adsp.c:479:3: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'unsigned int' [-Wformat] vim +464 sound/soc/codecs/wm_adsp.c aab034fe Mark Brown 2012-10-26 448 aab034fe Mark Brown 2012-10-26 449 pos = sizeof(adsp2_id) / 2; aab034fe Mark Brown 2012-10-26 450 term = pos + ((sizeof(*adsp2_alg) * algs) / 2); aab034fe Mark Brown 2012-10-26 451 break; aab034fe Mark Brown 2012-10-26 452 aab034fe Mark Brown 2012-10-26 453 default: aab034fe Mark Brown 2012-10-26 454 BUG_ON(NULL == "Unknown DSP type"); aab034fe Mark Brown 2012-10-26 455 return -EINVAL; aab034fe Mark Brown 2012-10-26 456 } aab034fe Mark Brown 2012-10-26 457 aab034fe Mark Brown 2012-10-26 458 if (algs == 0) { aab034fe Mark Brown 2012-10-26 459 adsp_err(dsp, "No algorithms\n"); aab034fe Mark Brown 2012-10-26 460 return -EINVAL; aab034fe Mark Brown 2012-10-26 461 } aab034fe Mark Brown 2012-10-26 462 7265971f Mark Brown 2012-12-19 463 if (algs > 1024) { 7265971f Mark Brown 2012-12-19 @464 adsp_err(dsp, "Algorithm count %d excessive\n", algs); 7265971f Mark Brown 2012-12-19 465 print_hex_dump_bytes(dev_name(dsp->dev), DUMP_PREFIX_OFFSET, 7265971f Mark Brown 2012-12-19 466 buf, buf_size); 7265971f Mark Brown 2012-12-19 467 return -EINVAL; 7265971f Mark Brown 2012-12-19 468 } 7265971f Mark Brown 2012-12-19 469 aab034fe Mark Brown 2012-10-26 470 /* Read the terminator first to validate the length */ aab034fe Mark Brown 2012-10-26 471 ret = regmap_raw_read(regmap, mem->base + term, &val, sizeof(val)); aab034fe Mark Brown 2012-10-26 472 if (ret != 0) { --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [asoc:topic/adsp 1/4] sound/soc/codecs/wm_adsp.c:446:3: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'unsigned int'
by kbuild test robot 08 Jan '13

08 Jan '13

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/adsp head: 25326bb263894a528288716901bd434372927844 commit: aab034fe60460c0e352a64e94f2323edc12ff296 [1/4] ASoC: wm_adsp: Add support for parsing algorithms config: make ARCH=x86_64 allmodconfig All warnings: sound/soc/codecs/wm_adsp.c: In function 'wm_adsp_setup_algs': sound/soc/codecs/wm_adsp.c:446:3: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'unsigned int' [-Wformat] vim +446 sound/soc/codecs/wm_adsp.c aab034fe Mark Brown 2012-10-26 430 } aab034fe Mark Brown 2012-10-26 431 aab034fe Mark Brown 2012-10-26 432 if (algs == 0) { aab034fe Mark Brown 2012-10-26 433 adsp_err(dsp, "No algorithms\n"); aab034fe Mark Brown 2012-10-26 434 return -EINVAL; aab034fe Mark Brown 2012-10-26 435 } aab034fe Mark Brown 2012-10-26 436 aab034fe Mark Brown 2012-10-26 437 /* Read the terminator first to validate the length */ aab034fe Mark Brown 2012-10-26 438 ret = regmap_raw_read(regmap, mem->base + term, &val, sizeof(val)); aab034fe Mark Brown 2012-10-26 439 if (ret != 0) { aab034fe Mark Brown 2012-10-26 440 adsp_err(dsp, "Failed to read algorithm list end: %d\n", aab034fe Mark Brown 2012-10-26 441 ret); aab034fe Mark Brown 2012-10-26 442 return ret; aab034fe Mark Brown 2012-10-26 443 } aab034fe Mark Brown 2012-10-26 444 aab034fe Mark Brown 2012-10-26 445 if (be32_to_cpu(val) != 0xbedead) aab034fe Mark Brown 2012-10-26 @446 adsp_warn(dsp, "Algorithm list end %zx 0x%x != 0xbeadead\n", aab034fe Mark Brown 2012-10-26 447 term, be32_to_cpu(val)); aab034fe Mark Brown 2012-10-26 448 aab034fe Mark Brown 2012-10-26 449 alg = kzalloc((term - pos) * 2, GFP_KERNEL); aab034fe Mark Brown 2012-10-26 450 if (!alg) aab034fe Mark Brown 2012-10-26 451 return -ENOMEM; aab034fe Mark Brown 2012-10-26 452 aab034fe Mark Brown 2012-10-26 453 ret = regmap_raw_read(regmap, mem->base + pos, alg, (term - pos) * 2); aab034fe Mark Brown 2012-10-26 454 if (ret != 0) { --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [PATCH v2] ASoC: mxs-saif: Use a signed integer for error value
by Fabio Estevam 08 Jan '13

08 Jan '13

saif->id and saif->master_id are unsigned, so they can not be negative. Fix the following warning when building with W=1 option: sound/soc/mxs/mxs-saif.c: In function 'mxs_saif_probe': sound/soc/mxs/mxs-saif.c:676:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] sound/soc/mxs/mxs-saif.c:688:3: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] sound/soc/mxs/mxs-saif.c:692:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] Use a signed variable 'ret' to handle the error values. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Keep the attributions in the case of of_alias_get_id is not negative. sound/soc/mxs/mxs-saif.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 752675d..8f17094 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -672,9 +672,12 @@ static int mxs_saif_probe(struct platform_device *pdev) if (!saif) return -ENOMEM; - saif->id = of_alias_get_id(np, "saif"); - if (saif->id < 0) - return saif->id; + ret = of_alias_get_id(np, "saif"); + if (ret < 0) + return ret; + else + saif->id = ret; + /* * If there is no "fsl,saif-master" phandle, it's a saif * master. Otherwise, it's a slave and its phandle points @@ -684,12 +687,14 @@ static int mxs_saif_probe(struct platform_device *pdev) if (!master) { saif->master_id = saif->id; } else { - saif->master_id = of_alias_get_id(master, "saif"); - if (saif->master_id < 0) - return saif->master_id; + ret = of_alias_get_id(master, "saif"); + if (ret < 0) + return ret; + else + saif->master_id = ret; } - if (saif->master_id < 0 || saif->master_id >= ARRAY_SIZE(mxs_saif)) { + if (saif->master_id >= ARRAY_SIZE(mxs_saif)) { dev_err(&pdev->dev, "get wrong master id\n"); return -EINVAL; } -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/2] ASoC: wm_adsp: Factor out calculation of memory base addresses
by Mark Brown 08 Jan '13

08 Jan '13

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 6bff303..ed9a6c4 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -156,6 +156,26 @@ static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp, return NULL; } +static unsigned int wm_adsp_region_to_reg(struct wm_adsp_region const *region, + unsigned int offset) +{ + switch (region->type) { + case WMFW_ADSP1_PM: + return region->base + (offset * 3); + case WMFW_ADSP1_DM: + return region->base + (offset * 2); + case WMFW_ADSP2_XM: + return region->base + (offset * 2); + case WMFW_ADSP2_YM: + return region->base + (offset * 2); + case WMFW_ADSP1_ZM: + return region->base + (offset * 2); + default: + WARN_ON(NULL != "Unknown memory region type"); + return offset; + } +} + static int wm_adsp_load(struct wm_adsp *dsp) { const struct firmware *firmware; @@ -283,27 +303,27 @@ static int wm_adsp_load(struct wm_adsp *dsp) case WMFW_ADSP1_PM: BUG_ON(!mem); region_name = "PM"; - reg = mem->base + (offset * 3); + reg = wm_adsp_region_to_reg(mem, offset); break; case WMFW_ADSP1_DM: BUG_ON(!mem); region_name = "DM"; - reg = mem->base + (offset * 2); + reg = wm_adsp_region_to_reg(mem, offset); break; case WMFW_ADSP2_XM: BUG_ON(!mem); region_name = "XM"; - reg = mem->base + (offset * 2); + reg = wm_adsp_region_to_reg(mem, offset); break; case WMFW_ADSP2_YM: BUG_ON(!mem); region_name = "YM"; - reg = mem->base + (offset * 2); + reg = wm_adsp_region_to_reg(mem, offset); break; case WMFW_ADSP1_ZM: BUG_ON(!mem); region_name = "ZM"; - reg = mem->base + (offset * 2); + reg = wm_adsp_region_to_reg(mem, offset); break; default: adsp_warn(dsp, -- 1.7.10.4

1 1

Re: [alsa-devel] [3.6.9 -> 3.7.1 regression] sound: snd_hda_intel codec probing issue?
by Takashi Iwai 08 Jan '13

08 Jan '13

At Fri, 28 Dec 2012 15:25:40 +0100, Vincent Blut wrote: > > Hi, > > Since I updated to Linux 3.7.1, listening to some audio/video bits > frequently cause the following: > > [ 7896.166946] hda-intel: azx_get_response timeout, switching to polling > mode: last cmd=0x020c0000 > [ 7897.173444] hda-intel: No response from codec, disabling MSI: last > cmd=0x020c0000 > [ 7898.179932] hda_intel: azx_get_response timeout, switching to > single_cmd mode: last cmd=0x020c0000 > [ 7898.179983] hda-codec: out of range cmd 0:0:20:400:fffff7ff > [ 9445.034371] plugin-containe[5873]: segfault at 7f44bb95e639 ip > 00007f44e454bca0 sp 00007f44c91165f8 error 4 in > libc-2.13.so[7f44e442c000+180000] > > It seems to be a codec probing failure (?). This is really fatal because > the sound become very choppy and can't recover until I reboot. > I'll try to play with 'probe_mask' kernel parameter to see if I can > narrow the correct codec slots! > > By the way I can't reproduce this on 3.6.9, so is there something that > changed in this area in 3.7.1? If it's new in 3.7, this could be a regression by runtime D3. Try to pass power_save_controller=0 option to snd-hda-intel module (or change it via sysfs dynamically). thanks, Takashi

4 10

[alsa-devel] [PATCH] ALSA: hda - print power state for AFG node in proc file
by David Henningsson 08 Jan '13

08 Jan '13

It seems useful, and power states are required for AFG nodes, so I see no reason not to print it. As a bonus, also print the AFG nid. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_proc.c | 2 ++ 1 file changed, 2 insertions(+) (Feel free to rephrase "State of AFG node 0x%02x:\n" if you like.) diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 045e5d3..d6c8416 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -603,6 +603,8 @@ static void print_codec_info(struct snd_info_entry *entry, print_amp_caps(buffer, codec, codec->afg, HDA_INPUT); snd_iprintf(buffer, "Default Amp-Out caps: "); print_amp_caps(buffer, codec, codec->afg, HDA_OUTPUT); + snd_iprintf(buffer, "State of AFG node 0x%02x:\n", codec->afg); + print_power_state(buffer, codec, codec->afg); nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid); if (! nid || nodes < 0) { -- 1.7.9.5

2 3