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

[PATCH] ASoC: tlv320aic32x4: Add multi endpoint support
by Marek Vasut 04 Sep '24

04 Sep '24

Support multiple endpoints on TLV320AIC32x4 codec port when used in of_graph context. This patch allows to share the codec port between two CPU DAIs. Example: Custom STM32MP157C board uses TLV320AIC32x4 audio codec. This codec is connected to two serial audio interfaces, which are configured either as rx or tx. From AsoC point of view the topolgy is the following: // 2 CPU DAIs (SAI2A/B), 1 Codec (TLV320AIC32x4) Playback: CPU-A-DAI(slave) -> (master)CODEC-DAI/port0 Record: CPU-B-DAI(slave) <- (master)CODEC-DAI/port0 In the DT two endpoints have to be associated to the codec port: tlv320aic32x4_port: port { tlv320aic32x4_tx_endpoint: endpoint@0 { remote-endpoint = <&sai2a_endpoint>; }; tlv320aic32x4_rx_endpoint: endpoint@1 { remote-endpoint = <&sai2b_endpoint>; }; }; However, when the audio graph card parses the codec nodes, it expects to find DAI interface indexes matching the endpoints indexes. The current patch forces the use of DAI id 0 for both endpoints, which allows to share the codec DAI between the two CPU DAIs for playback and capture streams respectively. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Baojun Xu <baojun.xu(a)ti.com> Cc: Charles Keepax <ckeepax(a)opensource.cirrus.com> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Kevin Lu <kevin-lu(a)ti.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Mark Brown <broonie(a)kernel.org> Cc: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: Shenghao Ding <shenghao-ding(a)ti.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: kernel(a)dh-electronics.com Cc: linux-sound(a)vger.kernel.org --- sound/soc/codecs/tlv320aic32x4.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 5c0c81da06dba..54ea4bc58c276 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -1073,6 +1073,13 @@ static int aic32x4_component_probe(struct snd_soc_component *component) return 0; } +static int aic32x4_of_xlate_dai_id(struct snd_soc_component *component, + struct device_node *endpoint) +{ + /* return dai id 0, whatever the endpoint index */ + return 0; +} + static const struct snd_soc_component_driver soc_component_dev_aic32x4 = { .probe = aic32x4_component_probe, .set_bias_level = aic32x4_set_bias_level, @@ -1082,6 +1089,7 @@ static const struct snd_soc_component_driver soc_component_dev_aic32x4 = { .num_dapm_widgets = ARRAY_SIZE(aic32x4_dapm_widgets), .dapm_routes = aic32x4_dapm_routes, .num_dapm_routes = ARRAY_SIZE(aic32x4_dapm_routes), + .of_xlate_dai_id = aic32x4_of_xlate_dai_id, .suspend_bias_off = 1, .idle_bias_on = 1, .use_pmdown_time = 1, @@ -1203,6 +1211,7 @@ static const struct snd_soc_component_driver soc_component_dev_aic32x4_tas2505 = .num_dapm_widgets = ARRAY_SIZE(aic32x4_tas2505_dapm_widgets), .dapm_routes = aic32x4_tas2505_dapm_routes, .num_dapm_routes = ARRAY_SIZE(aic32x4_tas2505_dapm_routes), + .of_xlate_dai_id = aic32x4_of_xlate_dai_id, .suspend_bias_off = 1, .idle_bias_on = 1, .use_pmdown_time = 1, -- 2.45.2

2 1

[PATCH v2 0/3] ASoC: dt-bindings: amlogic-sound-cards: document clocks property
by Neil Armstrong 02 Sep '24

02 Sep '24

Following an off-list discution with Jerome about fixing the following DTBs check errors: sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected) from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-sound-card.yaml# sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected) from schema $id: http://devicetree.org/schemas/sound/amlogic,gx-sound-card.yaml# sound: 'anyOf' conditional failed, one must be fixed: 'clocks' is a required property '#clock-cells' is a required property from schema $id: http://devicetree.org/schemas/clock/clock.yaml# It has been agreed documenting the clock in the sound card is a better solution than moving them to a random clock controller or consumer node which is not related to the actual meaning of those root frequencies. The patchset adds the clocks proprty to the bindings and finally adds the properties to the DT files. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Changes in v2: - drop clock-names in bindings & commit messages - fix new boards - drop RFS - Link to v1: https://lore.kernel.org/r/20240614-topic-amlogic-upstream-bindings-fixes-au… --- Neil Armstrong (3): ASoC: dt-bindings: amlogic,axg-sound-card: document clocks property ASoC: dt-bindings: amlogic,gx-sound-card: document clocks property arm64: dts: amlogic: add clock and clock-names to sound cards .../devicetree/bindings/sound/amlogic,axg-sound-card.yaml | 7 +++++++ Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml | 7 +++++++ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 4 ++++ .../arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi | 6 ++++++ arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts | 5 +++++ arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 4 ++++ 52 files changed, 217 insertions(+) --- base-commit: cb2361c78068ec47c3a6222d71f664b67665550e change-id: 20240614-topic-amlogic-upstream-bindings-fixes-audio-snd-card-2c642ccd2c6e Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

3 6

[tiwai-sound:for-next 11/11] sound/core/pcm_memory.c:196:37: error: incompatible pointer types passing 'size_t *' (aka 'unsigned int *') to parameter of type 'unsigned long *'
by kernel test robot 31 Aug '24

31 Aug '24

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next head: 61bc4deff033181992408f973b48fca08757d3ff commit: 61bc4deff033181992408f973b48fca08757d3ff [11/11] ALSA: pcm: replace simple_strtoul to kstrtoul config: hexagon-randconfig-002-20240901 (https://download.01.org/0day-ci/archive/20240901/202409010509.nOL6xTD7-lkp@…) compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 46fe36a4295f05d5d3731762e31fc4e6e99863e9) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240901/202409010509.nOL6xTD7-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409010509.nOL6xTD7-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from sound/core/pcm_memory.c:7: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 548 | val = __raw_readb(PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu' 37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) | ^ In file included from sound/core/pcm_memory.c:7: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu' 35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) | ^ In file included from sound/core/pcm_memory.c:7: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 585 | __raw_writeb(value, PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ In file included from sound/core/pcm_memory.c:14: In file included from include/sound/pcm.h:15: In file included from include/linux/mm.h:2228: include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion] 517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" | ~~~~~~~~~~~ ^ ~~~ >> sound/core/pcm_memory.c:196:37: error: incompatible pointer types passing 'size_t *' (aka 'unsigned int *') to parameter of type 'unsigned long *' [-Werror,-Wincompatible-pointer-types] 196 | buffer->error = kstrtoul(str, 10, &size); | ^~~~~ include/linux/kstrtox.h:30:90: note: passing argument to parameter 'res' here 30 | static inline int __must_check kstrtoul(const char *s, unsigned int base, unsigned long *res) | ^ 7 warnings and 1 error generated. vim +196 sound/core/pcm_memory.c 174 175 /* 176 * write callback for prealloc proc file 177 * 178 * accepts the preallocation size in kB. 179 */ 180 static void snd_pcm_lib_preallocate_proc_write(struct snd_info_entry *entry, 181 struct snd_info_buffer *buffer) 182 { 183 struct snd_pcm_substream *substream = entry->private_data; 184 struct snd_card *card = substream->pcm->card; 185 char line[64], str[64]; 186 size_t size; 187 struct snd_dma_buffer new_dmab; 188 189 guard(mutex)(&substream->pcm->open_mutex); 190 if (substream->runtime) { 191 buffer->error = -EBUSY; 192 return; 193 } 194 if (!snd_info_get_line(buffer, line, sizeof(line))) { 195 snd_info_get_str(str, line, sizeof(str)); > 196 buffer->error = kstrtoul(str, 10, &size); 197 if (buffer->error != 0) 198 return; 199 size *= 1024; 200 if ((size != 0 && size < 8192) || size > substream->dma_max) { 201 buffer->error = -EINVAL; 202 return; 203 } 204 if (substream->dma_buffer.bytes == size) 205 return; 206 memset(&new_dmab, 0, sizeof(new_dmab)); 207 new_dmab.dev = substream->dma_buffer.dev; 208 if (size > 0) { 209 if (do_alloc_pages(card, 210 substream->dma_buffer.dev.type, 211 substream->dma_buffer.dev.dev, 212 substream->stream, 213 size, &new_dmab) < 0) { 214 buffer->error = -ENOMEM; 215 pr_debug("ALSA pcmC%dD%d%c,%d:%s: cannot preallocate for size %zu\n", 216 substream->pcm->card->number, substream->pcm->device, 217 substream->stream ? 'c' : 'p', substream->number, 218 substream->pcm->name, size); 219 return; 220 } 221 substream->buffer_bytes_max = size; 222 } else { 223 substream->buffer_bytes_max = UINT_MAX; 224 } 225 if (substream->dma_buffer.area) 226 do_free_pages(card, &substream->dma_buffer); 227 substream->dma_buffer = new_dmab; 228 } else { 229 buffer->error = -EINVAL; 230 } 231 } 232 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[tiwai-sound:for-next 11/11] sound/core/pcm_memory.c:196:51: error: passing argument 3 of 'kstrtoul' from incompatible pointer type
by kernel test robot 31 Aug '24

31 Aug '24

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next head: 61bc4deff033181992408f973b48fca08757d3ff commit: 61bc4deff033181992408f973b48fca08757d3ff [11/11] ALSA: pcm: replace simple_strtoul to kstrtoul config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20240901/202409010425.YPS7cWeJ-lkp@…) compiler: sh4-linux-gcc (GCC) 14.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240901/202409010425.YPS7cWeJ-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409010425.YPS7cWeJ-lkp@intel.com/ All errors (new ones prefixed by >>): sound/core/pcm_memory.c: In function 'snd_pcm_lib_preallocate_proc_write': >> sound/core/pcm_memory.c:196:51: error: passing argument 3 of 'kstrtoul' from incompatible pointer type [-Wincompatible-pointer-types] 196 | buffer->error = kstrtoul(str, 10, &size); | ^~~~~ | | | size_t * {aka unsigned int *} In file included from include/linux/kernel.h:25, from arch/sh/include/asm/fixmap.h:13, from arch/sh/include/asm/pgtable.h:22, from include/linux/pgtable.h:6, from arch/sh/include/asm/io.h:21, from include/linux/io.h:14, from sound/core/pcm_memory.c:7: include/linux/kstrtox.h:30:90: note: expected 'long unsigned int *' but argument is of type 'size_t *' {aka 'unsigned int *'} 30 | static inline int __must_check kstrtoul(const char *s, unsigned int base, unsigned long *res) | ~~~~~~~~~~~~~~~^~~ vim +/kstrtoul +196 sound/core/pcm_memory.c 174 175 /* 176 * write callback for prealloc proc file 177 * 178 * accepts the preallocation size in kB. 179 */ 180 static void snd_pcm_lib_preallocate_proc_write(struct snd_info_entry *entry, 181 struct snd_info_buffer *buffer) 182 { 183 struct snd_pcm_substream *substream = entry->private_data; 184 struct snd_card *card = substream->pcm->card; 185 char line[64], str[64]; 186 size_t size; 187 struct snd_dma_buffer new_dmab; 188 189 guard(mutex)(&substream->pcm->open_mutex); 190 if (substream->runtime) { 191 buffer->error = -EBUSY; 192 return; 193 } 194 if (!snd_info_get_line(buffer, line, sizeof(line))) { 195 snd_info_get_str(str, line, sizeof(str)); > 196 buffer->error = kstrtoul(str, 10, &size); 197 if (buffer->error != 0) 198 return; 199 size *= 1024; 200 if ((size != 0 && size < 8192) || size > substream->dma_max) { 201 buffer->error = -EINVAL; 202 return; 203 } 204 if (substream->dma_buffer.bytes == size) 205 return; 206 memset(&new_dmab, 0, sizeof(new_dmab)); 207 new_dmab.dev = substream->dma_buffer.dev; 208 if (size > 0) { 209 if (do_alloc_pages(card, 210 substream->dma_buffer.dev.type, 211 substream->dma_buffer.dev.dev, 212 substream->stream, 213 size, &new_dmab) < 0) { 214 buffer->error = -ENOMEM; 215 pr_debug("ALSA pcmC%dD%d%c,%d:%s: cannot preallocate for size %zu\n", 216 substream->pcm->card->number, substream->pcm->device, 217 substream->stream ? 'c' : 'p', substream->number, 218 substream->pcm->name, size); 219 return; 220 } 221 substream->buffer_bytes_max = size; 222 } else { 223 substream->buffer_bytes_max = UINT_MAX; 224 } 225 if (substream->dma_buffer.area) 226 do_free_pages(card, &substream->dma_buffer); 227 substream->dma_buffer = new_dmab; 228 } else { 229 buffer->error = -EINVAL; 230 } 231 } 232 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

Fix TLV dB parser in case of used container
by GitHub pull_request - edited 31 Aug '24

31 Aug '24

alsa-project/alsa-lib pull request #409 was edited from arkq: In case when dB information does not appear as the only TLV type in the stream (it might be wrapped in a container, but the container can not have any other type), the TLV parser fails to get the dB TLV pointer. This commit fixes it by distinguishing between TLV parse error and dB information not being found in a container, so the parser can iterate over all elements in the container. Also, it fixes out-of-bounds read in case of malicious TLV record. EDIT: Other possibility to fix is to return `-ENOENT` in case where dB information was not found and handle that accordingly when iterating over items of a container. Request URL : https://github.com/alsa-project/alsa-lib/pull/409 Patch URL : https://github.com/alsa-project/alsa-lib/pull/409.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

Fix TLV dB parser in case of used container
by GitHub pull_request - opened 31 Aug '24

31 Aug '24

alsa-project/alsa-lib pull request #409 was opened from arkq: In case when dB information does not appear as the only TLV type in the stream (it might be wrapped in a container, but the container can not have any other type), the TLV parser fails to get the dB TLV pointer. This commit fixes it by distinguishing between TLV parse error and dB information not being found in a container, so the parser can iterate over all elements in the container. Also, it fixes out-of-bounds read in case of malicious TLV record. Request URL : https://github.com/alsa-project/alsa-lib/pull/409 Patch URL : https://github.com/alsa-project/alsa-lib/pull/409.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH v1] ASoC: codecs: Switch to use dev_err_probe()
by Yang Ruibin 30 Aug '24

30 Aug '24

Using dev_err_probe() instead of dev_err() in probe() simplifies the error path and standardizes the format of the error code. Signed-off-by: Yang Ruibin <11162571(a)vivo.com> --- sound/soc/codecs/ad1980.c | 8 +++----- sound/soc/codecs/adau1701.c | 19 +++++++------------ sound/soc/codecs/ssm2602.c | 6 ++---- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 3c1ae13c1..d2f679d9d 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c @@ -237,11 +237,9 @@ static int ad1980_soc_probe(struct snd_soc_component *component) u16 ext_status; ac97 = snd_soc_new_ac97_component(component, 0, 0); - if (IS_ERR(ac97)) { - ret = PTR_ERR(ac97); - dev_err(component->dev, "Failed to register AC97 component: %d\n", ret); - return ret; - } + if (IS_ERR(ac97)) + return dev_err_probe(component->dev, PTR_ERR(ac97), + "Failed to register AC97 component\n"); regmap = regmap_init_ac97(ac97, &ad1980_regmap_config); if (IS_ERR(regmap)) { diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index 8bd6067df..f4c574447 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -677,10 +677,9 @@ static int adau1701_probe(struct snd_soc_component *component) ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); - if (ret < 0) { - dev_err(component->dev, "Failed to enable regulators: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(component->dev, ret, + "Failed to enable regulators\n"); /* * Let the pll_clkdiv variable default to something that won't happen @@ -798,17 +797,13 @@ static int adau1701_i2c_probe(struct i2c_client *client) ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(adau1701->supplies), adau1701->supplies); - if (ret < 0) { - dev_err(dev, "Failed to get regulators: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get regulators\n"); ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); - if (ret < 0) { - dev_err(dev, "Failed to enable regulators: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to enable regulators\n"); adau1701->client = client; adau1701->regmap = devm_regmap_init(dev, NULL, client, diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index c29324403..153eb55a3 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -605,10 +605,8 @@ static int ssm260x_component_probe(struct snd_soc_component *component) int ret; ret = regmap_write(ssm2602->regmap, SSM2602_RESET, 0); - if (ret < 0) { - dev_err(component->dev, "Failed to issue reset: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(component->dev, ret, "Failed to issue reset\n"); regmap_register_patch(ssm2602->regmap, ssm2602_patch, ARRAY_SIZE(ssm2602_patch)); -- 2.34.1

2 1

[PATCH v2] ASoC: codecs: lpass-va-macro: set the default codec version for sm8250
by srinivas.kandagatla＠linaro.org 30 Aug '24

30 Aug '24

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> sm8250 and sc7280 have lpass codec version 1.0, as these are very old platforms, they do not have a reliable way to get the codec version from core_id registers. On codec versions below 2.0, even though the core_id registers are available to read, the values of these registers are not unique to be able to determine the version of the codec dynamically. Add the version info into of_data, so that driver does not need to use core_id registers to get version number for such situations. Fixes: 378918d59181 ("ASoC: codecs: lpass-macro: add helpers to get codec version") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes since v1: - updated commit text to add more details sound/soc/codecs/lpass-va-macro.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index 8454193ed22a..e95d1f29ef18 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -228,11 +228,13 @@ struct va_macro { struct va_macro_data { bool has_swr_master; bool has_npl_clk; + int version; }; static const struct va_macro_data sm8250_va_data = { .has_swr_master = false, .has_npl_clk = false, + .version = LPASS_CODEC_VERSION_1_0, }; static const struct va_macro_data sm8450_va_data = { @@ -1587,7 +1589,14 @@ static int va_macro_probe(struct platform_device *pdev) goto err_npl; } - va_macro_set_lpass_codec_version(va); + /** + * old version of codecs do not have a reliable way to determine the + * version from registers, get them from soc specific data + */ + if (data->version) + lpass_macro_set_codec_version(data->version); + else /* read version from register */ + va_macro_set_lpass_codec_version(va); if (va->has_swr_master) { /* Set default CLK div to 1 */ -- 2.25.1

5 4

[PATCH v1] ASoC: fsl_ssi: Simplify with dev_err_probe()
by Shen Lichuan 30 Aug '24

30 Aug '24

Use dev_err_probe() to simplify the error path and unify a message template. Using this helper is totally fine even if err is known to never be -EPROBE_DEFER. The benefit compared to a normal dev_err() is the standardized format of the error code, it being emitted symbolically and the fact that the error code is returned which allows more compact error paths. Signed-off-by: Shen Lichuan <shenlichuan(a)vivo.com> --- sound/soc/fsl/fsl_ssi.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index c4c1d9c44056..51927f89241f 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1354,19 +1354,16 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev, ssi->clk = devm_clk_get(dev, "ipg"); else ssi->clk = devm_clk_get(dev, NULL); - if (IS_ERR(ssi->clk)) { - ret = PTR_ERR(ssi->clk); - dev_err(dev, "failed to get clock: %d\n", ret); - return ret; - } + if (IS_ERR(ssi->clk)) + return dev_err_probe(dev, PTR_ERR(ssi->clk), + "failed to get clock\n"); /* Enable the clock since regmap will not handle it in this case */ if (!ssi->has_ipg_clk_name) { ret = clk_prepare_enable(ssi->clk); - if (ret) { - dev_err(dev, "clk_prepare_enable failed: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "clk_prepare_enable failed\n"); } /* Do not error out for consumer cases that live without a baud clock */ @@ -1552,10 +1549,9 @@ static int fsl_ssi_probe(struct platform_device *pdev) &regconfig); else ssi->regs = devm_regmap_init_mmio(dev, iomem, &regconfig); - if (IS_ERR(ssi->regs)) { - dev_err(dev, "failed to init register map\n"); - return PTR_ERR(ssi->regs); - } + if (IS_ERR(ssi->regs)) + return dev_err_probe(dev, PTR_ERR(ssi->regs), + "failed to init register map\n"); ssi->irq = platform_get_irq(pdev, 0); if (ssi->irq < 0) @@ -1607,7 +1603,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) mutex_init(&ssi->ac97_reg_lock); ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev); if (ret) { - dev_err(dev, "failed to set AC'97 ops\n"); + dev_err_probe(dev, ret, "failed to set AC'97 ops\n"); goto error_ac97_ops; } } @@ -1615,7 +1611,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) ret = devm_snd_soc_register_component(dev, &fsl_ssi_component, &ssi->cpu_dai_drv, 1); if (ret) { - dev_err(dev, "failed to register DAI: %d\n", ret); + dev_err_probe(dev, ret, "failed to register DAI\n"); goto error_asoc_register; } @@ -1623,7 +1619,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) ret = devm_request_irq(dev, ssi->irq, fsl_ssi_isr, 0, dev_name(dev), ssi); if (ret < 0) { - dev_err(dev, "failed to claim irq %u\n", ssi->irq); + dev_err_probe(dev, ret, "failed to claim irq %u\n", + ssi->irq); goto error_asoc_register; } } @@ -1649,8 +1646,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) ssi->card_name, ssi->card_idx, NULL, 0); if (IS_ERR(ssi->card_pdev)) { ret = PTR_ERR(ssi->card_pdev); - dev_err(dev, "failed to register %s: %d\n", - ssi->card_name, ret); + dev_err_probe(dev, ret, "failed to register %s\n", + ssi->card_name); goto error_sound_card; } } -- 2.17.1

1 0

ALSA question
by Hai Nguyen 30 Aug '24

30 Aug '24

Hi, I have a C++ audio application that plays back audio data on the sound card, Digigram VX882e. https://www.digigram.com/support/vx882e-support/ The application runs on HPE ProLiant DL380 Gen9 Server. HPE ProLiant DL380 Gen9 Server It has worked well under RHEL 7 (kernel 3.10) and RHEL 8 (kernel 4.x). Asthe OS is upgraded to RHEL 9 (kernel 5.14), there is an buffer underrun. When investigating the issue, I run “speaker-test” utility. It fails with the error below. I'm just wonder if this has something to do with the changes in ALSA driver from kernel 4.x to kernel 5.14? If not, what could cause the buffer underrun issue? Your advice/help is highly appreciated, Thanks, Kevin Nguyen sudo speaker-test -D plughw:VX882e0 -c 2 speaker-test 1.2.9 Playback device is plughw:VX882e0 Stream parameters are 48000Hz, S16_LE, 2 channels Using 16 octaves of pink noise Rate set to 48000Hz (requested 48000Hz) Buffer size range from 128 to 8192 Period size range from 64 to 4096 Using max buffer size 8192 Periods = 4 was set period_size = 2048 was set buffer_size = 8192 0 - Front Left Write error: -5,Input/outputerror xrun_recovery failed:-5,Input/output error Transfer failed: Input/outputerror The Digigram card is detected with “aplay -l” command. sudo aplay -l **** List of PLAYBACK Hardware Devices **** card 0: VX882e0 [Digigram [PCM #0]], device 0: pcxhr 0[pcxhr 0] Subdevices: 4/4 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 Subdevice #2: subdevice #2 Subdevice #3: subdevice #3 card 1: VX882e1 [Digigram [PCM #1]], device 0: pcxhr 1[pcxhr 1] Subdevices: 4/4 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 Subdevice #2: subdevice #2 Subdevice #3: subdevice #3 card 2: VX882e2 [Digigram [PCM #2]], device 0: pcxhr 2 [pcxhr2] Subdevices: 4/4 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 Subdevice #2: subdevice #2 Subdevice #3: subdevice #3 card 3: VX882e3 [Digigram [PCM #3]], device 0: pcxhr 3[pcxhr 3] Subdevices: 4/4 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 Subdevice #2: subdevice #2 Subdevice #3: subdevice #3

2 1