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

[PATCH v5 00/16] ALSA/ASoC: hda: Address format selection limitations and ambiguity
by Cezary Rojewski 27 Nov '23

27 Nov '23

Patchset aims to address format selection restrictions present currently in the HDAudio library. Formats which we are concerned about are 20 and 24 valid bits per sample within 32 bit depth container. One may identify them as S20_LE and S24_LE except that those, according to comments found in include/uapi/sound/asound.h, are for LSB-aligned scenarios. HDAudio streams expect MSB-aligned data, no matter if we are speaking of HOST (SDxFMT) or LINK (PPLCxFMT) side - chapter 4.5.1 of the public HDAudio specification. In short, S20_LE and S24_LE are invalid options. Right now, given the implementation of snd_hdac_query_supported_pcm() within sound/hda/hdac_device.c, even if a codec responds with: "I support all possible formats specified within HDAudio specification", there will be no option to open a 20/32 or 24/32 stream. The kernel will force the stream to be opened using the highest available bit depth. After discussing subject initially with Jaroslav and Takashi, suggestion was made to utilize 'subformat' option to address the problem. The eye-opening discussion begun much earlier though, in 2019 [1]. Paired with PRs for alsa-utils [2] and alsa-lib [3]. Flow of changes: The very first patch adds MSBITS subformat options to allow for granular 20/32, 24/32 and 32/32 format selection. The next two make sure subformat is actually honored during runtime. Most of that code is based on format-related API. Follow up is upgrade to the hda stream-format interface - several functions are added to make the granular format selection simple in the HDAudio world. Core of the implementation is based on the existing snd_hdac_calc_stream_format(). The next ten patches are straightforward switch from one interface to another with cleanup of now-unsed function as a finishing touch. Last but not least - the avs-driver, on which the problem analyzed and debugged, is updated to no longer acknowledge S24_LE as a valid format option. Results with skylake-driver and snd_hda_intel show status quo on our RVPs. PR filed on SOF github shows promising results too [4]. Changes in v5: - reworded 'bps' to 'bits' in all occurrences. - fixed an issue of MSBITS_MAX not being reported for S32_LE as reported by Jaroslav - snd_pcm_subformat_width() has been inlined into its only user: snd_pcm_hw_params_bits() as suggested by Jaroslav. - updated commit messege for patch 01 as it was out of date given the recent updates. Changes in v4: - fixed compilation issues in sof-driver, patch 12/16, reported by ikp - fixed sparse warnings in patch 01/16, reported by ikp - updated commit message for patch 03: "ASoC pcm: Honor subformat when configuring runtime", as snd_pcm_hw_copy() is gone since revision v3. Changes in v3: - merged the first two patches as suggested by Jaroslav - re-authored patch 01 to Jaroslav, added my Co-developed-by. - added Jaroslav' Co-developed-by to patch 02. - 'subformats' field now S32_LE-specific. Given the fact that it is the only format currently requiring subformat-intervention, functionality is narrowed to reduce amount of memory allocations and cleanup. Suggested by Jaroslav. - note to the above: the hdaudio part converted 1:1 as requested, patch 02/16 - note #2: alsa part converted to S32_LE-specific yet without addition of the chicken bit. Instead, struct snd_pcm_hardware is updated with u32 subformat mask to do the job. - ALSA-core additions in form of snd_pcm_subformat_width() and snd_pcm_hw_params_bps() relocated from 01/16 to the user, patch 05. Changes in v2: - patch 01/17, introduced struct snd_pcm_subformat which task is to represent subformat-mask on per format basis. Expectation is that manipulated arrays of subformats always end with a sentinel entry - patch 01/17, added snd_pcm_hw_copy() as the copying snd_pcm_hardware becomes non-trivial - patch 02/17, added hw_rule that produces final subformat mask based on provided formats as suggested by Jaroslav - patch 04/17, soc_pcm_hw_update_subformat() refactored as the subformat intersection becomes non-trivial - relevant functions releasing resources occupied by hda_pcm and snd_pcm_runtime updated to also kfree() subformats - except for 16/17, no changes to patches past 04/17, retaining acks for these Changes in v1: - fixed UBSAN due to missing snd_pcm_subformat_names[] entries for new subformats - as HDMI stream capabilities are assigned on PCM open, patch 16/17 has been updated to ignore such codecs for now. A separate patchset will take care of this case - params_bps() reworded to snd_pcm_hw_params_bps() - fixed compilation issues in sof-driver, patch 13/17 [1]: https://lore.kernel.org/alsa-devel/20190905053302.9262-1-pawel.harlozinski@… [2]: https://github.com/alsa-project/alsa-utils/pull/228 [3]: https://github.com/alsa-project/alsa-lib/pull/342 [4]: https://github.com/thesofproject/linux/pull/4539 Cezary Rojewski (15): ALSA: hda: Honor subformat when querying PCMs ASoC: pcm: Honor subformat when configuring runtime ALSA: hda: Upgrade stream-format infrastructure ALSA: hda: Switch to new stream-format interface ALSA: hda/hdmi: Switch to new stream-format interface ALSA: hda/ca0132: Switch to new stream-format interface ASoC: codecs: hda: Switch to new stream-format interface ASoC: codecs: hdac_hda: Switch to new stream-format interface ASoC: codecs: hdac_hdmi: Switch to new stream-format interface ASoC: Intel Skylake: Switch to new stream-format interface ASoC: SOF: Intel: Switch to new stream-format interface ASoC: Intel: avs: Switch to new stream-format interface ALSA: hda: Drop snd_hdac_calc_stream_format() ASoC: Intel: avs: Kill S24_LE format ASoC: Intel: avs: Unhardcode HDAudio BE DAI drivers description Jaroslav Kysela (1): ALSA: pcm: Introduce MSBITS subformat interface include/sound/hda_codec.h | 5 +- include/sound/hdaudio.h | 13 +-- include/sound/pcm.h | 7 ++ include/sound/pcm_params.h | 2 + include/sound/soc.h | 1 + include/uapi/sound/asound.h | 7 +- sound/core/pcm.c | 3 + sound/core/pcm_lib.c | 34 +++++++ sound/core/pcm_native.c | 55 ++++++++++- sound/hda/hdac_device.c | 156 +++++++++++++++++++++--------- sound/pci/hda/hda_codec.c | 2 + sound/pci/hda/hda_controller.c | 10 +- sound/pci/hda/patch_ca0132.c | 3 +- sound/pci/hda/patch_hdmi.c | 6 +- sound/soc/codecs/hda-dai.c | 7 +- sound/soc/codecs/hda.c | 2 + sound/soc/codecs/hdac_hda.c | 8 +- sound/soc/codecs/hdac_hdmi.c | 10 +- sound/soc/intel/avs/loader.c | 4 +- sound/soc/intel/avs/path.c | 2 +- sound/soc/intel/avs/pcm.c | 58 +++++++++-- sound/soc/intel/avs/probes.c | 3 +- sound/soc/intel/avs/topology.c | 13 ++- sound/soc/intel/skylake/skl-pcm.c | 13 ++- sound/soc/soc-pcm.c | 10 ++ sound/soc/sof/intel/hda-dai-ops.c | 21 ++-- tools/include/uapi/sound/asound.h | 7 +- 27 files changed, 352 insertions(+), 110 deletions(-) -- 2.25.1

3 19

ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA
by Malcolm Hart 27 Nov '23

27 Nov '23

Like other ASUS models the Asus Vivobook E1504FA requires an entry in the quirk list to enable the internal microphone. Showing with 7 additions and 0 deletions. 7 changes: 7 additions & 0 deletions 7 sound/soc/amd/yc/acp6x-mach.c @@ -283,6 +283,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"), } }, { .driver_data = &acp6x_card, .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_PRODUCT_NAME, "E1504FA"), } }, { I have this laptop and I have tested this patch successfully. Malcolm

2 2

[PATCH] ALSA: hda: intel-nhlt: Ignore vbps when looking for DMIC 32 bps format
by Peter Ujfalusi 27 Nov '23

27 Nov '23

When looking up DMIC blob from the NHLT table and the format is 32 bits, ignore the vbps matching for 32 bps for DMIC since some NHLT table have the vbps as 24, some have it as 32. The DMIC hardware supports only one type of 32 bit sample size, which is 24 bit sampling on the MSB side and bits[1:0] is used for indicating the channel number. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.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> --- sound/hda/intel-nhlt.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c index 2c4dfc0b7e34..696a958d93e9 100644 --- a/sound/hda/intel-nhlt.c +++ b/sound/hda/intel-nhlt.c @@ -238,7 +238,7 @@ EXPORT_SYMBOL(intel_nhlt_ssp_mclk_mask); static struct nhlt_specific_cfg * nhlt_get_specific_cfg(struct device *dev, struct nhlt_fmt *fmt, u8 num_ch, - u32 rate, u8 vbps, u8 bps) + u32 rate, u8 vbps, u8 bps, bool ignore_vbps) { struct nhlt_fmt_cfg *cfg = fmt->fmt_config; struct wav_fmt *wfmt; @@ -255,8 +255,12 @@ nhlt_get_specific_cfg(struct device *dev, struct nhlt_fmt *fmt, u8 num_ch, dev_dbg(dev, "Endpoint format: ch=%d fmt=%d/%d rate=%d\n", wfmt->channels, _vbps, _bps, wfmt->samples_per_sec); + /* + * When looking for exact match of configuration ignore the vbps + * from NHLT table when ignore_vbps is true + */ if (wfmt->channels == num_ch && wfmt->samples_per_sec == rate && - vbps == _vbps && bps == _bps) + (ignore_vbps || vbps == _vbps) && bps == _bps) return &cfg->config; cfg = (struct nhlt_fmt_cfg *)(cfg->config.caps + cfg->config.size); @@ -289,6 +293,7 @@ intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, { struct nhlt_specific_cfg *cfg; struct nhlt_endpoint *epnt; + bool ignore_vbps = false; struct nhlt_fmt *fmt; int i; @@ -298,7 +303,26 @@ intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, dev_dbg(dev, "Looking for configuration:\n"); dev_dbg(dev, " vbus_id=%d link_type=%d dir=%d, dev_type=%d\n", bus_id, link_type, dir, dev_type); - dev_dbg(dev, " ch=%d fmt=%d/%d rate=%d\n", num_ch, vbps, bps, rate); + if (link_type == NHLT_LINK_DMIC && bps == 32 && (vbps == 24 || vbps == 32)) { + /* + * The DMIC hardware supports only one type of 32 bits sample + * size, which is 24 bit sampling on the MSB side and bits[1:0] + * are used for indicating the channel number. + * It has been observed that some NHLT tables have the vbps + * specified as 32 while some uses 24. + * The format these variations describe are identical, the + * hardware is configured and behaves the same way. + * Note: when the samples assumed to be vbps=32 then the 'noise' + * introduced by the lower two bits (channel number) have no + * real life implication on audio quality. + */ + dev_dbg(dev, + " ch=%d fmt=%d rate=%d (vbps is ignored for DMIC 32bit format)\n", + num_ch, bps, rate); + ignore_vbps = true; + } else { + dev_dbg(dev, " ch=%d fmt=%d/%d rate=%d\n", num_ch, vbps, bps, rate); + } dev_dbg(dev, "Endpoint count=%d\n", nhlt->endpoint_count); epnt = (struct nhlt_endpoint *)nhlt->desc; @@ -307,7 +331,8 @@ intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, if (nhlt_check_ep_match(dev, epnt, bus_id, link_type, dir, dev_type)) { fmt = (struct nhlt_fmt *)(epnt->config.caps + epnt->config.size); - cfg = nhlt_get_specific_cfg(dev, fmt, num_ch, rate, vbps, bps); + cfg = nhlt_get_specific_cfg(dev, fmt, num_ch, rate, + vbps, bps, ignore_vbps); if (cfg) return cfg; } -- 2.43.0

2 1

Yamaha YIT-W12TX not working
by Julian Sikorski 27 Nov '23

27 Nov '23

Hi list, Yamaha YIT-W12TX is a USB dongle which allows to transmit audio from PC to the YSP-4300 sound bar [1][2]. While it is quite old and no longer sold, I recently tried to make it work under linux. Unfortunately, it did not work: [ 3676.366404] usb 2-1.1: new full-speed USB device number 5 using ehci-pci [ 3676.445995] usb 2-1.1: config 1 has an invalid interface number: 4 but max is 3 [ 3676.446001] usb 2-1.1: config 1 has no interface number 2 [ 3676.446664] usb 2-1.1: New USB device found, idVendor=0499, idProduct=3108, bcdDevice= 1.00 [ 3676.446666] usb 2-1.1: New USB device strings: Mfr=2, Product=1, SerialNumber=0 [ 3676.446679] usb 2-1.1: Product: YIT-W12TX [ 3676.446683] usb 2-1.1: Manufacturer: YAMAHA Corp. [ 3676.449508] hid-generic 0003:0499:3108.0001: hiddev96,hidraw0: USB HID v0.01 Device [YAMAHA Corp. YIT-W12TX] on usb-0000:00:1d.0-1.1/input3 [ 3676.450846] input: YAMAHA Corp. YIT-W12TX as /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.1/2-1.1:1.4/0003:0499:3108.0002/input/input34 [ 3676.503844] hid-generic 0003:0499:3108.0002: input,hidraw1: USB HID v1.00 Device [YAMAHA Corp. YIT-W12TX] on usb-0000:00:1d.0-1.1/input4 [ 3676.671641] usb 2-1.1: 1:1: cannot get freq at ep 0x1 [ 3676.675786] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.676476] usbcore: registered new interface driver snd-usb-audio [ 3676.731911] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.735658] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.739399] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.743131] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.746920] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.750648] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.754445] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.758524] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.762274] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.789671] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.790049] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.790414] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.790773] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.791169] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.792134] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.792547] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.792899] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.793254] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.793634] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.794900] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.795255] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.795634] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.796008] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.796384] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.797543] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.797879] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.798254] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.798634] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.799007] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.813819] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.814281] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.814686] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.815281] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.815929] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.817807] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.818155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.818592] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.819165] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.819801] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.822163] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.822802] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.823284] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.824161] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.824907] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.827683] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.828159] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.828675] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.829415] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.830157] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.841801] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.842155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.842551] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.843158] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.843785] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.844909] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.845283] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.845673] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.846156] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.846800] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.848287] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.848799] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.849280] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.850031] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.850799] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.852677] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.853154] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.853674] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.854429] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.855155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.858916] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.859277] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.859672] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.860280] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.860909] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.862033] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.862418] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.862797] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.863279] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.863923] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.865471] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.866033] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.866590] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.867410] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.868157] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.870162] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.870674] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.871155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.871908] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.872676] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.900672] usb 2-1.1: USB disconnect, device number 5 [ 3676.900688] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 This is with kernel-5.9.13-200.fc33.x86_64 and alsa-lib-1.2.4-5.fc33.x86_64 on Fedora 33. Under Windows 10 the dongle works without any special drivers from Yamaha, everything appears to be downloaded by Windows automatically, so I was hoping the device could be made to work under Linux relatively easily. Best regards, Julian [1] https://europe.yamaha.com/en/products/audio_visual/accessories/yit-w12/down… [2] https://europe.yamaha.com/en/products/audio_visual/sound_bar/ysp-4300/downl…

2 7

[PATCH] sound: samsung: Add error handling to clk_set_rate in smdk_spdif
by Haoran Liu 27 Nov '23

27 Nov '23

This patch adds error handling for clk_set_rate calls in the set_audio_clock_rate function of the smdk_spdif.c file. Previously, the return value of clk_set_rate was not checked, which could potentially lead to unhandled errors in setting the audio clock rate. This change ensures that if clk_set_rate fails, the error is properly reported and handled. Signed-off-by: Haoran Liu <liuhaoran14(a)163.com> --- sound/soc/samsung/smdk_spdif.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/smdk_spdif.c b/sound/soc/samsung/smdk_spdif.c index 2474eb619882..c31b82b89148 100644 --- a/sound/soc/samsung/smdk_spdif.c +++ b/sound/soc/samsung/smdk_spdif.c @@ -75,6 +75,7 @@ static int set_audio_clock_rate(unsigned long epll_rate, unsigned long audio_rate) { struct clk *fout_epll, *sclk_spdif; + int ret; fout_epll = clk_get(NULL, "fout_epll"); if (IS_ERR(fout_epll)) { @@ -82,7 +83,14 @@ static int set_audio_clock_rate(unsigned long epll_rate, return -ENOENT; } - clk_set_rate(fout_epll, epll_rate); + ret = clk_set_rate(fout_epll, epll_rate); + if (ret) { + printk(KERN_ERR "%s: failed to set rate for fout_epll\n", + __func__); + clk_put(fout_epll); + return ret; + } + clk_put(fout_epll); sclk_spdif = clk_get(NULL, "sclk_spdif"); @@ -91,7 +99,15 @@ static int set_audio_clock_rate(unsigned long epll_rate, return -ENOENT; } - clk_set_rate(sclk_spdif, audio_rate); + ret = clk_set_rate(sclk_spdif, audio_rate); + if (ret) { + printk(KERN_ERR "%s: failed to set rate for sclk_spdif\n", + __func__); + clk_put(sclk_spdif); + clk_put(fout_epll); + return ret; + } + clk_put(sclk_spdif); return 0; -- 2.17.1

1 0

[PATCH v6 00/11] Introduce STM32 Firewall framework
by Gatien Chevallier 27 Nov '23

27 Nov '23

Introduce STM32 Firewall framework for STM32MP1x and STM32MP2x platforms. STM32MP1x(ETZPC) and STM32MP2x(RIFSC) Firewall controllers register to the framework to offer firewall services such as access granting. This series of patches is a new approach on the previous STM32 system bus, history is available here: https://lore.kernel.org/lkml/20230127164040.1047583/ The need for such framework arises from the fact that there are now multiple hardware firewalls implemented across multiple products. Drivers are shared between different products, using the same code. When it comes to firewalls, the purpose mostly stays the same: Protect hardware resources. But the implementation differs, and there are multiple types of firewalls: peripheral, memory, ... Some hardware firewall controllers such as the RIFSC implemented on STM32MP2x platforms may require to take ownership of a resource before being able to use it, hence the requirement for firewall services to take/release the ownership of such resources. On the other hand, hardware firewall configurations are becoming more and more complex. These mecanisms prevent platform crashes or other firewall-related incoveniences by denying access to some resources. The stm32 firewall framework offers an API that is defined in firewall controllers drivers to best fit the specificity of each firewall. For every peripherals protected by either the ETZPC or the RIFSC, the firewall framework checks the firewall controlelr registers to see if the peripheral's access is granted to the Linux kernel. If not, the peripheral is configured as secure, the node is marked populated, so that the driver is not probed for that device. The firewall framework relies on the access-controller device tree binding. It is used by peripherals to reference a domain access controller. In this case a firewall controller. The bus uses the ID referenced by the access-controller property to know where to look in the firewall to get the security configuration for the peripheral. This allows a device tree description rather than a hardcoded peripheral table in the bus driver. The STM32 ETZPC device is responsible for filtering accesses based on security level, or co-processor isolation for any resource connected to it. The RIFSC is responsible for filtering accesses based on Compartment ID / security level / privilege level for any resource connected to it. STM32MP13/15/25 SoC device tree files are updated in this series to implement this mecanism. Changes in V6: - Rename access-controller to access-controllers - Remove access-controller-provider - Update device trees and other bindings accordingly - Rework ETZPC/RIFSC bindings to define what access-controllers cells contain inside #access-controller-cells - Some other minor fixes Changes in V5: - Integrate and rework the "feature-domains" binding patch in this patchset. The binding is renamed to "access-controller" - Rename every feature-domain* reference to access-control* ones - Correct loop bug and missing select STM32_FIREWALL in 32-bit platform Kconfig Changes in V4: - Fix typo in commit message and YAML check errors in "dt-bindings: Document common device controller bindings" Note: This patch should be ignored as stated in the cover letter. I've done this to avoid errors on this series of patch - Correct code syntax/style issues reported by Simon Horman - Added Jonathan's tag for IIO on the treewide patch Changes in V3: Change incorrect ordering for bindings commits leading to an error while running "make DT_CHECKER_FLAGS=-m dt_binding_check" Changes in V2: generic: - Add fw_devlink dependency for "feature-domains" property. bindings: - Corrected YAMLS errors highlighted by Rob's robot - Firewall controllers YAMLs no longer define the maxItems for the "feature-domains" property - Renamed st,stm32-rifsc.yaml to st,stm32mp25-rifsc.yaml - Fix examples in YAML files - Change feature-domains maxItems to 2 in firewall consumer files as there should not be more than 2 entries for now - Declare "feature-domain-names" as an optional property for firewall controllers child nodes. - Add missing "feature-domains" property declaration in bosch,m_can.yaml and st,stm32-cryp.yaml files firewall framework: - Support multiple entries for "feature-domains" property - Better handle the device-tree parsing using phandle+args APIs - Remove "resource firewall" type - Add a field for the name of the firewall entry - Fix licenses RIFSC: - Add controller name - Driver is now a module_platform_driver - Fix license ETZPC: - Add controller name - Driver is now a module_platform_driver - Fix license Device trees: - Fix rifsc node name - Move the "ranges" property under the "feature-domains" one Gatien Chevallier (10): dt-bindings: treewide: add access-controllers description dt-bindings: bus: document RIFSC dt-bindings: bus: document ETZPC firewall: introduce stm32_firewall framework of: property: fw_devlink: Add support for "access-controller" bus: rifsc: introduce RIFSC firewall controller driver arm64: dts: st: add RIFSC as an access controller for STM32MP25x boards bus: etzpc: introduce ETZPC firewall controller driver ARM: dts: stm32: add ETZPC as a system bus for STM32MP15x boards ARM: dts: stm32: add ETZPC as a system bus for STM32MP13x boards Oleksii Moisieiev (1): dt-bindings: document generic access controllers .../access-controllers.yaml | 84 + .../bindings/bus/st,stm32-etzpc.yaml | 87 + .../bindings/bus/st,stm32mp25-rifsc.yaml | 96 + .../bindings/crypto/st,stm32-cryp.yaml | 4 + .../bindings/crypto/st,stm32-hash.yaml | 4 + .../devicetree/bindings/dma/st,stm32-dma.yaml | 4 + .../bindings/dma/st,stm32-dmamux.yaml | 4 + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 4 + .../bindings/iio/adc/st,stm32-adc.yaml | 4 + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 + .../bindings/iio/dac/st,stm32-dac.yaml | 4 + .../bindings/media/cec/st,stm32-cec.yaml | 4 + .../bindings/media/st,stm32-dcmi.yaml | 4 + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 4 + .../bindings/mfd/st,stm32-lptimer.yaml | 4 + .../bindings/mfd/st,stm32-timers.yaml | 4 + .../devicetree/bindings/mmc/arm,pl18x.yaml | 4 + .../bindings/net/can/bosch,m_can.yaml | 4 + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + .../bindings/phy/phy-stm32-usbphyc.yaml | 4 + .../bindings/regulator/st,stm32-vrefbuf.yaml | 4 + .../devicetree/bindings/rng/st,stm32-rng.yaml | 4 + .../bindings/serial/st,stm32-uart.yaml | 4 + .../bindings/sound/st,stm32-i2s.yaml | 4 + .../bindings/sound/st,stm32-sai.yaml | 4 + .../bindings/sound/st,stm32-spdifrx.yaml | 4 + .../bindings/spi/st,stm32-qspi.yaml | 4 + .../devicetree/bindings/spi/st,stm32-spi.yaml | 4 + .../devicetree/bindings/usb/dwc2.yaml | 4 + MAINTAINERS | 7 + arch/arm/boot/dts/st/stm32mp131.dtsi | 1025 +++--- arch/arm/boot/dts/st/stm32mp133.dtsi | 51 +- arch/arm/boot/dts/st/stm32mp13xc.dtsi | 19 +- arch/arm/boot/dts/st/stm32mp13xf.dtsi | 19 +- arch/arm/boot/dts/st/stm32mp151.dtsi | 2756 +++++++++-------- arch/arm/boot/dts/st/stm32mp153.dtsi | 52 +- arch/arm/boot/dts/st/stm32mp15xc.dtsi | 19 +- arch/arm/mach-stm32/Kconfig | 1 + arch/arm64/Kconfig.platforms | 1 + arch/arm64/boot/dts/st/stm32mp251.dtsi | 6 +- drivers/bus/Kconfig | 9 + drivers/bus/Makefile | 1 + drivers/bus/stm32_etzpc.c | 141 + drivers/bus/stm32_firewall.c | 294 ++ drivers/bus/stm32_firewall.h | 83 + drivers/bus/stm32_rifsc.c | 252 ++ drivers/of/property.c | 2 + include/linux/bus/stm32_firewall_device.h | 141 + 48 files changed, 3331 insertions(+), 1919 deletions(-) create mode 100644 Documentation/devicetree/bindings/access-controllers/access-controllers.yaml create mode 100644 Documentation/devicetree/bindings/bus/st,stm32-etzpc.yaml create mode 100644 Documentation/devicetree/bindings/bus/st,stm32mp25-rifsc.yaml create mode 100644 drivers/bus/stm32_etzpc.c create mode 100644 drivers/bus/stm32_firewall.c create mode 100644 drivers/bus/stm32_firewall.h create mode 100644 drivers/bus/stm32_rifsc.c create mode 100644 include/linux/bus/stm32_firewall_device.h -- 2.35.3

2 18

[RFC PATCH 0/2] ASoC: soc-dai: add flag to mute and unmute stream during trigger.
by Srinivas Kandagatla 27 Nov '23

27 Nov '23

Click/Pop Noise was a long pending issue with WSA Codecs which are prone to accumlate DC when ports are active but without any data streams. There are multiple places in the current setup, where this could happen in both startup as well as shutdown path. This patchset adds a new flag mute_unmute_on_trigger to dai_ops to let generic code do the mute/unmute on trigger. This patches help fix those issues by making sure the PA is Muted/Unmuted inline with the stream start/stop events. Srinivas Kandagatla (2): ASoC: soc-dai: add flag to mute and unmute stream during trigger ASoC: codecs: wsa883x: make use of new mute_unmute_on_trigger flag include/sound/soc-dai.h | 1 + sound/soc/codecs/wsa883x.c | 7 +------ sound/soc/soc-dai.c | 7 +++++++ sound/soc/soc-pcm.c | 12 ++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) -- 2.21.0

5 13

[PATCH v2 0/1] ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive
by Chancel Liu 27 Nov '23

27 Nov '23

It's reasonable that DAI parameters should be cleared if current DAI becomes inactive. Only check DAI active status in soc_pcm_hw_free() is not enough since there's the risk that DAI parameters never be cleared if there're more than one stream [see A]. Only check DAI active status in soc_pcm_close() is also not enough since it will cause the cleanup just happening in soc_pcm_close() [see B]. [A] For example, we have stream1 and stream2 for DAI about to stop. stream2 executes soc_pcm_hw_free() before stream1 executes soc_pcm_close(). At the moment, stream2 should clear current DAI parameters because stream1 passed the cleanup stage in soc_pcm_hw_free() and stream2 in fact is the only active stream which has a chance to do clean up. Since DAI active status is not yet updated by stream1 in soc_pcm_close(), stream2 doesn't know itself should clear DAI parameters. In result both stream1 and stream2 don't clear the parameters. [B] Suppose a case: aplay -Dhw:0 44100.wav 48000.wav In this case, we call soc_pcm_open()->soc_pcm_hw_params()->soc_pcm_hw_free() ->soc_pcm_hw_params()->soc_pcm_hw_free()->soc_pcm_close() in order. The DAI parameters would be remained in the system even if the playback of 44100.wav is finished. In conclusion, it's better to check DAI active status in both soc_pcm_hw_free() and soc_pcm_close() which makes sure DAI parameters cleared if the DAI becomes inactive. changes in v2: - Patch v1 link: https://lore.kernel.org/all/20230112065834.580192-1-chancel.liu@nxp.com/ Patch v1 tries to introduce a usage count called hw_params_count to fix issue on DAI parameters cleanup. However it's not a good fix because not considering hw_params() and hw_free() are not symmetrical and hw_params() might be called multilpe times by user. - Both check DAI active status in soc_pcm_hw_free() and soc_pcm_close() which makes sure DAI parameters cleared if the DAI becomes inactive. Chancel Liu (1): ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive sound/soc/soc-pcm.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.25.1

3 4

[PATCH v3 0/3] Add audio device nodes for i.MX93 platform
by Chancel Liu 27 Nov '23

27 Nov '23

changes in v3 - drop unused compatible string in fsl,mqs.yaml changes in v2 - Move MQS device node under "/" root node - Convert fsl,mqs.txt to yaml Chancel Liu (3): arm64: dts: imx93: Add audio device nodes arm64: dts: imx93: Configure clock rate for audio PLL ASoC: dt-bindings: fsl,mqs: Convert format to json-schema .../devicetree/bindings/sound/fsl,mqs.txt | 36 ------ .../devicetree/bindings/sound/fsl,mqs.yaml | 105 ++++++++++++++++++ arch/arm64/boot/dts/freescale/imx93.dtsi | 89 +++++++++++++++ 3 files changed, 194 insertions(+), 36 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.txt create mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.yaml -- 2.42.0

3 6

[PATCH v7 resend 0/5] ASoC: makes CPU/Codec channel connection map more generic
by Kuninori Morimoto 27 Nov '23

27 Nov '23

Hi Mark Cc Bard, Pierre-Louis, Jerome, DT-ML This is v7 patch-set. 2 weeks past, this is resend patch-set. Current ASoC is supporting CPU/Codec = N:M (N < M) connection by using ch_map idea. This patch-set expands it that all connection uses this idea, and no longer N < M limit [1][2]. Link: https://lore.kernel.org/r/87fs6wuszr.wl-kuninori.morimoto.gx@renesas.com [1] Link: https://lore.kernel.org/r/878r7yqeo4.wl-kuninori.morimoto.gx@renesas.com [2] ASoC core code ([PATCH 1/5]) is same as v6 and it was tested by Pierre-Louis, and Jerome. Big change on v7 is basically for Audio-Graph-Card2. v6 -> v7 - use "endpoint" for N:M connection instead of ch-map-idx on Audio-Graph-Card2 v5 -> v6 - tidyup some warnings - rename "ch-map-idx" -> "channel-map-index" - Update "channel-map-index" description - add Tested-by from Pierre-Louis / Jerome v4 -> v5 - use cpu/codec index on ch_maps - separate card2 sample DT patch into prepare and new feature - ch-maps -> ch-map-idx on DT v3 -> v4 - add Jerome on To - add "description" on "ch-maps" v2 -> v3 - tidyup comment - use more clear connection image on DT - "ch_maps" -> "ch-maps" on DT - Add DT maintainer on "To:" for all patches v1 -> v2 - makes CPU/Codec connection relation clear on comment/sample - fixup type "connction" -> "connection" - makes error message clear Kuninori Morimoto (5): ASoC: makes CPU/Codec channel connection map more generic ASoC: audio-graph-card2: use better image for Multi connection ASoC: audio-graph-card2: add CPU:Codec = N:M support ASoC: audio-graph-card2-custom-sample: Add connection image ASoC: audio-graph-card2-custom-sample: add CPU/Codec = N:M sample include/sound/soc.h | 56 ++- .../audio-graph-card2-custom-sample.dtsi | 380 ++++++++++++++++-- sound/soc/generic/audio-graph-card2.c | 277 ++++++++++--- sound/soc/intel/boards/sof_sdw.c | 28 +- sound/soc/soc-core.c | 95 ++++- sound/soc/soc-dapm.c | 45 +-- sound/soc/soc-pcm.c | 44 +- 7 files changed, 754 insertions(+), 171 deletions(-) -- 2.25.1

1 5