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

[alsa-devel] [PATCH] ALSA: usb-audio: set the interface format after resume on Dell WD19
by Hui Wang 19 Dec '19

19 Dec '19

Recently we found the headset-mic on the Dell Dock WD19 doesn't work anymore after s3 (s2i or deep), this problem could be workarounded by closeing (pcm_close) the app and then reopening (pcm_open) the app, so this bug is not easy to be detected by users. When problem happens, retire_capture_urb() could still be called periodically, but the size of captured data is always 0, it could be a firmware bug on the dock. Anyway I found after resuming, the snd_usb_pcm_prepare() will be called, and if we forcibly run set_format() to set the interface and its endpoint, the capture size will be normal again. This problem and workaound also apply to playback. To fix it in the kernel, add a quirk to let set_format() run forcibly once after resume. Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/usb/card.h | 1 + sound/usb/pcm.c | 21 +++++++++++++++++++-- sound/usb/quirks-table.h | 3 ++- sound/usb/quirks.c | 11 +++++++++++ sound/usb/usbaudio.h | 3 ++- 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/sound/usb/card.h b/sound/usb/card.h index 2991b9986f66..395403a2d33f 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -145,6 +145,7 @@ struct snd_usb_substream { struct snd_usb_endpoint *sync_endpoint; unsigned long flags; bool need_setup_ep; /* (re)configure EP at prepare? */ + bool need_setup_fmt; /* (re)configure fmt after resume? */ unsigned int speed; /* USB_SPEED_XXX */ u64 formats; /* format bitmasks (all or'ed) */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 8a52996041e9..4ac571b2e9a6 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -523,11 +523,11 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) if (WARN_ON(altsd->bAlternateSetting != fmt->altsetting)) return -EINVAL; - if (fmt == subs->cur_audiofmt) + if (fmt == subs->cur_audiofmt && !subs->need_setup_fmt) return 0; /* close the old interface */ - if (subs->interface >= 0 && subs->interface != fmt->iface) { + if (subs->interface >= 0 && (subs->interface != fmt->iface || subs->need_setup_fmt)) { if (!subs->stream->chip->keep_iface) { err = usb_set_interface(subs->dev, subs->interface, 0); if (err < 0) { @@ -541,6 +541,9 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) subs->altset_idx = 0; } + if (subs->need_setup_fmt) + subs->need_setup_fmt = false; + /* set interface */ if (iface->cur_altsetting != alts) { err = snd_usb_select_mode_quirk(subs, fmt); @@ -1734,6 +1737,13 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substrea subs->data_endpoint->retire_data_urb = retire_playback_urb; subs->running = 0; return 0; + case SNDRV_PCM_TRIGGER_SUSPEND: + if (subs->stream->chip->setup_fmt_after_resume_quirk) { + stop_endpoints(subs, true); + subs->need_setup_fmt = true; + return 0; + } + break; } return -EINVAL; @@ -1766,6 +1776,13 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream subs->data_endpoint->retire_data_urb = retire_capture_urb; subs->running = 1; return 0; + case SNDRV_PCM_TRIGGER_SUSPEND: + if (subs->stream->chip->setup_fmt_after_resume_quirk) { + stop_endpoints(subs, true); + subs->need_setup_fmt = true; + return 0; + } + break; } return -EINVAL; diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 70c338f3ae24..d187aa6d50db 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3466,7 +3466,8 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), .vendor_name = "Dell", .product_name = "WD19 Dock", .profile_name = "Dell-WD15-Dock", - .ifnum = QUIRK_NO_INTERFACE + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_SETUP_FMT_AFTER_RESUME } }, /* MOTU Microbook II */ diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 349e1e52996d..a81c2066499f 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -508,6 +508,16 @@ static int create_standard_mixer_quirk(struct snd_usb_audio *chip, return snd_usb_create_mixer(chip, quirk->ifnum, 0); } + +static int setup_fmt_after_resume_quirk(struct snd_usb_audio *chip, + struct usb_interface *iface, + struct usb_driver *driver, + const struct snd_usb_audio_quirk *quirk) +{ + chip->setup_fmt_after_resume_quirk = 1; + return 1; /* Continue with creating streams and mixer */ +} + /* * audio-interface quirks * @@ -546,6 +556,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip, [QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk, [QUIRK_AUDIO_ALIGN_TRANSFER] = create_align_transfer_quirk, [QUIRK_AUDIO_STANDARD_MIXER] = create_standard_mixer_quirk, + [QUIRK_SETUP_FMT_AFTER_RESUME] = setup_fmt_after_resume_quirk, }; if (quirk->type < QUIRK_TYPE_COUNT) { diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index ff3cbf653de8..6fe3ab582ec6 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -33,7 +33,7 @@ struct snd_usb_audio { wait_queue_head_t shutdown_wait; unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */ unsigned int tx_length_quirk:1; /* Put length specifier in transfers */ - + unsigned int setup_fmt_after_resume_quirk:1; /* setup the format to interface after resume */ int num_interfaces; int num_suspended_intf; int sample_rate_read_error; @@ -98,6 +98,7 @@ enum quirk_type { QUIRK_AUDIO_EDIROL_UAXX, QUIRK_AUDIO_ALIGN_TRANSFER, QUIRK_AUDIO_STANDARD_MIXER, + QUIRK_SETUP_FMT_AFTER_RESUME, QUIRK_TYPE_COUNT }; -- 2.17.1

3 6

[alsa-devel] [PATCH v3 0/8] ASoC: soc-core cleanup step8
by Kuninori Morimoto 19 Dec '19

19 Dec '19

Hi Mark # did I lost email ?? These are v3 of soc-core cleanup step8. The diff from v2 are - add Reported-by, Reviewed-By for each patches - [2/8] is added - rebase to latest for-v5.6 branch Kuninori Morimoto (8): ASoC: soc-core: remove snd_soc_rtdcom_list ASoC: soc-core: rename snd_soc_rtdcom_add() to snd_soc_rtd_add_component() ASoC: soc-core: care .ignore_suspend for Component suspend ASoC: soc-core: remove duplicate pinctrl operation when suspend ASoC: soc-core: do pinctrl_pm_select_xxx() as component ASoC: soc-core: add snd_soc_close_delayed_work() ASoC: soc-dapm: add snd_soc_dapm_stream_stop() ASoC: use snd_soc_dapm_stream_stop() for SND_SOC_DAPM_STREAM_STOP include/sound/soc-dapm.h | 1 + include/sound/soc.h | 19 +++--- sound/soc/soc-component.c | 33 +++++---- sound/soc/soc-compress.c | 124 ++++++++++------------------------ sound/soc/soc-core.c | 167 +++++++++++++++++++++++----------------------- sound/soc/soc-dapm.c | 23 +++++++ sound/soc/soc-pcm.c | 115 ++++++++----------------------- 7 files changed, 191 insertions(+), 291 deletions(-) -- 2.7.4

1 8

[alsa-devel] [PATCH v3 0/8] ASoC: soc-core cleanup step8
by Kuninori Morimoto 19 Dec '19

19 Dec '19

Hi Mark These are v3 of soc-core cleanup step8. The difference from v2 are... - add Reviewed-By, Reported-by for each patches - [2/8] is added - rebase to latest for-5.6 branch Kuninori Morimoto (8): 1) ASoC: soc-core: remove snd_soc_rtdcom_list 2) ASoC: soc-core: rename snd_soc_rtdcom_add() to snd_soc_rtd_add_component() 3) ASoC: soc-core: care .ignore_suspend for Component suspend 4) ASoC: soc-core: remove duplicate pinctrl operation when suspend 5) ASoC: soc-core: do pinctrl_pm_select_xxx() as component 6) ASoC: soc-core: add snd_soc_close_delayed_work() 7) ASoC: soc-dapm: add snd_soc_dapm_stream_stop() 8) ASoC: use snd_soc_dapm_stream_stop() for SND_SOC_DAPM_STREAM_STOP include/sound/soc-dapm.h | 1 + include/sound/soc.h | 19 +++--- sound/soc/soc-component.c | 33 +++++---- sound/soc/soc-compress.c | 124 ++++++++++------------------------ sound/soc/soc-core.c | 167 +++++++++++++++++++++++----------------------- sound/soc/soc-dapm.c | 23 +++++++ sound/soc/soc-pcm.c | 115 ++++++++----------------------- 7 files changed, 191 insertions(+), 291 deletions(-) -- 2.7.4

1 0

[alsa-devel] [PATCH 0/7 v2] ASoC: soc-core cleanup step8
by Kuninori Morimoto 19 Dec '19

19 Dec '19

Hi Mark These are v2 of soc-core cleanup step8. There is no relationship between each patches. - [6/7] renamed function name - [7/7] new patch which cares SND_SOC_DAPM_STREAM_STOP Kuninori Morimoto (7): 1) ASoC: soc-core: remove snd_soc_rtdcom_list 2) ASoC: soc-core: care .ignore_suspend for Component suspend 3) ASoC: soc-core: remove duplicate pinctrl operation when suspend 4) ASoC: soc-core: do pinctrl_pm_select_xxx() as component 5) ASoC: soc-core: add snd_soc_close_delayed_work() 6) ASoC: soc-dapm: add snd_soc_dapm_stream_stop() 7) ASoC: use snd_soc_dapm_stream_stop() for SND_SOC_DAPM_STREAM_STOP include/sound/soc-dapm.h | 1 + include/sound/soc.h | 19 +++--- sound/soc/soc-component.c | 33 +++++----- sound/soc/soc-compress.c | 112 +++++++++------------------------ sound/soc/soc-core.c | 157 +++++++++++++++++++++++----------------------- sound/soc/soc-dapm.c | 23 +++++++ sound/soc/soc-pcm.c | 115 ++++++++------------------------- 7 files changed, 181 insertions(+), 279 deletions(-) -- 2.7.4

5 17

[alsa-devel] [PATCH] ASoC: SOF: Intel: add PCI ID for CometLake-S
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

Mirror ID added for legacy HDaudio Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/Kconfig | 16 ++++++++++++++++ sound/soc/sof/sof-pci-dev.c | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index cc09bb606f7d..91c8bbcc015a 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -27,6 +27,7 @@ config SND_SOC_SOF_INTEL_PCI select SND_SOC_SOF_ICELAKE if SND_SOC_SOF_ICELAKE_SUPPORT select SND_SOC_SOF_COMETLAKE_LP if SND_SOC_SOF_COMETLAKE_LP_SUPPORT select SND_SOC_SOF_COMETLAKE_H if SND_SOC_SOF_COMETLAKE_H_SUPPORT + select SND_SOC_SOF_COMETLAKE_S if SND_SOC_SOF_COMETLAKE_S_SUPPORT select SND_SOC_SOF_TIGERLAKE if SND_SOC_SOF_TIGERLAKE_SUPPORT select SND_SOC_SOF_ELKHARTLAKE if SND_SOC_SOF_ELKHARTLAKE_SUPPORT select SND_SOC_SOF_JASPERLAKE if SND_SOC_SOF_JASPERLAKE_SUPPORT @@ -231,6 +232,21 @@ config SND_SOC_SOF_COMETLAKE_H_SUPPORT Say Y if you have such a device. If unsure select "N". +config SND_SOC_SOF_COMETLAKE_S + tristate + select SND_SOC_SOF_HDA_COMMON + help + This option is not user-selectable but automagically handled by + 'select' statements at a higher level + +config SND_SOC_SOF_COMETLAKE_S_SUPPORT + bool "SOF support for CometLake-S" + help + This adds support for Sound Open Firmware for Intel(R) platforms + using the Cometlake-H processors. + Say Y if you have such a device. + If unsure select "N". + config SND_SOC_SOF_TIGERLAKE_SUPPORT bool "SOF support for Tigerlake" help diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index bbeffd932de7..0b39ea6117cf 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -417,6 +417,10 @@ static const struct pci_device_id sof_pci_ids[] = { { PCI_DEVICE(0x8086, 0x06c8), .driver_data = (unsigned long)&cml_desc}, #endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_S) + { PCI_DEVICE(0x8086, 0xa3f0), + .driver_data = (unsigned long)&cml_desc}, +#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) { PCI_DEVICE(0x8086, 0xa0c8), .driver_data = (unsigned long)&tgl_desc}, -- 2.20.1

3 10

[alsa-devel] [PATCH v2 0/3] More stability fixes for corner cases.
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

It wasn't straightforward to add a Fixes tag for the two Intel patches, it's likely issues that can be applied to 5.3, possibly earlier. For Dragos' patch Ranjani mentioned this may be due to da704f26ba376 ('ASoC: soc-core: merge snd_soc_remove_dai_link() and soc_unbind_dai_link()'), but Morimoto-san may need to confirm. Changes since v1: Fixed conflict in 3rd patch with Morimoto-san changes (rename of snd_soc_remove_dai_link) Dragos Tarcatu (1): ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime() Kai Vehmanen (1): ASoC: SOF: fix fault at driver unload after failed probe Pierre-Louis Bossart (1): ASoC: SOF: Intel: hda: hda-dai: fix oops on hda_link .hw_free sound/soc/soc-topology.c | 8 ++++---- sound/soc/sof/intel/hda-dai.c | 11 +++++++++-- sound/soc/sof/ipc.c | 3 +++ 3 files changed, 16 insertions(+), 6 deletions(-) -- 2.20.1

3 7

[alsa-devel] [PATCH] ASoC: Intel: cml_rt1011_rt5682: fix codec_conf by removing legacy style
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

Now that the legacy style is removed, we have to use the new macros for the codec configuration. This change was missed in the initial series. Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Fixes: ee8f537fd8b71c ("ASoC: soc-core: remove legacy style of codec_conf") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index a22f97234201..ab1196108d23 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -406,19 +406,19 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { static struct snd_soc_codec_conf rt1011_conf[] = { { - .dev_name = "i2c-10EC1011:00", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:00"), .name_prefix = "WL", }, { - .dev_name = "i2c-10EC1011:01", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:01"), .name_prefix = "WR", }, { - .dev_name = "i2c-10EC1011:02", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:02"), .name_prefix = "TL", }, { - .dev_name = "i2c-10EC1011:03", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:03"), .name_prefix = "TR", }, }; -- 2.20.1

4 4

[alsa-devel] [PATCH 0/8] ASoC: SOF: Intel: add module namespace support
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

A lot of the existing SOF/Intel drivers expose ops structures or helpers that should not be visible or loadable by other drivers. During the last round of SoundWire reviews, GregKH suggested the use of module namespaces [1] to avoid exposing symbols that are only meant to be used in a restricted context. This patchset suggests the use of namespaces for the different Intel parts, largely modeled after the existing hiearchical Kconfig options. While several SOF reviewers suggested on GitHub that this use of namespaces was too fine-grained, it can also be argued that this level of detail helps identify cases where the existing structures are not properly defined. We found such a case with the Xtensa architecture abstraction and another code partitioning issue for the SoundWire driver yesterday. Module namespaces are currently not used widely in kernel circles, this is a first attempt to test the water for audio drivers and gather comments from maintainers/reviewers. [1] https://www.kernel.org/doc/html/latest/core-api/symbol-namespaces.html Pierre-Louis Bossart (8): ASoC: SOF: Intel: add module namespace for legacy IPC ASoC: SOF: Intel: add namespaces for BAYTRAIL and MERRIFIELD ASoC: SOF: Intel: add namespace for BROADWELL ASoC: SOF: remove references to Haswell ASoC: SOF: Intel: add namespace for HDA_COMMON ASoC: SOF: Intel: hda: add namespace for hda-codec functionality ASoC: SOF: move arch_ops under ops ASoC: SOF: Intel: add namespace for XTENSA include/sound/sof.h | 1 - sound/soc/sof/Kconfig | 2 +- sound/soc/sof/intel/apl.c | 6 ++++-- sound/soc/sof/intel/bdw.c | 8 ++++++-- sound/soc/sof/intel/byt.c | 20 ++++++++++++++------ sound/soc/sof/intel/cnl.c | 14 ++++++++------ sound/soc/sof/intel/hda-codec.c | 14 +++++++------- sound/soc/sof/intel/hda.c | 3 +++ sound/soc/sof/intel/intel-ipc.c | 8 ++++---- sound/soc/sof/intel/shim.h | 6 ++---- sound/soc/sof/sof-acpi-dev.c | 26 ++------------------------ sound/soc/sof/sof-pci-dev.c | 12 ++---------- sound/soc/sof/sof-priv.h | 4 +++- sound/soc/sof/xtensa/core.c | 2 +- 14 files changed, 57 insertions(+), 69 deletions(-) -- 2.20.1

2 16

[alsa-devel] [PATCH 0/8] ASoC: SOF: last patches for 2019
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

This patchset adds a set of somewhat independent changes for i.MX, Intel, boards and core. Guido Roncarolo (2): ASoC: SOF: imx: Describe SAI parameters to be sent to DSP ASoC: SOF: imx: Read SAI parameters and send them to DSP Kai Vehmanen (2): ASoC: SOF: Intel: drop HDA codec upon probe failure ASoC: Intel: boards: fix incorrect HDMI Kconfig dependency Karol Trzcinski (2): ASoC: SOF: define struct with compiler name and version ASoC: SOF: log compiler name and version information Ranjani Sridharan (1): ASoC: SOF: Introduce state machine for FW boot Yong Zhi (1): ASoC: Intel: Add machine driver for da7219_max98373 include/sound/sof/dai-imx.h | 20 + include/sound/sof/dai.h | 1 + include/sound/sof/info.h | 15 + include/uapi/sound/sof/tokens.h | 3 +- sound/soc/intel/boards/Kconfig | 28 +- sound/soc/intel/boards/Makefile | 3 + sound/soc/intel/boards/sof_da7219_max98373.c | 371 ++++++++++++++++++ .../intel/common/soc-acpi-intel-jsl-match.c | 7 + sound/soc/sof/core.c | 50 ++- sound/soc/sof/intel/hda-codec.c | 12 +- sound/soc/sof/intel/hda-loader.c | 1 - sound/soc/sof/intel/hda.c | 4 +- sound/soc/sof/intel/hda.h | 4 +- sound/soc/sof/ipc.c | 17 +- sound/soc/sof/loader.c | 58 ++- sound/soc/sof/pcm.c | 8 + sound/soc/sof/pm.c | 21 +- sound/soc/sof/sof-priv.h | 12 +- sound/soc/sof/topology.c | 69 +++- 19 files changed, 662 insertions(+), 42 deletions(-) create mode 100644 sound/soc/intel/boards/sof_da7219_max98373.c -- 2.20.1

2 16

[alsa-devel] [PATCH 0/4] ASoC: meson: axg-fifo: fix depth handling
by Jerome Brunet 18 Dec '19

18 Dec '19

This patchset improves the handling the depth of the different fifos found in amlogic audio subsystems derived from the axg family. Initially, it was reported that, when the period is less than 8kB on sm1 and with TODDR A, several period are coming at once. This is because the field related to the fifo request threshold changed on the sm1 SoC and also because TODDR A instance is significantly larger compared to the other instances. With this initial issue fixed, I used the opportunity to improve the driver and properly deal with the different fifo depth found in these SoCs. Jerome Brunet (4): ASoC: meson: axg-fifo: fix fifo threshold setup ASoC: meson: axg-fifo: add fifo depth to the bindings documentation ASoC: meson: axg-fifo: improve depth handling ASoC: meson: axg-fifo: relax period size constraints .../bindings/sound/amlogic,axg-fifo.txt | 4 ++ sound/soc/meson/axg-fifo.c | 50 ++++++++++++++++--- sound/soc/meson/axg-fifo.h | 9 ++-- sound/soc/meson/axg-frddr.c | 33 ++++++------ sound/soc/meson/axg-toddr.c | 21 ++++---- 5 files changed, 76 insertions(+), 41 deletions(-) -- 2.23.0

2 10