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

[PATCH v5 0/9] ALSA: add virtio sound driver
by Anton Yakovlev 27 Feb '21

27 Feb '21

This series implements a driver part of the virtio sound device specification v8 [1]. The driver supports PCM playback and capture substreams, jack and channel map controls. A message-based transport is used to write/read PCM frames to/from a device. As a device part was used OpenSynergy proprietary implementation. v5 changes: - Fixed another bunch of sparse warnings (replaced virtio_cread() -> virtio_cread_le()), no functional changes. (Sorry, I didn't know how to run sparse locally, now everything should be fixed) [1] https://lists.oasis-open.org/archives/virtio-dev/202003/msg00185.html Anton Yakovlev (9): uapi: virtio_ids: add a sound device type ID from OASIS spec ALSA: virtio: add virtio sound driver ALSA: virtio: handling control messages ALSA: virtio: build PCM devices and substream hardware descriptors ALSA: virtio: handling control and I/O messages for the PCM device ALSA: virtio: PCM substream operators ALSA: virtio: introduce jack support ALSA: virtio: introduce PCM channel map support ALSA: virtio: introduce device suspend/resume support MAINTAINERS | 9 + include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_snd.h | 334 +++++++++++++++++++++ sound/Kconfig | 2 + sound/Makefile | 3 +- sound/virtio/Kconfig | 10 + sound/virtio/Makefile | 13 + sound/virtio/virtio_card.c | 462 +++++++++++++++++++++++++++++ sound/virtio/virtio_card.h | 113 ++++++++ sound/virtio/virtio_chmap.c | 219 ++++++++++++++ sound/virtio/virtio_ctl_msg.c | 310 ++++++++++++++++++++ sound/virtio/virtio_ctl_msg.h | 78 +++++ sound/virtio/virtio_jack.c | 233 +++++++++++++++ sound/virtio/virtio_pcm.c | 498 ++++++++++++++++++++++++++++++++ sound/virtio/virtio_pcm.h | 120 ++++++++ sound/virtio/virtio_pcm_msg.c | 392 +++++++++++++++++++++++++ sound/virtio/virtio_pcm_ops.c | 491 +++++++++++++++++++++++++++++++ 17 files changed, 3287 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/virtio_snd.h create mode 100644 sound/virtio/Kconfig create mode 100644 sound/virtio/Makefile create mode 100644 sound/virtio/virtio_card.c create mode 100644 sound/virtio/virtio_card.h create mode 100644 sound/virtio/virtio_chmap.c create mode 100644 sound/virtio/virtio_ctl_msg.c create mode 100644 sound/virtio/virtio_ctl_msg.h create mode 100644 sound/virtio/virtio_jack.c create mode 100644 sound/virtio/virtio_pcm.c create mode 100644 sound/virtio/virtio_pcm.h create mode 100644 sound/virtio/virtio_pcm_msg.c create mode 100644 sound/virtio/virtio_pcm_ops.c -- 2.30.0

3 27

ASoc: soc_core.c stream direction from snd_soc_dai
by Matt Flax 26 Feb '21

26 Feb '21

Hi there, A large number of audio codecs allow different formats for playback and capture. This becomes very useful when there are different latencies between playback and capture hardware data lines. For example digital isolation chips typically have a 1 bit delay in propagation as the bit clock rate gets faster for higher sample rates. By setting the capture and playback formats to differ by one or two bit clock cycles, the delay problem is solved. There doesn't seem to be a simple way to detect stream direction in the codec driver's set_fmt function. The snd_soc_runtime_set_dai_fmt function : https://github.com/torvalds/linux/blob/master/sound/soc/soc-core.c#L1480 calls the snd_soc_dai_set_fmt function : https://github.com/torvalds/linux/blob/master/sound/soc/soc-dai.c#L101 which calls the set_fmt function : https://github.com/torvalds/linux/blob/master/include/sound/soc-dai.h#L189 The snd_soc_dai_ops set_fmt function is defined as : int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); Is there a simple way to find the stream direction from a snd_soc_dai ? If the stream direction can be detected then the playback and capture formats can be set independently for the codec. It there a different way to set the playback and capture formats for the codec independently at runtime, depending on the sample rate ? Matt

5 8

[PATCH alsa-ucm-conf 0/8] codecs/rt5640: Cleanup + HW volume control support
by Hans de Goede 26 Feb '21

26 Feb '21

Hi All, Here is a patch series consisting of some codecs/rt5640 cleanups and addition of HW volume control support to the rt5640 .conf snippets. Note patch 7 and 8 depend on a new "aif:%d" part being added to the components string, the kernel patches for this are pending upstream in the "[PATCH 0/5] AsoC: rt5640/rt5651: Volume control fixes" patch series. Patches 7 and 8 should probably not be merged until the kernel patches have landed, because theoretically the new component string part could change as part of the review of the kernel patches. Regards, Hans Hans de Goede (8): codecs/rt5640: Cleanup: unify Stereo / Mono ADC handling codecs/rt5640: Cleanup: Initially disable all inputs and outputs codecs/rt5640: Cleanup: Move 'SPK MIX' setup to main EnableSequene codecs/rt5640: Drop bogus 'DIG MIXL DAC L2 Switch' setting codecs/rt5640: Unify capture volume for AIF1 and AIF2 recording paths codecs/rt5640: Add hardware volume-control support codecs/rt5640: Use the new "aif:%d" part of the components string codecs/rt5640: Specify Playback/CaptureMasterElem for HW volume-control ucm2/bytcr-rt5640/HiFi.conf | 46 +++++++++++++++++ ucm2/codecs/rt5640/DigitalMics.conf | 18 ++++++- ucm2/codecs/rt5640/EnableSeq-AIF-unknown.conf | 7 +++ ucm2/codecs/rt5640/EnableSeq-AIF1.conf | 7 +++ ucm2/codecs/rt5640/EnableSeq-AIF2.conf | 7 +++ ucm2/codecs/rt5640/EnableSeq.conf | 50 ++++++++++++++----- ucm2/codecs/rt5640/HeadPhones.conf | 15 +++++- ucm2/codecs/rt5640/HeadsetMic.conf | 24 ++++++--- ucm2/codecs/rt5640/IN1-InternalMic.conf | 27 ++++++---- ucm2/codecs/rt5640/IN3-InternalMic.conf | 27 ++++++---- ucm2/codecs/rt5640/MonoSpeaker.conf | 17 +++++-- ucm2/codecs/rt5640/Speaker.conf | 17 +++++-- 12 files changed, 211 insertions(+), 51 deletions(-) create mode 100644 ucm2/codecs/rt5640/EnableSeq-AIF-unknown.conf create mode 100644 ucm2/codecs/rt5640/EnableSeq-AIF1.conf create mode 100644 ucm2/codecs/rt5640/EnableSeq-AIF2.conf -- 2.30.1

1 8

Possible alsa bug around USB drivers
by Steven Skeard 25 Feb '21

25 Feb '21

Hey all, The last few weeks I've been plagued by inconsistent audio on my PopOS 20.10 desktop. Sometimes on boot everything would be fine, but other times I would have no working audio and only dummy devices in the audio menus. I eventually found that if I specify the modprobe order so that the USB driver (eg. for my webcam) loads after the onboard motherboard driver, that audio will work consistently. Here are the related links: - Reddit thread where I posted the original problem and the solution: https://www.reddit.com/r/pop_os/comments/lmvbj3/audio_not_working_after_upg… - A related thread where it sounds like an arch user has the same problem: https://bbs.archlinux.org/viewtopic.php?id=260373 - The alsa info I uploaded while under the effects of the problem: http://alsa-project.org/db/?f=a23ccbb818fec6eaf08b032504eac5d5d8a30589 I'm not really sure where this problem originated but I figured you guys might be able to point me in the right direction if it is not an alsa problem. I don't think I messed with the original alsa-base.conf but I suppose my memory could be failing me here. I'm not sure where this file comes from but I'm guessing it could be either a pop os, ubuntu, or alsa default configuration? Thanks, Steven Skeard

1 0

[PATCH] ASoC: rt1015p: add acpi device id for rt1015p
by jack.yu＠realtek.com 25 Feb '21

25 Feb '21

From: Jack Yu <jack.yu(a)realtek.com> Add acpi device id for rt1015p. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- sound/soc/codecs/rt1015p.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/codecs/rt1015p.c b/sound/soc/codecs/rt1015p.c index 671f2a2130fe..4a00e7a4ef6f 100644 --- a/sound/soc/codecs/rt1015p.c +++ b/sound/soc/codecs/rt1015p.c @@ -4,6 +4,7 @@ // // Copyright 2020 The Linux Foundation. All rights reserved. +#include <linux/acpi.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h> @@ -130,10 +131,21 @@ static const struct of_device_id rt1015p_device_id[] = { MODULE_DEVICE_TABLE(of, rt1015p_device_id); #endif +#ifdef CONFIG_ACPI +static const struct acpi_device_id rt1015p_acpi_match[] = { + { "RT1015", 0}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, rt1015p_acpi_match); +#endif + static struct platform_driver rt1015p_platform_driver = { .driver = { .name = "rt1015p", .of_match_table = of_match_ptr(rt1015p_device_id), +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(rt1015p_acpi_match), +#endif }, .probe = rt1015p_platform_probe, }; -- 2.29.0

3 2

[PATCH] ASoC: Intel: bytcr_rt5640: Fix HP Pavilion x2 10-p0XX OVCD current threshold
by Hans de Goede 25 Feb '21

25 Feb '21

When I added the quirk for the "HP Pavilion x2 10-p0XX" I copied the byt_rt5640_quirk_table[] entry for the HP Pavilion x2 10-k0XX / 10-n0XX models since these use almost the same settings. While doing this I accidentally also copied and kept the non-standard OVCD_TH_1500UA setting used on those models. This too low threshold is causing headsets to often be seen as headphones (without a headset-mic) and when correctly identified it is causing ghost play/pause button-presses to get detected. Correct the HP Pavilion x2 10-p0XX quirk to use the default OVCD_TH_2000UA setting, fixing these problems. Fixes: fbdae7d6d04d ("ASoC: Intel: bytcr_rt5640: Fix HP Pavilion x2 Detachable quirks") Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 24ced8e4a574..1f6a636571c2 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -581,7 +581,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { }, .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | BYT_RT5640_JD_SRC_JD1_IN4P | - BYT_RT5640_OVCD_TH_1500UA | + BYT_RT5640_OVCD_TH_2000UA | BYT_RT5640_OVCD_SF_0P75 | BYT_RT5640_MCLK_EN), }, -- 2.30.1

3 2

[PATCH v2] ALSA: hda/realtek: Enable headset mic of Acer SWIFT with ALC256
by chris.chiu＠canonical.com 25 Feb '21

25 Feb '21

From: Chris Chiu <chris.chiu(a)canonical.com> The Acer SWIFT Swift SF314-54/55 laptops with ALC256 cannot detect both the headset mic and the internal mic. Introduce new fixup to enable the jack sense and the headset mic. However, the internal mic actually connects to Intel SST audio. It still needs Intel SST support to make internal mic capture work. Signed-off-by: Chris Chiu <chris.chiu(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1927605f0f7e..4871507cd4bf 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6406,6 +6406,7 @@ enum { ALC236_FIXUP_DELL_AIO_HEADSET_MIC, ALC282_FIXUP_ACER_DISABLE_LINEOUT, ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST, + ALC256_FIXUP_ACER_HEADSET_MIC, }; static const struct hda_fixup alc269_fixups[] = { @@ -7853,6 +7854,16 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC255_FIXUP_ACER_MIC_NO_PRESENCE, }, + [ALC256_FIXUP_ACER_HEADSET_MIC] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x19, 0x02a1113c }, /* use as headset mic, without its own jack detect */ + { 0x1a, 0x90a1092f }, /* use as internal mic */ + { } + }, + .chained = true, + .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -7879,9 +7890,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x1246, "Acer Predator Helios 500", ALC299_FIXUP_PREDATOR_SPK), SND_PCI_QUIRK(0x1025, 0x1247, "Acer vCopperbox", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS), SND_PCI_QUIRK(0x1025, 0x1248, "Acer Veriton N4660G", ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1025, 0x1269, "Acer SWIFT SF314-54", ALC256_FIXUP_ACER_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), + SND_PCI_QUIRK(0x1025, 0x129c, "Acer SWIFT SF314-55", ALC256_FIXUP_ACER_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1308, "Acer Aspire Z24-890", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC), -- 2.20.1

1 0

[PATCH] ALSA: hda/realtek: Enable MICs of Acer SWIFT with ALC256
by Chris Chiu 25 Feb '21

25 Feb '21

The Acer SWIFT Swift SF314-54/55 with ALC256 cannot detect the headset microphone and suffers the noise problem in audio capture. This patch enables the headset jack sense and fixes the noise problem with aamix fixup. Signed-off-by: Chris Chiu <chris.chiu(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 290645516313..57e4dbcd76a9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6372,6 +6372,8 @@ enum { ALC236_FIXUP_DELL_AIO_HEADSET_MIC, ALC282_FIXUP_ACER_DISABLE_LINEOUT, ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST, + ALC256_FIXUP_ACER_SWIFT_NO_MIC_PRESENCE, + ALC256_FIXUP_ACER_SWIFT_DISABLE_AAMIX, }; static const struct hda_fixup alc269_fixups[] = { @@ -7815,6 +7817,22 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC255_FIXUP_ACER_MIC_NO_PRESENCE, }, + [ALC256_FIXUP_ACER_SWIFT_NO_MIC_PRESENCE] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x19, 0x02a1113c }, /* use as headset mic, without its own jack detect */ + { 0x1a, 0x90a1092f }, /* use as internal mic */ + { }, + }, + .chained = true, + .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC + }, + [ALC256_FIXUP_ACER_SWIFT_DISABLE_AAMIX] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_disable_aamix, + .chained = true, + .chain_id = ALC256_FIXUP_ACER_SWIFT_NO_MIC_PRESENCE + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -7841,9 +7859,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x1246, "Acer Predator Helios 500", ALC299_FIXUP_PREDATOR_SPK), SND_PCI_QUIRK(0x1025, 0x1247, "Acer vCopperbox", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS), SND_PCI_QUIRK(0x1025, 0x1248, "Acer Veriton N4660G", ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1025, 0x1269, "Acer SWIFT SF314-54", ALC256_FIXUP_ACER_SWIFT_DISABLE_AAMIX), SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), + SND_PCI_QUIRK(0x1025, 0x129c, "Acer SWIFT SF314-55", ALC256_FIXUP_ACER_SWIFT_DISABLE_AAMIX), SND_PCI_QUIRK(0x1025, 0x1308, "Acer Aspire Z24-890", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC), -- 2.20.1

2 2

[PATCH] ALSA: hda/hdmi: let new platforms assign the pcm slot dynamically
by Hui Wang 25 Feb '21

25 Feb '21

If the platform set the dyn_pcm_assign to true, it will call hdmi_find_pcm_slot() to find a pcm slot when hdmi/dp monitor is connected and need to create a pcm. So far only intel_hsw_common_init() and patch_nvhdmi() set the dyn_pcm_assign to true, here we let tgl platforms assign the pcm slot dynamically first, if the driver runs for a period of time and there is no regression reported, we could set no_fixed_assgin to true in the intel_hsw_common_init(), and then set it to true in the patch_nvhdmi(). This change comes from the discussion between Takashi and Kai Vehmanen. Please refer to: https://github.com/alsa-project/alsa-lib/pull/118 Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_hdmi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index e405be7929e3..379a4d786b3b 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -157,6 +157,7 @@ struct hdmi_spec { bool dyn_pin_out; bool dyn_pcm_assign; + bool no_fixed_assign; bool intel_hsw_fixup; /* apply Intel platform-specific fixups */ /* * Non-generic VIA/NVIDIA specific @@ -1345,6 +1346,12 @@ static int hdmi_find_pcm_slot(struct hdmi_spec *spec, { int i; + /* on the new machines, try to assign the pcm slot dynamically, + * not use the preferred fixed map anymore. + */ + if (spec->no_fixed_assign) + goto last_try; + /* * generic_hdmi_build_pcms() may allocate extra PCMs on some * platforms (with maximum of 'num_nids + dev_num - 1') @@ -1374,6 +1381,7 @@ static int hdmi_find_pcm_slot(struct hdmi_spec *spec, return i; } + last_try: /* the last try; check the empty slots in pins */ for (i = 0; i < spec->num_nids; i++) { if (!test_bit(i, &spec->pcm_bitmap)) @@ -2937,6 +2945,9 @@ static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid, spec->port_num = port_num; spec->intel_hsw_fixup = true; + if (port_num > 6) + spec->no_fixed_assign = true; + intel_haswell_enable_all_pins(codec, true); intel_haswell_fixup_enable_dp12(codec); -- 2.25.1

4 10

[PATCH 1/2] ASoC: ak4458: Add MODULE_DEVICE_TABLE
by Shengjiu Wang 24 Feb '21

24 Feb '21

Add missed MODULE_DEVICE_TABLE for the driver can be loaded automatically at boot. Fixes: 08660086eff9 ("ASoC: ak4458: Add support for AK4458 DAC driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/codecs/ak4458.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c index 472caad17012..85a1d00894a9 100644 --- a/sound/soc/codecs/ak4458.c +++ b/sound/soc/codecs/ak4458.c @@ -812,6 +812,7 @@ static const struct of_device_id ak4458_of_match[] = { { .compatible = "asahi-kasei,ak4497", .data = &ak4497_drvdata}, { }, }; +MODULE_DEVICE_TABLE(of, ak4458_of_match); static struct i2c_driver ak4458_i2c_driver = { .driver = { -- 2.27.0

2 2