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

[PATCH 1/1] dt-bindings: mediatek: mt8192: eliminate yamllint warnings
by Zhen Lei 08 Dec '20

08 Dec '20

Eliminate the following yamllint warnings: ./Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml :10:4: [warning] wrong indentation: expected 2 but found 3 (indentation) Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> --- .../devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml index bf8c8ba25009dcc..54650823b29a41d 100644 --- a/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml +++ b/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml @@ -7,8 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Mediatek MT8192 with MT6359, RT1015 and RT5682 ASoC sound card driver maintainers: - - Jiaxin Yu <jiaxin.yu(a)mediatek.com> - - Shane Chien <shane.chien(a)mediatek.com> + - Jiaxin Yu <jiaxin.yu(a)mediatek.com> + - Shane Chien <shane.chien(a)mediatek.com> description: This binding describes the MT8192 sound card. -- 1.8.3

2 1

[PATCH] ASoC: SOF: trace: Add runtime trace filtering mechanism
by Kai Vehmanen 07 Dec '20

07 Dec '20

From: Karol Trzcinski <karolx.trzcinski(a)linux.intel.com> The "filter" debugfs file defines the log levels used by the firmware and reported by sof-logger. The file contains the formatted entry list, where each entry follows the following syntax in plain text: log_level uuid_id pipe_id comp_id; This file may be updated by userspace applications such sof-logger, or directly by the user during debugging process. An unused (wildcard) pipe_id or comp_id value should be set to -1, uuid_id is hexadecimal value, so when unused then should be set to 0. When the file is modified, an IPC command is sent to FW with new trace levels for selected components in filter elements list. Signed-off-by: Karol Trzcinski <karolx.trzcinski(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- include/sound/sof/header.h | 1 + include/sound/sof/trace.h | 28 +++++ sound/soc/sof/trace.c | 224 +++++++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+) diff --git a/include/sound/sof/header.h b/include/sound/sof/header.h index c93f08334bbe..4c747c52e01b 100644 --- a/include/sound/sof/header.h +++ b/include/sound/sof/header.h @@ -118,6 +118,7 @@ #define SOF_IPC_TRACE_DMA_PARAMS SOF_CMD_TYPE(0x001) #define SOF_IPC_TRACE_DMA_POSITION SOF_CMD_TYPE(0x002) #define SOF_IPC_TRACE_DMA_PARAMS_EXT SOF_CMD_TYPE(0x003) +#define SOF_IPC_TRACE_FILTER_UPDATE SOF_CMD_TYPE(0x004) /**< ABI3.17 */ /* debug */ #define SOF_IPC_DEBUG_MEM_USAGE SOF_CMD_TYPE(0x001) diff --git a/include/sound/sof/trace.h b/include/sound/sof/trace.h index c31a94a13ce0..25ea99f62d37 100644 --- a/include/sound/sof/trace.h +++ b/include/sound/sof/trace.h @@ -43,6 +43,34 @@ struct sof_ipc_dma_trace_posn { uint32_t messages; /* total trace messages */ } __packed; +/* Values used in sof_ipc_trace_filter_elem: */ + +/* bits 6..0 */ +#define SOF_IPC_TRACE_FILTER_ELEM_SET_LEVEL 0x01 /**< trace level for selected components */ +#define SOF_IPC_TRACE_FILTER_ELEM_BY_UUID 0x02 /**< filter by uuid key */ +#define SOF_IPC_TRACE_FILTER_ELEM_BY_PIPE 0x03 /**< filter by pipeline */ +#define SOF_IPC_TRACE_FILTER_ELEM_BY_COMP 0x04 /**< filter by component id */ + +/* bit 7 */ +#define SOF_IPC_TRACE_FILTER_ELEM_FIN 0x80 /**< mark last filter in set */ + +/* bits 31..8: Unused */ + +/** part of sof_ipc_trace_filter, ABI3.17 */ +struct sof_ipc_trace_filter_elem { + uint32_t key; /**< SOF_IPC_TRACE_FILTER_ELEM_ {LEVEL, UUID, COMP, PIPE} */ + uint32_t value; /**< element value */ +} __packed; + +/** Runtime tracing filtration data - SOF_IPC_TRACE_FILTER_UPDATE, ABI3.17 */ +struct sof_ipc_trace_filter { + struct sof_ipc_cmd_hdr hdr; /**< IPC command header */ + uint32_t elem_cnt; /**< number of entries in elems[] array */ + uint32_t reserved[8]; /**< reserved for future usage */ + /** variable size array with new filtering settings */ + struct sof_ipc_trace_filter_elem elems[]; +} __packed; + /* * Commom debug */ diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c index 69889241a092..f72a6e83e6af 100644 --- a/sound/soc/sof/trace.c +++ b/sound/soc/sof/trace.c @@ -13,6 +13,225 @@ #include "sof-priv.h" #include "ops.h" +#define TRACE_FILTER_ELEMENTS_PER_ENTRY 4 +#define TRACE_FILTER_MAX_CONFIG_STRING_LENGTH 1024 + +static int trace_filter_append_elem(struct snd_sof_dev *sdev, uint32_t key, uint32_t value, + struct sof_ipc_trace_filter_elem *elem_list, + int capacity, int *counter) +{ + if (*counter >= capacity) + return -ENOMEM; + + elem_list[*counter].key = key; + elem_list[*counter].value = value; + ++*counter; + + return 0; +} + +static int trace_filter_parse_entry(struct snd_sof_dev *sdev, const char *line, + struct sof_ipc_trace_filter_elem *elem, + int capacity, int *counter) +{ + int len = strlen(line); + int cnt = *counter; + uint32_t uuid_id; + int log_level; + int pipe_id; + int comp_id; + int read; + int ret; + + /* ignore empty content */ + ret = sscanf(line, " %n", &read); + if (!ret && read == len) + return len; + + ret = sscanf(line, " %d %x %d %d %n", &log_level, &uuid_id, &pipe_id, &comp_id, &read); + if (ret != TRACE_FILTER_ELEMENTS_PER_ENTRY || read != len) { + dev_err(sdev->dev, "error: invalid trace filter entry '%s'\n", line); + return -EINVAL; + } + + if (uuid_id > 0) { + ret = trace_filter_append_elem(sdev, SOF_IPC_TRACE_FILTER_ELEM_BY_UUID, + uuid_id, elem, capacity, &cnt); + if (ret) + return ret; + } + if (pipe_id >= 0) { + ret = trace_filter_append_elem(sdev, SOF_IPC_TRACE_FILTER_ELEM_BY_PIPE, + pipe_id, elem, capacity, &cnt); + if (ret) + return ret; + } + if (comp_id >= 0) { + ret = trace_filter_append_elem(sdev, SOF_IPC_TRACE_FILTER_ELEM_BY_COMP, + comp_id, elem, capacity, &cnt); + if (ret) + return ret; + } + + ret = trace_filter_append_elem(sdev, SOF_IPC_TRACE_FILTER_ELEM_SET_LEVEL | + SOF_IPC_TRACE_FILTER_ELEM_FIN, + log_level, elem, capacity, &cnt); + if (ret) + return ret; + + /* update counter only when parsing whole entry passed */ + *counter = cnt; + + return len; +} + +static int trace_filter_parse(struct snd_sof_dev *sdev, char *string, + int *out_elem_cnt, + struct sof_ipc_trace_filter_elem **out) +{ + static const char entry_delimiter[] = ";"; + char *entry = string; + int capacity = 0; + int entry_len; + int cnt = 0; + + /* + * Each entry contains at least 1, up to TRACE_FILTER_ELEMENTS_PER_ENTRY + * IPC elements, depending on content. Calculate IPC elements capacity + * for the input string where each element is set. + */ + while (entry) { + capacity += TRACE_FILTER_ELEMENTS_PER_ENTRY; + entry = strchr(entry + 1, entry_delimiter[0]); + } + *out = kmalloc(capacity * sizeof(**out), GFP_KERNEL); + if (!*out) + return -ENOMEM; + + /* split input string by ';', and parse each entry separately in trace_filter_parse_entry */ + while ((entry = strsep(&string, entry_delimiter))) { + entry_len = trace_filter_parse_entry(sdev, entry, *out, capacity, &cnt); + if (entry_len < 0) { + dev_err(sdev->dev, "error: %s failed for '%s', %d\n", __func__, entry, + entry_len); + return -EINVAL; + } + } + + *out_elem_cnt = cnt; + + return 0; +} + +static int sof_ipc_trace_update_filter(struct snd_sof_dev *sdev, int num_elems, + struct sof_ipc_trace_filter_elem *elems) +{ + struct sof_ipc_trace_filter *msg; + struct sof_ipc_reply reply; + size_t size; + int ret; + + size = struct_size(msg, elems, num_elems); + if (size > SOF_IPC_MSG_MAX_SIZE) + return -EINVAL; + + msg = kmalloc(size, GFP_KERNEL); + if (!msg) + return -ENOMEM; + + msg->hdr.size = size; + msg->hdr.cmd = SOF_IPC_GLB_TRACE_MSG | SOF_IPC_TRACE_FILTER_UPDATE; + msg->elem_cnt = num_elems; + memcpy(&msg->elems[0], elems, num_elems * sizeof(*elems)); + + ret = pm_runtime_get_sync(sdev->dev); + if (ret < 0 && ret != -EACCES) { + pm_runtime_put_noidle(sdev->dev); + dev_err(sdev->dev, "error: enabling device failed: %d\n", ret); + goto error; + } + ret = sof_ipc_tx_message(sdev->ipc, msg->hdr.cmd, msg, msg->hdr.size, + &reply, sizeof(reply)); + pm_runtime_mark_last_busy(sdev->dev); + pm_runtime_put_autosuspend(sdev->dev); + +error: + kfree(msg); + return ret ? ret : reply.error; +} + +static ssize_t sof_dfsentry_trace_filter_write(struct file *file, const char __user *from, + size_t count, loff_t *ppos) +{ + struct snd_sof_dfsentry *dfse = file->private_data; + struct sof_ipc_trace_filter_elem *elems = NULL; + struct snd_sof_dev *sdev = dfse->sdev; + loff_t pos = 0; + int num_elems; + char *string; + int ret; + + if (count > TRACE_FILTER_MAX_CONFIG_STRING_LENGTH) { + dev_err(sdev->dev, "%s too long input, %zu > %d\n", __func__, count, + TRACE_FILTER_MAX_CONFIG_STRING_LENGTH); + return -EINVAL; + } + + string = kmalloc(count + 1, GFP_KERNEL); + if (!string) + return -ENOMEM; + + /* assert null termination */ + string[count] = 0; + ret = simple_write_to_buffer(string, count, &pos, from, count); + if (ret < 0) + goto error; + + ret = trace_filter_parse(sdev, string, &num_elems, &elems); + if (ret < 0) { + dev_err(sdev->dev, "error: fail in trace_filter_parse, %d\n", ret); + goto error; + } + + if (num_elems) { + ret = sof_ipc_trace_update_filter(sdev, num_elems, elems); + if (ret < 0) { + dev_err(sdev->dev, "error: fail in sof_ipc_trace_update_filter %d\n", ret); + goto error; + } + } + ret = count; +error: + kfree(string); + kfree(elems); + return ret; +} + +static const struct file_operations sof_dfs_trace_filter_fops = { + .open = simple_open, + .write = sof_dfsentry_trace_filter_write, + .llseek = default_llseek, +}; + +static int trace_debugfs_filter_create(struct snd_sof_dev *sdev) +{ + struct snd_sof_dfsentry *dfse; + + dfse = devm_kzalloc(sdev->dev, sizeof(*dfse), GFP_KERNEL); + if (!dfse) + return -ENOMEM; + + dfse->sdev = sdev; + dfse->type = SOF_DFSENTRY_TYPE_BUF; + + debugfs_create_file("filter", 0200, sdev->debugfs_root, dfse, + &sof_dfs_trace_filter_fops); + /* add to dfsentry list */ + list_add(&dfse->list, &sdev->dfsentry_list); + + return 0; +} + static size_t sof_trace_avail(struct snd_sof_dev *sdev, loff_t pos, size_t buffer_size) { @@ -135,10 +354,15 @@ static const struct file_operations sof_dfs_trace_fops = { static int trace_debugfs_create(struct snd_sof_dev *sdev) { struct snd_sof_dfsentry *dfse; + int ret; if (!sdev) return -EINVAL; + ret = trace_debugfs_filter_create(sdev); + if (ret < 0) + dev_err(sdev->dev, "error: fail in %s, %d", __func__, ret); + dfse = devm_kzalloc(sdev->dev, sizeof(*dfse), GFP_KERNEL); if (!dfse) return -ENOMEM; -- 2.28.0

2 1

[PATCH] ASoC: pcm: send DAPM_STREAM_STOP event in dpcm_fe_dai_shutdown
by Ranjani Sridharan 07 Dec '20

07 Dec '20

A recent change removed the call to send the DAPM_STREAM_STOP event in dpcm_fe_dai_shutdown. But this causes a regression when a PCM prepare is not paired with a hw_free. So, add the DAPM_STREAM_STOP event back to dpcm_fe_dai_shutdown() to fix this. The new sequence would be: soc_pcm_prepare() -> SND_SOC_DAPM_STREAM_START soc_pcm_hw_free() -> soc_pcm_hw_free() -> SND_SOC_DAPM_STREAM_STOP dpcm_fe_dai_shutdown() -> SND_SOC_DAPM_STREAM_STOP Note that the DAPM_STREAM_STOP will be called twice but it seems harmless. Fixes: a27b421f1d04 ('ASoC: pcm: call snd_soc_dapm_stream_stop() in soc_pcm_hw_clean') Reported-by: Hans de Goede <hdegoede(a)redhat.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/soc/soc-pcm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5250124dc8f5..ae062e4d1ce8 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1860,6 +1860,9 @@ static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream) /* now shutdown the frontend */ soc_pcm_close(substream); + /* run the stream stop event */ + dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP); + fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE; dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO); return 0; -- 2.25.1

3 3

Alsa-lib compilation error
by Caio Lima 07 Dec '20

07 Dec '20

Hello ALSA-devel team, nice to contact you. Firstly I want to let you know I'm a fan of the work of you guys of the ALSA Project, specifically of the alsa-lib of which I had a little experience. I'm needing help with the compile of the alsa-lib library, I'm using cygwin and following the instructions in the "INSTALL" file inside the source but during the compiling with the command "./gitcompile" I'm getting some errors, here the entire log: Caio@Caio-PC ~/alsa-lib $ ./gitcompile configure.ac:30: installing './compile' configure.ac:15: installing './config.guess' configure.ac:15: installing './config.sub' configure.ac:16: installing './install-sh' configure.ac:16: installing './missing' alsalisp/Makefile.am: installing './depcomp' parallel-tests: installing './test-driver' CFLAGS=-O2 -Wall -W -Wunused-const-variable=0 -pipe -g ./configure --disable-aload --prefix=/usr --libdir=/usr/lib --with-plugindir=/usr/lib/alsa-lib --with-pkgconfdir=/usr/lib/pkgconfig configure: loading site script /usr/share/config.site checking build system type... x86_64-pc-cygwin checking host system type... x86_64-pc-cygwin checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /usr/bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether to enable maintainer-specific portions of Makefiles... yes checking whether make supports nested variables... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.exe checking for suffix of executables... .exe checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking whether make supports the include directive... yes (GNU style) checking dependency style of gcc... gcc3 checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking minix/config.h usability... no checking minix/config.h presence... no checking for minix/config.h... no checking whether it is safe to define __EXTENSIONS__... yes checking whether ln -s works... yes checking how to print strings... printf checking for a sed that does not truncate output... /usr/bin/sed checking for fgrep... /usr/bin/grep -F checking for ld used by gcc... /usr/x86_64-pc-cygwin/bin/ld.exe checking if the linker (/usr/x86_64-pc-cygwin/bin/ld.exe) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking the maximum length of command line arguments... 8192 checking how to convert x86_64-pc-cygwin file names to x86_64-pc-cygwin format... func_convert_file_noop checking how to convert x86_64-pc-cygwin file names to toolchain format... func_convert_file_noop checking for /usr/x86_64-pc-cygwin/bin/ld.exe option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... file_magic ^x86 archive import|^x86 DLL checking for dlltool... dlltool checking how to associate runtime and link libraries... func_cygming_dll_for_implib checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /usr/bin/dd checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1 checking for mt... no checking if : is a manifest tool... no checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -DDLL_EXPORT -DPIC checking if gcc PIC flag -DDLL_EXPORT -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/x86_64-pc-cygwin/bin/ld.exe) supports shared libraries... yes checking whether -lc should be explicitly linked in... yes checking dynamic linker characteristics... Win32 ld.exe checking how to hardcode library paths into programs... immediate checking whether a program can dlopen itself... yes checking whether a statically linked program can dlopen itself... yes checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking if gcc supports -Wl,--no-undefined flag... yes checking if gcc supports -Wl,-z,defs flag... checking for ANSI C header files... (cached) yes checking for an ANSI C-conforming const... yes checking for inline... inline checking whether time.h and sys/time.h may both be included... yes checking whether gcc needs -traditional... no checking for uselocale... yes checking for library version... major 1 minor 2 subminor 4 extrastr extraver 1000000 checking for versioned symbols... yes checking for symbolic-functions... no checking for custom symbol prefixes... checking for debug... yes checking for debug assert... no checking for tmpdir... /tmp checking for softfloat... no checking for libdl... checking for dlsym in -ldl... yes checking for pthread... checking for pthread_join in -lpthread... yes checking whether PTHREAD_MUTEX_RECURSIVE is declared... yes checking for __thread... yes checking for librt... checking for clock_gettime in -lrt... yes checking for use of wordexp... no checking endian.h usability... yes checking endian.h presence... yes checking for endian.h... yes checking sys/endian.h usability... no checking sys/endian.h presence... no checking for sys/endian.h... no checking sys/shm.h usability... yes checking sys/shm.h presence... yes checking for sys/shm.h... yes checking for resmgr support... no checking for aload* support... no checking for ALSA device file directory... /dev/snd/ checking for aload* device file directory... /dev/ checking whether GCC supports builtin atomic intrinsics... yes checking for default lockless dmix... no checking for max number of cards... 32 checking for thread-safe API functions... yes Making a symlink include/alsa checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating doc/Makefile config.status: creating doc/pictures/Makefile config.status: creating doc/doxygen.cfg config.status: creating include/Makefile config.status: creating include/sound/Makefile config.status: creating include/sound/uapi/Makefile config.status: creating src/Versions config.status: creating src/Makefile config.status: creating src/control/Makefile config.status: creating src/mixer/Makefile config.status: creating src/pcm/Makefile config.status: creating src/pcm/scopes/Makefile config.status: creating src/rawmidi/Makefile config.status: creating src/timer/Makefile config.status: creating src/hwdep/Makefile config.status: creating src/seq/Makefile config.status: creating src/ucm/Makefile config.status: creating src/alisp/Makefile config.status: creating src/topology/Makefile config.status: creating src/conf/Makefile config.status: creating src/conf/cards/Makefile config.status: creating src/conf/pcm/Makefile config.status: creating modules/Makefile config.status: creating modules/mixer/Makefile config.status: creating modules/mixer/simple/Makefile config.status: creating alsalisp/Makefile config.status: creating aserver/Makefile config.status: creating test/Makefile config.status: creating test/lsb/Makefile config.status: creating utils/Makefile config.status: creating utils/alsa-lib.spec config.status: creating utils/alsa.pc config.status: creating utils/alsa-topology.pc config.status: creating include/config.h config.status: executing depfiles commands config.status: executing libtool commands Creating asoundlib.h... Making all in doc make[1]: Entering directory '/home/Caio/alsa-lib/doc' Making all in pictures make[2]: Entering directory '/home/Caio/alsa-lib/doc/pictures' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory '/home/Caio/alsa-lib/doc/pictures' make[2]: Entering directory '/home/Caio/alsa-lib/doc' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory '/home/Caio/alsa-lib/doc' make[1]: Leaving directory '/home/Caio/alsa-lib/doc' Making all in include make[1]: Entering directory '/home/Caio/alsa-lib/include' make all-recursive make[2]: Entering directory '/home/Caio/alsa-lib/include' Making all in sound make[3]: Entering directory '/home/Caio/alsa-lib/include/sound' Making all in uapi make[4]: Entering directory '/home/Caio/alsa-lib/include/sound/uapi' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/home/Caio/alsa-lib/include/sound/uapi' make[4]: Entering directory '/home/Caio/alsa-lib/include/sound' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/home/Caio/alsa-lib/include/sound' make[3]: Leaving directory '/home/Caio/alsa-lib/include/sound' make[3]: Entering directory '/home/Caio/alsa-lib/include' Updating version.h make[3]: Leaving directory '/home/Caio/alsa-lib/include' make[2]: Leaving directory '/home/Caio/alsa-lib/include' make[1]: Leaving directory '/home/Caio/alsa-lib/include' Making all in src make[1]: Entering directory '/home/Caio/alsa-lib/src' Making all in control make[2]: Entering directory '/home/Caio/alsa-lib/src/control' CC cards.lo In file included from ../../include/local.h:25, from control_local.h:22, from cards.c:35: ../../include/config.h:226: warning: "__SYMBOL_PREFIX" redefined 226 | #define __SYMBOL_PREFIX "" | In file included from /usr/include/sys/config.h:238, from /usr/include/_ansi.h:11, from /usr/include/stdio.h:29, from cards.c:28: /usr/include/cygwin/config.h:58: note: this is the location of the previous definition 58 | # define __SYMBOL_PREFIX | In file included from ../../include/sound/asound.h:11, from ../../include/local.h:146, from control_local.h:22, from cards.c:35: ../../include/alsa/sound/uapi/asound.h:512:2: error: unknown type name ‘__s64’ 512 | __s64 tv_sec; | ^~~~~ ../../include/alsa/sound/uapi/asound.h:513:2: error: unknown type name ‘__s64’ 513 | __s64 tv_nsec; | ^~~~~ cards.c: In function ‘snd_card_load2’: ../../include/alsa/sound/uapi/asound.h:1064:35: warning: implicit declaration of function ‘_IOR’ [-Wimplicit-function-declaration] 1064 | #define SNDRV_CTL_IOCTL_CARD_INFO _IOR('U', 0x01, struct snd_ctl_card_info) | ^~~~ cards.c:49:23: note: in expansion of macro ‘SNDRV_CTL_IOCTL_CARD_INFO’ 49 | if (ioctl(open_dev, SNDRV_CTL_IOCTL_CARD_INFO, &info) < 0) { | ^~~~~~~~~~~~~~~~~~~~~~~~~ ../../include/alsa/sound/uapi/asound.h:1064:51: error: expected expression before ‘struct’ 1064 | #define SNDRV_CTL_IOCTL_CARD_INFO _IOR('U', 0x01, struct snd_ctl_card_info) | ^~~~~~ cards.c:49:23: note: in expansion of macro ‘SNDRV_CTL_IOCTL_CARD_INFO’ 49 | if (ioctl(open_dev, SNDRV_CTL_IOCTL_CARD_INFO, &info) < 0) { | ^~~~~~~~~~~~~~~~~~~~~~~~~ In file included from cards.c:32: cards.c: In function ‘snd_card_get_index’: cards.c:133:15: warning: array subscript has type ‘char’ [-Wchar-subscripts] 133 | if ((isdigit(*string) && *(string + 1) == 0) || | ^~~~~~~ cards.c:134:15: warning: array subscript has type ‘char’ [-Wchar-subscripts] 134 | (isdigit(*string) && isdigit(*(string + 1)) && *(string + 2) == 0)) { | ^~~~~~~ cards.c:134:35: warning: array subscript has type ‘char’ [-Wchar-subscripts] 134 | (isdigit(*string) && isdigit(*(string + 1)) && *(string + 2) == 0)) { | ^~~~~~~~~~~~~ make[2]: *** [Makefile:404: cards.lo] Error 1 make[2]: Leaving directory '/home/Caio/alsa-lib/src/control' make[1]: *** [Makefile:554: all-recursive] Error 1 make[1]: Leaving directory '/home/Caio/alsa-lib/src' make: *** [Makefile:405: all-recursive] Error 1 I would really appreciate your help with this issue! Regards Caio H. Lima

1 0

[RFC SOF 0/2] topology: Try to add sof-cht-nau8824 topology file
by Hans de Goede 07 Dec '20

07 Dec '20

Hi All, I have veen working on making the cht_bsw_nau8824 machine driver work together with the sof-audio-acpi driver. The sof topology files are missing a .tplg file for this setup. Simply copying over the standard sof-byt-codec.tplg file does the trick, but then some mixer setting changes are necessary to fix the right speaker/headphones channel not working. Specifically I need to change the DACR channel setting from CH1 to CH0. But that mixer setting breaks the right channel when used with the sst-acpi driver. The problem seems to be that the codec and ucm-mixer settings expect DSP_B TDM 4 channel 24 bit format, but the standard sof-byt-codec.tplg file specifies I2S 2 channel 24 bit format. I tried changing the kernel to program the codec and SSP2 CPU DAIs both at I2S 2 channel 24 bit format to match what most other machine drivers are doing. This causes the no sound on right speaker channel to reproduce with the SST driver too. And like with the SOF driver it can be fixed by changing the mixer setting. With this kernel changes the SOF driver also still needs the mixer-setting fix. So I can get things to work, and make SOF/SST behave consistent by switching both DAIs to I2S 2 channel 24 bit format and then changing the mixer settings. The problem is that this will cause regressions unless users update their kernel and UCM in sync... So I tried to instead change the tplg file so that SOF will use DSP_B TDM 4 channel 24 bit format on the SSP2 DAI side, so that it matches what SST is doing and we don't need to change the mixer settings. This RFC series reflects my attempts at switching the SSP2 DAI to DSP_B TDM 4 channel 24 bit format when using SOF, unfortunately it does not work, the resulting tplg file causes the following errors: [ 21.537432] sof-audio-acpi 808622A8:00: Firmware info: version 1:6:0-18fab [ 21.537447] sof-audio-acpi 808622A8:00: Firmware: ABI 3:17:0 Kernel ABI 3:18:0 [ 25.003836] sof-audio-acpi 808622A8:00: Topology: ABI 3:17:0 Kernel ABI 3:18:0 [ 25.216003] sof-audio-acpi 808622A8:00: error: ipc error for 0x80010000 size 12 [ 25.216060] sof-audio-acpi 808622A8:00: error: failed to set DAI config for SSP2-Codec index 2 [ 25.216070] sof-audio-acpi 808622A8:00: error: failed to save DAI config for SSP2 [ 25.216080] sof-audio-acpi 808622A8:00: ASoC: physical link loading failed [ 25.216089] sof-audio-acpi 808622A8:00: ASoC: topology: could not load header: -22 [ 25.217459] sof-audio-acpi 808622A8:00: error: tplg component load failed -22 [ 25.217643] sof-audio-acpi 808622A8:00: error: failed to load DSP topology -22 Which I'm not getting when using the default sof-byt-codec.tplg file. Possible ways to fix this which I can think of are: 1. Fix SOF and/or the tplg file so that it can do DSP_B TDM 4 channel 24 bit on BYT/CHT. 2. Switch the machine driver over the I2S 2 channel 24 bit, to align it with other machine drivers; and update the UCM files to match. Preferably together with some string in the components string advertised by the kernel so that the UCM files can be written so that they also keep working with older kernels. 3. Keep using DSP_B TDM 4 channel 24 bit with sst-acpi and switch to I2S 2 channel 24 bit with sof-audio-acpi; and update the UCM file to set the mixer settings accordingly depending on which driver is in use. I'm not sure what the best way to proceed is. To go with solution 1 I'm going to need some help, since I'm stuck there. I find solution 2 tempting because I like the idea of standardising all BYT/CHT machine drivers on using I2S 2 channel 24 bit format between the SSP DAI and the codec DAI. But this means that people upgrading their kernel might see a regression until they update their UCM files too. Regards, Hans

2 4

Re: wm8960: add DAC Slope switch
by Charles Keepax 07 Dec '20

07 Dec '20

On Tue, Nov 24, 2020 at 06:23:13PM +0100, Lukas F. Hartmann wrote: > The WM8960 DAC has a "DAC Slope" switch that can toggle between two > different output filter curves. This patch adds support for it. > > Signed-off-by: Lukas F. Hartmann <lukas(a)mntre.com> > --- > +static int wm8960_put_dacslope(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); > + struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component); > + unsigned int val = ucontrol->value.integer.value[0]; > + > + if (val > 1) > + return -EINVAL; > + > + wm8960->dacslope = val; > + > + return snd_soc_component_update_bits(component, WM8960_DACCTL1, > + 0x2, val<<1); Is the DAC Slope switch not in DACCTL2? Thanks, Charles

1 0

snd-rn-pci-acp3x - auto dmic detection unreliable
by Jaroslav Kysela 07 Dec '20

07 Dec '20

Hi, it seems that the ACPI auto-detection of the presence the digital microphone connected to AMD Renoir audio bridge is unreliable. It may be that hardware vendors do not provide the correct ACPI tables. Could you clarify the usage of _WOV integer value? It seems that this value is set on those plaforms which do not have the digital microphone (the microphone is connected to the HDA codec): Lenovo IdeaPad 5 (15ARE05) Lenovo Thinkpad X395 In any case, we should probably improve the auto-detection using DMI or other platform info. Jaroslav BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1892115 -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

3 6

[PATCH] ALSA: hda/realtek - Enable headset mic of ASUS X430UN with ALC256
by Chris Chiu 07 Dec '20

07 Dec '20

The ASUS laptop X430UN with ALC256 can't detect the headset microphone until ALC256_FIXUP_ASUS_MIC_NO_PRESENCE quirk applied. Signed-off-by: Chris Chiu <chiu(a)endlessos.org> Signed-off-by: Jian-Hong Pan <jhp(a)endlessos.org> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f2398721ac1e..d5e4d0ba1008 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7827,6 +7827,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x10d0, "ASUS X540LA/X540LJ", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x1271, "ASUS X430UN", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC), -- 2.20.1

2 1

rt715: init: setup ADC07 to a proper volume
by GitHub pull_request - opened 07 Dec '20

07 Dec '20

alsa-project/alsa-ucm-conf pull request #65 was opened from libinyang: This patch initiates 'rt715 ADC 07 Capture Volume' to a proper volume. Signed-off-by: Libin Yang <libin.yang(a)intel.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/65 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/65.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ALSA: rawmidi: Access runtime->avail always in spinlock
by Takashi Iwai 06 Dec '20

06 Dec '20

The runtime->avail field may be accessed concurrently while some places refer to it without taking the runtime->lock spinlock, as detected by KCSAN. Usually this isn't a big problem, but for consistency and safety, we should take the spinlock at each place referencing this field. Reported-by: syzbot+a23a6f1215c84756577c(a)syzkaller.appspotmail.com Reported-by: syzbot+3d367d1df1d2b67f5c19(a)syzkaller.appspotmail.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/rawmidi.c | 49 +++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index c78720a3299c..257ad5206240 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -95,11 +95,21 @@ static inline unsigned short snd_rawmidi_file_flags(struct file *file) } } -static inline int snd_rawmidi_ready(struct snd_rawmidi_substream *substream) +static inline bool __snd_rawmidi_ready(struct snd_rawmidi_runtime *runtime) +{ + return runtime->avail >= runtime->avail_min; +} + +static bool snd_rawmidi_ready(struct snd_rawmidi_substream *substream) { struct snd_rawmidi_runtime *runtime = substream->runtime; + unsigned long flags; + bool ready; - return runtime->avail >= runtime->avail_min; + spin_lock_irqsave(&runtime->lock, flags); + ready = __snd_rawmidi_ready(runtime); + spin_unlock_irqrestore(&runtime->lock, flags); + return ready; } static inline int snd_rawmidi_ready_append(struct snd_rawmidi_substream *substream, @@ -1019,7 +1029,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream, if (result > 0) { if (runtime->event) schedule_work(&runtime->event_work); - else if (snd_rawmidi_ready(substream)) + else if (__snd_rawmidi_ready(runtime)) wake_up(&runtime->sleep); } spin_unlock_irqrestore(&runtime->lock, flags); @@ -1098,7 +1108,7 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t coun result = 0; while (count > 0) { spin_lock_irq(&runtime->lock); - while (!snd_rawmidi_ready(substream)) { + while (!__snd_rawmidi_ready(runtime)) { wait_queue_entry_t wait; if ((file->f_flags & O_NONBLOCK) != 0 || result > 0) { @@ -1115,9 +1125,11 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t coun return -ENODEV; if (signal_pending(current)) return result > 0 ? result : -ERESTARTSYS; - if (!runtime->avail) - return result > 0 ? result : -EIO; spin_lock_irq(&runtime->lock); + if (!runtime->avail) { + spin_unlock_irq(&runtime->lock); + return result > 0 ? result : -EIO; + } } spin_unlock_irq(&runtime->lock); count1 = snd_rawmidi_kernel_read1(substream, @@ -1255,7 +1267,7 @@ int __snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int coun runtime->avail += count; substream->bytes += count; if (count > 0) { - if (runtime->drain || snd_rawmidi_ready(substream)) + if (runtime->drain || __snd_rawmidi_ready(runtime)) wake_up(&runtime->sleep); } return count; @@ -1444,9 +1456,11 @@ static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf, return -ENODEV; if (signal_pending(current)) return result > 0 ? result : -ERESTARTSYS; - if (!runtime->avail && !timeout) - return result > 0 ? result : -EIO; spin_lock_irq(&runtime->lock); + if (!runtime->avail && !timeout) { + spin_unlock_irq(&runtime->lock); + return result > 0 ? result : -EIO; + } } spin_unlock_irq(&runtime->lock); count1 = snd_rawmidi_kernel_write1(substream, buf, NULL, count); @@ -1526,6 +1540,7 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry, struct snd_rawmidi *rmidi; struct snd_rawmidi_substream *substream; struct snd_rawmidi_runtime *runtime; + unsigned long buffer_size, avail, xruns; rmidi = entry->private_data; snd_iprintf(buffer, "%s\n\n", rmidi->name); @@ -1544,13 +1559,16 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry, " Owner PID : %d\n", pid_vnr(substream->pid)); runtime = substream->runtime; + spin_lock_irq(&runtime->lock); + buffer_size = runtime->buffer_size; + avail = runtime->avail; + spin_unlock_irq(&runtime->lock); snd_iprintf(buffer, " Mode : %s\n" " Buffer size : %lu\n" " Avail : %lu\n", runtime->oss ? "OSS compatible" : "native", - (unsigned long) runtime->buffer_size, - (unsigned long) runtime->avail); + buffer_size, avail); } } } @@ -1568,13 +1586,16 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry, " Owner PID : %d\n", pid_vnr(substream->pid)); runtime = substream->runtime; + spin_lock_irq(&runtime->lock); + buffer_size = runtime->buffer_size; + avail = runtime->avail; + xruns = runtime->xruns; + spin_unlock_irq(&runtime->lock); snd_iprintf(buffer, " Buffer size : %lu\n" " Avail : %lu\n" " Overruns : %lu\n", - (unsigned long) runtime->buffer_size, - (unsigned long) runtime->avail, - (unsigned long) runtime->xruns); + buffer_size, avail, xruns); } } } -- 2.26.2

1 0