October 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: usb-audio: update quirk for B&W PX to remove microphone
by Nicolas Huaman 05 Oct '18

05 Oct '18

A quirk in snd-usb-audio was added to automate setting sample rate to 4800k and remove the previously exposed nonfunctional microphone for the Bowers & Wilkins PX: commit 240a8af929c7c57dcde28682725b29cf8474e8e5 https://lore.kernel.org/patchwork/patch/919689/ However the headphones where updated shortly after that to remove the unintentional microphone functionality. I guess because of this the headphones now crash when connecting them via USB while the quirk is active. Dmesg: snd-usb-audio: probe of 2-3:1.0 failed with error -22 usb 2-3: 2:1: cannot get min/max values for control 2 (id 2) This patch removes the microfone and allows the headphones to connect and work out of the box. It is based on the current mainline kernel and successfully applied an tested on my machine (4.18.10.arch1-1). Signed-off-by: Nicolas Huaman <nicolas(a)herochao.de> --- sound/usb/quirks-table.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 08aa78007020..849953e5775c 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3346,19 +3346,14 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), .ifnum = 0, .type = QUIRK_AUDIO_STANDARD_MIXER, }, - /* Capture */ - { - .ifnum = 1, - .type = QUIRK_IGNORE_INTERFACE, - }, /* Playback */ { - .ifnum = 2, + .ifnum = 1, .type = QUIRK_AUDIO_FIXED_ENDPOINT, .data = &(const struct audioformat) { .formats = SNDRV_PCM_FMTBIT_S16_LE, .channels = 2, - .iface = 2, + .iface = 1, .altsetting = 1, .altset_idx = 1, .attributes = UAC_EP_CS_ATTR_FILL_MAX | -- 2.19.0

3 3

[alsa-devel] [PATCH v2 0/1] ALSA: usb-audio: Add custom mixer status quirks for RME CC devices
by Jussi Laako 04 Oct '18

04 Oct '18

This patch has been updated with following changes and should be now good for merging: - Replace 64-bit division with suitable function to make it available on all architectures - Use specific VID:PID pairs instead of just VID to avoid confusions Last item was changed after discussion with RME.

2 4

[alsa-devel] [PATCH 0/5] ALSA: Fix fall-through annotations
by Takashi Iwai 04 Oct '18

04 Oct '18

Hi, here is some trivial patches to add / fix the fall-through annotations. The patchset for ASoC will follow later. Takashi === Takashi Iwai (5): ALSA: memalloc: Add fall-through annotation ALSA: caiaq: Add fall-through annotation ALSA: seq: oss: Use the standard fall-through annotation ALSA: opti92xx-ad1848: Use the standard fall-through annotation ALSA: au88xx: Add fall-through annotations sound/core/memalloc.c | 1 + sound/core/seq/oss/seq_oss_timer.c | 2 +- sound/isa/opti9xx/opti92x-ad1848.c | 6 ++++-- sound/pci/au88x0/au88x0_core.c | 6 ++++++ sound/usb/caiaq/device.c | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) -- 2.18.0

1 5

[alsa-devel] [PATCH] ASoC: ts3a227e: fix a typo in documentation
by Tzung-Bi Shih 04 Oct '18

04 Oct '18

There is no "MACBIAS". It should be "MICBIAS". Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- Documentation/devicetree/bindings/sound/ts3a227e.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/ts3a227e.txt b/Documentation/devicetree/bindings/sound/ts3a227e.txt index 3ed8359144d3..21ab45bc7e8f 100644 --- a/Documentation/devicetree/bindings/sound/ts3a227e.txt +++ b/Documentation/devicetree/bindings/sound/ts3a227e.txt @@ -14,7 +14,7 @@ Required properties: Optional properies: - ti,micbias: Intended MICBIAS voltage (datasheet section 9.6.7). - Select 0/1/2/3/4/5/6/7 to specify MACBIAS voltage + Select 0/1/2/3/4/5/6/7 to specify MICBIAS voltage 2.1V/2.2V/2.3V/2.4V/2.5V/2.6V/2.7V/2.8V Default value is "1" (2.2V). -- 2.19.0.605.g01d371f741-goog

2 2

[alsa-devel] [PATCH] ASoC: intel: skylake: Add missing break in skl_tplg_get_token()
by Takashi Iwai 04 Oct '18

04 Oct '18

skl_tplg_get_token() misses a break in the big switch() block for SKL_TKN_U8_CORE_ID entry. Spotted nicely by -Wimplicit-fallthrough compiler option. Fixes: 6277e83292a2 ("ASoC: Intel: Skylake: Parse vendor tokens to build module data") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/intel/skylake/skl-topology.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 2620d77729c5..f99c600f86e4 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -2461,6 +2461,7 @@ static int skl_tplg_get_token(struct device *dev, case SKL_TKN_U8_CORE_ID: mconfig->core_id = tkn_elem->value; + break; case SKL_TKN_U8_MOD_TYPE: mconfig->m_type = tkn_elem->value; -- 2.18.0

2 1

[alsa-devel] [PATCH] ASoC: qdsp6: q6asm-dai: checking NULL vs IS_ERR()
by Dan Carpenter 04 Oct '18

04 Oct '18

The q6asm_audio_client_alloc() doesn't return NULL, it returns error pointers. Fixes: 2a9e92d371db ("ASoC: qdsp6: q6asm: Add q6asm dai driver") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index c3806d7037fc..a16c71c03058 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -318,10 +318,11 @@ static int q6asm_dai_open(struct snd_pcm_substream *substream) prtd->audio_client = q6asm_audio_client_alloc(dev, (q6asm_cb)event_handler, prtd, stream_id, LEGACY_PCM_MODE); - if (!prtd->audio_client) { + if (IS_ERR(prtd->audio_client)) { pr_info("%s: Could not allocate memory\n", __func__); + ret = PTR_ERR(prtd->audio_client); kfree(prtd); - return -ENOMEM; + return ret; } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

2 1

[alsa-devel] [PATCH] ASoC: pxa-ssp: enable and disable extclk if given
by Daniel Mack 04 Oct '18

04 Oct '18

If a "extclk" clock is given, enable and disable it when appropriate. Signed-off-by: Daniel Mack <daniel(a)zonque.org> --- sound/soc/pxa/pxa-ssp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 69033e1a84e6..adcf8ba9d287 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -103,6 +103,9 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream, pxa_ssp_disable(ssp); } + if (priv->extclk) + clk_prepare_enable(priv->extclk); + dma = kzalloc(sizeof(struct snd_dmaengine_dai_dma_data), GFP_KERNEL); if (!dma) return -ENOMEM; @@ -125,6 +128,9 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream, clk_disable_unprepare(ssp->clk); } + if (priv->extclk) + clk_disable_unprepare(priv->extclk); + kfree(snd_soc_dai_get_dma_data(cpu_dai, substream)); snd_soc_dai_set_dma_data(cpu_dai, substream, NULL); } -- 2.17.1

2 1

[alsa-devel] [PATCH] ASoC: add fault detect recovery property to DT bindings
by Daniel Mack 04 Oct '18

04 Oct '18

The driver already has support for setting the FDRB bit in the CONFA register through platform data, but there was no property to set it in the device-tree bindings. Signed-off-by: Daniel Mack <daniel(a)zonque.org> --- Documentation/devicetree/bindings/sound/st,sta32x.txt | 3 +++ sound/soc/codecs/sta32x.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/st,sta32x.txt b/Documentation/devicetree/bindings/sound/st,sta32x.txt index 255de3ae5b2f..ff4a685a4303 100644 --- a/Documentation/devicetree/bindings/sound/st,sta32x.txt +++ b/Documentation/devicetree/bindings/sound/st,sta32x.txt @@ -39,6 +39,9 @@ Optional properties: - st,thermal-warning-recover: If present, thermal warning recovery is enabled. + - st,fault-detect-recovery: + If present, fault detect recovery is enabled. + - st,thermal-warning-adjustment: If present, thermal warning adjustment is enabled. diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index d5035f2f2b2b..22de1593443c 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -1038,6 +1038,8 @@ static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x) of_property_read_u8(np, "st,ch3-output-mapping", &pdata->ch3_output_mapping); + if (of_get_property(np, "st,fault-detect-recovery", NULL)) + pdata->fault_detect_recovery = 1; if (of_get_property(np, "st,thermal-warning-recovery", NULL)) pdata->thermal_warning_recovery = 1; if (of_get_property(np, "st,thermal-warning-adjustment", NULL)) -- 2.17.1

2 1

[alsa-devel] [BUG] sound: pci: trident: a possible data race
by Jia-Ju Bai 04 Oct '18

04 Oct '18

CPU0: snd_trident_hw_free snd_trident_free_voice line 3870: spin_lock_irqsave() line 3881: voice->substream = NULL; [WRITE] CPU1: snd_trident_interrupt line 3798: snd_pcm_period_elapsed(voice->substream); [READ] As for voice->substream, the WRITE operation in CPU0 is performed with holding a spinlock, but the READ operation in CPU1 is performed without holding this spinlock, so there may exist a data race. Best wishes, Jia-Ju Bai

2 4

[alsa-devel] Problem and Patch for B&W PX Bluetooth Headphones
by Nicolas Herochao 04 Oct '18

04 Oct '18

Hello, I'm writing this mail because of a Crash when connecting the B&W PX headphones via usb. Half a year ago this used to work with Linux after setting the default sample rate of pulseaudio to 48000k. A Launchpad Bug seems to describe this exact issue (detailed description below): https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1773697. It pointed me to the right direction, and today I have successfully compiled and tested a small patch that fixes the errors while also setting the sample rate to 48000k, making these headphones plug&play on any newer firmware. They sound awesome via USB! I would like to submit this patch, but it would be my first contribution and it could potentially break the B&W PX on older firmware. I can't test it since I see no obvious ways to downgrade the firmware. The automatic detection of these headphones always worked except for the sample-rate and perhaps the worst result is that old firmware will show a non-functional microphone, like on Windows. So I decided to first present the patch on this mailing list and ask for feedback and help. If anyone wants to pick the patch up, I'd appreciate that as well. My questions: * Can a quirk somehow handle multiple firmware versions of a usb device? * If not: Will this quirk allow old firmware to work out of the box but show a non-functional microphone? (And is that okay?) Thanks for your time and any feedback you can provide! Sincerely, Nicolas PS: more detail on the cause of the issue: ------ A quirk in snd-usb-audio was added to automate setting sample rate to 4800k and remove the previously exposed nonfunctional microphone: commit 240a8af929c7c57dcde28682725b29cf8474e8e5 https://lore.kernel.org/patchwork/patch/919689/ However the headphones where updated shortly after that to remove the unintentional microphone functionality. I guess because of this the headphones now crash when connecting them via USB while the quirk is active with the following dmesg errors: snd-usb-audio: probe of 2-3:1.0 failed with error -22 usb 2-3: 2:1: cannot get min/max values for control 2 (id 2) --------------- Finally, here is the patch (based on the current mainline kernel and generated according to all Guidelines I could find) which fixes the quirk by removing the microphone part: ---------------- From 748587283db85e219902abf4ac012864005943c8 Mon Sep 17 00:00:00 2001 From: Nicolas Huaman <nicolas(a)herochao.de> Date: Fri, 28 Sep 2018 18:05:15 +0200 Subject: [PATCH 1/1] SOUND: update quirk for B&W PX to remove microphone Signed-off-by: Nicolas Huaman <nicolas(a)herochao.de> --- sound/usb/quirks-table.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 08aa78007020..849953e5775c 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3346,19 +3346,14 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), .ifnum = 0, .type = QUIRK_AUDIO_STANDARD_MIXER, }, - /* Capture */ - { - .ifnum = 1, - .type = QUIRK_IGNORE_INTERFACE, - }, /* Playback */ { - .ifnum = 2, + .ifnum = 1, .type = QUIRK_AUDIO_FIXED_ENDPOINT, .data = &(const struct audioformat) { .formats = SNDRV_PCM_FMTBIT_S16_LE, .channels = 2, - .iface = 2, + .iface = 1, .altsetting = 1, .altset_idx = 1, .attributes = UAC_EP_CS_ATTR_FILL_MAX | -- 2.19.0

2 1