April 2020 - Alsa-devel - mailman.alsa-project.org

[RFC PATCH v2 0/2] Introduce multi PM domains helpers
by Daniel Baluta 21 Apr '20

21 Apr '20

From: Daniel Baluta <daniel.baluta(a)nxp.com> i.MX8QXP/i.MX8QM has IPs that need multiple power domains to be up in order to work. In order to help drivers, we introduce multi PM domains helpers that are able to activate/deactivate multi PM domains. First patch introduces the helpers and second patch demonstrates how a driver can use them instead of hardcoding the PM domains handling. Changes since v1: (addressed Ranjani's comments) - enhanced description for dev_multi_pm_attach return value - renamed exit_unroll_pm label to exit_detach_pm Daniel Baluta (2): PM / domains: Introduce multi PM domains helpers ASoC: SOF: Use multi PM domains helpers drivers/base/power/common.c | 93 +++++++++++++++++++++++++++++++++++++ include/linux/pm_domain.h | 19 ++++++++ sound/soc/sof/imx/imx8.c | 60 ++++-------------------- 3 files changed, 121 insertions(+), 51 deletions(-) -- 2.17.1

4 6

[RFC PATCH 0/9] fix -Wempty-body build warnings
by Randy Dunlap 21 Apr '20

21 Apr '20

Hi, When -Wextra is used, gcc emits many warnings about an empty 'if' or 'else' body, like this: ../fs/posix_acl.c: In function ‘get_acl’: ../fs/posix_acl.c:127:22: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] /* fall through */ ; ^ To quieten these warnings, add a new macro "do_empty()". I originally wanted to use do_nothing(), but that's already in use. It would sorta be nice if "fallthrough" could be coerced for this instead of using something like do_empty(). Or should we just use "{}" in place of ";"? This causes some odd coding style issue IMO. E.g., see this change: original: if (cmpxchg(p, ACL_NOT_CACHED, sentinel) != ACL_NOT_CACHED) /* fall through */ ; with new macro: if (cmpxchg(p, ACL_NOT_CACHED, sentinel) != ACL_NOT_CACHED) do_empty(); /* fall through */ using {}: if (cmpxchg(p, ACL_NOT_CACHED, sentinel) != ACL_NOT_CACHED) {} /* fall through */ or { /* fall through */ } or even if (cmpxchg(p, ACL_NOT_CACHED, sentinel) != ACL_NOT_CACHED) { /* fall through */ } or if (cmpxchg(p, ACL_NOT_CACHED, sentinel) != ACL_NOT_CACHED) { } /* fall through */ drivers/base/devcoredump.c | 5 +++-- drivers/dax/bus.c | 5 +++-- drivers/input/mouse/synaptics.c | 3 ++- drivers/target/target_core_pscsi.c | 3 ++- drivers/usb/core/sysfs.c | 2 +- fs/nfsd/nfs4state.c | 3 ++- fs/posix_acl.c | 2 +- include/linux/kernel.h | 8 ++++++++ sound/drivers/vx/vx_core.c | 3 ++- 9 files changed, 24 insertions(+), 10 deletions(-)

14 38

[PATCH] ASoC: wm8962: restore the CLOCKING2 register in resume
by Shengjiu Wang 21 Apr '20

21 Apr '20

The CLOCKING2 is a volatile register, but some bits should be restored when resume, for example SYSCLK_SRC. otherwise the output clock is wrong Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/codecs/wm8962.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index d9d59f45833f..6e96c0c5ad2a 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -82,6 +82,7 @@ struct wm8962_priv { #endif int irq; + u32 regcache_clocking2; }; /* We can't use the same notifier block for more than one supply and @@ -3813,6 +3814,10 @@ static int wm8962_runtime_resume(struct device *dev) regcache_sync(wm8962->regmap); + regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2, + WM8962_SYSCLK_SRC_MASK, + wm8962->regcache_clocking2); + regmap_update_bits(wm8962->regmap, WM8962_ANTI_POP, WM8962_STARTUP_BIAS_ENA | WM8962_VMID_BUF_ENA, WM8962_STARTUP_BIAS_ENA | WM8962_VMID_BUF_ENA); @@ -3842,6 +3847,9 @@ static int wm8962_runtime_suspend(struct device *dev) WM8962_STARTUP_BIAS_ENA | WM8962_VMID_BUF_ENA, 0); + regmap_read(wm8962->regmap, WM8962_CLOCKING2, + &wm8962->regcache_clocking2); + regcache_cache_only(wm8962->regmap, true); regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), -- 2.21.0

2 1

[PATCH 1/2] ASoC: SOF: Fix "no reply expected" error during firmware-boot
by Hans de Goede 21 Apr '20

21 Apr '20

At least on Canon Lake each time the SOF firmware is booted, the following error is logged in dmesg: [ 36.711803] sof-audio-pci 0000:00:1f.3: error: no reply expected, received 0x0 Since the DSP is powered down when not in used this happens everytime e.g. a notification plays, polluting dmesg with these false-positive errors. Add a check to snd_sof_ipc_reply() which makes it return success when receiving an unexpected msg_id 0 during fw-boot, fixing these false-positive errors being logged. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/sof/ipc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c index 78aa1da7c7a9..7303b3d42f12 100644 --- a/sound/soc/sof/ipc.c +++ b/sound/soc/sof/ipc.c @@ -312,6 +312,11 @@ int snd_sof_ipc_reply(struct snd_sof_dev *sdev, u32 msg_id) { struct snd_sof_ipc_msg *msg = &sdev->ipc->msg; + /* Ignore msg_id 0 being send during fw-boot */ + if (msg->ipc_complete && sdev->fw_state == SOF_FW_BOOT_IN_PROGRESS && + msg_id == 0) + return 0; + if (msg->ipc_complete) { dev_err(sdev->dev, "error: no reply expected, received 0x%x", msg_id); -- 2.26.0

4 11

Add support to SDM845 based platforms
by GitHub pull_request - opened 21 Apr '20

21 Apr '20

alsa-project/alsa-ucm-conf pull request #22 was opened from Srinivas-Kandagatla: Add Support to two codecs WCD934x and WSA881x and two platforms DragonBoard DB845c and Lenovo-YOGA-C630-13Q50 that use this codec. For ucm-validator to pass this PR depends on config files PR "ucm-validator: add config files for DB845c and Lenovo-YOGA-C630-13Q50" to alsa-tests Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/22 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/22.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ASoC: fsl_esai: Remove expensive print in irq handler
by Shengjiu Wang 21 Apr '20

21 Apr '20

Use dev_dbg instead of dev_err in irq handler, the dev_err is expensive, we don't need the message to be printed everytime, which is almost a debug option. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_esai.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c7a49d03463a..453392a9cd68 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -94,10 +94,10 @@ static irqreturn_t esai_isr(int irq, void *devid) dev_dbg(&pdev->dev, "isr: Transmission Initialized\n"); if (esr & ESAI_ESR_RFF_MASK) - dev_warn(&pdev->dev, "isr: Receiving overrun\n"); + dev_dbg(&pdev->dev, "isr: Receiving overrun\n"); if (esr & ESAI_ESR_TFE_MASK) - dev_warn(&pdev->dev, "isr: Transmission underrun\n"); + dev_dbg(&pdev->dev, "isr: Transmission underrun\n"); if (esr & ESAI_ESR_TLS_MASK) dev_dbg(&pdev->dev, "isr: Just transmitted the last slot\n"); -- 2.21.0

3 2

[PATCH v2 0/7] Add H6 I2S support
by Clément Péron 21 Apr '20

21 Apr '20

Hi, This is a sequel of Marcus Cooper serie[0], where remarks made by Maxime have been fixed. I have tested it on my Beelink GS1 board. Thanks, Clement 0: https://lore.kernel.org/patchwork/cover/1139949/ Changes since v1: - Fix missing header in set sign extend sample Jernej Skrabec (3): dt-bindings: ASoC: sun4i-i2s: Add H6 compatible ASoC: sun4i-i2s: Add support for H6 I2S arm64: dts: sun50i-h6: Add HDMI audio to H6 DTSI Marcus Cooper (4): ASoC: sun4i-i2s: Adjust LRCLK width ASoC: sun4i-i2s: Set sign extend sample ASoc: sun4i-i2s: Add 20 and 24 bit support ASoC: sun4i-i2s: Adjust regmap settings .../sound/allwinner,sun4i-a10-i2s.yaml | 2 + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 31 ++ sound/soc/sunxi/sun4i-i2s.c | 292 ++++++++++++++++-- 3 files changed, 301 insertions(+), 24 deletions(-) -- 2.20.1

2 11

Think I found an ALSA bug
by Ólafur Víðir Guðbjargarson 21 Apr '20

21 Apr '20

Dear receiver I think I found an ALSA bug. Yesterday my computer, which is running Manjaro 19.0.2 GNOME edition froze. After rebooting I checked the system log and found a message there to report to ALSA developers. This is just few lines from the log: apr 20 22:45:20 HP pulseaudio[1458]: E: [alsa-sink-ALC295 Analog] alsa- util.c: Most likely this is a bug in the ALSA driver 'snd_hda_intel'. Please report this issue to the ALSA developers. apr 20 22:45:20 HP pulseaudio[1458]: E: [alsa-sink-ALC295 Analog] alsa- util.c: snd_pcm_avail() returned a value that is exceptionally large: 2271932 bytes (12879 ms). I can't wrap this into code block here. I have attached the log as txt file. If you need further information, I will do my best to provide them. -- Kær kveðja/best regards Ólafur Víðir Guðbjargarson Tæknifræðingur/engineer technical GSM: 692 6292 olividir(a)gmail.com

1 0

[PATCH] ALSA: usb-audio: Add quirk for Focusrite Scarlett 2i2
by Gregor Pintar 21 Apr '20

21 Apr '20

Force it to use asynchronous playback. Same quirk has already been added for Focusrite Scarlett Solo (2nd gen) with a commit 46f5710f0b88 ("ALSA: usb-audio: Add quirk for Focusrite Scarlett Solo"). This also seems to prevent regular clicks when playing at 44100Hz on Scarlett 2i2 (2nd gen). I did not notice any side effects. Signed-off-by: Gregor Pintar <grpintar(a)gmail.com> --- sound/usb/quirks-table.h | 84 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index e009d584e..bc936bf79 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2840,6 +2840,90 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + /* + * Focusrite Scarlett 2i2 2nd generation + * Reports that playback should use Synch: Synchronous + * while still providing a feedback endpoint. Synchronous causes + * snapping on some sample rates. + * Force it to use Synch: Asynchronous. + */ + USB_DEVICE(0x1235, 0x8202), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 1, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .channels = 2, + .iface = 1, + .altsetting = 1, + .altset_idx = 1, + .attributes = 0, + .endpoint = 0x01, + .ep_attr = USB_ENDPOINT_XFER_ISOC | + USB_ENDPOINT_SYNC_ASYNC, + .protocol = UAC_VERSION_2, + .rates = SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_88200 | + SNDRV_PCM_RATE_96000 | + SNDRV_PCM_RATE_176400 | + SNDRV_PCM_RATE_192000, + .rate_min = 44100, + .rate_max = 192000, + .nr_rates = 6, + .rate_table = (unsigned int[]) { + 44100, 48000, 88200, + 96000, 176400, 192000 + }, + .clock = 41 + } + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .channels = 2, + .iface = 2, + .altsetting = 1, + .altset_idx = 1, + .attributes = 0, + .endpoint = 0x82, + .ep_attr = USB_ENDPOINT_XFER_ISOC | + USB_ENDPOINT_SYNC_ASYNC | + USB_ENDPOINT_USAGE_IMPLICIT_FB, + .protocol = UAC_VERSION_2, + .rates = SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_88200 | + SNDRV_PCM_RATE_96000 | + SNDRV_PCM_RATE_176400 | + SNDRV_PCM_RATE_192000, + .rate_min = 44100, + .rate_max = 192000, + .nr_rates = 6, + .rate_table = (unsigned int[]) { + 44100, 48000, 88200, + 96000, 176400, 192000 + }, + .clock = 41 + } + }, + { + .ifnum = 3, + .type = QUIRK_IGNORE_INTERFACE + }, + { + .ifnum = -1 + } + } + } +}, /* Access Music devices */ { -- 2.20.1

3 4

[PATCH 1/2] dt-bindings: ASoC: qdsp6: Suggest more generic node names
by Stephan Gerhold 21 Apr '20

21 Apr '20

Change the listed examples to use more generic node names, representing the class of the device nodes: - apr-service@<id> - dai@<id> Both names are already in use in arch/arm64/boot/dts/qcom/sdm845.dtsi. Also add #address-cells + #size-cells to the q6asm example, without them the example produces dtc warnings. Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Stephan Gerhold <stephan(a)gerhold.net> --- .../devicetree/bindings/sound/qcom,q6adm.txt | 2 +- .../devicetree/bindings/sound/qcom,q6afe.txt | 46 +++++++++---------- .../devicetree/bindings/sound/qcom,q6asm.txt | 7 ++- .../devicetree/bindings/sound/qcom,q6core.txt | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt index bbae426cdfb1..15c353a20de8 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt +++ b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt @@ -29,7 +29,7 @@ used by the apr service device. Definition: Must be 0 = EXAMPLE -q6adm@8 { +apr-service@8 { compatible = "qcom,q6adm"; reg = <APR_SVC_ADM>; q6routing: routing { diff --git a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt index d74888b9f1bb..4916dd6a0896 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt +++ b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt @@ -100,7 +100,7 @@ configuration of each dai. Must contain the following properties. = EXAMPLE -q6afe@4 { +apr-service@4 { compatible = "qcom,q6afe"; reg = <APR_SVC_AFE>; @@ -110,12 +110,12 @@ q6afe@4 { #address-cells = <1>; #size-cells = <0>; - hdmi@1 { - reg = <1>; + dai@1 { + reg = <HDMI_RX>; }; - tdm@24 { - reg = <24>; + dai@24 { + reg = <PRIMARY_TDM_RX_0>; qcom,tdm-sync-mode = <1>: qcom,tdm-sync-src = <1>; qcom,tdm-data-out = <0>; @@ -125,8 +125,8 @@ q6afe@4 { }; - tdm@25 { - reg = <25>; + dai@25 { + reg = <PRIMARY_TDM_TX_0>; qcom,tdm-sync-mode = <1>: qcom,tdm-sync-src = <1>; qcom,tdm-data-out = <0>; @@ -135,43 +135,43 @@ q6afe@4 { qcom,tdm-data-align = <0>; }; - prim-mi2s-rx@16 { - reg = <16>; + dai@16 { + reg = <PRIMARY_MI2S_RX>; qcom,sd-lines = <0 2>; }; - prim-mi2s-tx@17 { - reg = <17>; + dai@17 { + reg = <PRIMARY_MI2S_TX>; qcom,sd-lines = <1>; }; - sec-mi2s-rx@18 { - reg = <18>; + dai@18 { + reg = <SECONDARY_MI2S_RX>; qcom,sd-lines = <0 3>; }; - sec-mi2s-tx@19 { - reg = <19>; + dai@19 { + reg = <SECONDARY_MI2S_TX>; qcom,sd-lines = <1>; }; - tert-mi2s-rx@20 { - reg = <20>; + dai@20 { + reg = <TERTIARY_MI2S_RX>; qcom,sd-lines = <1 3>; }; - tert-mi2s-tx@21 { - reg = <21>; + dai@21 { + reg = <TERTIARY_MI2S_TX>; qcom,sd-lines = <0>; }; - quat-mi2s-rx@22 { - reg = <22>; + dai@22 { + reg = <QUATERNARY_MI2S_RX>; qcom,sd-lines = <0>; }; - quat-mi2s-tx@23 { - reg = <23>; + dai@23 { + reg = <QUATERNARY_MI2S_TX>; qcom,sd-lines = <1>; }; }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt index 9f5378c51686..6b9a88d0ea3f 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt +++ b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt @@ -51,13 +51,16 @@ configuration of each dai. Must contain the following properties. = EXAMPLE -q6asm@7 { +apr-service@7 { compatible = "qcom,q6asm"; reg = <APR_SVC_ASM>; q6asmdai: dais { compatible = "qcom,q6asm-dais"; + #address-cells = <1>; + #size-cells = <0>; #sound-dai-cells = <1>; - mm@0 { + + dai@0 { reg = <0>; direction = <2>; is-compress-dai; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6core.txt b/Documentation/devicetree/bindings/sound/qcom,q6core.txt index 7f36ff8bec18..5cd4cc9b1fde 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6core.txt +++ b/Documentation/devicetree/bindings/sound/qcom,q6core.txt @@ -15,7 +15,7 @@ used by the apr service device. example "qcom,q6core-v2.0" = EXAMPLE -q6core@3 { +apr-service@3 { compatible = "qcom,q6core"; reg = <APR_SVC_ADSP_CORE>; }; -- 2.26.1

5 7