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

Re: [PATCH 2/6] treewide: remove using list iterator after loop body as a ptr
by Christian König 03 Mar '22

03 Mar '22

Am 28.02.22 um 20:56 schrieb Linus Torvalds: > On Mon, Feb 28, 2022 at 4:19 AM Christian König > <christian.koenig(a)amd.com> wrote: >> I don't think that using the extra variable makes the code in any way >> more reliable or easier to read. > So I think the next step is to do the attached patch (which requires > that "-std=gnu11" that was discussed in the original thread). > > That will guarantee that the 'pos' parameter of list_for_each_entry() > is only updated INSIDE the for_each_list_entry() loop, and can never > point to the (wrongly typed) head entry. > > And I would actually hope that it should actually cause compiler > warnings about possibly uninitialized variables if people then use the > 'pos' pointer outside the loop. Except > > (a) that code in sgx/encl.c currently initializes 'tmp' to NULL for > inexplicable reasons - possibly because it already expected this > behavior > > (b) when I remove that NULL initializer, I still don't get a warning, > because we've disabled -Wno-maybe-uninitialized since it results in so > many false positives. > > Oh well. > > Anyway, give this patch a look, and at least if it's expanded to do > "(pos) = NULL" in the entry statement for the for-loop, it will avoid > the HEAD type confusion that Jakob is working on. And I think in a > cleaner way than the horrid games he plays. > > (But it won't avoid possible CPU speculation of such type confusion. > That, in my opinion, is a completely different issue) Yes, completely agree. > I do wish we could actually poison the 'pos' value after the loop > somehow - but clearly the "might be uninitialized" I was hoping for > isn't the way to do it. > > Anybody have any ideas? I think we should look at the use cases why code is touching (pos) after the loop. Just from skimming over the patches to change this and experience with the drivers/subsystems I help to maintain I think the primary pattern looks something like this: list_for_each_entry(entry, head, member) { if (some_condition_checking(entry)) break; } do_something_with(entry); So the solution should probably not be to change all those use cases to use more temporary variables, but rather to add a list_find_entry(..., condition) macro and consistently use that one instead. Regards, Christian. > > Linus

12 23

[PATCH] ASoC: mediatek: mt8183: support wb bt audio
by Jiaxin Yu 03 Mar '22

03 Mar '22

This patch use "bt-sco-pcm-wb" codec dai driver for wb bt audio. Signed-off-by: Jiaxin Yu <jiaxin.yu(a)mediatek.com> --- This patch depends on: https://patchwork.kernel.org/project/alsa-devel/patch/20220302013533.29068-… sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index b0ec5ebd4f2d..889f9e4a96aa 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -260,7 +260,7 @@ SND_SOC_DAILINK_DEFS(pcm2, SND_SOC_DAILINK_DEFS(i2s0, DAILINK_COMP_ARRAY(COMP_CPU("I2S0")), - DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm")), + DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm-wb")), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(i2s1, @@ -291,7 +291,7 @@ SND_SOC_DAILINK_DEFS(i2s3_rt1015p, SND_SOC_DAILINK_DEFS(i2s5, DAILINK_COMP_ARRAY(COMP_CPU("I2S5")), - DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm")), + DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm-wb")), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(tdm, @@ -508,7 +508,6 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .no_pcm = 1, .dpcm_capture = 1, .ignore_suspend = 1, - .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s0), }, @@ -541,7 +540,6 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .no_pcm = 1, .dpcm_playback = 1, .ignore_suspend = 1, - .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s5), }, -- 2.25.1

2 1

[PATCH 0/7 resend] ASoC: fsl_sai: Cleanups and 1:1 bclk:mclk ratio support
by Sascha Hauer 03 Mar '22

03 Mar '22

Resending this with the Cc: list expanded as Nicolin said he doesn't work on FSL platforms at the moment. This series has some updates for the fsl_sai driver: Some general cleanup patches, a bugfix in the ip revision checking and finally the mclk setting is made more accurate and support for 1:1 bclk:mclk setting is added. Ahmad Fatoum (2): ASoC: fsl_sai: simplify register poking in fsl_sai_set_bclk ASoC: fsl_sai: implement 1:1 bclk:mclk ratio support Sascha Hauer (5): ASoC: fsl_sai: Drop unnecessary defines ASoC: fsl_sai: simplify irq return value ASoC: fsl_sai: store full version instead of major/minor ASoC: fsl_sai: Use better variable names ASoC: fsl_sai: use DIV_ROUND_CLOSEST() to calculate divider sound/soc/fsl/fsl_sai.c | 100 ++++++++++++++++++++-------------------- sound/soc/fsl/fsl_sai.h | 9 +--- 2 files changed, 52 insertions(+), 57 deletions(-) -- 2.30.2

1 7

[PATCH 0/2] ASoC: mediatek: mt8192-mt6359: support machine
by Jiaxin Yu 03 Mar '22

03 Mar '22

The series reuses mt8192-mt6359-rt1015-rt5682.c for supporting machine driver with rt1015p speaker amplifier and rt5682s headset codec. Jiaxin Yu (2): ASoC: dt-bindings: mt8192-mt6359: add new compatible for using rt1015p and rt5682 ASoC: mediatek: mt8192: support rt1015p_rt5682s .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 1 + sound/soc/mediatek/Kconfig | 1 + .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 87 +++++++++++++++++-- 3 files changed, 84 insertions(+), 5 deletions(-) -- 2.18.0

2 5

[PATCH v6 0/3] Add support for SoundWire1.6 audio cgcr register control
by Srinivasa Rao Mandadapu 03 Mar '22

03 Mar '22

This patch series is to add v1.6.0 compatible name for qcom soundwire driver and corresponding dt bindings. Changes Since V4: -- Constify static struct qcom_swrm_data global variables. -- Remove redundant swrm_v1_6_data variable. Changes Since V4: -- Dropped audio cgcr control patch due to dependency on clock patches. -- Update dt-bindings as per new reset control properties. Changes Since V3: -- Add v1.6.0 compatible name and soundwire data structure. -- Change macro define name properly. -- Update bindings for new property. -- Change commit message description. -- Change signedoff by sequence. Changes since v2: -- Update error check after ioremap. Changes since v1: -- Add const name to mask value. Srinivasa Rao Mandadapu (3): soundwire: qcom: Add compatible name for v1.6.0 soundwire: qcom: constify static struct qcom_swrm_data global variables dt-bindings: soundwire: qcom: Add bindings for audio CSR reset control property Documentation/devicetree/bindings/soundwire/qcom,sdw.txt | 12 ++++++++++++ drivers/soundwire/qcom.c | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) -- 2.7.4

3 9

Issue in pcm_dsnoop.c in alsa-lib
by GitHub issues - edited 02 Mar '22

02 Mar '22

alsa-project/alsa-lib issue #213 was edited from TE-N-ShengjiuWang: Hi Takashi Iwai, Jaroslav Kysela We encountered an issue in the pcm_dsnoop use case, could you please help to have a look? Issue description: With two instances for dsnoop type device running in parallel, after suspend/resume, one of the instances will be hung in memcpy because the very large copy size is obtained. ``` #3 0x0000ffffa78d5098 in snd_pcm_dsnoop_sync_ptr (pcm=0xaaab06563da0) at pcm_dsnoop.c:158 dsnoop = 0xaaab06563c20 slave_hw_ptr = 64 old_slave_hw_ptr = 533120 avail = 187651522444320 ``` Reason analysis: The root cause that I analysis is that after suspend/resume, one instance will get the SND_PCM_STATE_SUSPENDED state from slave pcm device, then it will do snd_pcm_prepare() and snd_pcm_start(), which will reset the dsnoop->slave_hw_ptr and the hw_ptr of slave pcm device, then the state of this instance is correct. But another instance may not get the SND_PCM_STATE_SUSPENDED state from slave pcm device because slave device may have been recovered by first instance, so the dsnoop->slave_hw_ptr is not reset. but because hw_ptr of slave pcm device has been reset, so there will be a very large "avail" size. Solution: I didn't come up with a fix for this issue, seems there is no easy way to let another instance know this case and reset the dsnoop->slave_hw_ptr, could you please help? Issue URL : https://github.com/alsa-project/alsa-lib/issues/213 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 0/2] ASoC: codecs: Add Awinic AW8738 audio amplifier driver
by Stephan Gerhold 02 Mar '22

02 Mar '22

This series adds a simple driver and DT schema for the Awinic AW8738 audio amplifier. It's fairly simple - the main difference to simple-amplifier is that there is a "one-wire pulse control" that allows configuring the amplifier to one of a few pre-defined modes. Jonathan Albrieux (1): ASoC: codecs: Add Awinic AW8738 audio amplifier driver Stephan Gerhold (1): ASoC: dt-bindings: Add schema for "awinic,aw8738" .../bindings/sound/awinic,aw8738.yaml | 48 ++++++++ sound/soc/codecs/Kconfig | 10 ++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/aw8738.c | 104 ++++++++++++++++++ 4 files changed, 164 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw8738.yaml create mode 100644 sound/soc/codecs/aw8738.c -- 2.35.1

3 11

[PATCH 0/8] ASoC: Intel: machine driver updates for 5.18
by Pierre-Louis Bossart 02 Mar '22

02 Mar '22

Two cleanups to remove an unused filename and typos, and one addition of an ACPI matching table for a Dell SoundWire SKU without local microphones. The main change is the addition of a common 'sof-ssp-amp' machine driver for devices with amplifiers only (no headset codec) and different connections using I2S links (Bluetooth offload, HDMI receiver). It's likely that the amplifier will be swapped out by OEMs, this machine driver provides a relatively generic solution to avoid copy-paste of similar solutions. Brent Lu (4): ASoC: Intel: boards: create sof-realtek-common module ASoC: Intel: sof_rt1308: move rt1308 code to common module ASoC: Intel: cirrus-common: support cs35l41 amplifier ASoC: Intel: sof_ssp_amp: rename driver and support cs35l41 amplifier Libin Yang (1): ASoC: Intel: soc-acpi: add entries in ADL match table Pierre-Louis Bossart (2): ASoC: soc-acpi: remove sof_fw_filename ASoC: Intel: boards: fix spelling in comments balamurugan.c (1): ASoC: Intel: add RT1308 I2S machine driver and HDMI-in capture via I2S support. include/sound/soc-acpi.h | 2 - sound/soc/intel/boards/Kconfig | 24 + sound/soc/intel/boards/Makefile | 12 +- sound/soc/intel/boards/bdw-rt5650.c | 2 +- sound/soc/intel/boards/bdw-rt5677.c | 2 +- sound/soc/intel/boards/broadwell.c | 2 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- sound/soc/intel/boards/bytcht_da7213.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- sound/soc/intel/boards/haswell.c | 2 +- sound/soc/intel/boards/sof_cirrus_common.c | 163 ++++++ sound/soc/intel/boards/sof_cirrus_common.h | 25 + sound/soc/intel/boards/sof_realtek_common.c | 107 ++++ sound/soc/intel/boards/sof_realtek_common.h | 4 + sound/soc/intel/boards/sof_rt5682.c | 1 + sound/soc/intel/boards/sof_ssp_amp.c | 483 ++++++++++++++++++ .../intel/common/soc-acpi-intel-adl-match.c | 44 +- .../intel/common/soc-acpi-intel-bxt-match.c | 6 - .../intel/common/soc-acpi-intel-byt-match.c | 11 - .../intel/common/soc-acpi-intel-cht-match.c | 12 - .../intel/common/soc-acpi-intel-cml-match.c | 11 - .../intel/common/soc-acpi-intel-cnl-match.c | 4 - .../intel/common/soc-acpi-intel-ehl-match.c | 1 - .../intel/common/soc-acpi-intel-glk-match.c | 6 - .../intel/common/soc-acpi-intel-hda-match.c | 2 - .../common/soc-acpi-intel-hsw-bdw-match.c | 5 - .../intel/common/soc-acpi-intel-icl-match.c | 5 - .../intel/common/soc-acpi-intel-jsl-match.c | 7 - .../intel/common/soc-acpi-intel-tgl-match.c | 19 +- sound/soc/sof/intel/hda.c | 5 +- sound/soc/sof/intel/pci-tng.c | 1 - 40 files changed, 879 insertions(+), 117 deletions(-) create mode 100644 sound/soc/intel/boards/sof_cirrus_common.c create mode 100644 sound/soc/intel/boards/sof_cirrus_common.h create mode 100644 sound/soc/intel/boards/sof_ssp_amp.c -- 2.25.1

3 15

[PATCH] ASoC: amd: use asoc_substream_to_rtd()
by Zhen Ni 02 Mar '22

02 Mar '22

Uses asoc_substream_to_rtd() helper. Signed-off-by: Zhen Ni <nizhen(a)uniontech.com> --- sound/soc/amd/vangogh/acp5x-mach.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c index 14cf325e4b23..f2c32e5ed24f 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -101,7 +101,7 @@ static const struct snd_pcm_hw_constraint_list constraints_channels = { static int acp5x_8821_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -119,7 +119,7 @@ static int acp5x_8821_startup(struct snd_pcm_substream *substream) static int acp5x_nau8821_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, @@ -141,7 +141,7 @@ static int acp5x_nau8821_hw_params(struct snd_pcm_substream *substream, static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(card); @@ -158,7 +158,7 @@ static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream) static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_card *card = rtd->card; struct snd_soc_dai *codec_dai; int ret, i; -- 2.20.1

2 1

[PATCH] ASoC: atmel_ssc_dai: Handle errors for clk_enable
by Jiasheng Jiang 02 Mar '22

02 Mar '22

As the potential failure of the clk_enable(), it should be better to check it and return error if fals. Fixes: cbaadf0f90d6 ("ASoC: atmel_ssc_dai: refactor the startup and shutdown") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/atmel/atmel_ssc_dai.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 26e2bc690d86..c1dea8d62416 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -280,7 +280,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, /* Enable PMC peripheral clock for this SSC */ pr_debug("atmel_ssc_dai: Starting clock\n"); - clk_enable(ssc_p->ssc->clk); + ret = clk_enable(ssc_p->ssc->clk); + if (ret) + return ret; + ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk); /* Reset the SSC unless initialized to keep it in a clean state */ -- 2.25.1

3 3