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

Re: [PATCH v2 1/4] ASoC: dt-bindings: stm32: i2s: add audio-graph-card port
by Rob Herring 13 Dec '21

13 Dec '21

On Tue, Dec 7, 2021 at 7:52 AM Alexandre TORGUE <alexandre.torgue(a)foss.st.com> wrote: > > Hi Rob > > On 12/1/21 11:34 PM, Rob Herring wrote: > > On Fri, Nov 26, 2021 at 11:25:27AM +0100, Olivier MOYSAN wrote: > >> Hi Rob, > >> > >> On 11/25/21 10:26 PM, Rob Herring wrote: > >>> On Thu, 25 Nov 2021 15:40:50 +0100, Olivier Moysan wrote: > >>>> The STM2 I2S DAI can be connected via the audio-graph-card. > >>>> Add port entry into the bindings. > >>>> > >>>> Signed-off-by: Olivier Moysan <olivier.moysan(a)foss.st.com> > >>>> --- > >>>> Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml | 5 +++++ > >>>> 1 file changed, 5 insertions(+) > >>>> > >>> > >>> Running 'make dtbs_check' with the schema in this patch gives the > >>> following warnings. Consider if they are expected or the schema is > >>> incorrect. These may not be new warnings. > >>> > >>> Note that it is not yet a requirement to have 0 warnings for dtbs_check. > >>> This will change in the future. > >>> > >>> Full log is available here: https://patchwork.ozlabs.org/patch/1559750 > >>> > >>> > >>> audio-controller@4000b000: 'port' does not match any of the regexes: '^port@[0-9]', 'pinctrl-[0-9]+' > >>> arch/arm/boot/dts/stm32mp157a-dk1.dt.yaml > >>> arch/arm/boot/dts/stm32mp157c-dk2.dt.yaml > >>> > >> > >> This warning is not a new one. > >> > >> The i2s2 node in stm32mp15xx-dkx.dtsi would require the following binding: > >> port: > >> $ref: audio-graph-port.yaml# > >> unevaluatedProperties: false > >> > >> However the spi binding requires to introduce a unit address: > >> patternProperties: > >> '^port@[0-9]': > >> $ref: audio-graph-port.yaml# > >> unevaluatedProperties: false > >> > >> The warning can be removed by re-ordering the bindings patches in the serie, > >> as "additionalProperties: true" makes the check more tolerant on extra > >> properties. > > > > That's never right. > > > >> The patch "ASoC: dt-bindings: stm32: i2s: add audio-graph-card port" can > >> even be merely dropped. > >> So, I suggest to resend the serie without audio-graph-card patch. > > > > Only if you aren't using audio-graph-card. > > > >> > >> Does it sound too permissive to you ? > > > > I think perhaps you need to combine the schemas into 1. Or you need to > > restructure your dtsi files such that you only add spi specific > > properties when spi mode is enabled and only add i2s specific properties > > when i2s mode is enabled. Or use the /delete-property/ directive. > > Initially the aim of this series was to fix a "make W=1" warnings seen > on spi and i2s nodes (duplicate unit-address). Moving both nodes in a > common node + using a different compatible depending on SPI or I2S usage > sounded good) but it is not enough. In this series the common node is > named as following: "spi2s2: spi@4000b000". It is fine for a spi usage > but if we want to use this "common node" with I2S compatible and > specific bindings, the node name remains spi@... and then specific spi > checks are done. For this with this series applied we got this issue > reported by spi-controller.yaml: > > spi@4000b000: port@0: 'compatible' is a required property > > So, if we use two separates nodes we got W=1 warning and if we use a > common node we got yaml check issue. One possibility would be to use a > common node with a new node name (for example i2spi@...) but I think it > is not acceptable. It is acceptable, see this thread[1]. Rob [1] https://lore.kernel.org/all/20211203183517.11390-1-semen.protsenko@linaro.o…

2 1

[v2] SoC: qcom: Distinguish headset codec by codec_dai->name
by Judy Hsiao 13 Dec '21

13 Dec '21

Distinguish which headset codec is on the board by codec_dai->name instead of card->name. It fixes the crash of being unable to handle kernel paging requests at virtual address ADDR by initializing the correct audio codec on the board. Call stack of the crash: ``` Unable to handle kernel paging request at virtual address ffffffbfe7bba9ce Mem abort info: ESR = 0x96000005 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 Data abort info: ISV = 0, ISS = 0x00000005 CM = 0, WnR = 0 swapper pgtable: 4k pages, 39-bit VAs, pgdp=000000008379a000 [ffffffbfe7bba9ce] pgd=0000000000000000, pud=0000000000000000 Internal error: Oops: 96000005 [#1] PREEMPT SMP Modules linked in: ip6table_nat fuse uvcvideo videobuf2_vmalloc [trimmed] CPU: 7 PID: 2168 Comm: cras Not tainted 5.4.163-lockdep-17364-gfe3d4f499cf1 #1 Hardware name: Google Pompom (rev2) with LTE (DT) pstate: 00400009 (nzcv daif +PAN -UAO) pc : rt5682_set_component_pll+0xcc/0xb78 [snd_soc_rt5682] lr : rt5682_set_component_pll+0xbc/0xb78 [snd_soc_rt5682] sp : ffffff808ed7f320 x29: ffffff808ed7f390 x28: dfffffd000000000 x27: ffffff80b1409550 x26: 00000000aaaaaaaa x25: ffffff80d0a0b820 x24: ffffff80bc1f7098 x23: ffffff809332a080 x22: 00000000aaaaaaaa x21: 1ffffff01783ee13 x20: 00000000aaaaaaaa x19: 00000000aaaaaaaa x18: 1ffffff011dafe18 x17: 0000000000000000 x16: 0000000000000201 x15: 0000000000000000 x14: 0000000062f77d15 x13: dfffffd000000000 x12: ffffffd01302ed7c x11: 0000000000000000 x10: ffffff7f3ddd4e74 x9 : 0000000000000000 x8 : 1fffffefe7bba9ce x7 : aaaaaaaaaaaaaaaa x6 : 0000000000000000 x5 : 0000000000000000 x4 : 0000000000000008 x3 : 0000000000000000 x2 : 0000000000000008 x1 : 00000000000000aa x0 : ffffff808ed7f358 Call trace: rt5682_set_component_pll+0xcc/0xb78 [snd_soc_rt5682] snd_soc_component_set_pll+0x90/0x154 snd_soc_dai_set_pll+0xf4/0x1ac sc7180_snd_startup+0x268/0x3c0 [snd_soc_sc7180] snd_soc_link_startup+0xa4/0x180 soc_pcm_open+0x35c/0x15c8 snd_pcm_open_substream+0xa90/0x13b0 snd_pcm_open+0x1a4/0x55c snd_pcm_capture_open+0x7c/0xe8 snd_open+0x2b8/0x2e4 chrdev_open+0x364/0x3d4 do_dentry_open+0x66c/0xc58 vfs_open+0x7c/0x8c path_openat+0x108c/0x2bbc do_filp_open+0x15c/0x258 do_sys_open+0x278/0x62c __arm64_compat_sys_openat+0x9c/0xb0 el0_svc_common+0x1c0/0x3dc el0_svc_compat_handler+0x88/0xd4 el0_svc_compat+0x8/0x2c Code: 8b3acae8 910d310a d343fd48 a9012be8 (38fc6908) ``` Fixes: 425c5fce8a03 ("ASoC: qcom: Add support for ALC5682I-VS codec") Signed-off-by: Judy Hsiao <judyhsiao(a)chromium.org> --- sound/soc/qcom/sc7180.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c index 2fff764a00a7..37225ef2563a 100644 --- a/sound/soc/qcom/sc7180.c +++ b/sound/soc/qcom/sc7180.c @@ -131,13 +131,13 @@ static int sc7180_snd_startup(struct snd_pcm_substream *substream) struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); int pll_id, pll_source, pll_in, pll_out, clk_id, ret; - if (!(strcmp(card->name, "sc7180-rt5682-max98357a-1mic"))) { + if (!strcmp(codec_dai->name, "rt5682-aif1")) { pll_source = RT5682_PLL1_S_MCLK; pll_id = 0; clk_id = RT5682_SCLK_S_PLL1; pll_out = RT5682_PLL1_FREQ; pll_in = DEFAULT_MCLK_RATE; - } else if (!(strcmp(card->name, "sc7180-rt5682s-max98357a-1mic"))) { + } else if (!strcmp(codec_dai->name, "rt5682s-aif1")) { pll_source = RT5682S_PLL_S_MCLK; pll_id = RT5682S_PLL2; clk_id = RT5682S_SCLK_S_PLL2; -- 2.31.0

2 1

[PATCH v2] ALSA: gus: Fix memory leaks at memory allocator error paths
by Takashi Iwai 13 Dec '21

13 Dec '21

When snd_gf1_mem_xalloc() returns NULL, the current code still leaves the formerly allocated block.name string but returns an error immediately. This patch does code-refactoring to move the kstrdup() call itself into snd_gf1_mem_xalloc() and deals with the resource free in the helper code by itself for fixing those memory leaks. Suggested-by: Jaroslav Kysela <perex(a)perex.cz> Link: https://lore.kernel.org/r/20211213132444.22385-2-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/gus/gus_mem.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index 5e3ff3137dd7..3e56c01c4544 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -24,8 +24,9 @@ void snd_gf1_mem_lock(struct snd_gf1_mem * alloc, int xup) } } -static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc, - struct snd_gf1_mem_block * block) +static struct snd_gf1_mem_block * +snd_gf1_mem_xalloc(struct snd_gf1_mem *alloc, struct snd_gf1_mem_block *block, + const char *name) { struct snd_gf1_mem_block *pblock, *nblock; @@ -33,6 +34,12 @@ static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc, if (nblock == NULL) return NULL; *nblock = *block; + nblock->name = kstrdup(name, GFP_KERNEL); + if (!nblock->name) { + kfree(nblock); + return NULL; + } + pblock = alloc->first; while (pblock) { if (pblock->ptr > nblock->ptr) { @@ -198,12 +205,7 @@ struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owne if (share_id != NULL) memcpy(&block.share_id, share_id, sizeof(block.share_id)); block.owner = owner; - block.name = kstrdup(name, GFP_KERNEL); - if (block.name == NULL) { - snd_gf1_mem_lock(alloc, 1); - return NULL; - } - nblock = snd_gf1_mem_xalloc(alloc, &block); + nblock = snd_gf1_mem_xalloc(alloc, &block, name); snd_gf1_mem_lock(alloc, 1); return nblock; } @@ -240,14 +242,12 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) if (gus->gf1.enh_mode) { block.ptr = 0; block.size = 1024; - block.name = kstrdup("InterWave LFOs", GFP_KERNEL); - if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (!snd_gf1_mem_xalloc(alloc, &block, "InterWave LFOs")) return -ENOMEM; } block.ptr = gus->gf1.default_voice_address; block.size = 4; - block.name = kstrdup("Voice default (NULL's)", GFP_KERNEL); - if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (!snd_gf1_mem_xalloc(alloc, &block, "Voice default (NULL's)")) return -ENOMEM; #ifdef CONFIG_SND_DEBUG snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read); -- 2.31.1

2 1

alsa crashing each time my screen gets locked
by GitHub issues - opened 13 Dec '21

13 Dec '21

alsa-project/alsa-lib issue #203 was opened from Fallast: each time i get my screen lock after being inactive for 5 minutes i log back in and alsa stops working and my volume icon disappears i have to run volumeicon to get it working back again i'm on mx linux, based on debian bullseye Issue URL : https://github.com/alsa-project/alsa-lib/issues/203 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 1/2] ALSA: gus: Fix erroneous memory allocation
by Takashi Iwai 13 Dec '21

13 Dec '21

snd_gf1_mem_xalloc() returns NULL incorrectly when the memory chunk is allocated in the middle of the chain. This patch corrects the return value to treat it properly. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/gus/gus_mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index 4c691dbf2721..5e3ff3137dd7 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -44,7 +44,7 @@ static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc, else nblock->prev->next = nblock; mutex_unlock(&alloc->memory_mutex); - return NULL; + return nblock; } pblock = pblock->next; } -- 2.31.1

2 4

[PATCH v2] ALSA: sound/isa/gus: check the return value of kstrdup()
by Xiaoke Wang 13 Dec '21

13 Dec '21

kstrdup() returns NULL when some internal memory errors happen, it is better to check the return value of it. Otherwise, we may not to be able to catch some memory errors in time. Signed-off-by: Xiaoke Wang <xkernel.wang(a)foxmail.com> --- Changes in v2: - add the proper error handling. Thanks for the suggestions from Takashi Iwai. In the future, I'll pay more attention to what he mentioned. --- sound/isa/gus/gus_mem.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index ff9480f..4c691db 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -199,6 +199,10 @@ struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owne memcpy(&block.share_id, share_id, sizeof(block.share_id)); block.owner = owner; block.name = kstrdup(name, GFP_KERNEL); + if (block.name == NULL) { + snd_gf1_mem_lock(alloc, 1); + return NULL; + } nblock = snd_gf1_mem_xalloc(alloc, &block); snd_gf1_mem_lock(alloc, 1); return nblock; @@ -237,13 +241,13 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) block.ptr = 0; block.size = 1024; block.name = kstrdup("InterWave LFOs", GFP_KERNEL); - if (snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) return -ENOMEM; } block.ptr = gus->gf1.default_voice_address; block.size = 4; block.name = kstrdup("Voice default (NULL's)", GFP_KERNEL); - if (snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) return -ENOMEM; #ifdef CONFIG_SND_DEBUG snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read); --

2 1

Re: [PATCH] ALSA: sound/isa/gus: check the return value of kstrdup()
by Xiaoke Wang 13 Dec '21

13 Dec '21

Note: Compare with the last email, this one is using my full name. kstrdup() returns NULL when some internal memory errors happen, it is better to check the return value of it. Otherwise, we may not to be able to catch some memory errors in time. Signed-off-by: Xiaoke Wang <xkernel.wang(a)foxmail.com> --- sound/isa/gus/gus_mem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index ff9480f..f8d915f 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -199,6 +199,8 @@ struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owne memcpy(&block.share_id, share_id, sizeof(block.share_id)); block.owner = owner; block.name = kstrdup(name, GFP_KERNEL); + if (block.name == NULL) + return NULL; nblock = snd_gf1_mem_xalloc(alloc, &block); snd_gf1_mem_lock(alloc, 1); return nblock; @@ -237,13 +239,13 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) block.ptr = 0; block.size = 1024; block.name = kstrdup("InterWave LFOs", GFP_KERNEL); - if (snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) return -ENOMEM; } block.ptr = gus->gf1.default_voice_address; block.size = 4; block.name = kstrdup("Voice default (NULL's)", GFP_KERNEL); - if (snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) return -ENOMEM; #ifdef CONFIG_SND_DEBUG snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read); --

2 1

Re: [PATCH] ALSA: jack: Check the return value of kstrdup()
by Xiaoke Wang 13 Dec '21

13 Dec '21

kstrdup() can return NULL, it is better to check the return value of it. Fix: free jack and use my full name. Signed-off-by: Xiaoke Wang <xkernel.wang(a)foxmail.com> --- sound/core/jack.c | 4 ++ 1 file changed, 4 insertions(+) diff --git a/sound/core/jack.c b/sound/core/jack.c index 32350c6..5fd9954 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -509,6 +509,10 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, return -ENOMEM; jack->id = kstrdup(id, GFP_KERNEL); + if (jack->id == NULL) { + kfree(jack); + return -ENOMEM; + } /* don't creat input device for phantom jack */ if (!phantom_jack) { --

2 1

[PATCH] ALSA: drivers: opl3: Fix incorrect use of vp->state
by Colin Ian King 13 Dec '21

13 Dec '21

Static analysis with scan-build has found an assignment to vp2 that is never used. It seems that the check on vp->state > 0 should be actually on vp2->state instead. Fix this. This dates back to 2002, I found the offending commit from the git history git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git, commit 91e39521bbf6 ("[PATCH] ALSA patch for 2.5.4") Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/drivers/opl3/opl3_midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c index e1b69c65c3c8..e2b7be67f0e3 100644 --- a/sound/drivers/opl3/opl3_midi.c +++ b/sound/drivers/opl3/opl3_midi.c @@ -397,7 +397,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) } if (instr_4op) { vp2 = &opl3->voices[voice + 3]; - if (vp->state > 0) { + if (vp2->state > 0) { opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset + 3); reg_val = vp->keyon_reg & ~OPL3_KEYON_BIT; -- 2.33.1

2 1

[PATCH] ALSA: uapi: use C90 comment style instead of C99 style
by Takashi Sakamoto 13 Dec '21

13 Dec '21

UAPI headers are built with compiler option for C90, thus double-slashes comment introduced in C99 is not preferable. Fixes: fb6723daf890 ("ALSA: pcm: comment about relation between msbits hw parameter and [S|U]32 formats") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- include/uapi/sound/asound.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index cf1d20e34167..1834f58b8ede 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -202,9 +202,11 @@ typedef int __bitwise snd_pcm_format_t; #define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) /* low three bytes */ #define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) /* low three bytes */ #define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) /* low three bytes */ -// For S32/U32 formats, 'msbits' hardware parameter is often used to deliver information about the -// available bit count in most significant bit. It's for the case of so-called 'left-justified' or -// `right-padding` sample which has less width than 32 bit. +/* + * For S32/U32 formats, 'msbits' hardware parameter is often used to deliver information about the + * available bit count in most significant bit. It's for the case of so-called 'left-justified' or + * `right-padding` sample which has less width than 32 bit. + */ #define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10) #define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11) #define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12) -- 2.32.0

2 1