July 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH AUTOSEL 5.18 37/54] ASoC: tlv320adcx140: Fix tx_mask check
by Sasha Levin 20 Jul '22

20 Jul '22

From: Sascha Hauer <s.hauer(a)pengutronix.de> [ Upstream commit 7d90c8e6396ba245da16bedd789df6d669375408 ] The tx_mask check doesn't reflect what the driver and the chip support. The check currently checks for exactly two slots being enabled. The tlv320adcx140 supports anything between one and eight channels, so relax the check accordingly. The tlv320adcx140 supports arbitrary tx_mask settings, but the driver currently only supports adjacent slots beginning with the first slot, so extend the check to check that the first slot is being used and that there are no holes in the tx_mask. Leave a comment to make it's the driver that limits the tx_mask settings, not the chip itself. While at it remove the set-but-unused struct adcx140p_priv::tdm_delay field. Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Link: https://lore.kernel.org/r/20220624105716.2579539-1-s.hauer@pengutronix.de Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/tlv320adcx140.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c index 32b120d624b2..bf18fcfcaeb9 100644 --- a/sound/soc/codecs/tlv320adcx140.c +++ b/sound/soc/codecs/tlv320adcx140.c @@ -33,7 +33,6 @@ struct adcx140_priv { bool micbias_vg; unsigned int dai_fmt; - unsigned int tdm_delay; unsigned int slot_width; }; @@ -792,12 +791,13 @@ static int adcx140_set_dai_tdm_slot(struct snd_soc_dai *codec_dai, { struct snd_soc_component *component = codec_dai->component; struct adcx140_priv *adcx140 = snd_soc_component_get_drvdata(component); - unsigned int lsb; - /* TDM based on DSP mode requires slots to be adjacent */ - lsb = __ffs(tx_mask); - if ((lsb + 1) != __fls(tx_mask)) { - dev_err(component->dev, "Invalid mask, slots must be adjacent\n"); + /* + * The chip itself supports arbitrary masks, but the driver currently + * only supports adjacent slots beginning at the first slot. + */ + if (tx_mask != GENMASK(__fls(tx_mask), 0)) { + dev_err(component->dev, "Only lower adjacent slots are supported\n"); return -EINVAL; } @@ -812,7 +812,6 @@ static int adcx140_set_dai_tdm_slot(struct snd_soc_dai *codec_dai, return -EINVAL; } - adcx140->tdm_delay = lsb; adcx140->slot_width = slot_width; return 0; -- 2.35.1

1 0

[PATCH AUTOSEL 5.18 36/54] ASoC: ti: omap-mcbsp: duplicate sysfs error
by Sasha Levin 20 Jul '22

20 Jul '22

From: David Owens <daowens01(a)gmail.com> [ Upstream commit f0d96937d31c4615a6418e4bed5cee50a952040e ] Convert to managed versions of sysfs and clk allocation to simplify unbinding and error handling in probe. Managed sysfs node creation specifically addresses the following error seen the second time probe is attempted after sdma_pcm_platform_register() previously requsted probe deferral: sysfs: cannot create duplicate filename '/devices/platform/68000000.ocp/49022000.mcbsp/max_tx_thres' Signed-off-by: David Owens <dowens(a)precisionplanting.com> Link: https://lore.kernel.org/r/20220620183744.3176557-1-dowens@precisionplanting… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/ti/omap-mcbsp-priv.h | 2 -- sound/soc/ti/omap-mcbsp-st.c | 14 ++------------ sound/soc/ti/omap-mcbsp.c | 19 ++----------------- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/sound/soc/ti/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h index 7865cda4bf0a..da519ea1f303 100644 --- a/sound/soc/ti/omap-mcbsp-priv.h +++ b/sound/soc/ti/omap-mcbsp-priv.h @@ -316,8 +316,6 @@ static inline int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, /* Sidetone specific API */ int omap_mcbsp_st_init(struct platform_device *pdev); -void omap_mcbsp_st_cleanup(struct platform_device *pdev); - int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp); int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp); diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c index 0bc7d26c660a..7e8179cae92e 100644 --- a/sound/soc/ti/omap-mcbsp-st.c +++ b/sound/soc/ti/omap-mcbsp-st.c @@ -347,7 +347,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data) return -ENOMEM; - st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick"); + st_data->mcbsp_iclk = devm_clk_get(mcbsp->dev, "ick"); if (IS_ERR(st_data->mcbsp_iclk)) { dev_warn(mcbsp->dev, "Failed to get ick, sidetone might be broken\n"); @@ -359,7 +359,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data->io_base_st) return -ENOMEM; - ret = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group); + ret = devm_device_add_group(mcbsp->dev, &sidetone_attr_group); if (ret) return ret; @@ -368,16 +368,6 @@ int omap_mcbsp_st_init(struct platform_device *pdev) return 0; } -void omap_mcbsp_st_cleanup(struct platform_device *pdev) -{ - struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - - if (mcbsp->st_data) { - sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group); - clk_put(mcbsp->st_data->mcbsp_iclk); - } -} - static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 4479d74f0a45..9933b33c80ca 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -702,8 +702,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10; mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10; - ret = sysfs_create_group(&mcbsp->dev->kobj, - &additional_attr_group); + ret = devm_device_add_group(mcbsp->dev, &additional_attr_group); if (ret) { dev_err(mcbsp->dev, "Unable to create additional controls\n"); @@ -711,16 +710,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) } } - ret = omap_mcbsp_st_init(pdev); - if (ret) - goto err_st; - - return 0; - -err_st: - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - return ret; + return omap_mcbsp_st_init(pdev); } /* @@ -1431,11 +1421,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req)) cpu_latency_qos_remove_request(&mcbsp->pm_qos_req); - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - - omap_mcbsp_st_cleanup(pdev); - return 0; } -- 2.35.1

1 0

Behringer UMC204HD HiFi "Default" profile crackling audio
by GitHub issues - opened 20 Jul '22

20 Jul '22

alsa-project/alsa-ucm-conf issue #192 was opened from acepukas: Since the recent update to 1.2.7.2, the Behringer UMC204HD "Default" profile has crackling audio through "Line A" and "Line B" ports. Switching to the "Direct" profile allows for clean audio but it's output over 4 speakers (front left and right, rear left and right). Not really sure how to trouble shoot this. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/192 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ASoC: Is this bug ? DAPM source vs sink
by Kuninori Morimoto 20 Jul '22

20 Jul '22

Hi ASoC Cc Lars-Peter I have noticed that DAPM source vs sink are strange. ASoC had used source/sink or input/output before, but it was exchanged by this patch a3423b02cf745c1418f1f199646c450d6fc9ca4e ("ASoC: dapm: Consolidate input and output path handling") I think source/sink pair are converted to SND_SOC_DAPM_DIR_IN/OUT by this patch. source <=> IN sink <=> OUT But, its for_each are inverted #define snd_soc_dapm_widget_for_each_sink_path(w, p) \ snd_soc_dapm_widget_for_each_path(w, SND_SOC_DAPM_DIR_IN, p) #define snd_soc_dapm_widget_for_each_source_path(w, p) \ snd_soc_dapm_widget_for_each_path(w, SND_SOC_DAPM_DIR_OUT, p) I have thought this for_each is for special handling, but, the original was sink is for sink, source is for source after all. #define snd_soc_dapm_widget_for_each_sink_path(w, p) \ list_for_each_entry(p, &w->sinks, list_source) #define snd_soc_dapm_widget_for_each_source_path(w, p) \ list_for_each_entry(p, &w->sources, list_sink) So, I guess current for_each is wrong, but I'm not 100% sure #define snd_soc_dapm_widget_for_each_sink_path(w, p) \ - snd_soc_dapm_widget_for_each_path(w, SND_SOC_DAPM_DIR_IN, p) + snd_soc_dapm_widget_for_each_path(w, SND_SOC_DAPM_DIR_OUT, p) #define snd_soc_dapm_widget_for_each_source_path(w, p) \ - snd_soc_dapm_widget_for_each_path(w, SND_SOC_DAPM_DIR_OUT, p) + snd_soc_dapm_widget_for_each_path(w, SND_SOC_DAPM_DIR_IN, p) I'm happy to create patch if I could get your ack. Thank you for your help !! Best regards --- Kuninori Morimoto

3 3

[PATCH 00/11] ASoC: SOF: Intel: updates and cleanups
by Pierre-Louis Bossart 19 Jul '22

19 Jul '22

Set of updates for IPC3, IPC4, MTL support and cleanups for the topology filename override which was broken for HDaudio platforms. It may be too late for 5.20, it's ok if these patches are applied in the next cycle. The topology override depends on the patch "ASoC: SOF: Intel: enable dmic handling with 2 or fewer SoundWire links" shared in a separate patchset. Bard Liao (1): ASoC: SOF: ipc4-topology: move ida allocate/free to widget_setup/free Peter Ujfalusi (2): ASoC: SOF: ipc3-loader: Print out the non matching ext_man magic number ASoC: SOF: Intel: atom: don't keep a temporary string in fixup_tplg_name Pierre-Louis Bossart (4): ASoC: SOF: Intel: hda: don't set fw_filename ASoC: SOF: Intel: hda: only fixup topology name if not set already ASoC: SOF: probes: rename assign/free callbacks as startup/shutdown ASoC: SOF: Intel: hda-stream: test DMA buffer first in hw_params Rander Wang (3): ASoC: SOF: ipc4-pcm: set pcm rate to dai setting ASoC: SOF: add ipc4 SRC module support ASoC: SOF: ipc4-topology: set domain bit based on dp domain type Yong Zhi (1): ASoC: SOF: Intel: MTL: remove redundant snd_sof_dsp_read() call sound/soc/sof/intel/atom.c | 16 +-- sound/soc/sof/intel/hda-probes.c | 16 +-- sound/soc/sof/intel/hda-stream.c | 15 ++- sound/soc/sof/intel/hda.c | 71 +++++++++----- sound/soc/sof/intel/mtl.c | 13 +-- sound/soc/sof/ipc3-loader.c | 6 +- sound/soc/sof/ipc4-pcm.c | 4 + sound/soc/sof/ipc4-topology.c | 156 +++++++++++++++++++++++++----- sound/soc/sof/ipc4-topology.h | 27 +++++- sound/soc/sof/sof-client-probes.c | 8 +- sound/soc/sof/sof-client-probes.h | 8 +- 11 files changed, 250 insertions(+), 90 deletions(-) -- 2.34.1

2 12

[PATCH] ASOC: nau8821: add new widget to control system clock
by Wallace Lin 19 Jul '22

19 Jul '22

From: Wallace Lin <savagecin0(a)gmail.com> Add new widget to control system clock for power saving. Signed-off-by: Wallace Lin <savagecin0(a)gmail.com> Signed-off-by: Wallace Lin <sjlin0(a)nuvoton.com> --- sound/soc/codecs/nau8821.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sound/soc/codecs/nau8821.c b/sound/soc/codecs/nau8821.c index 2600be250a3c..83a17c48d594 100644 --- a/sound/soc/codecs/nau8821.c +++ b/sound/soc/codecs/nau8821.c @@ -36,6 +36,7 @@ static int nau8821_configure_sysclk(struct nau8821 *nau8821, int clk_id, unsigned int freq); +static bool nau8821_is_jack_inserted(struct regmap *regmap); struct nau8821_fll { int mclk_src; @@ -495,7 +496,33 @@ static int nau8821_output_dac_event(struct snd_soc_dapm_widget *w, return 0; } +static int system_clock_control(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + struct nau8821 *nau8821 = snd_soc_component_get_drvdata(component); + + if (SND_SOC_DAPM_EVENT_OFF(event)) { + dev_dbg(nau8821->dev, "system clock control : POWER OFF\n"); + /* Set clock source to disable or internal clock before the + * playback or capture end. Codec needs clock for Jack + * detection and button press if jack inserted; otherwise, + * the clock should be closed. + */ + if (nau8821_is_jack_inserted(nau8821->regmap)) { + nau8821_configure_sysclk(nau8821, + NAU8821_CLK_INTERNAL, 0); + } else { + nau8821_configure_sysclk(nau8821, NAU8821_CLK_DIS, 0); + } + } + return 0; +} + static const struct snd_soc_dapm_widget nau8821_dapm_widgets[] = { + SND_SOC_DAPM_SUPPLY("System Clock", SND_SOC_NOPM, 0, 0, + system_clock_control, SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_SUPPLY("MICBIAS", NAU8821_R74_MIC_BIAS, NAU8821_MICBIAS_POWERUP_SFT, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("DMIC Clock", SND_SOC_NOPM, 0, 0, @@ -607,6 +634,9 @@ static const struct snd_soc_dapm_route nau8821_dapm_routes[] = { {"AIFTX", NULL, "ADCL Digital path"}, {"AIFTX", NULL, "ADCR Digital path"}, + {"AIFTX", NULL, "System Clock"}, + {"AIFRX", NULL, "System Clock"}, + {"DDACL", NULL, "AIFRX"}, {"DDACR", NULL, "AIFRX"}, -- 2.25.1

2 1

[PATCH] ASoC: amd: yc: Decrease level of error message
by Mario Limonciello 19 Jul '22

19 Jul '22

On a number of platforms that contain acp3x controller a new ERR level message is showing up: `acp6x pci device not found` This is because ACP3x and ACP6x share same PCI ID but can be identified by PCI revision. As this is expected behavior for a system with ACP3x decrease message to debug. Fixes: b1630fcbfde6c ("ASoC: amd: yc: add new YC platform varaint support") Cc: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- sound/soc/amd/yc/pci-acp6x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c index 20f7a99783f20..77c5fa1f7af14 100644 --- a/sound/soc/amd/yc/pci-acp6x.c +++ b/sound/soc/amd/yc/pci-acp6x.c @@ -159,7 +159,7 @@ static int snd_acp6x_probe(struct pci_dev *pci, case 0x6f: break; default: - dev_err(&pci->dev, "acp6x pci device not found\n"); + dev_dbg(&pci->dev, "acp6x pci device not found\n"); return -ENODEV; } if (pci_enable_device(pci)) { -- 2.25.1

2 1

[PATCH v1 1/1] rsnd: ssiu: add missing .quit callback for gen2
by Jiada Wang 19 Jul '22

19 Jul '22

From: Wang Jiada <jiada_wang(a)mentor.com> commit 83b220cf8eb2a ("ASoC: rsnd: implement BUSIF related code in ssiu.c") moved BUSIF related code in ssiu.c which added .quit callback in ssiu.c to disable error irq when ssiu quits. But .quit callback was added only for gen1 and is missing for gen2, this causes error irq is left enabled after ssiu quits on gen2. This commit adds missing .quit callback for gen2 Signed-off-by: Wang Jiada <jiada_wang(a)mentor.com> Cc: Dean Jenkins <Dean_Jenkins(a)mentor.com> Cc: Eugeniu Rosca <erosca(a)de.adit-jv.com> --- sound/soc/sh/rcar/ssiu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 4b8a63e336c7..19a8030a660d 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -417,6 +417,7 @@ static struct rsnd_mod_ops rsnd_ssiu_ops_gen2 = { .name = SSIU_NAME, .dma_req = rsnd_ssiu_dma_req, .init = rsnd_ssiu_init_gen2, + .quit = rsnd_ssiu_quit, .start = rsnd_ssiu_start_gen2, .stop = rsnd_ssiu_stop_gen2, .get_status = rsnd_ssiu_get_status, -- 2.25.1

3 2

[PATCH] docs: driver-api: firmware: add driver firmware guidelines.
by Dave Airlie 19 Jul '22

19 Jul '22

From: Dave Airlie <airlied(a)redhat.com> A recent snafu where Intel ignored upstream feedback on a firmware change, led to a late rc6 fix being required. In order to avoid this in the future we should document some expectations around linux-firmware. I was originally going to write this for drm, but it seems quite generic advice. I'm cc'ing this quite widely to reach subsystems which use fw a lot. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- Documentation/driver-api/firmware/core.rst | 1 + .../firmware/firmware-usage-guidelines.rst | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 Documentation/driver-api/firmware/firmware-usage-guidelines.rst diff --git a/Documentation/driver-api/firmware/core.rst b/Documentation/driver-api/firmware/core.rst index 1d1688cbc078..803cd574bbd7 100644 --- a/Documentation/driver-api/firmware/core.rst +++ b/Documentation/driver-api/firmware/core.rst @@ -13,4 +13,5 @@ documents these features. direct-fs-lookup fallback-mechanisms lookup-order + firmware-usage-guidelines diff --git a/Documentation/driver-api/firmware/firmware-usage-guidelines.rst b/Documentation/driver-api/firmware/firmware-usage-guidelines.rst new file mode 100644 index 000000000000..34d2412e78c6 --- /dev/null +++ b/Documentation/driver-api/firmware/firmware-usage-guidelines.rst @@ -0,0 +1,34 @@ +=================== +Firmware Guidelines +=================== + +Drivers that use firmware from linux-firmware should attempt to follow +the rules in this guide. + +* Firmware should be versioned with at least a major/minor version. It + is suggested that the firmware files in linux-firmware be named with + some device specific name, and just the major version. The + major/minor/patch versions should be stored in a header in the + firmware file for the driver to detect any non-ABI fixes/issues. The + firmware files in linux-firmware should be overwritten with the newest + compatible major version. Newer major version firmware should remain + compatible with all kernels that load that major number. + +* Users should *not* have to install newer firmware to use existing + hardware when they install a newer kernel. If the hardware isn't + enabled by default or under development, this can be ignored, until + the first kernel release that enables that hardware. This means no + major version bumps without the kernel retaining backwards + compatibility for the older major versions. Minor version bumps + should not introduce new features that newer kernels depend on + non-optionally. + +* If a security fix needs lockstep firmware and kernel fixes in order to + be successful, then all supported major versions in the linux-firmware + repo should be updated with the security fix, and the kernel patches + should detect if the firmware is new enough to declare if the security + issue is fixed. All communications around security fixes should point + at both the firmware and kernel fixes. If a security fix requires + deprecating old major versions, then this should only be done as a + last option, and be stated clearly in all communications. + -- 2.36.1

6 7

Re: [PATCH -next v2] ASoC: Intel: Fix missing clk_disable_unprepare() on err in platform_clock_control()
by Pierre-Louis Bossart 19 Jul '22

19 Jul '22

On 7/18/22 20:36, Zhang Zekun wrote: > Fix the missing clk_disable_unprepare() before return > from platform_clock_control() in error handling path. > > Fixes: 9a87fc1e0619 ("ASoC: Intel: bytcr_wm5102: Add machine driver for BYT/WM5102") > Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> > --- > sound/soc/intel/boards/bytcr_wm5102.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c > index 45a6805787f5..3e3cdee4b1ce 100644 > --- a/sound/soc/intel/boards/bytcr_wm5102.c > +++ b/sound/soc/intel/boards/bytcr_wm5102.c > @@ -111,6 +111,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, > ret = byt_wm5102_prepare_and_enable_pll1(codec_dai, 48000); > if (ret) { > dev_err(card->dev, "Error setting codec sysclk: %d\n", ret); > + clk_disable_unprepare(priv->mclk); This change looks legit to me, but you want to CC: maintainers (Mark Brown, Takashi Iwai), use the alsa-devel mailing list and CC: the initial contributor Hans de Goede. > return ret; > } > } else {

1 0