June 2021 - Alsa-devel - mailman.alsa-project.org

[RFC PATCH 00/13] ASoC: qcom: Add AudioReach support
by Srinivas Kandagatla 12 Jul '21

12 Jul '21

This patchset adds ASoC driver support to configure signal processing framework ("AudioReach") which is integral part of Qualcomm next generation audio SDK and will be deployed on upcoming Qualcomm chipsets. It makes use of ASoC Topology to load graphs on to the DSP which is then managed by APM (Audio Processing Manager) service to prepare/start/stop. Here is simpified high-level block diagram of AudioReach: ___________________________________________________________ | CPU (Application Processor) | | +---------+ +---------+ +---------+ | | | q6apm | | q6apm | | q6afe | | | | dais | <------> | | <-----> | bedais | | | +---------+ +---------+ +---------+ | | ^ ^ | | | | +---------+ | | +---------+ v +---------->|topology | | | | q6prm | +---------+ | | | | | |<-------->| GPR | +---------+ | | +---------+ +---------+ | | ^ | |____________________________|______________________________| | | RPMSG (IPC over GLINK) ____________________________|______________________________ | | | | +-----------------------+ | | | | | | v v q6 (Audio DSP) | |+-----+ +----------------------------------+ | || PRM | | APM (Audio Processing Manager) | | |+-----+ | . Graph Management | | | | . Command Handing | | | | . Event Management | | | | ... | | | +----------------------------------+ | | ^ | |____________________________|______________________________| | | LPASS AIF ____________________________|______________________________ | | Audio I/O | | v | | +--------------------------------------------------+ | | | Audio devices | | | | CODEC | HDMI-TX | PCM | SLIMBUS | I2S |MI2S |...| | | | | | | +--------------------------------------------------+ | |___________________________________________________________| AudioReach has constructs of sub-graph, container and modules. Each sub-graph can have N containers and each Container can have N Modules and connections between them can be linear or non-linear. An audio function can be realized with one or many connected sub-graphs. There are also control/event paths between modules that can be wired up while building graph to achieve various control mechanism between modules. These concepts of Sub-Graph, Containers and Modules are represented in ASoC topology. Here is simple I2S graph with a Write Shared Memory and a Volume control module within a single Subgraph (1) with one Container (1) and 5 modules. ____________________________________________________________ | Sub-Graph [1] | | _______________________________________________________ | | | Container [1] | | | | [WR_SH] -> [PCM DEC] -> [PCM CONV] -> [VOL]-> [I2S-EP]| | | |_______________________________________________________| | |____________________________________________________________| For now this graph is split into two subgraphs to achieve dpcm like below: ________________________________________________ _________________ | Sub-Graph [1] | | Sub-Graph [2] | | ____________________________________________ | | _____________ | | | Container [1] | | | |Container [2]| | | | [WR_SH] -> [PCM DEC] -> [PCM CONV] -> [VOL]| | | | [I2S-EP] | | | |____________________________________________| | | |_____________| | |________________________________________________| |_________________| _________________ | Sub-Graph [3] | | _____________ | | |Container [3]| | | | [DMA-EP] | | | |_____________| | |_________________| This patchset adds very minimal support for AudioReach which includes supporting sub-graphs containing CODEC DMA ports and simple PCM Decoder/Encoder and Logger Modules. Additional capabilities will be built over time to expose features offered by AudioReach. This patchset is Tested on SM8250 SoC based Qualcomm Robotics Platform RB5 and SM9250 MTP with WSA881X Smart Speaker Amplifiers, DMICs connected via VA Macro and WCD938x Codec connected via TX and RX Macro. Sample WIP ASoC graphs are available at https://git.linaro.org/people/srinivas.kandagatla/audioreach-topology.git/ Thanks, srini Srinivas Kandagatla (13): soc: dt-bindings: qcom: add gpr bindings soc: qcom: add gpr driver support ASoC: qcom: dt-bindings: add bindings Audio Processing manager ASoC: qcom: audioreach: add basic pkt alloc support ASoC: qcom: audioreach: add q6apm support ASoC: qcom: audioreach: add module configuration command helpers ASoC: qcom: audioreach: add topology support ASoC: qcom: audioreach: add q6apm-dai support ASoC: qcom: audioreach: add bedai support ASoC: qcom: dt-bindings: add bindings for Proxy Resource Manager ASoC: qcom: audioreach: add q6prm support ASoC: qcom: dt-bindings: add audioreach soundcard compatibles ASoC: qcom: sm8250: Add audioreach support .../bindings/soc/qcom/qcom,gpr.yaml | 74 ++ .../devicetree/bindings/sound/qcom,q6apm.yaml | 72 ++ .../devicetree/bindings/sound/qcom,q6prm.yaml | 43 + .../bindings/sound/qcom,sm8250.yaml | 43 + drivers/soc/qcom/Kconfig | 9 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/gpr.c | 487 ++++++++ include/dt-bindings/soc/qcom,gpr.h | 18 + include/dt-bindings/sound/qcom,q6apm.h | 215 ++++ include/dt-bindings/sound/qcom,q6prm.h | 205 ++++ include/linux/soc/qcom/gpr.h | 127 ++ include/uapi/sound/snd_ar_tokens.h | 200 +++ sound/soc/qcom/Kconfig | 20 + sound/soc/qcom/Makefile | 1 + sound/soc/qcom/audioreach/Makefile | 12 + sound/soc/qcom/audioreach/audioreach.c | 1082 +++++++++++++++++ sound/soc/qcom/audioreach/audioreach.h | 649 ++++++++++ sound/soc/qcom/audioreach/q6apm-bedai.c | 377 ++++++ sound/soc/qcom/audioreach/q6apm-dai.c | 494 ++++++++ sound/soc/qcom/audioreach/q6apm.c | 962 +++++++++++++++ sound/soc/qcom/audioreach/q6apm.h | 171 +++ sound/soc/qcom/audioreach/q6prm.c | 412 +++++++ sound/soc/qcom/audioreach/topology.c | 848 +++++++++++++ sound/soc/qcom/sm8250.c | 144 ++- 24 files changed, 6665 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gpr.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6prm.yaml create mode 100644 drivers/soc/qcom/gpr.c create mode 100644 include/dt-bindings/soc/qcom,gpr.h create mode 100644 include/dt-bindings/sound/qcom,q6apm.h create mode 100644 include/dt-bindings/sound/qcom,q6prm.h create mode 100644 include/linux/soc/qcom/gpr.h create mode 100644 include/uapi/sound/snd_ar_tokens.h create mode 100644 sound/soc/qcom/audioreach/Makefile create mode 100644 sound/soc/qcom/audioreach/audioreach.c create mode 100644 sound/soc/qcom/audioreach/audioreach.h create mode 100644 sound/soc/qcom/audioreach/q6apm-bedai.c create mode 100644 sound/soc/qcom/audioreach/q6apm-dai.c create mode 100644 sound/soc/qcom/audioreach/q6apm.c create mode 100644 sound/soc/qcom/audioreach/q6apm.h create mode 100644 sound/soc/qcom/audioreach/q6prm.c create mode 100644 sound/soc/qcom/audioreach/topology.c -- 2.21.0

2 19

trigger timestamp
by Muni Sekhar 08 Jul '21

08 Jul '21

Hi all, >From the user space test application , Is it possible to get the trigger timestamp corresponding to SNDRV_PCM_TRIGGER_START & SNDRV_PCM_TRIGGER_STOP events for audio playback capture? -- Thanks, Sekhar

2 5

ALSA: intel8x0: div by zero in snd_intel8x0_update()
by Sergey Senozhatsky 08 Jul '21

08 Jul '21

Hi, I'm running (sometimes) into the following problem during resume divide error: 0000 [#1] PREEMPT SMP NOPTI RIP: 0010:snd_intel8x0_interrupt+0x121/0x279 Code: 42 8b 44 35 34 41 0f af c5 42 03 44 35 38 42 89 44 35 38 48 8b 0c 24 80 b9 60 03 00 00 00 78 0f 49 8d 0c 2e 48 83 c1 38 31 d2 <f7> 71 f4 89 11 42 8b 7c 35 48 44 01 ef 83 e7 1f 42 89 7c 35 48 48 RSP: 0000:ffff9a0a80108eb0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000019 RCX: ffff90d8c5efc198 RDX: 0000000000000000 RSI: ffff9a0a80549016 RDI: ffff9a0a80549024 RBP: ffff90d8c5efc060 R08: 000000000000197a R09: 00000f604ed00191 R10: 00000000000001e0 R11: ffffffff9468e1d8 R12: 0000000000000020 R13: 0000000000000040 R14: 0000000000000100 R15: 0000000000000002 FS: 00007a75c397aff8(0000) GS:ffff90d912d80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007a77945d1000 CR3: 000000015bf46002 CR4: 0000000000360ea0 Call Trace: <IRQ> __handle_irq_event_percpu+0xa0/0x1c0 handle_irq_event_percpu+0x2d/0x70 handle_irq_event+0x2c/0x48 handle_fasteoi_irq+0xa1/0x161 do_IRQ+0x51/0xd6 common_interrupt+0xf/0xf </IRQ> RIP: 0033:0x7a7856462c59 Code: 89 ca 48 2b 57 20 48 83 c2 10 31 c0 48 3b 57 28 48 0f 46 c1 c3 cc cc cc cc cc cc cc cc cc cc cc cc 64 48 8b 0c 25 00 00 00 00 <b8> f8 02 00 00 48 03 41 08 c3 cc cc cc cc cc cc cc cc cc cc cc cc RSP: 002b:00007a75c39794e8 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffde RAX: 02fa413b24209c6c RBX: 0000017f19e1cf9e RCX: 00007a75c397aff8 RDX: 00007a7855792472 RSI: 00007a7855790aa0 RDI: 0000000000000005 RBP: 0000000000000005 R08: 0000000000000012 R09: 000000000000000d R10: 00000000009f86d2 R11: 000000000000197a R12: 0000017f19e40e7d R13: 000005ee937ae557 R14: 00007a7855790aa0 R15: 00007a7855792472 Modules linked in: ---[ end trace 2ef6d63d0e3d757c ]--- RIP: 0010:snd_intel8x0_interrupt+0x121/0x279 Code: 42 8b 44 35 34 41 0f af c5 42 03 44 35 38 42 89 44 35 38 48 8b 0c 24 80 b9 60 03 00 00 00 78 0f 49 8d 0c 2e 48 83 c1 38 31 d2 <f7> 71 f4 89 11 42 8b 7c 35 48 44 01 ef 83 e7 1f 42 89 7c 35 48 48 RSP: 0000:ffff9a0a80108eb0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000019 RCX: ffff90d8c5efc198 RDX: 0000000000000000 RSI: ffff9a0a80549016 RDI: ffff9a0a80549024 RBP: ffff90d8c5efc060 R08: 000000000000197a R09: 00000f604ed00191 R10: 00000000000001e0 R11: ffffffff9468e1d8 R12: 0000000000000020 R13: 0000000000000040 R14: 0000000000000100 R15: 0000000000000002 FS: 00007a75c397aff8(0000) GS:ffff90d912d80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007a77945d1000 CR3: 000000015bf46002 CR4: 0000000000360ea0 This corresponds to ichdev->position %= ichdev->size; in snd_intel8x0_update(). A print out of that ichdev looks as follows snd_intel8x0 0000:00:18.0: lvi_frag = 0, frags = 0, size = 0, period_size = 0x0, period_size1 = 0x0

3 18

[PATCH v2] ASoC: atmel: ATMEL drivers depend on HAS_DMA
by Randy Dunlap 08 Jul '21

08 Jul '21

On a config (such as arch/sh/) which does not set HAS_DMA when MMU is not set, several ATMEL ASoC drivers select symbols that cause kconfig warnings. There is one "depends on HAS_DMA" here but several more are needed to prevent kconfig warnings since 'select' does not recognize any dependencies. Fix the following kconfig warnings: WARNING: unmet direct dependencies detected for SND_ATMEL_SOC_PDC Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && HAS_DMA [=n] Selected by [m]: - SND_ATMEL_SOC_SSC [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] - SND_ATMEL_SOC_SSC_PDC [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && ATMEL_SSC [=m] WARNING: unmet direct dependencies detected for SND_ATMEL_SOC_SSC_PDC Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && ATMEL_SSC [=m] && HAS_DMA [=n] Selected by [m]: - SND_AT91_SOC_SAM9G20_WM8731 [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && (ARCH_AT91 || COMPILE_TEST [=y]) && ATMEL_SSC [=m] && SND_SOC_I2C_AND_SPI [=m] WARNING: unmet direct dependencies detected for SND_ATMEL_SOC_SSC Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && HAS_DMA [=n] Selected by [m]: - SND_ATMEL_SOC_SSC_DMA [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && ATMEL_SSC [=m] WARNING: unmet direct dependencies detected for SND_ATMEL_SOC_SSC_DMA Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && ATMEL_SSC [=m] && HAS_DMA [=n] Selected by [m]: - SND_ATMEL_SOC_WM8904 [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && (ARCH_AT91 || COMPILE_TEST [=y]) && ATMEL_SSC [=m] && I2C [=m] - SND_AT91_SOC_SAM9X5_WM8731 [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_ATMEL_SOC [=m] && (ARCH_AT91 || COMPILE_TEST [=y]) && ATMEL_SSC [=m] && SND_SOC_I2C_AND_SPI [=m] Fixes: 3951e4aae2ce ("ASoC: atmel-pcm: dma support based on pcm dmaengine") Fixes: 18291410557f ("ASoC: atmel: enable SOC_SSC_PDC and SOC_SSC_DMA in Kconfig") Fixes: 061981ff8cc8 ("ASoC: atmel: properly select dma driver state") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> Cc: alsa-devel(a)alsa-project.org Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Michał Mirosław <mirq-linux(a)rere.qmqm.pl> Cc: Alexandre Belloni <alexandre.belloni(a)free-electrons.com> --- v2: rebase & resend; drop Cc: to Bo Shen <voice.shen(a)atmel.com> # bounced sound/soc/atmel/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) --- linux-next-20210628.orig/sound/soc/atmel/Kconfig +++ linux-next-20210628/sound/soc/atmel/Kconfig @@ -19,12 +19,14 @@ config SND_ATMEL_SOC_DMA config SND_ATMEL_SOC_SSC tristate + depends on HAS_DMA select SND_ATMEL_SOC_DMA select SND_ATMEL_SOC_PDC config SND_ATMEL_SOC_SSC_PDC tristate "SoC PCM DAI support for AT91 SSC controller using PDC" depends on ATMEL_SSC + depends on HAS_DMA select SND_ATMEL_SOC_PDC select SND_ATMEL_SOC_SSC help @@ -34,6 +36,7 @@ config SND_ATMEL_SOC_SSC_PDC config SND_ATMEL_SOC_SSC_DMA tristate "SoC PCM DAI support for AT91 SSC controller using DMA" depends on ATMEL_SSC + depends on HAS_DMA select SND_ATMEL_SOC_DMA select SND_ATMEL_SOC_SSC help @@ -44,6 +47,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" depends on ARCH_AT91 || COMPILE_TEST depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI + depends on HAS_DMA select SND_ATMEL_SOC_SSC_PDC select SND_SOC_WM8731 help @@ -54,6 +58,7 @@ config SND_ATMEL_SOC_WM8904 tristate "Atmel ASoC driver for boards using WM8904 codec" depends on ARCH_AT91 || COMPILE_TEST depends on ATMEL_SSC && I2C + depends on HAS_DMA select SND_ATMEL_SOC_SSC_DMA select SND_SOC_WM8904 help @@ -64,6 +69,7 @@ config SND_AT91_SOC_SAM9X5_WM8731 tristate "SoC Audio support for WM8731-based at91sam9x5 board" depends on ARCH_AT91 || COMPILE_TEST depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI + depends on HAS_DMA select SND_ATMEL_SOC_SSC_DMA select SND_SOC_WM8731 help

3 3

[PATCH v2 0/8] ASoC: mediatek: Add support for MT8195 SoC
by Trevor Wu 05 Jul '21

05 Jul '21

This series of patches adds support for Mediatek AFE of MT8195 SoC. Patches are based on broonie tree "for-next" branch. Changes since v1: - fixed some problems related to dt-bindings - add some missing properties to dt-bindings - add depency declaration on dt-bindings - fixed some warnings found by kernel test robot Trevor Wu (8): ASoC: mediatek: mt8195: update mediatek common driver ASoC: mediatek: mt8195: support etdm in platform driver ASoC: mediatek: mt8195: support adda in platform driver ASoC: mediatek: mt8195: support pcm in platform driver ASoC: mediatek: mt8195: add platform driver dt-bindings: mediatek: mt8195: add audio afe document ASoC: mediatek: mt8195: add machine driver with mt6359, rt1019 and rt5682 dt-bindings: mediatek: mt8195: add mt8195-mt6359-rt1019-rt5682 document .../bindings/sound/mt8195-afe-pcm.yaml | 136 + .../sound/mt8195-mt6359-rt1019-rt5682.yaml | 39 + sound/soc/mediatek/Kconfig | 23 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 22 +- sound/soc/mediatek/common/mtk-base-afe.h | 10 +- sound/soc/mediatek/mt8195/Makefile | 14 + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 899 +++++ sound/soc/mediatek/mt8195/mt8195-afe-clk.h | 201 + sound/soc/mediatek/mt8195/mt8195-afe-common.h | 200 + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 3264 +++++++++++++++++ sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 929 +++++ sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 2666 ++++++++++++++ sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 393 ++ .../mt8195/mt8195-mt6359-rt1019-rt5682.c | 977 +++++ sound/soc/mediatek/mt8195/mt8195-reg.h | 2793 ++++++++++++++ 16 files changed, 12562 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml create mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml create mode 100644 sound/soc/mediatek/mt8195/Makefile create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-clk.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-clk.h create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-common.h create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-pcm.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-dai-adda.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-dai-etdm.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-dai-pcm.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-reg.h -- 2.18.0

2 9

[PATCH] ALSA: hda: Enable runtime PM when codec probe fails
by Kai-Heng Feng 02 Jul '21

02 Jul '21

When codec probe fails, it doesn't enable runtime suspend, and can prevent graphics card from getting powered down: [ 4.280991] snd_hda_intel 0000:01:00.1: no codecs initialized $ cat /sys/bus/pci/devices/0000:01:00.1/power/runtime_status active So enable runtime PM when codec probe fails, to let graphics card be able to runtime suspend again. Merge azx_probe_continue() into azx_probe() and just let probe fail for this case could be a better approach. However that's a much bigger task so let's settle with a quirk workaround. BugLink: https://bugs.launchpad.net/bugs/1907212 Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 6852668f1bcb..3fd920069268 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2328,7 +2328,7 @@ static int azx_probe_continue(struct azx *chip) if (bus->codec_mask) { err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]); if (err < 0) - goto out_free; + goto out_enable_rpm; } #ifdef CONFIG_SND_HDA_PATCH_LOADER @@ -2360,6 +2360,7 @@ static int azx_probe_continue(struct azx *chip) set_default_power_save(chip); +out_enable_rpm: if (azx_has_pm_runtime(chip)) { pm_runtime_use_autosuspend(&pci->dev); pm_runtime_allow(&pci->dev); -- 2.29.2

8 32

[PATCH 0/3] ALSA: firewire: media clock recovery for syt-aware devices
by Takashi Sakamoto 02 Jul '21

02 Jul '21

Hi, In a commit f9e5ecdfc2c2 ("ALSA: firewire-lib: add replay target to cache sequence of packet"), I categorize devices supported by drivers in ALSA firewire stack in terms of the way to deliver effective sampling transfer frequency. This patchset is for the devices in group 2. The devices are known to have problems when ALSA dice/bebob drivers handle. Many of them sometimes transfer packets with discontinued counter, corrupt at break of CMP connection, generates bus-reset voluntarily. The devices interpret presentation time to decide playback timing. The drivers process presentation time expressed in syt field of CIP header for outgoing packets. Current implementation of the drivers processes the sequence of outgoing packet by computation according to nominal sampling transfer frequency, assisted by ALSA IEC 61883-1/6 packet streaming engine. However, the ideal sequence is not adequate to the devices, actually. With this patchset, the drivers are going to replay the sequence of incoming packets for media clock recovery. For the detail of sequence replay, please refer to a commit 39c2649c71d8 ("ALSA: firewire-lib: replay sequence of incoming packets for outgoing packets"). Takashi Sakamoto (3): ALSA: dice: wait just for NOTIFY_CLOCK_ACCEPTED after GLOBAL_CLOCK_SELECT operation ALSA: dice: perform sequence replay for media clock recovery ALSA: bebob: perform sequence replay for media clock recovery sound/firewire/bebob/bebob_stream.c | 13 +++++++--- sound/firewire/dice/dice-stream.c | 35 +++++++++----------------- sound/firewire/dice/dice-transaction.c | 2 +- 3 files changed, 22 insertions(+), 28 deletions(-) -- 2.27.0

3 5

[PATCH] ALSA: usb-audio: scarlett2: Fix for loop increment in scarlett2_usb_get_config
by Nathan Chancellor 01 Jul '21

01 Jul '21

Clang warns: sound/usb/mixer_scarlett_gen2.c:1189:32: warning: expression result unused [-Wunused-value] for (i = 0; i < count; i++, (u16 *)buf++) ^ ~~~~~ 1 warning generated. It appears the intention was to cast the void pointer to a u16 pointer so that the data could be iterated through like an array of u16 values. However, the cast happens after the increment because a cast is an rvalue, whereas the post-increment operator only works on lvalues, so the loop does not iterate as expected. Replace the post-increment shorthand with the full expression so the cast can be added in the right place and the look works as expected. Fixes: ac34df733d2d ("ALSA: usb-audio: scarlett2: Update get_config to do endian conversion") Link: https://github.com/ClangBuiltLinux/linux/issues/1408 Signed-off-by: Nathan Chancellor <nathan(a)kernel.org> --- sound/usb/mixer_scarlett_gen2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index fcba682cd422..c20c7f1ddc50 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -1186,7 +1186,7 @@ static int scarlett2_usb_get_config( if (err < 0) return err; if (size == 2) - for (i = 0; i < count; i++, (u16 *)buf++) + for (i = 0; i < count; i++, buf = (u16 *)buf + 1) *(u16 *)buf = le16_to_cpu(*(__le16 *)buf); return 0; } base-commit: 5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28 -- 2.32.0.93.g670b81a890

3 10

[PATCH] ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits
by Kyle Russell 01 Jul '21

01 Jul '21

These are backwards from Table 7-71 of the TLV320AIC3100 spec [1]. This was broken in 12eb4d66ba2e when BCLK_MASTER and WCLK_MASTER were converted from 0x08 and 0x04 to BIT(2) and BIT(3), respectively. -#define AIC31XX_BCLK_MASTER 0x08 -#define AIC31XX_WCLK_MASTER 0x04 +#define AIC31XX_BCLK_MASTER BIT(2) +#define AIC31XX_WCLK_MASTER BIT(3) Probably just a typo since the defines were not listed in bit order. [1] https://www.ti.com/lit/gpn/tlv320aic3100 Signed-off-by: Kyle Russell <bkylerussell(a)gmail.com> --- sound/soc/codecs/tlv320aic31xx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index 81952984613d..2513922a0292 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -151,8 +151,8 @@ struct aic31xx_pdata { #define AIC31XX_WORD_LEN_24BITS 0x02 #define AIC31XX_WORD_LEN_32BITS 0x03 #define AIC31XX_IFACE1_MASTER_MASK GENMASK(3, 2) -#define AIC31XX_BCLK_MASTER BIT(2) -#define AIC31XX_WCLK_MASTER BIT(3) +#define AIC31XX_BCLK_MASTER BIT(3) +#define AIC31XX_WCLK_MASTER BIT(2) /* AIC31XX_DATA_OFFSET */ #define AIC31XX_DATA_OFFSET_MASK GENMASK(7, 0) -- 2.25.1

2 1

[PATCH 0/2] arm64: tegra: Enable audio IOMMU support on Tegra194
by Thierry Reding 01 Jul '21

01 Jul '21

From: Thierry Reding <treding(a)nvidia.com> This small series addresses a minor issue with how IOMMU support is wired up on various Tegra generations. Currently the virtual "card" device is used to allocate DMA memory for, but since that device does not actually exist, the path to memory cannot be correctly described. To address this, this series moves to using the ADMAIF as the DMA device for audio. This is a real device that can have a proper DMA mask set and with which a stream ID can be associated with in the SMMU. The memory accesses technically originate from the ADMA controller (that the ADMAIF uses), but DMA channel are dynamically allocated at runtime while DMA memory is allocated at driver load time, drivers won't have access to the ADMA device yet. Further patches will be required to correct this issue on Tegra186 and Tegra210, but I wanted to get feedback on this approach first. Thierry Thierry Reding (2): ASoC: tegra: Use ADMAIF component for DMA allocations arm64: tegra: Enable audio IOMMU support on Tegra194 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 4 ++++ sound/soc/tegra/tegra_pcm.c | 21 +++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) -- 2.32.0

2 5