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

[PATCH AUTOSEL 5.8 04/20] ASoC: wm8994: Ensure the device is resumed in wm89xx_mic_detect functions
by Sasha Levin 21 Sep '20

21 Sep '20

From: Sylwester Nawrocki <s.nawrocki(a)samsung.com> [ Upstream commit f5a2cda4f1db89776b64c4f0f2c2ac609527ac70 ] When the wm8958_mic_detect, wm8994_mic_detect functions get called from the machine driver, e.g. from the card's late_probe() callback, the CODEC device may be PM runtime suspended and any regmap writes have no effect. Add PM runtime calls to these functions to ensure the device registers are updated as expected. This suppresses an error during boot "wm8994-codec: ASoC: error at snd_soc_component_update_bits on wm8994-codec" caused by the regmap access error due to the cache_only flag being set. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Acked-by: Krzysztof Kozlowski <krzk(a)kernel.org> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20200827173357.31891-2-s.nawrocki@samsung.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm8994.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index c2116836a7203..58f21329d0e99 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3491,6 +3491,8 @@ int wm8994_mic_detect(struct snd_soc_component *component, struct snd_soc_jack * return -EINVAL; } + pm_runtime_get_sync(component->dev); + switch (micbias) { case 1: micdet = &wm8994->micdet[0]; @@ -3538,6 +3540,8 @@ int wm8994_mic_detect(struct snd_soc_component *component, struct snd_soc_jack * snd_soc_dapm_sync(dapm); + pm_runtime_put(component->dev); + return 0; } EXPORT_SYMBOL_GPL(wm8994_mic_detect); @@ -3905,6 +3909,8 @@ int wm8958_mic_detect(struct snd_soc_component *component, struct snd_soc_jack * return -EINVAL; } + pm_runtime_get_sync(component->dev); + if (jack) { snd_soc_dapm_force_enable_pin(dapm, "CLK_SYS"); snd_soc_dapm_sync(dapm); @@ -3973,6 +3979,8 @@ int wm8958_mic_detect(struct snd_soc_component *component, struct snd_soc_jack * snd_soc_dapm_sync(dapm); } + pm_runtime_put(component->dev); + return 0; } EXPORT_SYMBOL_GPL(wm8958_mic_detect); -- 2.25.1

1 0

[PATCH AUTOSEL 5.8 02/20] ASoC: pcm3168a: ignore 0 Hz settings
by Sasha Levin 21 Sep '20

21 Sep '20

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> [ Upstream commit 7ad26d6671db758c959d7e1d100b138a38483612 ] Some sound card try to set 0 Hz as reset, but it is impossible. This patch ignores it to avoid error return. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Link: https://lore.kernel.org/r/87a6yjy5sy.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/pcm3168a.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 9711fab296ebc..045c6f8b26bef 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -306,6 +306,13 @@ static int pcm3168a_set_dai_sysclk(struct snd_soc_dai *dai, struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(dai->component); int ret; + /* + * Some sound card sets 0 Hz as reset, + * but it is impossible to set. Ignore it here + */ + if (freq == 0) + return 0; + if (freq > PCM3168A_MAX_SYSCLK) return -EINVAL; -- 2.25.1

1 0

[PATCH 1/2] ASoC: rt700: wait for the delayed work to finish when the system suspends
by shumingf＠realtek.com 21 Sep '20

21 Sep '20

From: Shuming Fan <shumingf(a)realtek.com> To avoid the IO error, we need to cancel the delayed work and wait for it to finish. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt700-sdw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c index ead4918bbf90..c7deb4e4fcf1 100644 --- a/sound/soc/codecs/rt700-sdw.c +++ b/sound/soc/codecs/rt700-sdw.c @@ -490,6 +490,9 @@ static int __maybe_unused rt700_dev_suspend(struct device *dev) if (!rt700->hw_init) return 0; + cancel_delayed_work_sync(&rt700->jack_detect_work); + cancel_delayed_work_sync(&rt700->jack_btn_check_work); + regcache_cache_only(rt700->regmap, true); return 0; -- 2.28.0

2 1

[PATCH 2/2] ASoC: rt711: wait for the delayed work to finish when the system suspends
by shumingf＠realtek.com 21 Sep '20

21 Sep '20

From: Shuming Fan <shumingf(a)realtek.com> To avoid the IO error, we need to cancel the delayed work and wait for it to finish. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt711-sdw.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c index 28d663673320..3a8ca600d1cf 100644 --- a/sound/soc/codecs/rt711-sdw.c +++ b/sound/soc/codecs/rt711-sdw.c @@ -491,6 +491,10 @@ static int __maybe_unused rt711_dev_suspend(struct device *dev) if (!rt711->hw_init) return 0; + cancel_delayed_work_sync(&rt711->jack_detect_work); + cancel_delayed_work_sync(&rt711->jack_btn_check_work); + cancel_work_sync(&rt711->calibration_work); + regcache_cache_only(rt711->regmap, true); return 0; -- 2.28.0

2 1

[PATCH v5 00/13] ASoC: Intel: Catpt - Lynx and Wildcat point
by Cezary Rojewski 21 Sep '20

21 Sep '20

Implement support for Lynxpoint and Wildcat Point AudioDSP. Catpt solution deprecates existing sound/soc/intel/haswell which is removed in the following series. This cover-letter is followed by 'Developer's deep dive' message schedding light on catpt's key concepts and areas addressed. Due to high range of errors and desynchronization from recommendations set by Windows solution, re-write came as a lower-cost solution compared to refactoring /haswell/ with several series of patches. Series is dependent on linux-spi change: spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers https://www.spinics.net/lists/linux-spi/msg23885.html which has been already merged and is now part of linux-spi tree. Special thanks go to Marcin Barlik and Piotr Papierkowski for sharing their LPT/WPT AudioDSP architecture expertise as well as helping backtrack its historical background. My thanks go to Amadeusz Slawinski for reviews and improvements proposed on and off the internal list. Most of internal diff below is his contribution. Krzysztof Hejmowski helped me setup my own Xtensa environment and recompile LPT/WPT FW binary sources what sped up the development greatly. This would not have been possible without help from these champions, especially considering how quickly the catpt was written: 2 weeks features, 3 weeks optimizations. Thank you. Userspace-exposed members are compatible with what is exposed by deprecated solution as well as FW binary being re-used thus no harm is done. The only visible differences are: the newly added 'Loopback Mute' kcontrol and volume support extending to quad from stereo. On top of fixing erros and design flows, catpt also adds module reload, dynamic SRAM memory allocation during PCM runtime and exposes missing userspace API: 'Loopback Mute' kcontrol, quad volume controls and sysfs fw-version entries. Event tracing is provided to easy solution debugging. Following are not included in this update and are scheduled as later addition: - fw logging - module (library) support Note: LPT power up/down sequences might get aligned with WPT once enough testing is done as capabilities are shared for both DSPs. Note #2: Both LPT and WPT power up/down sequences may get optimized in future updates as thanks to help from the Windows team, most of nuances behind why/what/when in regard to hw registers have been backtracked and reviewed again. Link to developer's deep dive message: https://www.spinics.net/lists/alsa-devel/msg113563.html Changes in v5: Basically everything below is result of Andy's review. Thank you Andy for taking time into this detailed review - catpt now makes use of common linux/pxa2xx_ssp.h header file, removing redundant SSP register declarations in the process. As stated in the opening, this is dependent upon linux-spi change: spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers - updated Kconfig by removing DMADEVICES and adding COMPILE_TEST as optional depends-on - updated all register macros definitions to be more safe against common arithmetics when specifying macro's parameters - removed CONFIG_PM and CONFIG_PM_SLEEP usage in favor of __maybe_unused - all 'if (ret < 0)' converted to simple 'if (ret)' whenever possible - fixed erroneous check for platform_device_register_data within catpt_register_board() - _SLAVE/_MASTER replaced with more inclusive _CONSUMER/_PROVIDER for enum catpt_ssp_mode - catpt_acpi_probe() is now making use of high-level wrappers for ioremapping and resource assignment, reducing function's code size - due to improved catpt_acpi_probe() behavior, catpt_acpi_remove() needs not to cast dma_free_coherent() any longer - DMA source and destrination maxburst now of value 16, see: https://www.spinics.net/lists/alsa-devel/msg114394.html - simplified catpt_dsp_update_lpclock() as list_for_each_entry() is empty-safe by default - dropped '_SSP_' from all names of all CATPT_SSP_SSXXX_DEFAULT macros - catpt_updatel_pci now makes use of linux/pci.h and uapi/linux/pci.h constants such as: PCI_PM_CTRL_STATE_MASK and PCI_D3hot Changes in v4: https://www.spinics.net/lists/alsa-devel/msg113762.html - fixed compilation with i386 kconfig (conflicting names) - streamlined naming for SHIM and PCI registers to match SSP ones (SHIM_REG -> SHIM) - catpt_component_probe removed and kcontrols again initializzed statically via snd_kcontrol_new array: this is to remove kctl->id.device shenanigans - renamed catpt_set_ctlvol to catpt_set_dspvol - function name wasn't matching its purpose Changes in v3: - fixed IRAM mask usage in lpt_dsp_power_up (dsp.c) - updated dbg message formatting in catpt_restore_fwimage as suggested by Andy - fixed alignment for struct catpt_ssp_device_format - catpt_set_ctlvol now verifies all-equal scenario based on all channels rather than just first two as requested by Amadeo - fixed SPDX for registers.h Changes in v2: https://www.spinics.net/lists/alsa-devel/msg113660.html - fixed SPDX formatting for all header files as well as pcm.c - fixed size provided to memcpy() in fw_build_read() as reported by Mark - renamed struct catpt_pdata to struct catpt_spec (cosmetic) - fixed erroneous path in catpt_load_block: region is properly released - trace.h events for updating registers have been removed and usages replaced by dev_dbg (SRAMPGE/ LPCS) - as requested by Andy, struct resource has replaced struct catpt_mbank and struct catpt_mregion. This change cascaded into: - catpt_mbank_size and catpt_mregion_size replaced by resource_size - catpt_mregion_intersects replaced by resource_overlaps - all catpt_mbank_ and catpt_mregion_ handlers found in loader.c (_request, _reserve, _release, _extract, _split, _join) have been removed - __request_region and __release_region have been enlisted in their place - catpt_mregion_intersecting renamed to catpt_resource_overlapping - catpt_request_region helper has been provided to deal with -size based requests o haven't found direct replacements in resource.c/ ioport.h for both functions - catpt_mbank_create and catpt_mbank_remove renamed to catpt_sram_init and catpt_sram_free respectively - catpt_sram_init now returns void instead of int and has been converted to simple initialized. This change ultimately cascaded into: o both SRAM banks initialization being moved to catpt_dev_init from catpt_acpi_probe (device.c) o catpt_dev::spec is now initialized first, with catpt_dev_init following it soon after o catpt_acpi_probe erroneous path has been simplified as SRAM banks no longer need to be freed - catpt_sram_free now frees all resources via child -> sibling enumeration rather than region_list iteration - catpt_dsp_update_srampge and catpt_dsp_set_srampge now accept new argument: unsigned long mask. Caused by removal of catpt_mbank - mask is taken directly from catpt_dev::spec::d/iram_mask - trace.h events for catpt_mbank and catpt_mregion have been removed Diff against last drop on internal list: https://www.spinics.net/lists/alsa-devel/msg113549.html - replaced spinlock with mutex for mregion allocation and release to address sleeping in atomic context warnings - fixed coredump fw_hash dumping - kcontrol values are now always stored regardless of stream of interest is running or not - kcontrol values are now applied after stream is prepared instead of ignoring what has been set by user initially - catpt_pdata instances have been renamed from hsw_ and bdw_ to lpt_ and wpt_ respectively - reordered Makefile .o(s) (cosmetic) Cezary Rojewski (13): ASoC: Intel: Add catpt device ASoC: Intel: catpt: Define DSP operations ASoC: Intel: catpt: Firmware loading and context restore ASoC: Intel: catpt: Implement IPC protocol ASoC: Intel: catpt: Add IPC messages ASoC: Intel: catpt: PCM operations ASoC: Intel: catpt: Event tracing ASoC: Intel: catpt: Simple sysfs attributes ASoC: Intel: Select catpt and deprecate haswell ASoC: Intel: haswell: Remove haswell-solution specific code ASoC: Intel: broadwell: Remove haswell-solution specific code ASoC: Intel: bdw-5650: Remove haswell-solution specific code ASoC: Intel: bdw-5677: Remove haswell-solution specific code sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/boards/Kconfig | 8 +- sound/soc/intel/boards/bdw-rt5650.c | 36 - sound/soc/intel/boards/bdw-rt5677.c | 33 - sound/soc/intel/boards/broadwell.c | 33 - sound/soc/intel/boards/haswell.c | 28 +- sound/soc/intel/catpt/Makefile | 6 + sound/soc/intel/catpt/core.h | 187 +++++ sound/soc/intel/catpt/device.c | 354 ++++++++ sound/soc/intel/catpt/dsp.c | 572 +++++++++++++ sound/soc/intel/catpt/fs.c | 79 ++ sound/soc/intel/catpt/ipc.c | 298 +++++++ sound/soc/intel/catpt/loader.c | 673 +++++++++++++++ sound/soc/intel/catpt/messages.c | 313 +++++++ sound/soc/intel/catpt/messages.h | 401 +++++++++ sound/soc/intel/catpt/pcm.c | 1212 +++++++++++++++++++++++++++ sound/soc/intel/catpt/registers.h | 178 ++++ sound/soc/intel/catpt/trace.h | 83 ++ 19 files changed, 4377 insertions(+), 143 deletions(-) create mode 100644 sound/soc/intel/catpt/Makefile create mode 100644 sound/soc/intel/catpt/core.h create mode 100644 sound/soc/intel/catpt/device.c create mode 100644 sound/soc/intel/catpt/dsp.c create mode 100644 sound/soc/intel/catpt/fs.c create mode 100644 sound/soc/intel/catpt/ipc.c create mode 100644 sound/soc/intel/catpt/loader.c create mode 100644 sound/soc/intel/catpt/messages.c create mode 100644 sound/soc/intel/catpt/messages.h create mode 100644 sound/soc/intel/catpt/pcm.c create mode 100644 sound/soc/intel/catpt/registers.h create mode 100644 sound/soc/intel/catpt/trace.h -- 2.17.1

4 30

[PATCH] Revert "ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO"
by Takashi Iwai 21 Sep '20

21 Sep '20

This reverts commit 15cbff3fbbc6 ("ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO"). A regression reported by a Fedora user for MSI X570-A PRO mobo. Until the correct solution is found out, let's revert the quirk as a quick workaround. Fixes: 15cbff3fbbc6 ("ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO") Reported-by: Hans de Goede <hdegoede(a)redhat.com> Cc: <stable(a)vger.kernel.org> Cc: Dan Crawford <dnlcrwfrd(a)gmail.com> BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1879277 Link: https://lore.kernel.org/r/7efd2fe5-bf38-7f85-891a-eee3845d1493@redhat.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c4d615cf8de1..d4f17b465892 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2475,7 +2475,6 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x1293, "MSI-GP65", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD), - SND_PCI_QUIRK(0x1462, 0x9c37, "MSI X570-A PRO", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3), SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX), -- 2.16.4

1 0

[PATCH v2 1/1] ALSA: hda: Refactor calculating SDnFMT according to specification
by Pawel Harlozinski 21 Sep '20

21 Sep '20

Fix setting SDnFMT based on High Definition Audio Specification Rev. 1.0a page 48. Bits per Sample (BITS): 000 = 8 bits. The data will be packed in memory in 8-bit containers on 16-bit boundaries. 001 = 16 bits. The data will be packed in memory in 16-bit containers on 16-bit boundaries. 010 = 20 bits. The data will be packed in memory in 32-bit containers on 32-bit boundaries. 011 = 24 bits. The data will be packed in memory in 32-bit containers on 32-bit boundaries. 100 = 32 bits. The data will be packed in memory in 32-bit containers on 32-bit boundaries. 101-111 = Reserved Set SDnFMT depending on which format was given. Henceforth split cases for formats 20, 24, 32 bits, but leave constraints to maxbps. Change-Id: I97771b16da14e85b7f35372f5dfc87bb13bb5ce0 Signed-off-by: Pawel Harlozinski <pawel.harlozinski(a)linux.intel.com> --- sound/hda/hdac_device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index 3e9e9ac804f6..ccc47a10ba63 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -764,7 +764,14 @@ unsigned int snd_hdac_calc_stream_format(unsigned int rate, val |= AC_FMT_BITS_16; break; case 20: + val |= AC_FMT_BITS_20; + break; case 24: + if (maxbps >= 24) + val |= AC_FMT_BITS_24; + else + val |= AC_FMT_BITS_20; + break; case 32: if (maxbps >= 32 || format == SNDRV_PCM_FORMAT_FLOAT_LE) val |= AC_FMT_BITS_32; -- 2.17.1

3 2

PROBLEM: A page fault occurs when the sound driver is loaded (ThinkPad X13/T14)
by Philipp Leskovitz 21 Sep '20

21 Sep '20

[1.] One line summary of the problem: A page fault occurs when the sound driver is loaded. [2.] Full description of the problem/report: A page fault occurs when the sound driver for Intel Commet-Lake platform is loaded. This happens e.g. on Lenovo ThinkPad X13 and T14 at startup and version 1.4.3 of intel-sof-firmware binaries (https://github.com/thesofproject/sof-bin/tree/stable-v1.4.3). Same result with version 1.5.1. [3.] Keywords (i.e., modules, networking, kernel): [4.] Kernel information [4.1.] Kernel version (from /proc/version): >5.9-rc5 commit-id: fc4f28bb3daf3265d6bc5f73b497306985bb23ab [4.2.] Kernel .config file: See attachment for full configuration, the important part is: ... CONFIG_SND_SOC=y CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y CONFIG_SND_SOC_INTEL_CML_LP=y CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_MACH=y CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_PCI=y CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1=y ... [5.] Most recent kernel version which did not have the bug: - Ubuntu 20.04.1 works fine (5.4.0-45) - Kernel 5.4.61 with some backports from 5.7 [6.] Output of Oops.. message (if applicable) with symbolic information resolved (see Documentation/admin-guide/oops-tracing.rst) See attachment for full log. ... [ 6.380009] snd_hda_intel 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040380 [ 6.380536] snd_hda_intel 0000:00:1f.3: Digital mics found on Skylake+ platform, using SOF driver [ 6.381915] usbcore: registered new interface driver snd-usb-audio [ 6.382525] sof-audio-pci 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040380 [ 6.383090] sof-audio-pci 0000:00:1f.3: Digital mics found on Skylake+ platform, using SOF driver [ 6.386039] sof-audio-pci 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if 0x040380 [ 6.386862] usb 1-1: New USB device found, idVendor=058f, idProduct=9540, bcdDevice= 1.20 [ 6.386959] IPv4 over IPsec tunneling driver [ 6.387207] sof-audio-pci 0000:00:1f.3: bound 0000:00:02.0 (ops i915_audio_component_bind_ops) [ 6.387747] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [ 6.389474] usb 1-1: Product: EMV Smartcard Reader [ 6.390069] usb 1-1: Manufacturer: Generic [ 6.390892] Initializing XFRM netlink socket [ 6.392858] NET: Registered protocol family 10 [ 6.395179] sof-audio-pci 0000:00:1f.3: use msi interrupt mode [ 6.396219] Segment Routing with IPv6 [ 6.399097] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 6.402236] NET: Registered protocol family 17 [ 6.405170] NET: Registered protocol family 15 [ 6.406068] 9pnet: Installing 9P2000 support [ 6.408354] microcode: sig=0x806ec, pf=0x4, revision=0xd6 [ 6.409081] microcode: Microcode Update Driver: v2.2. [ 6.409083] IPI shorthand broadcast: enabled [ 6.410374] sched_clock: Marking stable (6404500108, 5227507)->(6418014859, -8287244) [ 6.411127] Loading compiled-in X.509 certificates [ 6.412635] HDMI HDA Codec ehdaudio0D2: Max dais supported: 3 [ 6.413502] sof-audio-pci 0000:00:1f.3: hda codecs found, mask 5 [ 6.414129] sof-audio-pci 0000:00:1f.3: using HDA machine driver skl_hda_dsp_generic now [ 6.414714] sof-audio-pci 0000:00:1f.3: DMICs detected in NHLT tables: 2 [ 6.416290] Loaded X.509 cert 'Build time autogenerated kernel key: b521b2c060c3f56dd5ab1fbfb34c05c2916a8c0c' [ 6.416931] pstore: Using crash dump compression: deflate [ 6.423238] PM: Magic number: 4:125:733 [ 6.423900] hwmon hwmon0: hash matches [ 6.424597] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 6.429162] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 6.434042] ALSA device list: [ 6.434894] No soundcards found. [ 6.439211] Freeing unused kernel image (initmem) memory: 1572K [ 6.445948] Write protecting the kernel read-only data: 24576k [ 6.448072] Freeing unused kernel image (text/rodata gap) memory: 2044K [ 6.448904] Freeing unused kernel image (rodata/data gap) memory: 368K [ 6.449569] Run /init as init process [ 6.450203] with arguments: [ 6.450203] /init [ 6.450204] with environment: [ 6.450204] HOME=/ [ 6.450204] TERM=linux [ 6.450205] BOOT_IMAGE=/isolinux/bzImage [ 6.450205] intel_iommu=on,igfx_off [ 6.487322] usb 2-4: new SuperSpeed Gen 1 USB device number 2 using xhci_hcd [ 6.501610] usb 2-4: New USB device found, idVendor=0781, idProduct=5580, bcdDevice= 0.10 [ 6.502354] usb 2-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 6.503080] usb 2-4: Product: Extreme [ 6.503794] usb 2-4: Manufacturer: SanDisk [ 6.504502] usb 2-4: SerialNumber: AA010121131224373982 [ 6.519956] sof-audio-pci 0000:00:1f.3: Firmware info: version 1:4:3-76052 [ 6.520648] sof-audio-pci 0000:00:1f.3: Firmware: ABI 3:11:0 Kernel ABI 3:16:0 [ 6.521724] sof-audio-pci 0000:00:1f.3: Topology: ABI 3:11:0 Kernel ABI 3:16:0 [ 6.522393] sof-audio-pci 0000:00:1f.3: warning: widget type 7 name iDisp3 Tx not handled [ 6.524941] sof-audio-pci 0000:00:1f.3: warning: widget type 0 name codec0_in not handled [ 6.528203] sof-audio-pci 0000:00:1f.3: warning: widget type 7 name iDisp2 Tx not handled [ 6.533912] sof-audio-pci 0000:00:1f.3: warning: widget type 0 name codec1_in not handled [ 6.534597] sof-audio-pci 0000:00:1f.3: warning: widget type 7 name iDisp1 Tx not handled [ 6.540491] sof-audio-pci 0000:00:1f.3: warning: widget type 1 name codec0_out not handled [ 6.541826] sof-audio-pci 0000:00:1f.3: warning: widget type 7 name Analog CPU Playback not handled [ 6.546622] sof-audio-pci 0000:00:1f.3: warning: widget type 1 name codec1_out not handled [ 6.547556] sof-audio-pci 0000:00:1f.3: warning: widget type 7 name Digital CPU Playback not handled [ 6.548221] sof-audio-pci 0000:00:1f.3: warning: widget type 0 name codec2_in not handled [ 6.548852] sof-audio-pci 0000:00:1f.3: warning: widget type 7 name Alt Analog CPU Playback not handled [ 6.549510] sof-audio-pci 0000:00:1f.3: warning: widget type 1 name codec2_out not handled [ 6.550316] sof-audio-pci 0000:00:1f.3: warning: widget type 0 name Analog CPU Capture not handled [ 6.551743] sof-audio-pci 0000:00:1f.3: warning: widget type 1 name iDisp1_out not handled [ 6.552380] sof-audio-pci 0000:00:1f.3: warning: widget type 0 name Digital CPU Capture not handled [ 6.554251] sof-audio-pci 0000:00:1f.3: warning: widget type 1 name iDisp2_out not handled [ 6.554853] sof-audio-pci 0000:00:1f.3: warning: widget type 0 name Alt Analog CPU Capture not handled [ 6.557362] sof-audio-pci 0000:00:1f.3: warning: widget type 1 name iDisp3_out not handled [ 6.578044] sof-audio-pci 0000:00:1f.3: ASoC: Parent card not yet available, widget card binding deferred [ 6.583577] HDMI HDA Codec ehdaudio0D2: hdac_hdmi_present_sense: disconnect for pin:port 5:0 [ 6.584601] HDMI HDA Codec ehdaudio0D2: hdac_hdmi_present_sense: disconnect for pin:port 6:0 [ 6.585451] HDMI HDA Codec ehdaudio0D2: hdac_hdmi_present_sense: disconnect for pin:port 7:0 [ 6.605984] snd_hda_codec_realtek ehdaudio0D0: autoconfig for ALC257: line_outs=1 (0x14/0x0/0x0/0x0/0x0) type:speaker [ 6.607282] snd_hda_codec_realtek ehdaudio0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 6.608474] snd_hda_codec_realtek ehdaudio0D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) [ 6.611586] snd_hda_codec_realtek ehdaudio0D0: mono: mono_out=0x0 [ 6.612904] snd_hda_codec_realtek ehdaudio0D0: inputs: [ 6.615225] snd_hda_codec_realtek ehdaudio0D0: Mic=0x19 [ 6.615902] usb 1-8: new high-speed USB device number 3 using xhci_hcd [ 6.667538] skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi3 overwritten [ 6.668264] skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi2 overwritten [ 6.668918] skl_hda_dsp_generic skl_hda_dsp_generic: ASoC: sink widget hifi1 overwritten [ 6.669698] BUG: unable to handle page fault for address: ffffffffffffffe0 [ 6.670415] #PF: supervisor write access in kernel mode [ 6.670993] #PF: error_code(0x0002) - not-present page [ 6.671558] PGD 34180d067 P4D 34180d067 PUD 34180f067 PMD 0 [ 6.672142] Oops: 0002 [#1] SMP NOPTI [ 6.672675] CPU: 2 PID: 126 Comm: kworker/2:2 Not tainted 5.9.0-devel+ #2 [ 6.673225] Hardware name: LENOVO 20S1S19N00/20S1S19N00, BIOS N2XET16W (1.06 ) 05/13/2020 [ 6.673844] Workqueue: events sof_probe_work [ 6.674387] RIP: 0010:hda_dsp_hdmi_build_controls+0x5b/0xff [ 6.674942] Code: 48 8d 98 20 ff ff ff 49 39 c4 74 4c 45 31 ff 49 c7 c6 e0 1a 36 a2 44 89 fe 48 89 ef e8 1e ff ff ff 48 85 c0 0f 84 be 00 00 00 <48> 89 83 c0 00 00 00 44 8b 48 18 44 89 8b bc 00 00 00 0f 1f 44 00 [ 6.675525] RSP: 0000:ffff9e93038e7b08 EFLAGS: 00010286 [ 6.676113] RAX: ffff8ef56180f000 RBX: ffffffffffffff20 RCX: 0000000000000004 [ 6.676705] RDX: 0000000000000004 RSI: ffffffffa26e729f RDI: ffff8ef56180f02d [ 6.677291] RBP: ffffffffa291a240 R08: 0000000000000049 R09: 0000000000000000 [ 6.677889] R10: ffff8ef5635ef024 R11: ffff9e93207d8220 R12: ffff8ef56231dc68 [ 6.678481] R13: ffff8ef56231d828 R14: ffffffffa2361ae0 R15: 0000000000000000 [ 6.679064] FS: 0000000000000000(0000) GS:ffff8ef56f680000(0000) knlGS:0000000000000000 [ 6.679667] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 6.680322] CR2: ffffffffffffffe0 CR3: 0000000820c24003 CR4: 00000000003706e0 [ 6.680968] Call Trace: [ 6.681583] skl_hda_hdmi_jack_init+0x119/0x12b [ 6.682227] ? snprintf+0x49/0x60 [ 6.682844] snd_soc_card_late_probe+0x1e/0x70 [ 6.683461] snd_soc_bind_card+0x83f/0x960 [ 6.684075] devm_snd_soc_register_card+0x43/0x80 [ 6.684676] skl_hda_audio_probe+0x142/0x2e0 [ 6.685265] platform_drv_probe+0x35/0x80 [ 6.685851] really_probe+0x31b/0x430 [ 6.686428] ? driver_allows_async_probing+0x50/0x50 [ 6.687004] driver_probe_device+0xde/0x150 [ 6.687581] ? driver_allows_async_probing+0x50/0x50 [ 6.688162] bus_for_each_drv+0x79/0xc0 [ 6.688736] __device_attach+0xe0/0x160 [ 6.689310] bus_probe_device+0x87/0xa0 [ 6.689885] device_add+0x436/0x810 [ 6.690458] ? _cond_resched+0x15/0x30 [ 6.691032] platform_device_add+0x110/0x240 [ 6.691611] platform_device_register_full+0xc7/0x120 [ 6.692191] sof_machine_register+0x60/0xc0 [ 6.692777] sof_probe_work+0x11c/0x230 [ 6.693357] process_one_work+0x205/0x3d0 [ 6.693938] ? process_one_work+0x3d0/0x3d0 [ 6.694515] worker_thread+0x2d/0x3c0 [ 6.695090] ? process_one_work+0x3d0/0x3d0 [ 6.695664] kthread+0x116/0x130 [ 6.696235] ? kthread_park+0x80/0x80 [ 6.696804] ret_from_fork+0x1f/0x30 [ 6.697372] Modules linked in: [ 6.697936] CR2: ffffffffffffffe0 [7.] A small shell script or example program which triggers the problem (if possible) [8.] Environment [8.1.] Software (add the output of the ver_linux script here) [8.2.] Processor information (from /proc/cpuinfo): [8.3.] Module information (from /proc/modules): [8.4.] Loaded driver and hardware information (/proc/ioports, /proc/iomem) [8.5.] PCI information ('lspci -vvv' as root) [8.6.] SCSI information (from /proc/scsi/scsi) [8.7.] Other information that might be relevant to the problem (please look in /proc and include all information that you think to be relevant): [X.] Other notes, patches, fixes, workarounds:

2 1

[PATCH] ALSA: usb-audio: Add delay quirk for H570e USB headsets
by Joakim Tjernlund 21 Sep '20

21 Sep '20

Needs the same delay as H650e Signed-off-by: Joakim Tjernlund <joakim.tjernlund(a)infinera.com> Cc: stable(a)vger.kernel.org --- sound/usb/quirks.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 75bbdc691243..892296df131d 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1678,12 +1678,13 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) msleep(20); - /* Zoom R16/24, Logitech H650e, Jabra 550a, Kingston HyperX needs a tiny - * delay here, otherwise requests like get/set frequency return as - * failed despite actually succeeding. + /* Zoom R16/24, Logitech H650e/H570e, Jabra 550a, Kingston HyperX + * needs a tiny delay here, otherwise requests like get/set + * frequency return as failed despite actually succeeding. */ if ((chip->usb_id == USB_ID(0x1686, 0x00dd) || chip->usb_id == USB_ID(0x046d, 0x0a46) || + chip->usb_id == USB_ID(0x046d, 0x0a56) || chip->usb_id == USB_ID(0x0b0e, 0x0349) || chip->usb_id == USB_ID(0x0951, 0x16ad)) && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) -- 2.26.2

3 4

[PATCH] ALSA: compat_ioctl: avoid compat_alloc_user_space
by Arnd Bergmann 21 Sep '20

21 Sep '20

Using compat_alloc_user_space() tends to add complexity to the ioctl handling, so I am trying to remove it everywhere. The two callers in sound/core can rewritten to just call the same code that operates on a kernel pointer as the native handler. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/core/control.c | 38 ++++++++++++++++++++++++------------- sound/core/control_compat.c | 14 ++++++-------- sound/core/hwdep.c | 27 ++++++++++++++++---------- sound/core/hwdep_compat.c | 23 +++++++--------------- 4 files changed, 55 insertions(+), 47 deletions(-) diff --git a/sound/core/control.c b/sound/core/control.c index aa0c0cf182af..e014598142df 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -717,22 +717,19 @@ static int snd_ctl_card_info(struct snd_card *card, struct snd_ctl_file * ctl, } static int snd_ctl_elem_list(struct snd_card *card, - struct snd_ctl_elem_list __user *_list) + struct snd_ctl_elem_list *list) { - struct snd_ctl_elem_list list; struct snd_kcontrol *kctl; struct snd_ctl_elem_id id; unsigned int offset, space, jidx; int err = 0; - if (copy_from_user(&list, _list, sizeof(list))) - return -EFAULT; - offset = list.offset; - space = list.space; + offset = list->offset; + space = list->space; down_read(&card->controls_rwsem); - list.count = card->controls_count; - list.used = 0; + list->count = card->controls_count; + list->used = 0; if (space > 0) { list_for_each_entry(kctl, &card->controls, list) { if (offset >= kctl->count) { @@ -741,12 +738,12 @@ static int snd_ctl_elem_list(struct snd_card *card, } for (jidx = offset; jidx < kctl->count; jidx++) { snd_ctl_build_ioff(&id, kctl, jidx); - if (copy_to_user(list.pids + list.used, &id, + if (copy_to_user(list->pids + list->used, &id, sizeof(id))) { err = -EFAULT; goto out; } - list.used++; + list->used++; if (!--space) goto out; } @@ -755,11 +752,26 @@ static int snd_ctl_elem_list(struct snd_card *card, } out: up_read(&card->controls_rwsem); - if (!err && copy_to_user(_list, &list, sizeof(list))) - err = -EFAULT; return err; } +static int snd_ctl_elem_list_user(struct snd_card *card, + struct snd_ctl_elem_list __user *_list) +{ + struct snd_ctl_elem_list list; + int err; + + if (copy_from_user(&list, _list, sizeof(list))) + return -EFAULT; + err = snd_ctl_elem_list(card, &list); + if (err) + return err; + if (copy_to_user(_list, &list, sizeof(list))) + return -EFAULT; + + return 0; +} + /* Check whether the given kctl info is valid */ static int snd_ctl_check_elem_info(struct snd_card *card, const struct snd_ctl_elem_info *info) @@ -1703,7 +1715,7 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg case SNDRV_CTL_IOCTL_CARD_INFO: return snd_ctl_card_info(card, ctl, cmd, argp); case SNDRV_CTL_IOCTL_ELEM_LIST: - return snd_ctl_elem_list(card, argp); + return snd_ctl_elem_list_user(card, argp); case SNDRV_CTL_IOCTL_ELEM_INFO: return snd_ctl_elem_info_user(ctl, argp); case SNDRV_CTL_IOCTL_ELEM_READ: diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index 02df1d7db9a1..1d708aab9c98 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -22,24 +22,22 @@ struct snd_ctl_elem_list32 { static int snd_ctl_elem_list_compat(struct snd_card *card, struct snd_ctl_elem_list32 __user *data32) { - struct snd_ctl_elem_list __user *data; + struct snd_ctl_elem_list data = {}; compat_caddr_t ptr; int err; - data = compat_alloc_user_space(sizeof(*data)); - /* offset, space, used, count */ - if (copy_in_user(data, data32, 4 * sizeof(u32))) + if (copy_from_user(&data, data32, 4 * sizeof(u32))) return -EFAULT; /* pids */ - if (get_user(ptr, &data32->pids) || - put_user(compat_ptr(ptr), &data->pids)) + if (get_user(ptr, &data32->pids)) return -EFAULT; - err = snd_ctl_elem_list(card, data); + data.pids = compat_ptr(ptr); + err = snd_ctl_elem_list(card, &data); if (err < 0) return err; /* copy the result */ - if (copy_in_user(data32, data, 4 * sizeof(u32))) + if (copy_to_user(data32, &data, 4 * sizeof(u32))) return -EFAULT; return 0; } diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index 21edb8ac95eb..0c029892880a 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c @@ -203,28 +203,35 @@ static int snd_hwdep_dsp_status(struct snd_hwdep *hw, } static int snd_hwdep_dsp_load(struct snd_hwdep *hw, - struct snd_hwdep_dsp_image __user *_info) + struct snd_hwdep_dsp_image *info) { - struct snd_hwdep_dsp_image info; int err; if (! hw->ops.dsp_load) return -ENXIO; - memset(&info, 0, sizeof(info)); - if (copy_from_user(&info, _info, sizeof(info))) - return -EFAULT; - if (info.index >= 32) + if (info->index >= 32) return -EINVAL; /* check whether the dsp was already loaded */ - if (hw->dsp_loaded & (1u << info.index)) + if (hw->dsp_loaded & (1u << info->index)) return -EBUSY; - err = hw->ops.dsp_load(hw, &info); + err = hw->ops.dsp_load(hw, info); if (err < 0) return err; - hw->dsp_loaded |= (1u << info.index); + hw->dsp_loaded |= (1u << info->index); return 0; } +static int snd_hwdep_dsp_load_user(struct snd_hwdep *hw, + struct snd_hwdep_dsp_image __user *_info) +{ + struct snd_hwdep_dsp_image info = {}; + + if (copy_from_user(&info, _info, sizeof(info))) + return -EFAULT; + return snd_hwdep_dsp_load(hw, &info); +} + + static long snd_hwdep_ioctl(struct file * file, unsigned int cmd, unsigned long arg) { @@ -238,7 +245,7 @@ static long snd_hwdep_ioctl(struct file * file, unsigned int cmd, case SNDRV_HWDEP_IOCTL_DSP_STATUS: return snd_hwdep_dsp_status(hw, argp); case SNDRV_HWDEP_IOCTL_DSP_LOAD: - return snd_hwdep_dsp_load(hw, argp); + return snd_hwdep_dsp_load_user(hw, argp); } if (hw->ops.ioctl) return hw->ops.ioctl(hw, file, cmd, arg); diff --git a/sound/core/hwdep_compat.c b/sound/core/hwdep_compat.c index bc81db9cb3d4..a0b76706c083 100644 --- a/sound/core/hwdep_compat.c +++ b/sound/core/hwdep_compat.c @@ -19,26 +19,17 @@ struct snd_hwdep_dsp_image32 { static int snd_hwdep_dsp_load_compat(struct snd_hwdep *hw, struct snd_hwdep_dsp_image32 __user *src) { - struct snd_hwdep_dsp_image __user *dst; + struct snd_hwdep_dsp_image info = {}; compat_caddr_t ptr; - u32 val; - dst = compat_alloc_user_space(sizeof(*dst)); - - /* index and name */ - if (copy_in_user(dst, src, 4 + 64)) - return -EFAULT; - if (get_user(ptr, &src->image) || - put_user(compat_ptr(ptr), &dst->image)) - return -EFAULT; - if (get_user(val, &src->length) || - put_user(val, &dst->length)) - return -EFAULT; - if (get_user(val, &src->driver_data) || - put_user(val, &dst->driver_data)) + if (copy_from_user(&info, src, 4 + 64) || + get_user(ptr, &src->image) || + get_user(info.length, &src->length) || + get_user(info.driver_data, &src->driver_data)) return -EFAULT; + info.image = compat_ptr(ptr); - return snd_hwdep_dsp_load(hw, dst); + return snd_hwdep_dsp_load(hw, &info); } enum { -- 2.27.0

2 1