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

make check fails to compile playmidi1.c: "error: expected identifier or '(' before numeric constant"
by GitHub issues - opened 22 Dec '24

22 Dec '24

alsa-project/alsa-lib issue #430 was opened from 746B61: Getting the latest version from branch master (352cbc5e) and running `./gitcompile` followed by `make check` fails with: ``` Making check in test make[1]: Entering directory '/tmp/alsa-lib-master/test' Making check in . make[2]: Entering directory '/tmp/alsa-lib-master/test' make control pcm pcm_min latency seq seq-ump-example playmidi1 timer rawmidi midiloop umpinfo oldapi queue_timer namehint client_event_filter chmap audio_time user-ctl-element-set pcm-multi-thread make[3]: Entering directory '/tmp/alsa-lib-master/test' CC control.o CCLD control CC pcm.o CCLD pcm CC pcm_min.o CCLD pcm_min CC latency.o CCLD latency CC seq.o In file included from seq.c:12: seq-sender.c: In function 'event_sender': seq-sender.c:150:62: warning: variable 'pcm_flag' set but not used [-Wunused-but-set-variable] 150 | int client, port, queue, max, err, v1, v2, time = 0, pcm_flag = 0; | ^~~~~~~~ CCLD seq CC seq-ump-example.o CCLD seq-ump-example CC playmidi1.o In file included from playmidi1.c:48: midifile.h:55:33: error: expected identifier or '(' before numeric constant 55 | #define note_on 0x90 | ^~~~ ../include/alsa/ump_msg.h:170:41: note: in expansion of macro 'note_on' 170 | snd_ump_msg_midi1_note_t note_on; /**< MIDI1 note-on message */ | ^~~~~~~ midifile.h:54:33: error: expected identifier or '(' before numeric constant 54 | #define note_off 0x80 | ^~~~ ../include/alsa/ump_msg.h:171:41: note: in expansion of macro 'note_off' 171 | snd_ump_msg_midi1_note_t note_off; /**< MIDI1 note-off message */ | ^~~~~~~~ midifile.h:57:33: error: expected identifier or '(' before numeric constant 57 | #define control_change 0xb0 | ^~~~ ../include/alsa/ump_msg.h:173:41: note: in expansion of macro 'control_change' 173 | snd_ump_msg_midi1_cc_t control_change; /**< MIDI1 control-change message */ | ^~~~~~~~~~~~~~ midifile.h:55:33: error: expected identifier or '(' before numeric constant 55 | #define note_on 0x90 | ^~~~ ../include/alsa/ump_msg.h:432:41: note: in expansion of macro 'note_on' 432 | snd_ump_msg_midi2_note_t note_on; /**< MIDI2 note-on message */ | ^~~~~~~ midifile.h:54:33: error: expected identifier or '(' before numeric constant 54 | #define note_off 0x80 | ^~~~ ../include/alsa/ump_msg.h:433:41: note: in expansion of macro 'note_off' 433 | snd_ump_msg_midi2_note_t note_off; /**< MIDI2 note-off message */ | ^~~~~~~~ midifile.h:57:33: error: expected identifier or '(' before numeric constant 57 | #define control_change 0xb0 | ^~~~ ../include/alsa/ump_msg.h:438:41: note: in expansion of macro 'control_change' 438 | snd_ump_msg_midi2_cc_t control_change; /**< MIDI2 control-change message */ | ^~~~~~~~~~~~~~ In file included from playmidi1.c:49: midifile.c:57:33: error: expected identifier or '(' before numeric constant 57 | #define set_tempo 0x51 | ^~~~ ../include/alsa/ump_msg.h:711:41: note: in expansion of macro 'set_tempo' 711 | snd_ump_msg_set_tempo_t set_tempo; /**< Set Tempo */ | ^~~~~~~~~ make[3]: *** [Makefile:622: playmidi1.o] Error 1 make[3]: Leaving directory '/tmp/alsa-lib-master/test' make[2]: *** [Makefile:819: check-am] Error 2 make[2]: Leaving directory '/tmp/alsa-lib-master/test' make[1]: *** [Makefile:669: check-recursive] Error 1 make[1]: Leaving directory '/tmp/alsa-lib-master/test' make: *** [Makefile:414: check-recursive] Error 1 ``` The issue was introduced with commit 07cee0ba. playmidi1.c first [includes](https://github.com/alsa-project/alsa-lib/blob/352cbc5eb94a271a9c3… midifile.h from the test directory, which [has](https://github.com/alsa-project/alsa-lib/blob/352cbc5eb94a271a9c3c0ff5… `#define note_on 0x90`. After commit 07cee0ba, ump_msg.h gets included later, which [has](https://github.com/alsa-project/alsa-lib/blob/352cbc5eb94a271a9c3c0ff5… ` snd_ump_msg_midi1_note_t note_on; /**< MIDI1 note-on message */`. The preprocessor replaces `note_on` with `0x90` and the compilation fails with the error above. Issue URL : https://github.com/alsa-project/alsa-lib/issues/430 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

sun4i-codec: add routing for headphones and internal speaker
by GitHub pull_request - opened 21 Dec '24

21 Dec '24

alsa-project/alsa-ucm-conf pull request #491 was opened from tokyovigilante: The sun4i-codec kernel driver covers a large number of Allwinner SoCs. The H616 codec has a single line-out route, which is used in concert with a Toshiba mux chip to send audio to either an internal speaker or headphone jack on a number of Anbernic handheld gaming devices. Add a UCM configuration to allow enabling/disabling the speaker amp depending on whether headphones are in use or not. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/491 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/491.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

API memory allocator
by GitHub issues - opened 20 Dec '24

20 Dec '24

alsa-project/alsa-lib issue #429 was opened from sylware: If I recall properly some data returned from the alsa lib API must be free using the C runtime free(). Would it be appropriate to move away from the C allocator to an API install-able memory allocator (like vulkan3D)? Backward compatibility would be achieved since the "default memory allocator" would be the C one, if the C runtime is around. Unless that part of the API is already deprecated (and I should not have used it). Issue URL : https://github.com/alsa-project/alsa-lib/issues/429 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 00/35] Reorganize kerneldoc parameter names
by Julia Lawall 20 Dec '24

20 Dec '24

Reorganize kerneldoc parameter names to match the parameter order in the function header. The misordered cases were identified using the following Coccinelle semantic patch: // <smpl> @initialize:ocaml@ @@ let parse_doc l = let pieces = List.map String.trim (String.split_on_char '*' l) in let l = String.concat " " pieces in match String.split_on_char ':' l with x::xs -> x | _ -> "" let params ps = List.rev (List.fold_left (fun prev (pm,_) -> let ty = String.trim(Pretty_print_c.string_of_fullType pm.Ast_c.p_type) in if ty = "void" && pm.Ast_c.p_namei = None then prev else let name = match pm.Ast_c.p_namei with Some name -> name | None -> failwith "function parameter has no name" in (String.trim (Pretty_print_c.string_of_name name),ty)::prev) [] ps) @r@ comments c; identifier fn; position p; parameter list ps; type T; @@ T@c fn@p(ps) { ... } @script:ocaml@ p << r.p; c << r.c; (_,ps) << r.ps; @@ let isdoc c ps = List.length ps > 1 && (let c = String.trim c in String.length c > 3 && String.sub c 0 3 = "/**" && String.get c 3 != '*') in let subset l1 l2 = List.for_all (fun x -> List.mem x l2) l1 in let (cb,cm,ca) = List.hd c in match List.rev cb with c::_ when isdoc c ps -> let pieces = String.split_on_char '@' c in (match pieces with _::tl -> let d_names = List.map parse_doc tl in (* check parameters *) let p_names = List.map fst (params ps) in if d_names <> [] && not(d_names = p_names) then begin if List.sort compare d_names = List.sort compare p_names then Coccilib.print_main "out of order" p else if subset d_names p_names then Coccilib.print_main "doc is missing a parameter" p else if subset d_names p_names then Coccilib.print_main "doc has an extra parameter" p end | _ -> ()) | _ -> () // </smpl> --- arch/arm/mach-omap2/prm2xxx_3xxx.c | 1 - arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/ps3/repository.c | 2 +- drivers/base/firmware_loader/main.c | 2 +- drivers/comedi/drivers/comedi_8254.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 3 +-- drivers/gpu/drm/drm_gpuvm.c | 2 +- drivers/gpu/drm/radeon/radeon_ib.c | 2 +- drivers/iommu/iommu.c | 2 +- drivers/leds/leds-gpio-register.c | 2 +- drivers/mfd/atmel-smc.c | 4 ++-- drivers/misc/mei/bus.c | 2 +- drivers/mtd/ubi/eba.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c | 2 +- drivers/net/ethernet/intel/e1000/e1000_hw.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 7 +++---- drivers/net/ethernet/intel/ice/ice_common.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- drivers/nvdimm/dimm_devs.c | 2 +- drivers/pci/hotplug/pci_hotplug_core.c | 2 +- drivers/pinctrl/pinmux.c | 2 +- drivers/slimbus/messaging.c | 2 +- drivers/soc/qcom/qmi_interface.c | 2 +- drivers/soundwire/stream.c | 2 +- drivers/usb/gadget/config.c | 4 ++-- fs/char_dev.c | 2 +- fs/dcache.c | 4 ++-- fs/seq_file.c | 2 +- kernel/audit.c | 2 +- kernel/resource.c | 2 +- kernel/sysctl.c | 1 - kernel/trace/ring_buffer.c | 2 +- lib/lru_cache.c | 2 +- lib/maple_tree.c | 2 +- mm/mmu_notifier.c | 2 +- net/dccp/feat.c | 2 +- net/mac80211/mesh_hwmp.c | 6 +++--- net/mac80211/mesh_pathtbl.c | 10 +++++----- net/socket.c | 2 +- net/sunrpc/xprt.c | 2 +- net/tipc/link.c | 14 +++++++------- net/tipc/msg.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- 45 files changed, 60 insertions(+), 64 deletions(-)

4 5

[alsa-ucm-conf] sof-soundwire: Use correct speaker data port and PCM for cs35l56 bridge
by Maciej Strozek 20 Dec '24

20 Dec '24

Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> --- ucm2/sof-soundwire/cs35l56-bridge.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ucm2/sof-soundwire/cs35l56-bridge.conf b/ucm2/sof-soundwire/cs35l56-bridge.conf index 176f880..2e8c1c6 100644 --- a/ucm2/sof-soundwire/cs35l56-bridge.conf +++ b/ucm2/sof-soundwire/cs35l56-bridge.conf @@ -23,8 +23,8 @@ SectionDevice."Speaker" { EnableSequence [ cset "name='cs42l43 Speaker L Input 1' 'ASPRX1'" cset "name='cs42l43 Speaker R Input 1' 'ASPRX2'" - cset "name='cs42l43 ASPTX1 Input' 'DP5RX1'" - cset "name='cs42l43 ASPTX2 Input' 'DP5RX2'" + cset "name='cs42l43 ASPTX1 Input' 'DP6RX1'" + cset "name='cs42l43 ASPTX2 Input' 'DP6RX2'" cset "name='AMPL ASP1 TX1 Source' 'DSP1TX1'" cset "name='AMPL ASP1 TX2 Source' 'None'" @@ -54,7 +54,7 @@ SectionDevice."Speaker" { Value { PlaybackPriority 100 - PlaybackPCM "hw:${CardId},0" + PlaybackPCM "hw:${CardId},2" PlaybackMixer "default:${CardId}" PlaybackMixerElem "Speaker" } -- 2.39.5

2 1

hda: how to implement component master_unbind?
by Kai Vehmanen 20 Dec '24

20 Dec '24

Hi Takashi et al, I've been having multiple discussions with our i915 team w.r.t. audio driver behaviour when the aggregate component is unbound, triggered by i915 unbind. This came up again in the recent regression with devres allocations and I now dug into the topic again. In short, I'm puzzled how to really implement this. ALSA (or ASoC) don't really have support for individual components of a card disappearing in a hotplug fashion. At card level, we do have such support (USB, firewire and recent work for PCI hotplug). But not individual components of a card getting unplugged. In current code we have this: static void hdac_component_master_unbind(struct device *dev) { » struct drm_audio_component *acomp = hdac_get_acomp(dev); » if (acomp->audio_ops && acomp->audio_ops->master_unbind) » » acomp->audio_ops->master_unbind(dev, acomp); » module_put(acomp->ops->owner); » component_unbind_all(dev, acomp); » WARN_ON(acomp->ops || acomp->dev); } ... when e.g. i915 driver is unbound (but could be any driver using the component framework, not jus Intel hw), i915 calls component_del() and HDA gets call to the above. After this, acomp ops are null are audio no longer has ability to talk to i915 driver (which makes sense given it's unbound). If audio was runtime suspended, this kind of works (but relies on some good luck). Upon HDA controller resume, we note acomp ops are NULL and HDMI/DP operations (like snd_hdac_display_power()) silently become no-ops. PCM streaming will go to /dev/null, but this is ok'ish since no monitor can be connected anyways. If audio was active, we start to get warnings or worse. Audio expects hw display codec to be powered and programmed, but suddenly it mey lose state. If the audio controller is actually part of the display hardware (e.g. discrete GPUs), then controller registers can stop functioning (they should be still available, but given the main diplay driver is unbound, odds of suprising behaviour are high). So this is less than ideal. I've been looking at options: 1) prevent/block the unbind if audio device is busy The component framework does not allow individual components to return -EBUSY, so there's no way to let others know that unbind is not possible now. This would force anyone testing DRM driver unbind to first unbind the audio driver and stop any active audio use-cases if needed. 2) unbind the ALSA card I've experimented doing a device_unregister() from the above callback, but this has not really worked (onion peeling exercise of new probelms). The code is shared by multiple controllers, so getting a handle to an snd_card object is not straighforward (drvdata is differnet for SOF and snd-hda-intel for instance). But with some new work, maybe we could call snd_card_disconnect() to detach the card and inform user-space. 3) continue as-is and try to fix bugs If audio is active, maybe we could force a acomp->put_power() to ensure a clean unregister of the display part. But this leaves a big chunk of issues especially with HDA controllers that require the display to be powered on, to function. .. Any ideas, and/or has there been prior work? It seems Takashi it's been mostly you who has been active working on the acomp integration recently. I also included Chris, Daniel and Jani who've had patches to hdac_component.c. Br, Kai

3 5

[GIT PULL] ASoC fixes for v6.13-rc3
by Mark Brown 20 Dec '24

20 Dec '24

The following changes since commit 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8: Linux 6.13-rc3 (2024-12-15 15:58:23 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.13-rc3 for you to fetch changes up to 32c9c06adb5b157ef259233775a063a43746d699: ASoC: mediatek: disable buffer pre-allocation (2024-12-19 11:15:09 +0000) ---------------------------------------------------------------- ASoC: Fixes for v6.13 A mix of quirks and small fixes, nothing too major anywhere. ---------------------------------------------------------------- Chen-Yu Tsai (2): ASoC: dt-bindings: realtek,rt5645: Fix CPVDD voltage comment ASoC: mediatek: disable buffer pre-allocation Mark Brown (1): ASoC: Intel: sof_sdw: Update DMI matches for Lenovo Peter Ujfalusi (1): ASoC: SOF: Intel: hda-dai: Do not release the link DMA on STOP Richard Fitzgerald (2): ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 21Q6 and 21Q7 ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 21QA and 21QB Shuming Fan (1): ASoC: rt722: add delay time to wait for the calibration procedure Venkata Prasad Potturu (1): ASoC: amd: ps: Fix for enabling DMIC on acp63 platform via _DSD entry .../devicetree/bindings/sound/realtek,rt5645.yaml | 2 +- sound/soc/amd/ps/pci-ps.c | 17 ++++++++++++++- sound/soc/codecs/rt722-sdca.c | 7 +++++- sound/soc/intel/boards/sof_sdw.c | 23 +++++++++++++++++--- .../soc/mediatek/common/mtk-afe-platform-driver.c | 4 ++-- sound/soc/sof/intel/hda-dai.c | 25 ++++++++++++++++------ sound/soc/sof/intel/hda.h | 2 -- 7 files changed, 64 insertions(+), 16 deletions(-)

2 1

USB-Audio: Add support for TASCAM Model 12
by GitHub pull_request - opened 20 Dec '24

20 Dec '24

alsa-project/alsa-ucm-conf pull request #490 was opened from Unveiled53: Adds support for the TASCAM Model 12 USB multi-track mixer. Couple of things to note: - This profile assumes the "USB AUDIO" setting on the mixer itself is set to "MULTI INPUT". - Under the "MULTI INPUT" mode, this mixer has 12 logical input channels (Last two are a stereo mix) and 10 logical output channels. - Most of the accessible I/O is combo XLR/TRS jacks, so I opted to have the mono capture devices (With the exception of physical inputs 8 and 10 which are TRS only) named as "Mic" with the rest as "Line". Otherwise, the profile is tested and working with the latest USB-Audio profiles. [alsa-info.txt](https://github.com/user-attachments/files/18207924/alsa-info… Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/490 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/490.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH RESEND] soundwire: amd: clear wake enable register for power off mode
by Vijendar Mukunda 19 Dec '24

19 Dec '24

As per design for power off mode, clear the wake enable register during resume sequence. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_manager.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 5a4bfaef65fb..96a3aa6da711 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -1190,6 +1190,7 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { return amd_sdw_clock_stop_exit(amd_manager); } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { + writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); if (val) { val |= AMD_SDW_CLK_RESUME_REQ; -- 2.34.1

2 2

[PATCH 00/21] ASoC: amd: acp70: add soundwire and acp pdm support
by Vijendar Mukunda 19 Dec '24

19 Dec '24

This patch series includes below changes - Add Audio IO support for ACP7.0 and ACP7.1 platforms for SoundWire IO and ACP PDM controller combination. - Add common driver modules for ACP7.0 and ACP7.1 platforms (acp pci driver, Soundwire dma driver, pdm platform driver). - Add SoundWire generic machine driver changes for legacy stack (No DSP enabled) for ACP7.0 & ACP7.1 platforms. - Add SoundWire machines for ACP7.0 & ACP7.1 platforms. Vijendar Mukunda (21): ASoC: amd: add register header file for ACP7.0 platform ASoC: amd: acp70: add acp pci driver for ACP7.0 and ACP7.1 platforms ASoC: amd: acp70: add acp init and de-init functions ASoC: amd: acp70: add logic for scanning acp child devices ASoC: amd: acp70: create platform devices for acp child nodes ASoC: amd: acp70: enable driver build for ACP7.0 platform ASoC: amd: acp70: add acp pdm platform driver ASoC: amd: acp70: add acp pdm driver dma ops and dai ops ASoC: amd: acp70: add acp soundwire dma driver ASoC: amd: update ACP7.0 KConfig option description ASoC: amd: acp70: add soundwire dma driver dma ops ASoC: amd: acp70: add acp ip interrupt handler ASoC: amd: acp70: add acp pdm driver pm ops ASoC: amd: acp70: add pm ops support for soundwire dma driver ASoC: amd: acp70: add acp driver pm ops support ASoC: amd: acp70: enable wake capability for acp pci driver ASoC: amd: acp70: add soundwire host wake interrupt handling ASoC: amd: acp70: create a device node for soundwire machine driver ASoC: amd: acp: add machine driver changes for ACP7.0 and ACP7.1 platforms ASoC: amd: acp: add RT711, RT714 & RT1316 support for ACP7.0 platform ASoC: amd: acp: amd-acp70-acpi-match: Add rt722 support include/sound/acp70_chip_offset_byte.h | 484 ++++++++++++++ sound/soc/amd/Kconfig | 12 + sound/soc/amd/Makefile | 1 + sound/soc/amd/acp/Makefile | 2 +- sound/soc/amd/acp/acp-sdw-legacy-mach.c | 16 + sound/soc/amd/acp/acp-sdw-mach-common.c | 34 + sound/soc/amd/acp/amd-acp70-acpi-match.c | 132 ++++ sound/soc/amd/acp/soc_amd_sdw_common.h | 11 + sound/soc/amd/acp70/Makefile | 9 + sound/soc/amd/acp70/acp70-pdm-dma.c | 463 +++++++++++++ sound/soc/amd/acp70/acp70-sdw-dma.c | 586 ++++++++++++++++ sound/soc/amd/acp70/acp70.h | 283 ++++++++ sound/soc/amd/acp70/pci-acp70.c | 807 +++++++++++++++++++++++ sound/soc/amd/mach-config.h | 1 + 14 files changed, 2840 insertions(+), 1 deletion(-) create mode 100644 include/sound/acp70_chip_offset_byte.h create mode 100644 sound/soc/amd/acp/amd-acp70-acpi-match.c create mode 100644 sound/soc/amd/acp70/Makefile create mode 100644 sound/soc/amd/acp70/acp70-pdm-dma.c create mode 100644 sound/soc/amd/acp70/acp70-sdw-dma.c create mode 100644 sound/soc/amd/acp70/acp70.h create mode 100644 sound/soc/amd/acp70/pci-acp70.c -- 2.34.1

2 22