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

AIF2 ADC Stereo Capture Route is uninitialised in alsa-ucm-conf
by GitHub issues - edited 16 Sep '23

16 Sep '23

alsa-project/alsa-ucm-conf issue #351 was edited from broukema: DESCRIPTION: `AIF2 ADC Stereo Capture Route` is not initialised in `alsa-ucm-conf`. This implies that if its setting is significant, any accidental change by the user (using any of the various `alsa` tools) to a wrong setting will not be corrected by any of the three `PinePhone/*.conf` files, leading, in particular, to audio errors during a phone call. This was discovered by testing variations on the Mobian version of the PinePhone alsa-ucm-conf files. CODING ARGUMENT: All parameters that can significantly affect the audio system should be either initialised or overridden in configuration files that the user expects to necessarily work, such as those for phone calls. In `alsa-ucm-conf` commit b68aa52 (one beyond v1.2.10): ```` $ grep -ri "AIF2 ADC Stereo Capture" . $ ```` shows that `AIF2 ADC Stereo Capture Route` is not set for any device at all (PinePhone or other). HARDWARE ARGUMENT: For the PinePhone (PP), Megi recommends in https://xnux.eu/devices/feature/audio-pp.html that `AIF2 ADC Stereo Capture Route` is set to `Mix Mono`. TESTING ARGUMENT: Experimentation with different stored alsa settings (from ```` sudo alsactl store -f - > YYYYMMDD_example_alsa_settings ```` ) showed that settings files whose only substantial difference was in the setting of `AIF2 ADC Stereo Capture Route` had the effect that audio from the PP was heard on the remote phone when the value was `Mix Mono` and was not heard with the value `Stereo`. Testing was done with the equivalent of https://codeberg.org/boud/pinephone_hacks/src/commit/7c7b6660a4446a24747f2c… with the settings file https://codeberg.org/boud/pinephone_hacks/src/commit/7c7b6660a4446a24747f2c… that has the `Mix Mono` value selected. RECOMMENDATIONS: * `AIF2 ADC Stereo Capture Route` should be initialised or set to *something* in one of the .conf files (in the PP case, most likely in `VoiceCall.conf`), at least for the PinePhone, to prevent users who experiment and have difficulty remembering which of the 50 PinePhone alsa parameters should be set in which way from accidentally sabotaging their otherwise working audio calls; * Based on Megi's 2020 page and my testing, it seems that the correct value should be `Mix Mono`. COMMENT: While setting all 50 of the alsa settings for the PinePHone ```` $ sudo alsactl store -f - |grep "name " |wc 50 258 1788 ```` in the .conf files is most likely unnecessary, there could be others that are necessary too. Ideally, someone who really understands how the PP audio system works (including Megi's two diagrams at https://xnux.eu/devices/feature/audio-pp.html) should be able to make these recommendations. Some other phones may need this or other parameters initialised too. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/351 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ALSA: rawmidi: Fix NULL dereference at proc read
by Takashi Iwai 16 Sep '23

16 Sep '23

At the implementation of the optional proc fs in rawmidi, I forgot that rmidi->ops itself is optional and can be NULL. Add the proper NULL check for avoiding the Oops. Fixes: fa030f666d24 ("ALSA: ump: Additional proc output") Reported-and-tested-by: Mark Hills <mark(a)xwax.org> Closes: https://lore.kernel.org/r/ef9118c3-a2eb-d0ff-1efa-cc5fb6416bde@xwax.org Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/rawmidi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index ba06484ac4aa..1431cb997808 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -1770,7 +1770,7 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry, if (IS_ENABLED(CONFIG_SND_UMP)) snd_iprintf(buffer, "Type: %s\n", rawmidi_is_ump(rmidi) ? "UMP" : "Legacy"); - if (rmidi->ops->proc_read) + if (rmidi->ops && rmidi->ops->proc_read) rmidi->ops->proc_read(entry, buffer); mutex_lock(&rmidi->open_mutex); if (rmidi->info_flags & SNDRV_RAWMIDI_INFO_OUTPUT) { -- 2.35.3

1 0

[REGRESSION] rust midir MIDI library causes kernel oops
by Ash Holland 16 Sep '23

16 Sep '23

Hello, I upgraded to Linux 6.5 and found that my MIDI-input application no longer works, and causes an oops when I launch it. The application can be found at https://github.com/sersorrel/lp; `cargo run` is enough to cause the oops, though it has many undocumented dependencies, sorry (including a Novation Launchpad Mini Mk3). Once the oops occurs, it seems like it can still send MIDI to the Launchpad (i.e. display things on it), but input from the Launchpad doesn't work. I use NixOS with minimally-altered kernel configuration (blacklisted r8152 module and `amdgpu.reset_method=4` parameter), and was happily using kernel 6.4.9 or so before upgrading to 6.5. I bisected this to: commit f80e6d60d677be1d4dbbcdbf97379b8fbcf97ff0 Author: Takashi Iwai <tiwai(a)suse.de> Date: 2023-05-23 09:53:38 +0200 ALSA: seq: Clear padded bytes at expanding events There can be a small memory hole that may not be cleared at expanding an event with the variable length type. Make sure to clear it. Reviewed-by: Jaroslav Kysela <perex(a)perex.cz> Link: https://lore.kernel.org/r/20230523075358.9672-18-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> #regzbot introduced: f80e6d60d677be1d4dbbcdbf97379b8fbcf97ff0 I guess the problematic part is the `memset(buf + len, 0, newlen - len)`, which tries to memset a buffer that can be allocated in userspace. The oops: Sep 02 13:40:35 kernel: BUG: unable to handle page fault for address: 000055efb39dffb5 Sep 02 13:40:35 kernel: #PF: supervisor write access in kernel mode Sep 02 13:40:36 kernel: #PF: error_code(0x0003) - permissions violation Sep 02 13:40:36 kernel: PGD 1aff38067 P4D 1aff38067 PUD 1aff37067 PMD 1a975f067 PTE 80000001b315b067 Sep 02 13:40:36 kernel: Oops: 0003 [#1] PREEMPT SMP NOPTI Sep 02 13:40:36 kernel: CPU: 3 PID: 4441 Comm: midir ALSA inpu Not tainted 6.5.0 #1-NixOS Sep 02 13:40:36 kernel: Hardware name: To Be Filled By O.E.M. X570S PG Riptide/X570S PG Riptide, BIOS P5.01 01/17/2023 Sep 02 13:40:36 kernel: RIP: 0010:memset+0xf/0x20 Sep 02 13:40:36 kernel: Code: 44 88 1f e9 83 69 01 00 0f 1f 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 f3 0f 1e fa 66 90 49 89 f9 40 88 f0 48 89 d1 <f3> aa 4c 89 c8 e9 57 69 01 00 0f 1f 80 00 00 00 00 90 90 90 90 90 Sep 02 13:40:36 kernel: RSP: 0018:ffffa699c3607dd0 EFLAGS: 00010202 Sep 02 13:40:36 kernel: RAX: 0000000000000000 RBX: 0000000000000009 RCX: 0000000000000013 Sep 02 13:40:36 kernel: RDX: 0000000000000013 RSI: 0000000000000000 RDI: 000055efb39dffb5 Sep 02 13:40:36 kernel: RBP: 000000000000001c R08: 0000000000000009 R09: 000055efb39dffb5 Sep 02 13:40:36 kernel: R10: ffffa699c3607e68 R11: 0000000000000000 R12: 000055efb39dffac Sep 02 13:40:36 kernel: R13: 000055efb39dff00 R14: ffff9d2a2bd671e0 R15: ffff9d2aa2b36d00 Sep 02 13:40:36 kernel: FS: 00007fe33e2d86c0(0000) GS:ffff9d38feac0000(0000) knlGS:0000000000000000 Sep 02 13:40:36 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 Sep 02 13:40:36 kernel: CR2: 000055efb39dffb5 CR3: 000000018e25c000 CR4: 0000000000750ee0 Sep 02 13:40:36 kernel: PKRU: 55555554 Sep 02 13:40:36 kernel: Call Trace: Sep 02 13:40:36 kernel: <TASK> Sep 02 13:40:36 kernel: ? __die+0x23/0x70 Sep 02 13:40:36 kernel: ? page_fault_oops+0x17d/0x4b0 Sep 02 13:40:36 kernel: ? exc_page_fault+0x6d/0x150 Sep 02 13:40:36 kernel: ? asm_exc_page_fault+0x26/0x30 Sep 02 13:40:36 kernel: ? memset+0xf/0x20 Sep 02 13:40:36 kernel: snd_seq_expand_var_event+0x6b/0xa0 [snd_seq] Sep 02 13:40:36 kernel: snd_seq_read+0x1b5/0x270 [snd_seq] Sep 02 13:40:36 kernel: vfs_read+0xaf/0x350 Sep 02 13:40:36 kernel: ? srso_alias_return_thunk+0x5/0x7f Sep 02 13:40:36 kernel: ? __fget_light+0x9d/0x100 Sep 02 13:40:36 kernel: ksys_read+0xbb/0xf0 Sep 02 13:40:36 kernel: do_syscall_64+0x3e/0x90 Sep 02 13:40:36 kernel: entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Sep 02 13:40:36 kernel: RIP: 0033:0x7fe33ebf074c Sep 02 13:40:36 kernel: Code: ec 28 48 89 54 24 18 48 89 74 24 10 89 7c 24 08 e8 59 bb f8 ff 48 8b 54 24 18 48 8b 74 24 10 41 89 c0 8b 7c 24 08 31 c0 0f 05 <48> 3d 00 f0 ff ff 77 34 44 89 c7 48 89 44 24 08 e8 af bb f8 ff 48 Sep 02 13:40:36 kernel: RSP: 002b:00007fe33e2d7a70 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 Sep 02 13:40:36 kernel: RAX: ffffffffffffffda RBX: 000055efb39d9440 RCX: 00007fe33ebf074c Sep 02 13:40:36 kernel: RDX: 00000000000036b0 RSI: 000055efb39dff90 RDI: 0000000000000005 Sep 02 13:40:36 kernel: RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000020 Sep 02 13:40:36 kernel: R10: 2b7b3401fd8f65e7 R11: 0000000000000246 R12: 00007fe33e2d7d01 Sep 02 13:40:36 kernel: R13: 00007fe33e2d7b80 R14: 00007fe32c000cd0 R15: 0000000000000001 Sep 02 13:40:36 kernel: </TASK> Sep 02 13:40:36 kernel: Modules linked in: snd_hrtimer snd_seq_midi snd_seq_dummy snd_seq_midi_event snd_seq xt_MASQUERADE xt_mark nft_chain_nat nf_nat af_packet rfkill amdgpu snd_hda_codec_realtek snd_hda_codec_generic nls_iso8859_1 nls_cp437 ledtrig_audio vfat fat amdxcp snd_hda_codec_hdmi iommu_v2 drm_buddy gpu_sc> Sep 02 13:40:36 kernel: xt_tcpudp nft_compat nf_tables sch_fq_codel nfnetlink uinput i2c_piix4 i2c_dev ctr atkbd libps2 serio vivaldi_fmap loop tun tap macvlan bridge stp llc kvm_amd ccp kvm drm irqbypass fuse deflate efi_pstore backlight configfs efivarfs dmi_sysfs ip_tables x_tables autofs4 dm_crypt cbc encrypted_> Sep 02 13:40:36 kernel: CR2: 000055efb39dffb5 Sep 02 13:40:36 kernel: ---[ end trace 0000000000000000 ]--- thanks, Ash -- Ash Holland, she/her

3 8

[PATCH] ASoC: cs42l43: Add shared IRQ flag for shutters
by Charles Keepax 16 Sep '23

16 Sep '23

The microphone and speaker shutters on cs42l43 can be configured to trigger from the same GPIO, in this case the current code returns an error as we attempt to request two IRQ handlers for the same IRQ. Fix this by always requesting the shutter IRQs with the IRQF_SHARED flag. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/cs42l43.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c index 1a95c370fc4c9..5643c666d7d04 100644 --- a/sound/soc/codecs/cs42l43.c +++ b/sound/soc/codecs/cs42l43.c @@ -2077,7 +2077,8 @@ static const struct cs42l43_irq cs42l43_irqs[] = { static int cs42l43_request_irq(struct cs42l43_codec *priv, struct irq_domain *dom, const char * const name, - unsigned int irq, irq_handler_t handler) + unsigned int irq, irq_handler_t handler, + unsigned long flags) { int ret; @@ -2087,8 +2088,8 @@ static int cs42l43_request_irq(struct cs42l43_codec *priv, dev_dbg(priv->dev, "Request IRQ %d for %s\n", ret, name); - ret = devm_request_threaded_irq(priv->dev, ret, NULL, handler, IRQF_ONESHOT, - name, priv); + ret = devm_request_threaded_irq(priv->dev, ret, NULL, handler, + IRQF_ONESHOT | flags, name, priv); if (ret) return dev_err_probe(priv->dev, ret, "Failed to request IRQ %s\n", name); @@ -2124,11 +2125,11 @@ static int cs42l43_shutter_irq(struct cs42l43_codec *priv, return 0; } - ret = cs42l43_request_irq(priv, dom, close_name, close_irq, handler); + ret = cs42l43_request_irq(priv, dom, close_name, close_irq, handler, IRQF_SHARED); if (ret) return ret; - return cs42l43_request_irq(priv, dom, open_name, open_irq, handler); + return cs42l43_request_irq(priv, dom, open_name, open_irq, handler, IRQF_SHARED); } static int cs42l43_codec_probe(struct platform_device *pdev) @@ -2178,7 +2179,8 @@ static int cs42l43_codec_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(cs42l43_irqs); i++) { ret = cs42l43_request_irq(priv, dom, cs42l43_irqs[i].name, - cs42l43_irqs[i].irq, cs42l43_irqs[i].handler); + cs42l43_irqs[i].irq, + cs42l43_irqs[i].handler, 0); if (ret) goto err_pm; } -- 2.30.2

2 1

[PATCH][next] ASoC: cs42l43: make const array controls static
by Colin Ian King 16 Sep '23

16 Sep '23

Don't populate the const array controls on the stack, instead make it static. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/codecs/cs42l43.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c index 1a95c370fc4c..4e3bc15f1b25 100644 --- a/sound/soc/codecs/cs42l43.c +++ b/sound/soc/codecs/cs42l43.c @@ -162,7 +162,7 @@ CS42L43_IRQ_COMPLETE(load_detect) static irqreturn_t cs42l43_mic_shutter(int irq, void *data) { struct cs42l43_codec *priv = data; - const char * const controls[] = { + static const char * const controls[] = { "Decimator 1 Switch", "Decimator 2 Switch", "Decimator 3 Switch", -- 2.39.2

3 2

[PATCH] ASoC: SOF: Intel: MTL: Reduce the DSP init timeout
by Peter Ujfalusi 16 Sep '23

16 Sep '23

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> 20s seems unnecessarily large for the DSP init timeout. This coupled with multiple FW boot attempts causes an excessive delay in the error path when booting in recovery mode. Reduce it to 0.5s and use the existing HDA_DSP_INIT_TIMEOUT_US. Link: https://github.com/thesofproject/linux/issues/4565 Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/intel/mtl.c | 2 +- sound/soc/sof/intel/mtl.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c index b84ca58da9d5..f9412517eaf2 100644 --- a/sound/soc/sof/intel/mtl.c +++ b/sound/soc/sof/intel/mtl.c @@ -460,7 +460,7 @@ int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot) /* step 3: wait for IPC DONE bit from ROM */ ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, chip->ipc_ack, status, ((status & chip->ipc_ack_mask) == chip->ipc_ack_mask), - HDA_DSP_REG_POLL_INTERVAL_US, MTL_DSP_PURGE_TIMEOUT_US); + HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_INIT_TIMEOUT_US); if (ret < 0) { if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS) dev_err(sdev->dev, "timeout waiting for purge IPC done\n"); diff --git a/sound/soc/sof/intel/mtl.h b/sound/soc/sof/intel/mtl.h index 02181490f12a..95696b3d7c4c 100644 --- a/sound/soc/sof/intel/mtl.h +++ b/sound/soc/sof/intel/mtl.h @@ -62,7 +62,6 @@ #define MTL_DSP_IRQSTS_IPC BIT(0) #define MTL_DSP_IRQSTS_SDW BIT(6) -#define MTL_DSP_PURGE_TIMEOUT_US 20000000 /* 20s */ #define MTL_DSP_REG_POLL_INTERVAL_US 10 /* 10 us */ /* Memory windows */ -- 2.42.0

2 1

[PATCH 00/19] ASoC: Intel: machine driver update
by Bard Liao 16 Sep '23

16 Sep '23

Some cleanups from Brent Lu for I2S platforms. And minor additions for RVPs and Chromebooks. Balamurugan C (1): ASoC: Intel: sof_rt5682: add HDMI_In capture feature support for RPL. Brent Lu (16): ASoC: Intel: sof_rt5682: cleanup unnecessary quirk flag ASoC: Intel: ssp-common: support codec detection ASoC: Intel: use ACPI HID definition in ssp-common ASoC: Intel: sof_rt5682: use ssp-common module to detect codec ASoC: Intel: sof_cs42l42: use ssp-common module to detect codec ASoC: Intel: sof_ssp_amp: use ssp-common module to detect codec ASoC: Intel: sof_nau8825: use ssp-common module to detect codec ASoC: Intel: sof_rt5682: add adl_rt5650 board config ASoC: Intel: sof_ssp_amp: do not create amp link for nocodec board ASoC: Intel: nuvoton-common: support nau8318 amplifier ASoC: Intel: sof_nau8825: use nuvoton-common module ASoC: Intel: sof_nau8825: use realtek-common module ASoC: Intel: sof_da7219: rename driver file and kernel option ASoC: Intel: sof_da7219: use maxim-common module ASoC: Intel: sof_da7219: add adl_mx98360_da7219 board config ASoC: Intel: sof_da7219: use ssp-common module to detect codec Uday M Bhat (2): ASoC: Intel: sof_rt5682: Add support for Rex with discrete BT offload. ASoC: Intel: sof_rt5682: Modify number of HDMI to 3 for MTL/Rex devices sound/soc/intel/boards/Kconfig | 24 +- sound/soc/intel/boards/Makefile | 10 +- sound/soc/intel/boards/sof_cirrus_common.h | 9 +- sound/soc/intel/boards/sof_cs42l42.c | 55 +- .../{sof_da7219_max98373.c => sof_da7219.c} | 361 ++++++++----- sound/soc/intel/boards/sof_maxim_common.h | 13 +- sound/soc/intel/boards/sof_nau8825.c | 168 +++---- sound/soc/intel/boards/sof_nuvoton_common.c | 73 +++ sound/soc/intel/boards/sof_nuvoton_common.h | 22 + sound/soc/intel/boards/sof_realtek_common.h | 37 +- sound/soc/intel/boards/sof_rt5682.c | 473 ++++++++++-------- sound/soc/intel/boards/sof_ssp_amp.c | 114 +++-- sound/soc/intel/boards/sof_ssp_common.c | 101 ++++ sound/soc/intel/boards/sof_ssp_common.h | 71 +++ .../intel/common/soc-acpi-intel-adl-match.c | 19 + .../intel/common/soc-acpi-intel-jsl-match.c | 12 +- .../intel/common/soc-acpi-intel-rpl-match.c | 7 + 17 files changed, 1008 insertions(+), 561 deletions(-) rename sound/soc/intel/boards/{sof_da7219_max98373.c => sof_da7219.c} (56%) create mode 100644 sound/soc/intel/boards/sof_nuvoton_common.c create mode 100644 sound/soc/intel/boards/sof_nuvoton_common.h create mode 100644 sound/soc/intel/boards/sof_ssp_common.c create mode 100644 sound/soc/intel/boards/sof_ssp_common.h -- 2.25.1

2 20

[PATCH] ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful
by Peter Ujfalusi 16 Sep '23

16 Sep '23

All the fail paths during probe will free up the ops, on remove we should only free it if the probe was successful. Fixes: bc433fd76fae ("ASoC: SOF: Add ops_free") Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> --- sound/soc/sof/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 30db685cc5f4..2d1616b81485 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -486,10 +486,9 @@ int snd_sof_device_remove(struct device *dev) snd_sof_ipc_free(sdev); snd_sof_free_debug(sdev); snd_sof_remove(sdev); + sof_ops_free(sdev); } - sof_ops_free(sdev); - /* release firmware */ snd_sof_fw_unload(sdev); -- 2.42.0

2 1

[PATCH 1/1] ASoC: Intel: common: add ACPI matching tables for Arrow Lake
by Bard Liao 16 Sep '23

16 Sep '23

From: Arun T <arun.t(a)intel.com> Initial support for ARL w/ RT711 Signed-off-by: Arun T <arun.t(a)intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- include/sound/soc-acpi-intel-match.h | 2 + sound/soc/intel/common/Makefile | 1 + .../intel/common/soc-acpi-intel-arl-match.c | 51 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 sound/soc/intel/common/soc-acpi-intel-arl-match.c diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h index e49b97d9e3ff..845e7608ac37 100644 --- a/include/sound/soc-acpi-intel-match.h +++ b/include/sound/soc-acpi-intel-match.h @@ -32,6 +32,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[]; @@ -42,6 +43,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[]; /* * generic table used for HDA codec-based platforms, possibly with diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index 07aa37dd90e9..f7370e5b4e9e 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -10,6 +10,7 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m soc-acpi-intel-tgl-match.o soc-acpi-intel-ehl-match.o \ soc-acpi-intel-jsl-match.o soc-acpi-intel-adl-match.o \ soc-acpi-intel-rpl-match.o soc-acpi-intel-mtl-match.o \ + soc-acpi-intel-arl-match.o \ soc-acpi-intel-lnl-match.o \ soc-acpi-intel-hda-match.o \ soc-acpi-intel-sdw-mockup-match.o diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c new file mode 100644 index 000000000000..e52797aae6e6 --- /dev/null +++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * soc-apci-intel-arl-match.c - tables and support for ARL ACPI enumeration. + * + * Copyright (c) 2023 Intel Corporation. + */ + +#include <sound/soc-acpi.h> +#include <sound/soc-acpi-intel-match.h> + +static const struct snd_soc_acpi_endpoint single_endpoint = { + .num = 0, + .aggregated = 0, + .group_position = 0, + .group_id = 0, +}; + +static const struct snd_soc_acpi_adr_device rt711_0_adr[] = { + { + .adr = 0x000020025D071100ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt711" + } +}; + +static const struct snd_soc_acpi_link_adr arl_rvp[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt711_0_adr), + .adr_d = rt711_0_adr, + }, + {} +}; + +struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[] = { + {}, +}; +EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_machines); + +/* this table is used when there is no I2S codec present */ +struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = { + { + .link_mask = 0x1, /* link0 required */ + .links = arl_rvp, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-arl-rt711.tplg", + }, + {}, +}; +EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_sdw_machines); -- 2.25.1

2 1

[PATCH 0/4] ASoC: intel: sof_sdw: Remove large global CPUs array
by Bard Liao 16 Sep '23

16 Sep '23

Rather than keeping a single array of CPU dai link components allocate a smaller one for each DAI link, this reduces the amount of state that needs to be passed back and forth in the driver. Charles Keepax (4): ASoC: intel: sof_sdw: Move sdw_pin_index into private struct ASoC: intel: sof_sdw: Add simple DAI link creation helper ASoC: intel: sof_sdw: Make create_sdw_dailink allocate link components ASoC: intel: sof_sdw: Increment be_id in init_dai_link sound/soc/intel/boards/sof_sdw.c | 244 ++++++++++-------------- sound/soc/intel/boards/sof_sdw_common.h | 4 + 2 files changed, 101 insertions(+), 147 deletions(-) -- 2.25.1

2 5