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

[alsa-devel] [PATCH] ASoC: wm8962: Update register CLASS_D_CONTROL_1 to be non-volatile
by Charles Keepax 13 May '14

13 May '14

The register CLASS_D_CONTROL_1 is marked as volatile because it contains a bit, DAC_MUTE, which is also mirrored in the ADC_DAC_CONTROL_1 register. This causes problems for the "Speaker Switch" control, which will report an error if the CODEC is suspended because it relies on a volatile register. To resolve this issue mark CLASS_D_CONTROL_1 as non-volatile and manually keep the register cache in sync by updating both bits when changing the mute status. Reported-by: Shawn Guo <shawn.guo(a)linaro.org> Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- Hi Shawn, I am afraid I don't have access to hardware for 8962 at the moment, so have only build tested this, but I believe it should fix your issue. Please let me know how you get on. Thanks, Charles sound/soc/codecs/wm8962.c | 15 ++++++++++++--- sound/soc/codecs/wm8962.h | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 5522d25..ecd26dd 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -154,6 +154,7 @@ static struct reg_default wm8962_reg[] = { { 40, 0x0000 }, /* R40 - SPKOUTL volume */ { 41, 0x0000 }, /* R41 - SPKOUTR volume */ + { 49, 0x0010 }, /* R49 - Class D Control 1 */ { 51, 0x0003 }, /* R51 - Class D Control 2 */ { 56, 0x0506 }, /* R56 - Clocking 4 */ @@ -795,7 +796,6 @@ static bool wm8962_volatile_register(struct device *dev, unsigned int reg) case WM8962_ALC2: case WM8962_THERMAL_SHUTDOWN_STATUS: case WM8962_ADDITIONAL_CONTROL_4: - case WM8962_CLASS_D_CONTROL_1: case WM8962_DC_SERVO_6: case WM8962_INTERRUPT_STATUS_1: case WM8962_INTERRUPT_STATUS_2: @@ -2929,13 +2929,22 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, static int wm8962_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; - int val; + int val, ret; if (mute) - val = WM8962_DAC_MUTE; + val = WM8962_DAC_MUTE | WM8962_DAC_MUTE_ALT; else val = 0; + /** + * The DAC mute bit is mirrored in two registers, update both to keep + * the register cache consistent. + */ + ret = snd_soc_update_bits(codec, WM8962_CLASS_D_CONTROL_1, + WM8962_DAC_MUTE_ALT, val); + if (ret < 0) + return ret; + return snd_soc_update_bits(codec, WM8962_ADC_DAC_CONTROL_1, WM8962_DAC_MUTE, val); } diff --git a/sound/soc/codecs/wm8962.h b/sound/soc/codecs/wm8962.h index a1a5d52..910aafd 100644 --- a/sound/soc/codecs/wm8962.h +++ b/sound/soc/codecs/wm8962.h @@ -1954,6 +1954,10 @@ #define WM8962_SPKOUTL_ENA_MASK 0x0040 /* SPKOUTL_ENA */ #define WM8962_SPKOUTL_ENA_SHIFT 6 /* SPKOUTL_ENA */ #define WM8962_SPKOUTL_ENA_WIDTH 1 /* SPKOUTL_ENA */ +#define WM8962_DAC_MUTE_ALT 0x0010 /* DAC_MUTE */ +#define WM8962_DAC_MUTE_ALT_MASK 0x0010 /* DAC_MUTE */ +#define WM8962_DAC_MUTE_ALT_SHIFT 4 /* DAC_MUTE */ +#define WM8962_DAC_MUTE_ALT_WIDTH 1 /* DAC_MUTE */ #define WM8962_SPKOUTL_PGA_MUTE 0x0002 /* SPKOUTL_PGA_MUTE */ #define WM8962_SPKOUTL_PGA_MUTE_MASK 0x0002 /* SPKOUTL_PGA_MUTE */ #define WM8962_SPKOUTL_PGA_MUTE_SHIFT 1 /* SPKOUTL_PGA_MUTE */ -- 1.7.2.5

3 2

[alsa-devel] Broken outmixer_event function in wm8400/wm8990/wm8991
by Lars-Peter Clausen 13 May '14

13 May '14

Hi, I was looking at the drivers that were using the SND_SOC_DAPM_PRE_REG event and I noticed that the outmixer_event function for the wm8400, wm8990 and wm8991 is broken. They do a switch statement to determine which kcontrol cause the event in the form of 'switch(kcontrol->private_value) { case (REG | (SHIFT << 8)): ...'. Long long time ago we used to store the register and the shift in the same integer which was stored in private_value. But this was changed in commit 4eaa9819 ("ALSA: ASoC: Convert bitfields in ASoC into full int width"). This was long before the wm8400 and wm8991 drivers were merged and just a month after the wm8990 driver was merged. So these functions have been dead code pretty much for as long as they existed. Do you want to fix this up? If not I'm going to send a patch that removes the functions. If you want to fix this up, this should be re-implemented as a custom put handler for the kcontrols rather than a event callback, which checks whether the change is valid before doing any DAPM changes. The event callback runs in the middle of the DAPM sequence, so half of the changes will already have been applied before the check is made whether the change should be done or not. - Lars

3 5

Re: [alsa-devel] Sound issue in omap-twl4030
by Chaitral Purkar 13 May '14

13 May '14

Can somebody provide any pointers? Thanks and regards, Chaitral Purkar DISCLAIMER ========== This e-mail may contain privileged and confidential information which is the property of Persistent Systems Ltd. It is intended only for the use of the individual or entity to which it is addressed. If you are not the intended recipient, you are not authorized to read, retain, copy, print, distribute or use this message. If you have received this communication in error, please notify the sender and delete all copies of this message. Persistent Systems Ltd. does not accept any liability for virus infected mails.

1 0

[alsa-devel] [PATCH] ALSA: Add patchwork URL to MAINTAINERS
by Takashi Iwai 13 May '14

13 May '14

Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e67ea2442041..dd400288f9fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8244,6 +8244,7 @@ L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) W: http://www.alsa-project.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git T: git git://git.alsa-project.org/alsa-kernel.git +Q: http://patchwork.kernel.org/project/alsa-devel/list/ S: Maintained F: Documentation/sound/ F: include/sound/ -- 1.9.2

2 2

[alsa-devel] [PATCH v2] ALSA: hda - mask buggy stream DMA0 for Broadwell display controller
by mengdong.lin＠intel.com 13 May '14

13 May '14

From: Mengdong Lin <mengdong.lin(a)intel.com> Broadwell display controller has 3 stream DMA engines. DMA0 cannot update DMA postion buffer properly while DMA1 and DMA2 can work well. So this patch masks the buggy DMA0 by keeping it as opened. This is a tentative workaround, so keep the change small as Takashi suggested. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index d6bca62..6309b5b 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1366,6 +1366,12 @@ static int azx_first_init(struct azx *chip) /* initialize streams */ azx_init_stream(chip); + /* workaround for Broadwell HDMI: the first stream is broken, + * so mask it by keeping it as if opened + */ + if (pci->vendor == 0x8086 && pci->device == 0x160c) + chip->azx_dev[0].opened = 1; + /* initialize chip */ azx_init_pci(chip); azx_init_chip(chip, (probe_only[dev] & 2) == 0); -- 1.8.1.2

2 1

[alsa-devel] [PATCH] ASoC: Intel: remove duplicate headers
by Andy Shevchenko 13 May '14

13 May '14

A few files contain duplicate headers. This patch removes the second entry of duplicate in each file under question. There is no functional changes. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- sound/soc/intel/sst-baytrail-ipc.c | 1 - sound/soc/intel/sst-haswell-ipc.c | 1 - sound/soc/intel/sst-haswell-pcm.c | 1 - 3 files changed, 3 deletions(-) diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/sst-baytrail-ipc.c index 0d31dbb..a9c58cd 100644 --- a/sound/soc/intel/sst-baytrail-ipc.c +++ b/sound/soc/intel/sst-baytrail-ipc.c @@ -22,7 +22,6 @@ #include <linux/export.h> #include <linux/slab.h> #include <linux/delay.h> -#include <linux/list.h> #include <linux/platform_device.h> #include <linux/kthread.h> #include <linux/firmware.h> diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index e7996b3..2dfd070 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -25,7 +25,6 @@ #include <linux/slab.h> #include <linux/delay.h> #include <linux/sched.h> -#include <linux/list.h> #include <linux/platform_device.h> #include <linux/kthread.h> #include <linux/firmware.h> diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index ce27b50..058efb1 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -17,7 +17,6 @@ #include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/slab.h> -#include <linux/module.h> #include <linux/delay.h> #include <asm/page.h> #include <asm/pgtable.h> -- 2.0.0.rc2

2 1

[alsa-devel] [PATCH] ALSA: hda - using POS_FIX_LPIB on Broadwell HDMI Audio
by libin.yang＠intel.com 13 May '14

13 May '14

From: Libin Yang <libin.yang(a)intel.com> Audio stream is not continuous if using position buffer on Broadwell HDMI audio. Sound is clipped. Fix this issue by using POS_FIX_LPIB. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- sound/pci/hda/hda_intel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b540ad7..9cd40c6 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -993,6 +993,7 @@ static struct snd_pci_quirk position_fix_list[] = { SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB), SND_PCI_QUIRK(0x1849, 0x0888, "775Dual-VSTA", POS_FIX_LPIB), SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB), + SND_PCI_QUIRK(0x8086, 0x2010, "Broadwell HDMI audio", POS_FIX_LPIB), {} }; -- 1.8.3.2

6 21

[alsa-devel] Too many snd_pcm_mmap_readi calls
by Jan Homann 13 May '14

13 May '14

Hi ALSA-Dev-List I am very new to all this ALSA-Dev-stuff. For a few decades I have been just an alsa user but now i try to develop a tiny sound recorder like millions or thousands did before. On the recorder there is a small while-loop for capturing the pcm data, encode them and send them to a server every 10ms. On my desktop-pc and on a Freescale i.mx 233 (ARMv5) the recorder is working quite well. Now i run into a problem where the recorder is using all the cpu-time on the arm-device for a few minutes. I tried to debug this behaviour without any luck. Next i tried to trace the problem and removed as many calls as possible and put a "gettimeofday" between every remaining call. Here is the remaining code: while(1) { sleep(1); gettimeofday(&time1,NULL); snd_pcm_wait( pcm_handle, REC_BUFFER_ELEMENT_SIZE_MS + 10); gettimeofday(&time2,NULL); snd_pcm_mmap_begin(pcm_handle, &my_areas, &offset, &frames); gettimeofday(&time2,NULL); snd_pcm_avail_update ( pcm_handle ); gettimeofday(&time2,NULL); snd_pcm_mmap_readi( pcm_handle, network_data.data_UC, ALSA_READ_FRAMES); gettimeofday(&time3,NULL); snd_pcm_mmap_commit(pcm_handle, offset, frames); gettimeofday(&time4,NULL); } This is the output from strace: 0.001062 [401b418c] nanosleep({1, 0}, 0xbebd017c) = 0 1.001190 [401a4dac] gettimeofday({1399380864, 459211}, NULL) = 0 0.001032 [401de46c] ioctl(3, SNDRV_PCM_IOCTL_SYNC_PTR, 0x4e1b0) = 0 0.002780 [401a4dac] gettimeofday({1399380864, 463023}, NULL) = 0 0.001063 [401a4dac] gettimeofday({1399380864, 464086}, NULL) = 0 0.001031 [401de46c] ioctl(3, SNDRV_PCM_IOCTL_SYNC_PTR, 0x4e1b0) = 0 0.000968 [401a4dac] gettimeofday({1399380864, 466085}, NULL) = 0 0.001032 [401de46c] ioctl(3, SNDRV_PCM_IOCTL_SYNC_PTR, 0x4e1b0) = 0 0.000968 [401de46c] ioctl(3, SNDRV_PCM_IOCTL_SYNC_PTR, 0x4e1b0) = 0 0.000969 [401de46c] ioctl(3, SNDRV_PCM_IOCTL_SYNC_PTR, 0x4e1b0) = 0 0.001000 [401de46c] ioctl(3, SNDRV_PCM_IOCTL_SYNC_PTR, 0x4e1b0) = 0 0.002249 [401a4dac] gettimeofday({1399380864, 472678}, NULL) = 0 0.001438 [401a4dac] gettimeofday({1399380864, 473740}, NULL) = 0 0.001031 [40149518] rt_sigprocmask(SIG_BLOCK, [CHLD], [], 8) = 0 0.001218 [40149400] rt_sigaction(SIGCHLD, NULL, {SIG_DFL, [], 0}, 8) = 0 0.001562 [40149518] rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 0.001032 [401b418c] nanosleep({1, 0}, ^CProcess 14219 detached As you can see, the output starts with the sleep. I just added the sleep to find my loop-start in the trace-outpus. Before every gettimeofday there is one call to a snd_pcm-function (ok, besides the sleep). There is a block of four ioctl calls between the fourth and the fifth gettimeofday. This sould be the sound_pcm_mmap_readi. In the while loop there is only one call to sound_pcm_mmap_read and on my desktop-pc trace even shows only one call to sound_pcm_mmap_readi. Maybe anyone can explain to me why the function is called that often on the arm-device? Maybe you can give some hints on what to check for the high cpu utilization? Any hints would be kindly appreciated. Thanks in advance, Jan Homann

3 5

[alsa-devel] [PATCH] ALSA: hda - Add new GPU codec ID to snd-hda
by Aaron Plattner 13 May '14

13 May '14

Vendor ID 0x10de0071 is used by a yet-to-be-named GPU chip. Signed-off-by: Aaron Plattner <aplattner(a)nvidia.com> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Stephen Warren <swarren(a)nvidia.com> --- I verified that the patch_nvhdmi code is still needed for this chip. sound/pci/hda/patch_hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 0cb5b89cd0c8..347a84b58c39 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -3330,6 +3330,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = { { .id = 0x10de0051, .name = "GPU 51 HDMI/DP", .patch = patch_nvhdmi }, { .id = 0x10de0060, .name = "GPU 60 HDMI/DP", .patch = patch_nvhdmi }, { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, +{ .id = 0x10de0071, .name = "GPU 71 HDMI/DP", .patch = patch_nvhdmi }, { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, { .id = 0x11069f80, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi }, { .id = 0x11069f81, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi }, @@ -3385,6 +3386,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0044"); MODULE_ALIAS("snd-hda-codec-id:10de0051"); MODULE_ALIAS("snd-hda-codec-id:10de0060"); MODULE_ALIAS("snd-hda-codec-id:10de0067"); +MODULE_ALIAS("snd-hda-codec-id:10de0071"); MODULE_ALIAS("snd-hda-codec-id:10de8001"); MODULE_ALIAS("snd-hda-codec-id:11069f80"); MODULE_ALIAS("snd-hda-codec-id:11069f81"); -- 1.9.2

2 1

[alsa-devel] [PATCH 2/2] ALSA: hda - mask buggy stream DMA0 for Broadwell display controller
by mengdong.lin＠intel.com 13 May '14

13 May '14

From: Mengdong Lin <mengdong.lin(a)intel.com> Broadwell display controller has 3 stream DMA engines. DMA0 cannot update DMA postion buffer properly while DMA1 and DMA2 can work well. So this patch masks the buggy DMA0. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 377c3a5..13b13a3 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -281,6 +281,9 @@ static char *driver_short_names[] = { [AZX_DRIVER_GENERIC] = "HD-Audio Generic", }; +#define is_broadwell_controller(pci) \ + ((pci)->vendor == 0x8086 && (pci)->device == 0x160c) + #ifdef CONFIG_X86 static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on) { @@ -1249,6 +1252,7 @@ static int azx_first_init(struct azx *chip) struct snd_card *card = chip->card; int err; unsigned short gcap; + unsigned int stream_mask = 0; #if BITS_PER_LONG != 64 /* Fix up base address on ULI M5461 */ @@ -1364,7 +1368,10 @@ static int azx_first_init(struct azx *chip) return err; /* initialize streams */ - azx_init_stream(chip, 0); + if (is_broadwell_controller(pci)) + stream_mask = 0x1; /* mask buggy stream DMA0 */ + + azx_init_stream(chip, stream_mask); /* initialize chip */ azx_init_pci(chip); -- 1.8.1.2

1 0