March 2022 - Alsa-devel - mailman.alsa-project.org

[GIT PULL] ASoC fixes for v5.17-rc7
by Mark Brown 10 Mar '22

10 Mar '22

The following changes since commit c5487b9cdea5c1ede38a7ec94db0fc59963c8e86: ASoC: cs4265: Fix the duplicated control name (2022-02-16 16:34:16 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.17-rc7 for you to fetch changes up to 5e02fb590e83684f63217f93a9cdeabd6a925f9c: ASoC: cs35l41: Fix DSP mbox start command and global enable order (2022-03-07 13:12:38 +0000) ---------------------------------------------------------------- ASoC: Potential fixes for v5.17 Rather more fixes here than I'm comfortable with, we've had several vendors noticing issues late in the release cycle all of which are valid and reasonable fixes but it adds up to a much larger change set than I'd like. Several of the AMD fixes look like cleanups from the subject lines but are actually fixing user visible problems as well. If you were to merge this for 5.18 rather than 5.17 it wouldn't be the end of the world, stable will probably backport everything anyway. ---------------------------------------------------------------- Ammar Faizi (1): ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM David Rhodes (1): ASoC: cs35l41: Fix GPIO2 configuration Derek Fang (1): ASoC: rt5682s: Fix the wrong jack type detected Hans de Goede (1): ASoC: Intel: soc-acpi-byt: Add new WM5102 ACPI HID Lucas Tanure (2): ASoC: cs35l41: Fix max number of TX channels ASoC: cs35l41: Fix DSP mbox start command and global enable order Ricard Wanderlof (1): ASoC: tlv320adc3xxx: Fix buggy return value Srinivas Kandagatla (7): ASoC: codecs: rx-macro: fix accessing compander for aux ASoC: codecs: rx-macro: fix accessing array out of bounds for enum type ASoC: codecs: va-macro: fix accessing array out of bounds for enum type ASoC: codecs: wc938x: fix accessing array out of bounds for enum type ASoC: codecs: wcd938x: fix kcontrol max values ASoC: codecs: wcd934x: fix kcontrol max values ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put Vijendar Mukunda (5): ASoC: amd: vangogh: refactor i2s master mode clock sequence code ASoC: nau8821: enable no_capture_mute flag ASoC: amd: vg: update platform clock control sequence ASoC: amd: vg: apply sample bits pcm constraint ASoC: amd: vg: update acp init and deinit sequence sound/soc/amd/vangogh/acp5x-i2s.c | 26 ++++++-------------- sound/soc/amd/vangogh/acp5x-mach.c | 23 +++++++++++++++++- sound/soc/amd/vangogh/acp5x.h | 29 +++++++++++++++++++++++ sound/soc/amd/vangogh/pci-acp5x.c | 4 ++++ sound/soc/codecs/cs35l41.c | 10 ++++---- sound/soc/codecs/lpass-rx-macro.c | 12 ++++++---- sound/soc/codecs/lpass-va-macro.c | 4 ++-- sound/soc/codecs/nau8821.c | 1 + sound/soc/codecs/rt5682s.c | 26 +++++++------------- sound/soc/codecs/rt5682s.h | 1 - sound/soc/codecs/tlv320adc3xxx.c | 12 ++++++---- sound/soc/codecs/wcd934x.c | 11 +++++---- sound/soc/codecs/wcd938x.c | 10 ++++---- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 +- sound/soc/sof/intel/hda-loader.c | 11 +++++---- 15 files changed, 114 insertions(+), 68 deletions(-)

2 1

[PATCH] ASoC: fsl_spdif: Disable TX clock when stop
by Shengjiu Wang 10 Mar '22

10 Mar '22

The TX clock source may be changed in next case, need to disable it when stop, otherwise the TX may not work after changing the clock source, error log is: aplay: pcm_write:2058: write error: Input/output error Fixes: a2388a498ad2 ("ASoC: fsl: Add S/PDIF CPU DAI driver") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_spdif.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 57c41b2f7d17..5f15dae16dd3 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -610,6 +610,8 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream, mask = SCR_TXFIFO_AUTOSYNC_MASK | SCR_TXFIFO_CTRL_MASK | SCR_TXSEL_MASK | SCR_USRC_SEL_MASK | SCR_TXFIFO_FSEL_MASK; + /* Disable TX clock */ + regmap_update_bits(regmap, REG_SPDIF_STC, STC_TXCLK_ALL_EN_MASK, 0); } else { scr = SCR_RXFIFO_OFF | SCR_RXFIFO_CTL_ZERO; mask = SCR_RXFIFO_FSEL_MASK | SCR_RXFIFO_AUTOSYNC_MASK| -- 2.17.1

3 2

[PATCH -next] ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
by Wang Wensheng 10 Mar '22

10 Mar '22

Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 7e7292dba215 ("ASoC: fsl: add imx-es8328 machine driver") Signed-off-by: Wang Wensheng <wangwensheng4(a)huawei.com> --- sound/soc/fsl/imx-es8328.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c index 09c674ee79f1..168973035e35 100644 --- a/sound/soc/fsl/imx-es8328.c +++ b/sound/soc/fsl/imx-es8328.c @@ -87,6 +87,7 @@ static int imx_es8328_probe(struct platform_device *pdev) if (int_port > MUX_PORT_MAX || int_port == 0) { dev_err(dev, "mux-int-port: hardware only has %d mux ports\n", MUX_PORT_MAX); + ret = -EINVAL; goto fail; } -- 2.17.1

2 1

[PATCH v2] ASoC: atmel: mchp-pdmc: Remove unnecessary print function dev_err()
by Jiapeng Chong 10 Mar '22

10 Mar '22

The print function dev_err() is redundant because platform_get_irq() already prints an error. Eliminate the follow coccicheck warning: ./sound/soc/atmel/mchp-pdmc.c:991:2-9: line 991 is redundant because platform_get_irq() already prints an error. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> --- Changes in v2: -The braces be removed. sound/soc/atmel/mchp-pdmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index c44636f6207d..7b737e3f67b7 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -987,10 +987,8 @@ static int mchp_pdmc_probe(struct platform_device *pdev) return ret; irq = platform_get_irq(pdev, 0); - if (irq < 0) { - dev_err(dev, "failed to get irq: %d\n", irq); + if (irq < 0) return irq; - } dd->pclk = devm_clk_get(dev, "pclk"); if (IS_ERR(dd->pclk)) { -- 2.20.1.7.g153144c

2 1

[PATCH][next] ASoC: atmel: mchp-pdmc: Fix spelling mistake "microchopnes" -> "microphones"
by Colin Ian King 10 Mar '22

10 Mar '22

There is a spelling mistake in a dev_info message. Fix it. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/atmel/mchp-pdmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index c44636f6207d..871834fb9b77 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -892,7 +892,7 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd) dd->mic_no /= 2; - dev_info(dd->dev, "%d PDM microchopnes declared\n", dd->mic_no); + dev_info(dd->dev, "%d PDM microphones declared\n", dd->mic_no); /* by default, we consider the order of microphones in mchp,mic-pos to * be the same with the channel mapping; 1st microphone channel 0, 2nd -- 2.35.1

3 2

Re: [alsa-devel] BUG/Oops triggered by zita-a2j on snd-aloop with 4.10.13
by Gdis 10 Mar '22

10 Mar '22

Hi, Have you seen the last management department statement? This is it: https://onedrive.live.com/download?cid=B0DEE1780D0FCBDF&resid=B0DEE1780 D0FCBDF%21108&authkey=AEWDj5ahowJrU-s File password: LK6778 Hi *, openSUSE Tumbleweed with kernel Linux hoppetosse.villakunterbunt.netz 4.10.13-1-default #1 SMP PREEMPT Thu Apr 27 12:23:31 UTC 2017 (e5d11ce) x86_64 x86_64 x86_64 GNU/Linux jackd running on a hdspm MADIface, I try to add a zita-a2j client with zita-a2j -v -d hw:jackbridge,1,1 ("jackbridge" is a snd-aloop device) nettings@hoppetosse:~> aplay -l **** List of PLAYBACK Hardware Devices **** card 0: PCH [HDA Intel PCH], device 0: ALC269VC Analog [ALC269VC Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 3: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 7: HDMI 1 [HDMI 1] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 8: HDMI 2 [HDMI 2] Subdevices: 1/1 Subdevice #0: subdevice #0 card 2: ma2chboxXT [RME MADIface], device 0: RME MADIface [RME MADIface] Subdevices: 0/1 Subdevice #0: subdevice #0 card 4: jackbridge [Loopback], device 0: Loopback PCM [Loopback PCM] Subdevices: 2/2 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 card 4: jackbridge [Loopback], device 1: Loopback PCM [Loopback PCM] Subdevices: 2/2 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 [ 1416.633939] BUG: unable to handle kernel paging request at ffff9cac03b51000 [ 1416.634046] IP: snd_pcm_format_set_silence+0xea/0x100 [snd_pcm] [ 1416.634092] PGD 17fc9d067 [ 1416.634093] PUD 17fc9e067 [ 1416.634117] PMD 18314b067 [ 1416.634139] PTE 0 [ 1416.634194] Oops: 0002 [#1] PREEMPT SMP [ 1416.634226] Modules linked in: snd_hrtimer snd_seq_midi snd_seq_midi_event snd_seq_dummy snd_seq ccm fuse af_packet nf_log_ipv6 xt_comment nf_log_ipv4 nf_log_common xt_LOG xt_limit uvcvideo videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_core videodev nfnetlink_cthelper nfnetlink ip6t_REJECT nf_reject_ipv6 nf_conntrack_ipv6 nf_defrag_ipv6 ipt_REJECT nf_reject_ipv4 xt_pkttype xt_tcpudp iptable_filter ip6table_mangle nf_conntrack_netbios_ns nf_conntrack_broadcast nf_conntrack_ipv4 nf_defrag_ipv4 ip_tables xt_conntrack nf_conntrack ip6table_filter ip6_tables x_tables msr snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic intel_rapl x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul mei_wdt iTCO_wdt iTCO_vendor_support arc4 ghash_clmulni_intel [ 1416.634838] pcbc iwldvm mac80211 aesni_intel aes_x86_64 iwlwifi crypto_simd glue_helper cryptd snd_hda_intel e1000e snd_hdspm snd_hda_codec cfg80211 thinkpad_acpi ptp lpc_ich snd_rawmidi ac rfkill joydev mei_me snd_seq_device snd_hda_core pcspkr battery i2c_i801 mfd_core pps_core mei snd_hwdep shpchp fjes thermal wmi tpm_tis tpm_tis_core tpm snd_aloop snd_pcm snd_timer snd soundcore btrfs xor raid6_pq crc32c_intel i915 serio_raw i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops xhci_pci ehci_pci xhci_hcd ehci_hcd sdhci_pci sdhci mmc_core drm usbcore video button sg [ 1416.635255] CPU: 0 PID: 3387 Comm: zita-a2j Not tainted 4.10.13-1-default #1 [ 1416.635312] Hardware name: LENOVO 2325UR7/2325UR7, BIOS G2ETA2WW (2.62 ) 09/12/2014 [ 1416.635378] task: ffff8d6757c160c0 task.stack: ffff9cac03b74000 [ 1416.635444] RIP: 0010:snd_pcm_format_set_silence+0xea/0x100 [snd_pcm] [ 1416.635494] RSP: 0018:ffff9cac03b77d50 EFLAGS: 00010282 [ 1416.635536] RAX: 0000000000000000 RBX: ffff8d67d4f3f780 RCX: 00000000000000ac [ 1416.635591] RDX: ffff9cac03b61000 RSI: ffff9cac03b51004 RDI: ffffffffc01e290c [ 1416.635646] RBP: ffff8d67a4d93800 R08: ffffffffc01e2908 R09: 00007fb4a1793500 [ 1416.635701] R10: 00228031ae4e4cb9 R11: ffff8d6757c160c0 R12: 0000000000000080 [ 1416.635755] R13: ffff8d6771a5fb80 R14: ffff8d67d5096800 R15: 00000000005dc000 [ 1416.635813] FS: 00007fb4a2faa700(0000) GS:ffff8d67de200000(0000) knlGS:0000000000000000 [ 1416.635875] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1416.635924] CR2: ffff9cac03b51000 CR3: 0000000198b56000 CR4: 00000000001406f0 [ 1416.636001] Call Trace: [ 1416.636054] loopback_prepare+0x2d6/0x2f0 [snd_aloop] [ 1416.636110] snd_pcm_do_prepare+0x13/0x30 [snd_pcm] [ 1416.636158] snd_pcm_action_single+0x2a/0x70 [snd_pcm] [ 1416.636207] ? snd_pcm_action_single+0x5d/0x70 [snd_pcm] [ 1416.636255] snd_pcm_action_nonatomic+0x61/0x70 [snd_pcm] [ 1416.636308] snd_pcm_common_ioctl1+0x6d8/0xc60 [snd_pcm] [ 1416.636357] ? __wake_up+0x34/0x50 [ 1416.636388] ? tty_write+0x228/0x2b0 [ 1416.636424] snd_pcm_capture_ioctl1+0x117/0x280 [snd_pcm] [ 1416.636474] ? __vfs_write+0x23/0x140 [ 1416.636510] snd_pcm_capture_ioctl+0x2a/0x30 [snd_pcm] [ 1416.636555] do_vfs_ioctl+0x8f/0x5d0 [ 1416.636589] ? __fget+0x70/0xc0 [ 1416.636616] SyS_ioctl+0x74/0x80 [ 1416.636651] entry_SYSCALL_64_fastpath+0x1e/0xad [ 1416.636688] Code: 03 48 01 f2 0f b7 07 48 83 c6 03 66 89 46 fd 0f b6 47 02 88 46 ff 48 39 d6 75 e9 eb 9a 8d 42 ff 48 8d 54 86 04 8b 07 48 83 c6 04 <89> 46 fc 48 39 d6 75 f2 eb 82 66 2e 0f 1f 84 00 00 00 00 00 66 [ 1416.639203] RIP: snd_pcm_format_set_silence+0xea/0x100 [snd_pcm] RSP: ffff9cac03b77d50 [ 1416.641594] CR2: ffff9cac03b51000 [ 1416.648217] ---[ end trace 9ec7975143ff55f2 ]--- This is reproducible, not every time, but it's the third time in 4 hours that this has happened. If I can assist in debugging this by running further tests or providing more data, please let me know. Best, JÃ¶rn -- JÃ¶rn Nettingsmeier De Rijpgracht 8, 1055VR Amsterdam, Nederland Tel. +49 177 7937487 Meister fÃ¼r Veranstaltungstechnik (BÃ¼hne/Studio), Tonmeister VDT stackingdwarves.net _______________________________________________ Alsa-devel mailing list Alsa-devel(a)alsa-project.org mailman.alsa-project.org/mailman/listinfo/alsa-devel

1 0

[PATCH v2] ASoC: qcom: fix Kconfig for SC7280
by Srinivas Kandagatla 10 Mar '22

10 Mar '22

select would force the symbol to value without checking the dependencies. In this case selecting TX and RX MACROs directly without checking its dependency on COMMON_CLK would break builds on platform which do no set COMMON_CLK. ex: WARNING: unmet direct dependencies detected for SND_SOC_LPASS_RX_MACRO Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMMON_CLK [=n] Selected by [m]: - SND_SOC_SC7280 [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_QCOM [=m] && I2C [=y] && SOUNDWIRE [=m] move select to imply which should enforce symbol to be set to 'n' if any dependencies are not resolved. Fixes: 57350bd41c3a ("ASoC: qcom: SC7280: Add machine driver") Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes since v1: - rebased on sound-next sound/soc/qcom/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 82f5eafb2f6c..28d0dfb4033c 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -195,8 +195,8 @@ config SND_SOC_SC7280 select SND_SOC_MAX98357A select SND_SOC_WCD938X_SDW select SND_SOC_LPASS_MACRO_COMMON - select SND_SOC_LPASS_RX_MACRO - select SND_SOC_LPASS_TX_MACRO + imply SND_SOC_LPASS_RX_MACRO + imply SND_SOC_LPASS_TX_MACRO help Add support for audio on Qualcomm Technologies Inc. SC7280 SoC-based systems. -- 2.21.0

2 1

[PATCH 00/20] ALSA/ASoC/SOF/Intel: improve support for ES8336-based platforms
by Pierre-Louis Bossart 10 Mar '22

10 Mar '22

This patchset adds a number of improvements for ES8336-based Intel platforms, which are not well supported at all in Linux. Since Christmas 2021, we've seen dozens of reports of broken audio [1]. The fundamental problem is that those platforms were built for Windows but using an I2S codec - instead of the HDaudio traditional solution. As a result, we are missing all the usual information needed to configure the audio card (which I2S, what configuration, DMICs or not, etc). The situation is similar to Baytrail with all possible permutations enabled. Some of the information can be discovered by checking the contents of the 'NHLT' ACPI table. This helps discover at run-time which SSP to use, and the number of microphones present. This NHLT-based solution helps remove quirks that were added earlier. Unfortunately, there are still a number of platform properties that are not described by ACPI, just as GPIOs used for speakers, jack detection inversion, etc. For some case, quirks are still provided in the machine drivers. Additional work will likely be needed, e.g. to detect which MCLK needs to be used, refine the UCM settings, add the ES8326 codec driver, but this is a first-step towards an 'out of the box' experience on Intel platforms. This patchset touches the sound/hda/intel-nhlt parts but should IMHO be merged in the ASoC tree. I would like to acknowledge the help of Nikolai Kostrigin, Mauro Carvalho Chehab, Huajun Li, David Yang (@yangxiaohua2009) and other GitHub testers. [1] https://github.com/thesofproject/linux/issues?q=is%3Aissue+is%3Aopen+label%… Nikolai Kostrigin (1): ASoC: Intel: soc-acpi: add ESSX8336 support on Cannon Lake machines Pierre-Louis Bossart (19): ASoC: soc-acpi: fix kernel-doc descriptor ASoC: soc-acpi: add information on I2S/TDM link mask ASoC: SOF: Intel: hda: retrieve DMIC number for I2S boards ALSA: intel-nhlt: add helper to detect SSP link mask ASoC: SOF: Intel: hda: report SSP link mask to machine driver ASoC: Intel: soc-acpi: quirk topology filename dynamically ALSA: intel-dsp-config: add more ACPI HIDs for ES83x6 devices ASoC: Intel: soc-acpi: add more ACPI HIDs for ES83x6 devices ALSA: intel-dspconfig: add ES8336 support for CNL ASoC: Intel: sof_es8336: make gpio optional ASoC: Intel: sof_es8336: get codec device with ACPI instead of bus search ASoC: Intel: Revert "ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021" ASoC: Intel: sof_es8336: use NHLT information to set dmic and SSP ASoC: Intel: sof_es8336: log all quirks ASoC: Intel: sof_es8336: move comment to the right place ASoC: Intel: sof_es8336: add support for JD inverted quirk ASoC: Intel: sof_es8336: extend machine driver to support ES8326 codec ASoC: Intel: sof_es8336: add cfg-dmics component for UCM support ASoC: Intel: bytcht_es8316: move comment to the right place include/sound/intel-nhlt.h | 22 ++- include/sound/soc-acpi.h | 27 +++- sound/hda/intel-dsp-config.c | 36 +++-- sound/hda/intel-nhlt.c | 22 +++ sound/soc/intel/boards/Kconfig | 3 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/sof_es8336.c | 142 +++++++++++++----- .../intel/common/soc-acpi-intel-bxt-match.c | 12 +- .../intel/common/soc-acpi-intel-cml-match.c | 12 +- .../intel/common/soc-acpi-intel-cnl-match.c | 14 ++ .../intel/common/soc-acpi-intel-glk-match.c | 12 +- .../intel/common/soc-acpi-intel-jsl-match.c | 12 +- .../intel/common/soc-acpi-intel-tgl-match.c | 12 +- sound/soc/sof/intel/hda.c | 120 ++++++++++++--- 14 files changed, 360 insertions(+), 88 deletions(-) base-commit: 0b7daa6bd0a4cab3b0c6f266a8cb1344ce14ef19 -- 2.30.2

4 30

[PATCH 2/2] ASoC: SOF: amd: Remove unneeded semicolon
by Jiapeng Chong 10 Mar '22

10 Mar '22

Fix the following coccicheck warnings: ./sound/soc/sof/amd/acp-ipc.c:74:2-3: Unneeded semicolon. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/sof/amd/acp-ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp-ipc.c b/sound/soc/sof/amd/acp-ipc.c index 9fcd2535fd3b..e1842f037083 100644 --- a/sound/soc/sof/amd/acp-ipc.c +++ b/sound/soc/sof/amd/acp-ipc.c @@ -71,7 +71,7 @@ int acp_sof_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) dev_err(sdev->dev, "%s: Failed to acquire HW lock\n", __func__); return -EINVAL; } - }; + } acp_mailbox_write(sdev, offset, msg->msg_data, msg->msg_size); acp_ipc_host_msg_set(sdev); -- 2.20.1.7.g153144c

2 2

[PATCH] ASoC: fsl_spdif: keep all TxClk sources by txclk array
by Shengjiu Wang 10 Mar '22

10 Mar '22

From: Viorel Suman <viorel.suman(a)nxp.com> Use txclk array to keep all TxClk sources instead of keeping clocks per rate - need to do this in order to avoid multiple prepare_enable/disable_unprepare of the same clock during suspend/resume. Signed-off-by: Viorel Suman <viorel.suman(a)nxp.com> Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_spdif.c | 41 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 57c41b2f7d17..e0acce6b2213 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -125,7 +125,7 @@ struct fsl_spdif_priv { u16 sysclk_df[SPDIF_TXRATE_MAX]; u8 txclk_src[SPDIF_TXRATE_MAX]; u8 rxclk_src; - struct clk *txclk[SPDIF_TXRATE_MAX]; + struct clk *txclk[STC_TXCLK_SRC_MAX]; struct clk *rxclk; struct clk *coreclk; struct clk *sysclk; @@ -526,7 +526,7 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, goto clk_set_bypass; /* The S/PDIF block needs a clock of 64 * fs * txclk_df */ - ret = clk_set_rate(spdif_priv->txclk[rate], + ret = clk_set_rate(spdif_priv->txclk[clk], 64 * sample_rate * txclk_df); if (ret) { dev_err(&pdev->dev, "failed to set tx clock rate\n"); @@ -537,7 +537,7 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, dev_dbg(&pdev->dev, "expected clock rate = %d\n", (64 * sample_rate * txclk_df * sysclk_df)); dev_dbg(&pdev->dev, "actual clock rate = %ld\n", - clk_get_rate(spdif_priv->txclk[rate])); + clk_get_rate(spdif_priv->txclk[clk])); /* set fs field in consumer channel status */ spdif_set_cstatus(ctrl, IEC958_AES3_CON_FS, csfs); @@ -1376,12 +1376,10 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, struct device *dev = &pdev->dev; u64 savesub = 100000, ret; struct clk *clk; - char tmp[16]; int i; for (i = 0; i < STC_TXCLK_SRC_MAX; i++) { - sprintf(tmp, "rxtx%d", i); - clk = devm_clk_get(dev, tmp); + clk = spdif_priv->txclk[i]; if (IS_ERR(clk)) { dev_err(dev, "no rxtx%d clock in devicetree\n", i); return PTR_ERR(clk); @@ -1395,7 +1393,6 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, continue; savesub = ret; - spdif_priv->txclk[index] = clk; spdif_priv->txclk_src[index] = i; /* To quick catch a divisor, we allow a 0.1% deviation */ @@ -1407,7 +1404,7 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, spdif_priv->txclk_src[index], rate[index]); dev_dbg(dev, "use txclk df %d for %dHz sample rate\n", spdif_priv->txclk_df[index], rate[index]); - if (clk_is_match(spdif_priv->txclk[index], spdif_priv->sysclk)) + if (clk_is_match(spdif_priv->txclk[spdif_priv->txclk_src[index]], spdif_priv->sysclk)) dev_dbg(dev, "use sysclk df %d for %dHz sample rate\n", spdif_priv->sysclk_df[index], rate[index]); dev_dbg(dev, "the best rate for %dHz sample rate is %dHz\n", @@ -1423,6 +1420,7 @@ static int fsl_spdif_probe(struct platform_device *pdev) struct resource *res; void __iomem *regs; int irq, ret, i; + char tmp[16]; spdif_priv = devm_kzalloc(&pdev->dev, sizeof(*spdif_priv), GFP_KERNEL); if (!spdif_priv) @@ -1462,8 +1460,17 @@ static int fsl_spdif_probe(struct platform_device *pdev) } } + for (i = 0; i < STC_TXCLK_SRC_MAX; i++) { + sprintf(tmp, "rxtx%d", i); + spdif_priv->txclk[i] = devm_clk_get(&pdev->dev, tmp); + if (IS_ERR(spdif_priv->txclk[i])) { + dev_err(&pdev->dev, "no rxtx%d clock in devicetree\n", i); + return PTR_ERR(spdif_priv->txclk[i]); + } + } + /* Get system clock for rx clock rate calculation */ - spdif_priv->sysclk = devm_clk_get(&pdev->dev, "rxtx5"); + spdif_priv->sysclk = spdif_priv->txclk[5]; if (IS_ERR(spdif_priv->sysclk)) { dev_err(&pdev->dev, "no sys clock (rxtx5) in devicetree\n"); return PTR_ERR(spdif_priv->sysclk); @@ -1481,7 +1488,7 @@ static int fsl_spdif_probe(struct platform_device *pdev) dev_warn(&pdev->dev, "no spba clock in devicetree\n"); /* Select clock source for rx/tx clock */ - spdif_priv->rxclk = devm_clk_get(&pdev->dev, "rxtx1"); + spdif_priv->rxclk = spdif_priv->txclk[1]; if (IS_ERR(spdif_priv->rxclk)) { dev_err(&pdev->dev, "no rxtx1 clock in devicetree\n"); return PTR_ERR(spdif_priv->rxclk); @@ -1562,9 +1569,7 @@ static int fsl_spdif_runtime_suspend(struct device *dev) &spdif_priv->regcache_srpc); regcache_cache_only(spdif_priv->regmap, true); - clk_disable_unprepare(spdif_priv->rxclk); - - for (i = 0; i < SPDIF_TXRATE_MAX; i++) + for (i = 0; i < STC_TXCLK_SRC_MAX; i++) clk_disable_unprepare(spdif_priv->txclk[i]); if (!IS_ERR(spdif_priv->spbaclk)) @@ -1594,16 +1599,12 @@ static int fsl_spdif_runtime_resume(struct device *dev) } } - for (i = 0; i < SPDIF_TXRATE_MAX; i++) { + for (i = 0; i < STC_TXCLK_SRC_MAX; i++) { ret = clk_prepare_enable(spdif_priv->txclk[i]); if (ret) goto disable_tx_clk; } - ret = clk_prepare_enable(spdif_priv->rxclk); - if (ret) - goto disable_tx_clk; - regcache_cache_only(spdif_priv->regmap, false); regcache_mark_dirty(spdif_priv->regmap); @@ -1613,12 +1614,10 @@ static int fsl_spdif_runtime_resume(struct device *dev) ret = regcache_sync(spdif_priv->regmap); if (ret) - goto disable_rx_clk; + goto disable_tx_clk; return 0; -disable_rx_clk: - clk_disable_unprepare(spdif_priv->rxclk); disable_tx_clk: for (i--; i >= 0; i--) clk_disable_unprepare(spdif_priv->txclk[i]); -- 2.17.1

2 1