diff --git a/.alsa-lib.metadata b/.alsa-lib.metadata index 284bb7c..94af904 100644 --- a/.alsa-lib.metadata +++ b/.alsa-lib.metadata @@ -1,3 +1,2 @@ -839e6b32dcfed7a335e150cd8be6071cd2c1ffbd SOURCES/alsa-lib-1.2.7.2.tar.bz2 -8c1d225b9fe108797349e8d0cb6161271aab0f50 SOURCES/alsa-topology-conf-1.2.5.tar.bz2 -ca89963b2a61acde1d091d7d58d8af8c3a921c99 SOURCES/alsa-ucm-conf-1.2.7.2.tar.bz2 +1271796a37df0bb11b2cb06ad6e7428a009ca012 SOURCES/alsa-lib-1.2.8.tar.bz2 +69313df69892c02bbe70e10c2e88c4b34e716b3d SOURCES/alsa-ucm-conf-1.2.8.tar.bz2 diff --git a/.gitignore b/.gitignore index 2b38d3c..3ddbd40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -SOURCES/alsa-lib-1.2.7.2.tar.bz2 -SOURCES/alsa-topology-conf-1.2.5.tar.bz2 -SOURCES/alsa-ucm-conf-1.2.7.2.tar.bz2 +SOURCES/alsa-lib-1.2.8.tar.bz2 +SOURCES/alsa-ucm-conf-1.2.8.tar.bz2 diff --git a/SOURCES/alsa-git.patch b/SOURCES/alsa-git.patch index e69de29..b242825 100644 --- a/SOURCES/alsa-git.patch +++ b/SOURCES/alsa-git.patch @@ -0,0 +1,1617 @@ +From 1b436862ed6253629d79edc2e09826efd4e0f4e3 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 2 Nov 2022 15:01:56 +0100 +Subject: [PATCH 01/20] ucm: fix enhanced ID parsing in + snd_use_case_parse_ctl_elem_id() + +Reported-by: Takashi Iwai +Signed-off-by: Jaroslav Kysela +--- + src/ucm/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ucm/main.c b/src/ucm/main.c +index 30ab1e41..28c60565 100644 +--- a/src/ucm/main.c ++++ b/src/ucm/main.c +@@ -2793,7 +2793,7 @@ int snd_use_case_parse_ctl_elem_id(snd_ctl_elem_id_t *dst, + strcmp(ucm_id, "CaptureSwitch")) + return -EINVAL; + snd_ctl_elem_id_clear(dst); +- if (strcasestr(ucm_id, "name=")) ++ if (strcasestr(value, "name=")) + return __snd_ctl_ascii_elem_id_parse(dst, value, NULL); + iface = SND_CTL_ELEM_IFACE_MIXER; + if (jack_control) +-- +2.39.0 + + +From aa4f56c3c952269c36464cc0da9db5a1381648fa Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 9 Nov 2022 08:11:42 +0100 +Subject: [PATCH 02/20] pcm: rate - fix the crash in + snd_pcm_rate_may_wait_for_avail_min() + +The pcm argument passed to the conversion function in +snd_pcm_plugin_may_wait_for_avail_min_conv() should be +pcm->fast_op_arg. + +Test command: arecord -Dplughw:x -r12000 -c2 -fS16_LE -M temp.wav + +Fixes: d9dbb57b ("pcm: rate - rewrite the may_wait_for_avail_min callback for the rate plugin") + +BugLink: https://lore.kernel.org/alsa-devel/1667793912-18957-1-git-send-email-shengjiu.wang@nxp.com/ +Fixes: https://github.com/alsa-project/alsa-lib/issues/282 +Reported-by: Shengjiu Wang +Signed-off-by: Jaroslav Kysela +--- + src/pcm/pcm_plugin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c +index 6bb90b8b..ec64604c 100644 +--- a/src/pcm/pcm_plugin.c ++++ b/src/pcm/pcm_plugin.c +@@ -622,7 +622,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv( + * This code is also used by extplug, but extplug does not allow to alter the sampling rate. + */ + if (conv) +- needed_slave_avail_min = conv(pcm, needed_slave_avail_min); ++ needed_slave_avail_min = conv(pcm->fast_op_arg, needed_slave_avail_min); + + if (slave->avail_min != needed_slave_avail_min) { + snd_pcm_sw_params_t *swparams; +-- +2.39.0 + + +From 39060852d810461dc8cd1464cfb2ffe84da42d56 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 9 Nov 2022 09:31:34 +0100 +Subject: [PATCH 03/20] pcm: rate - correct the previous fix for + snd_pcm_rate_may_wait_for_avail_min() + +The previous fix in aa4f56c3 was not correct. The root of the cause is +implementation in snd_pcm_may_wait_for_avail_min() inline function +where the improper pcm argument is passed to the fast_ops function. + +Fixes: aa4f56c3 ("pcm: rate - fix the crash in snd_pcm_rate_may_wait_for_avail_min()") +Fixes: d9dbb57b ("pcm: rate - rewrite the may_wait_for_avail_min callback for the rate plugin") +Signed-off-by: Jaroslav Kysela +--- + src/pcm/pcm_local.h | 2 +- + src/pcm/pcm_plugin.c | 10 +++++++--- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h +index 8d25971f..ae0c44bf 100644 +--- a/src/pcm/pcm_local.h ++++ b/src/pcm/pcm_local.h +@@ -1144,7 +1144,7 @@ static inline int snd_pcm_may_wait_for_avail_min(snd_pcm_t *pcm, snd_pcm_uframes + if (avail >= pcm->avail_min) + return 0; + if (pcm->fast_ops->may_wait_for_avail_min) +- return pcm->fast_ops->may_wait_for_avail_min(pcm, avail); ++ return pcm->fast_ops->may_wait_for_avail_min(pcm->fast_op_arg, avail); + return 1; + } + +diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c +index ec64604c..b3af1fb7 100644 +--- a/src/pcm/pcm_plugin.c ++++ b/src/pcm/pcm_plugin.c +@@ -597,8 +597,12 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv( + * a) the slave can provide contineous hw_ptr between periods + * b) avail_min does not match one slave_period + */ +- snd_pcm_plugin_t *plugin = pcm->private_data; +- snd_pcm_t *slave = plugin->gen.slave; ++ snd_pcm_generic_t *generic = pcm->private_data; ++ /* ++ * do not use snd_pcm_plugin_t pointer here ++ * this code is used from the generic plugins, too ++ */ ++ snd_pcm_t *slave = generic->slave; + snd_pcm_uframes_t needed_slave_avail_min; + snd_pcm_sframes_t available; + +@@ -622,7 +626,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv( + * This code is also used by extplug, but extplug does not allow to alter the sampling rate. + */ + if (conv) +- needed_slave_avail_min = conv(pcm->fast_op_arg, needed_slave_avail_min); ++ needed_slave_avail_min = conv(pcm, needed_slave_avail_min); + + if (slave->avail_min != needed_slave_avail_min) { + snd_pcm_sw_params_t *swparams; +-- +2.39.0 + + +From 161f47da5f196c291ac0e11d066fa5ff5f79fa04 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 9 Nov 2022 14:37:45 +0100 +Subject: [PATCH 04/20] include: pcm_old.h - use a macro for the symbol + versioning + +Make the header file more readable and error prone. + +Signed-off-by: Jaroslav Kysela +--- + include/pcm_old.h | 133 ++++++++++++++++++++++++---------------------- + 1 file changed, 68 insertions(+), 65 deletions(-) + +diff --git a/include/pcm_old.h b/include/pcm_old.h +index e6e050fc..a9f5308f 100644 +--- a/include/pcm_old.h ++++ b/include/pcm_old.h +@@ -2,11 +2,14 @@ + * Old ALSA 0.9.x API + */ + ++#define ___symbol_version(name, version) \ ++ __asm__ (".symver " #name "," #name "@" version) ++ + #ifdef ALSA_PCM_OLD_HW_PARAMS_API + +-asm(".symver snd_pcm_hw_params_get_access,snd_pcm_hw_params_get_access@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_access_first,snd_pcm_hw_params_set_access_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_access_last,snd_pcm_hw_params_set_access_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_access, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_access_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_access_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params); + int snd_pcm_hw_params_test_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t val); +@@ -16,9 +19,9 @@ snd_pcm_access_t snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_pa + int snd_pcm_hw_params_set_access_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); + void snd_pcm_hw_params_get_access_mask(snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); + +-asm(".symver snd_pcm_hw_params_get_format,snd_pcm_hw_params_get_format@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_format_first,snd_pcm_hw_params_set_format_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_format_last,snd_pcm_hw_params_set_format_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_format, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_format_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_format_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_format(const snd_pcm_hw_params_t *params); + int snd_pcm_hw_params_test_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val); +@@ -28,9 +31,9 @@ snd_pcm_format_t snd_pcm_hw_params_set_format_last(snd_pcm_t *pcm, snd_pcm_hw_pa + int snd_pcm_hw_params_set_format_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_mask_t *mask); + void snd_pcm_hw_params_get_format_mask(snd_pcm_hw_params_t *params, snd_pcm_format_mask_t *mask); + +-asm(".symver snd_pcm_hw_params_get_subformat,snd_pcm_hw_params_get_subformat@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_subformat_first,snd_pcm_hw_params_set_subformat_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_subformat_last,snd_pcm_hw_params_set_subformat_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_subformat, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_subformat_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_subformat_last, "ALSA_0.9"); + + int snd_pcm_hw_params_test_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t val); + int snd_pcm_hw_params_get_subformat(const snd_pcm_hw_params_t *params); +@@ -40,12 +43,12 @@ snd_pcm_subformat_t snd_pcm_hw_params_set_subformat_last(snd_pcm_t *pcm, snd_pcm + int snd_pcm_hw_params_set_subformat_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_mask_t *mask); + void snd_pcm_hw_params_get_subformat_mask(snd_pcm_hw_params_t *params, snd_pcm_subformat_mask_t *mask); + +-asm(".symver snd_pcm_hw_params_get_channels,snd_pcm_hw_params_get_channels@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_channels_min,snd_pcm_hw_params_get_channels_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_channels_max,snd_pcm_hw_params_get_channels_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_channels_near,snd_pcm_hw_params_set_channels_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_channels_first,snd_pcm_hw_params_set_channels_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_channels_last,snd_pcm_hw_params_set_channels_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_channels, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_channels_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_channels_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_channels_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_channels_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_channels_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_channels(const snd_pcm_hw_params_t *params); + unsigned int snd_pcm_hw_params_get_channels_min(const snd_pcm_hw_params_t *params); +@@ -59,12 +62,12 @@ unsigned int snd_pcm_hw_params_set_channels_near(snd_pcm_t *pcm, snd_pcm_hw_para + unsigned int snd_pcm_hw_params_set_channels_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); + unsigned int snd_pcm_hw_params_set_channels_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); + +-asm(".symver snd_pcm_hw_params_get_rate,snd_pcm_hw_params_get_rate@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_rate_min,snd_pcm_hw_params_get_rate_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_rate_max,snd_pcm_hw_params_get_rate_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_rate_near,snd_pcm_hw_params_set_rate_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_rate_first,snd_pcm_hw_params_set_rate_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_rate_last,snd_pcm_hw_params_set_rate_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_rate, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_rate_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_rate_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_rate_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_rate_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_rate_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_rate(const snd_pcm_hw_params_t *params, int *dir); + unsigned int snd_pcm_hw_params_get_rate_min(const snd_pcm_hw_params_t *params, int *dir); +@@ -80,12 +83,12 @@ unsigned int snd_pcm_hw_params_set_rate_last(snd_pcm_t *pcm, snd_pcm_hw_params_t + int snd_pcm_hw_params_set_rate_resample(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val); + int snd_pcm_hw_params_get_rate_resample(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); + +-asm(".symver snd_pcm_hw_params_get_period_time,snd_pcm_hw_params_get_period_time@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_period_time_min,snd_pcm_hw_params_get_period_time_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_period_time_max,snd_pcm_hw_params_get_period_time_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_period_time_near,snd_pcm_hw_params_set_period_time_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_period_time_first,snd_pcm_hw_params_set_period_time_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_period_time_last,snd_pcm_hw_params_set_period_time_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_period_time, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_period_time_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_period_time_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_period_time_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_period_time_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_period_time_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_period_time(const snd_pcm_hw_params_t *params, int *dir); + unsigned int snd_pcm_hw_params_get_period_time_min(const snd_pcm_hw_params_t *params, int *dir); +@@ -99,12 +102,12 @@ unsigned int snd_pcm_hw_params_set_period_time_near(snd_pcm_t *pcm, snd_pcm_hw_p + unsigned int snd_pcm_hw_params_set_period_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); + unsigned int snd_pcm_hw_params_set_period_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); + +-asm(".symver snd_pcm_hw_params_get_period_size,snd_pcm_hw_params_get_period_size@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_period_size_min,snd_pcm_hw_params_get_period_size_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_period_size_max,snd_pcm_hw_params_get_period_size_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_period_size_near,snd_pcm_hw_params_set_period_size_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_period_size_first,snd_pcm_hw_params_set_period_size_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_period_size_last,snd_pcm_hw_params_set_period_size_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_period_size, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_period_size_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_period_size_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_period_size_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_period_size_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_period_size_last, "ALSA_0.9"); + + snd_pcm_sframes_t snd_pcm_hw_params_get_period_size(const snd_pcm_hw_params_t *params, int *dir); + snd_pcm_uframes_t snd_pcm_hw_params_get_period_size_min(const snd_pcm_hw_params_t *params, int *dir); +@@ -119,12 +122,12 @@ snd_pcm_uframes_t snd_pcm_hw_params_set_period_size_first(snd_pcm_t *pcm, snd_pc + snd_pcm_uframes_t snd_pcm_hw_params_set_period_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); + int snd_pcm_hw_params_set_period_size_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); + +-asm(".symver snd_pcm_hw_params_get_periods,snd_pcm_hw_params_get_periods@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_periods_min,snd_pcm_hw_params_get_periods_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_periods_max,snd_pcm_hw_params_get_periods_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_periods_near,snd_pcm_hw_params_set_periods_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_periods_first,snd_pcm_hw_params_set_periods_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_periods_last,snd_pcm_hw_params_set_periods_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_periods, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_periods_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_periods_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_periods_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_periods_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_periods_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_periods(const snd_pcm_hw_params_t *params, int *dir); + unsigned int snd_pcm_hw_params_get_periods_min(const snd_pcm_hw_params_t *params, int *dir); +@@ -139,12 +142,12 @@ unsigned int snd_pcm_hw_params_set_periods_first(snd_pcm_t *pcm, snd_pcm_hw_para + unsigned int snd_pcm_hw_params_set_periods_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); + int snd_pcm_hw_params_set_periods_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); + +-asm(".symver snd_pcm_hw_params_get_buffer_time,snd_pcm_hw_params_get_buffer_time@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_buffer_time_min,snd_pcm_hw_params_get_buffer_time_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_buffer_time_max,snd_pcm_hw_params_get_buffer_time_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_buffer_time_near,snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_buffer_time_first,snd_pcm_hw_params_set_buffer_time_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_buffer_time_last,snd_pcm_hw_params_set_buffer_time_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_buffer_time, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_buffer_time_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_buffer_time_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_buffer_time_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_buffer_time_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_buffer_time_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_buffer_time(const snd_pcm_hw_params_t *params, int *dir); + unsigned int snd_pcm_hw_params_get_buffer_time_min(const snd_pcm_hw_params_t *params, int *dir); +@@ -158,12 +161,12 @@ unsigned int snd_pcm_hw_params_set_buffer_time_near(snd_pcm_t *pcm, snd_pcm_hw_p + unsigned int snd_pcm_hw_params_set_buffer_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); + unsigned int snd_pcm_hw_params_set_buffer_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); + +-asm(".symver snd_pcm_hw_params_get_buffer_size,snd_pcm_hw_params_get_buffer_size@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_buffer_size_min,snd_pcm_hw_params_get_buffer_size_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_buffer_size_max,snd_pcm_hw_params_get_buffer_size_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_buffer_size_near,snd_pcm_hw_params_set_buffer_size_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_buffer_size_first,snd_pcm_hw_params_set_buffer_size_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_buffer_size_last,snd_pcm_hw_params_set_buffer_size_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_buffer_size, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_buffer_size_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_buffer_size_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_buffer_size_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_buffer_size_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_buffer_size_last, "ALSA_0.9"); + + snd_pcm_sframes_t snd_pcm_hw_params_get_buffer_size(const snd_pcm_hw_params_t *params); + snd_pcm_uframes_t snd_pcm_hw_params_get_buffer_size_min(const snd_pcm_hw_params_t *params); +@@ -177,12 +180,12 @@ snd_pcm_uframes_t snd_pcm_hw_params_set_buffer_size_near(snd_pcm_t *pcm, snd_pcm + snd_pcm_uframes_t snd_pcm_hw_params_set_buffer_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); + snd_pcm_uframes_t snd_pcm_hw_params_set_buffer_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); + +-asm(".symver snd_pcm_hw_params_get_tick_time,snd_pcm_hw_params_get_tick_time@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_tick_time_min,snd_pcm_hw_params_get_tick_time_min@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_get_tick_time_max,snd_pcm_hw_params_get_tick_time_max@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_tick_time_near,snd_pcm_hw_params_set_tick_time_near@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_tick_time_first,snd_pcm_hw_params_set_tick_time_first@ALSA_0.9"); +-asm(".symver snd_pcm_hw_params_set_tick_time_last,snd_pcm_hw_params_set_tick_time_last@ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_tick_time, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_tick_time_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_get_tick_time_max, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_tick_time_near, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_tick_time_first, "ALSA_0.9"); ++___symbol_version(snd_pcm_hw_params_set_tick_time_last, "ALSA_0.9"); + + int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params, int *dir); + unsigned int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params, int *dir); +@@ -201,14 +204,14 @@ unsigned int snd_pcm_hw_params_set_tick_time_last(snd_pcm_t *pcm, snd_pcm_hw_par + + #ifdef ALSA_PCM_OLD_SW_PARAMS_API + +-asm(".symver snd_pcm_sw_params_get_tstamp_mode,snd_pcm_sw_params_get_tstamp_mode@ALSA_0.9"); +-asm(".symver snd_pcm_sw_params_get_sleep_min,snd_pcm_sw_params_get_sleep_min@ALSA_0.9"); +-asm(".symver snd_pcm_sw_params_get_avail_min,snd_pcm_sw_params_get_avail_min@ALSA_0.9"); +-asm(".symver snd_pcm_sw_params_get_xfer_align,snd_pcm_sw_params_get_xfer_align@ALSA_0.9"); +-asm(".symver snd_pcm_sw_params_get_start_threshold,snd_pcm_sw_params_get_start_threshold@ALSA_0.9"); +-asm(".symver snd_pcm_sw_params_get_stop_threshold,snd_pcm_sw_params_get_stop_threshold@ALSA_0.9"); +-asm(".symver snd_pcm_sw_params_get_silence_threshold,snd_pcm_sw_params_get_silence_threshold@ALSA_0.9"); +-asm(".symver snd_pcm_sw_params_get_silence_size,snd_pcm_sw_params_get_silence_size@ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_tstamp_mode, "ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_sleep_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_avail_min, "ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_xfer_align, "ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_start_threshold, "ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_stop_threshold, "ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_silence_threshold, "ALSA_0.9"); ++___symbol_version(snd_pcm_sw_params_get_silence_size, "ALSA_0.9"); + + int snd_pcm_sw_params_set_tstamp_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_tstamp_t val); + snd_pcm_tstamp_t snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params); +-- +2.39.0 + + +From 152983f01b0bc1178ea0d461ebf66e2d2a8e2e02 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 9 Nov 2022 15:04:06 +0100 +Subject: [PATCH 05/20] include: alsa-symbols.h - use newer gcc symver function + attribute + +Use the symver function attribute for newer gccs (version 11+). +The symver function attribute was introduced probably earlier +(gcc-10). We can fix that on demand later. + +Signed-off-by: Jaroslav Kysela +--- + include/alsa-symbols.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h +index 344f021a..f8c49103 100644 +--- a/include/alsa-symbols.h ++++ b/include/alsa-symbols.h +@@ -29,10 +29,17 @@ + #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post + #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) + ++#if __GNUC__ > 10 ++#define symbol_version(real, name, version) \ ++ extern __typeof (real) real __attribute__((symver (#name "@" #version))) ++#define default_symbol_version(real, name, version) \ ++ extern __typeof (real) real __attribute__((symver (#name "@@" #version))) ++#else + #define symbol_version(real, name, version) \ + __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version) + #define default_symbol_version(real, name, version) \ + __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version) ++#endif + + #ifdef __clang__ + #define EXPORT_SYMBOL __attribute__((visibility("default"))) +-- +2.39.0 + + +From 78b20e3caa7bba930095e05f3f8cbe665204fcfd Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 14 Nov 2022 12:36:04 +0100 +Subject: [PATCH 06/20] test: latency - use snd_pcm_format_physical_width() + +We need to allocate frames using the physical size not +the sample bit size. + +Signed-off-by: Jaroslav Kysela +--- + src/topology/ctl.c | 7 ++++++- + test/latency.c | 6 +++--- + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/topology/ctl.c b/src/topology/ctl.c +index dd05424d..2c500ffc 100644 +--- a/src/topology/ctl.c ++++ b/src/topology/ctl.c +@@ -17,9 +17,13 @@ + Liam Girdwood + */ + ++#define ALSA_PCM_OLD_HW_PARAMS_API 1 ++#define ALSA_PCM_OLD_SW_PARAMS_API 1 ++#include "../../include/asoundlib.h" + #include "list.h" + #include "tplg_local.h" + ++ + #define ENUM_VAL_SIZE (SNDRV_CTL_ELEM_ID_NAME_MAXLEN >> 2) + + struct ctl_access_elem { +@@ -71,7 +75,8 @@ static int parse_access_values(snd_config_t *cfg, + } + } + } +- ++ return snd_pcm_hw_params_get_channels(NULL); ++ //return snd_pcm_hw_params_get_access(NULL); + return 0; + } + +diff --git a/test/latency.c b/test/latency.c +index 298bab8a..95b3c0ee 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -354,7 +354,7 @@ long readbuf(snd_pcm_t *handle, char *buf, long len, size_t *frames, size_t *max + } + // printf("read = %li\n", r); + } else { +- int frame_bytes = (snd_pcm_format_width(format) / 8) * channels; ++ int frame_bytes = (snd_pcm_format_physical_width(format) / 8) * channels; + do { + r = snd_pcm_readi(handle, buf, len); + if (r > 0) { +@@ -374,7 +374,7 @@ long readbuf(snd_pcm_t *handle, char *buf, long len, size_t *frames, size_t *max + long writebuf(snd_pcm_t *handle, char *buf, long len, size_t *frames) + { + long r; +- int frame_bytes = (snd_pcm_format_width(format) / 8) * channels; ++ int frame_bytes = (snd_pcm_format_physical_width(format) / 8) * channels; + + while (len > 0) { + r = snd_pcm_writei(handle, buf, len); +@@ -579,7 +579,7 @@ int main(int argc, char *argv[]) + + loop_limit = loop_sec * rate; + latency = latency_min - 4; +- buffer = malloc((latency_max * snd_pcm_format_width(format) / 8) * 2); ++ buffer = malloc((latency_max * snd_pcm_format_physical_width(format) / 8) * 2); + + setscheduler(); + +-- +2.39.0 + + +From 425e4d1fbea4965ea0fb7529b1ee6cbb47eb7227 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 14 Nov 2022 14:34:46 +0100 +Subject: [PATCH 07/20] pcm: fix the fast_ops pcm argument for fast_ops + +The fast_ops callback invocation must always pass the fast_op_arg +as the pcm argument. Plugins expect that. + +Signed-off-by: Jaroslav Kysela +--- + src/pcm/pcm.c | 4 ++-- + src/pcm/pcm_direct.c | 2 +- + src/pcm/pcm_hw.c | 2 +- + src/pcm/pcm_multi.c | 5 +++-- + 4 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c +index 927aa055..2b966d44 100644 +--- a/src/pcm/pcm.c ++++ b/src/pcm/pcm.c +@@ -1705,7 +1705,7 @@ int snd_pcm_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2) + assert(pcm1); + assert(pcm2); + if (pcm1->fast_ops->link) +- err = pcm1->fast_ops->link(pcm1, pcm2); ++ err = pcm1->fast_ops->link(pcm1->fast_op_arg, pcm2); + else + err = -ENOSYS; + return err; +@@ -1722,7 +1722,7 @@ int snd_pcm_unlink(snd_pcm_t *pcm) + + assert(pcm); + if (pcm->fast_ops->unlink) +- err = pcm->fast_ops->unlink(pcm); ++ err = pcm->fast_ops->unlink(pcm->fast_op_arg); + else + err = -ENOSYS; + return err; +diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c +index 4803b81b..3cc5305f 100644 +--- a/src/pcm/pcm_direct.c ++++ b/src/pcm/pcm_direct.c +@@ -688,7 +688,7 @@ int snd_pcm_direct_check_xrun(snd_pcm_direct_t *direct, snd_pcm_t *pcm) + * so don't increment but just update to actual counter + */ + direct->recoveries = direct->shmptr->s.recoveries; +- pcm->fast_ops->drop(pcm); ++ pcm->fast_ops->drop(pcm->fast_op_arg); + /* trigger_tstamp update is missing in drop callbacks */ + gettimestamp(&direct->trigger_tstamp, pcm->tstamp_type); + /* no timer clear: +diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c +index 5dfe32ee..0588ce5e 100644 +--- a/src/pcm/pcm_hw.c ++++ b/src/pcm/pcm_hw.c +@@ -838,7 +838,7 @@ static int snd_pcm_hw_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2) + { + if (pcm2->type != SND_PCM_TYPE_HW) { + if (pcm2->fast_ops->link_slaves) +- return pcm2->fast_ops->link_slaves(pcm2, pcm1); ++ return pcm2->fast_ops->link_slaves(pcm2->fast_op_arg, pcm1); + return -ENOSYS; + } + return hw_link(pcm1, pcm2); +diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c +index bec6d06f..3e7ce82c 100644 +--- a/src/pcm/pcm_multi.c ++++ b/src/pcm/pcm_multi.c +@@ -759,8 +759,9 @@ static int snd_pcm_multi_link_slaves(snd_pcm_t *pcm, snd_pcm_t *master) + static int snd_pcm_multi_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2) + { + snd_pcm_multi_t *multi = pcm1->private_data; +- if (multi->slaves[0].pcm->fast_ops->link) +- return multi->slaves[0].pcm->fast_ops->link(multi->slaves[0].pcm, pcm2); ++ snd_pcm_t *main_pcm = multi->slaves[0].pcm; ++ if (main_pcm->fast_ops->link) ++ return main_pcm->fast_ops->link(main_pcm->fast_op_arg, pcm2); + return -ENOSYS; + } + +-- +2.39.0 + + +From 3e4aeba25bf4a4808183c4b64270f7321b436c13 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 14 Nov 2022 20:42:10 +0100 +Subject: [PATCH 08/20] test: latency - add more realtime tests + +Add '-x' and '-X' tests and '-U' - I/O update mode based +on the system timing. + +It may be required to check the position updates for the specific hardware. +Print the real time / stream time differences. + +Also include code to make valgrind happy (including the wrong memory +llocation for the stream buffer). + +Signed-off-by: Jaroslav Kysela +--- + test/latency.c | 163 +++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 151 insertions(+), 12 deletions(-) + +diff --git a/test/latency.c b/test/latency.c +index 95b3c0ee..91bef1a1 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -33,10 +33,13 @@ + #include + #include + #include ++#include + #include "../include/asoundlib.h" + #include + #include + ++typedef struct timespec timestamp_t; ++ + char *pdevice = "hw:0,0"; + char *cdevice = "hw:0,0"; + snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE; +@@ -50,10 +53,40 @@ int loop_sec = 30; /* seconds */ + int block = 0; /* block mode */ + int use_poll = 0; + int resample = 1; ++int sys_latency = 0; /* data I/O: use system timings instead driver wakeups */ ++int pos_dump = 0; /* dump positions */ ++int realtime_check = 0; + unsigned long loop_limit; ++snd_pcm_uframes_t playback_buffer_size; + + snd_output_t *output = NULL; + ++static inline long long frames_to_micro(size_t frames) ++{ ++ return (long long)((frames * 1000000LL) + (rate / 2)) / rate; ++} ++ ++void timestamp_now(timestamp_t *tstamp) ++{ ++ if (clock_gettime(CLOCK_MONOTONIC_RAW, tstamp)) ++ printf("clock_gettime() failed\n"); ++} ++ ++long long timestamp_diff_micro(timestamp_t *tstamp) ++{ ++ timestamp_t now, diff; ++ timestamp_now(&now); ++ if (tstamp->tv_nsec > now.tv_nsec) { ++ diff.tv_sec = now.tv_sec - tstamp->tv_sec - 1; ++ diff.tv_nsec = (now.tv_nsec + 1000000000L) - tstamp->tv_nsec; ++ } else { ++ diff.tv_sec = now.tv_sec - tstamp->tv_sec; ++ diff.tv_nsec = now.tv_nsec - tstamp->tv_nsec; ++ } ++ /* microseconds */ ++ return (diff.tv_sec * 1000000) + ((diff.tv_nsec + 500L) / 1000L); ++} ++ + int setparams_stream(snd_pcm_t *handle, + snd_pcm_hw_params_t *params, + const char *id) +@@ -96,6 +129,14 @@ int setparams_stream(snd_pcm_t *handle, + printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err); + return -EINVAL; + } ++ /* we do not want driver wakeups */ ++ if (sys_latency > 0 && snd_pcm_hw_params_can_disable_period_wakeup(params)) { ++ err = snd_pcm_hw_params_set_period_wakeup(handle, params, 0); ++ if (err < 0) { ++ printf("Cannot disable period wakeups for %s\n", id); ++ return err; ++ } ++ } + return 0; + } + +@@ -227,6 +268,7 @@ int setparams(snd_pcm_t *phandle, snd_pcm_t *chandle, int *bufsize) + goto __again; + + snd_pcm_hw_params_get_buffer_size(p_params, &p_size); ++ playback_buffer_size = p_size; + if (p_psize * 2 < p_size) { + snd_pcm_hw_params_get_periods_min(p_params, &val, NULL); + if (val > 2) { +@@ -390,7 +432,7 @@ long writebuf(snd_pcm_t *handle, char *buf, long len, size_t *frames) + } + return 0; + } +- ++ + #define FILTERSWEEP_LFO_CENTER 2000. + #define FILTERSWEEP_LFO_DEPTH 1800. + #define FILTERSWEEP_LFO_FREQ 0.2 +@@ -434,6 +476,19 @@ void applyeffect(char* buffer,int r) + } + } + ++static ssize_t get_avail(snd_pcm_t *pcm) ++{ ++ ssize_t avail; ++ ++ while (1) { ++ avail = snd_pcm_avail(pcm); ++ if (avail == -EAGAIN) ++ continue; ++ break; ++ } ++ return avail; ++} ++ + void help(void) + { + int k; +@@ -444,6 +499,7 @@ void help(void) + "-C,--cdevice capture device\n" + "-m,--min minimum latency in frames\n" + "-M,--max maximum latency in frames\n" ++"-U,--updates I/O updates in milliseconds (0 = off)\n" + "-F,--frames frames to transfer\n" + "-f,--format sample format\n" + "-c,--channels channels\n" +@@ -454,6 +510,8 @@ void help(void) + "-b,--block block mode\n" + "-p,--poll use poll (wait for event - reduces CPU usage)\n" + "-e,--effect apply an effect (bandpass filter sweep)\n" ++"-x,--posdump dump buffer positions\n" ++"-X,--realtime do a realtime check (buffering)\n" + ); + printf("Recognized sample formats are:"); + for (k = 0; k < SND_PCM_FORMAT_LAST; ++k) { +@@ -480,6 +538,7 @@ int main(int argc, char *argv[]) + {"cdevice", 1, NULL, 'C'}, + {"min", 1, NULL, 'm'}, + {"max", 1, NULL, 'M'}, ++ {"updates", 1, NULL, 'U'}, + {"frames", 1, NULL, 'F'}, + {"format", 1, NULL, 'f'}, + {"channels", 1, NULL, 'c'}, +@@ -490,20 +549,23 @@ int main(int argc, char *argv[]) + {"block", 0, NULL, 'b'}, + {"poll", 0, NULL, 'p'}, + {"effect", 0, NULL, 'e'}, ++ {"posdump", 0, NULL, 'x'}, ++ {"realtime", 0, NULL, 'X'}, + {NULL, 0, NULL, 0}, + }; + snd_pcm_t *phandle, *chandle; + char *buffer; + int err, latency, morehelp; +- int ok; ++ int ok, first_avail; + snd_timestamp_t p_tstamp, c_tstamp; +- ssize_t r; ++ ssize_t r, cap_avail, cap_avail_max, pbk_fill, pbk_fill_min; + size_t frames_in, frames_out, in_max; ++ timestamp_t tstamp_start; + int effect = 0; + morehelp = 0; + while (1) { + int c; +- if ((c = getopt_long(argc, argv, "hP:C:m:M:F:f:c:r:B:E:s:bpen", long_option, NULL)) < 0) ++ if ((c = getopt_long(argc, argv, "hP:C:m:M:U:F:f:c:r:B:E:s:bpenxX", long_option, NULL)) < 0) + break; + switch (c) { + case 'h': +@@ -525,6 +587,10 @@ int main(int argc, char *argv[]) + err = atoi(optarg) / 2; + latency_max = latency_min > err ? latency_min : err; + break; ++ case 'U': ++ err = atoi(optarg); ++ sys_latency = err <= 0 ? 0 : err; ++ break; + case 'f': + format = snd_pcm_format_value(optarg); + if (format == SND_PCM_FORMAT_UNKNOWN) { +@@ -564,6 +630,12 @@ int main(int argc, char *argv[]) + case 'n': + resample = 0; + break; ++ case 'x': ++ pos_dump = 1; ++ break; ++ case 'X': ++ realtime_check = 1; ++ break; + } + } + +@@ -579,15 +651,27 @@ int main(int argc, char *argv[]) + + loop_limit = loop_sec * rate; + latency = latency_min - 4; +- buffer = malloc((latency_max * snd_pcm_format_physical_width(format) / 8) * 2); ++ buffer = malloc((latency_max * 2 * snd_pcm_format_physical_width(format) / 8) * channels); ++ ++ /* I/O updates based on a system timer */ ++ if (sys_latency > 0) { ++ block = 0; ++ use_poll = 0; ++ } + + setscheduler(); + + printf("Playback device is %s\n", pdevice); + printf("Capture device is %s\n", cdevice); +- printf("Parameters are %iHz, %s, %i channels, %s mode\n", rate, snd_pcm_format_name(format), channels, block ? "blocking" : "non-blocking"); +- printf("Poll mode: %s\n", use_poll ? "yes" : "no"); +- printf("Loop limit is %lu frames, minimum latency = %i, maximum latency = %i\n", loop_limit, latency_min * 2, latency_max * 2); ++ printf("Parameters are %iHz, %s, %i channels, %s mode, use poll %s\n", ++ rate, snd_pcm_format_name(format), ++ channels, block ? "blocking" : "non-blocking", ++ use_poll ? "yes" : "no"); ++ printf("Loop limit is %lu frames, minimum latency = %i, maximum latency = %i", ++ loop_limit, latency_min * 2, latency_max * 2); ++ if (sys_latency > 0) ++ printf(", I/O updates %ims", sys_latency); ++ printf("\n"); + + if ((err = snd_pcm_open(&phandle, pdevice, SND_PCM_STREAM_PLAYBACK, block ? 0 : SND_PCM_NONBLOCK)) < 0) { + printf("Playback open error: %s\n", snd_strerror(err)); +@@ -613,6 +697,9 @@ int main(int argc, char *argv[]) + y[1] = (float*) malloc(channels*sizeof(float)); + y[2] = (float*) malloc(channels*sizeof(float)); + } ++ ++ cap_avail_max = 0; ++ pbk_fill_min = latency * 2; + + while (1) { + frames_in = frames_out = 0; +@@ -623,7 +710,7 @@ int main(int argc, char *argv[]) + printf("Streams link error: %s\n", snd_strerror(err)); + exit(0); + } +- if (snd_pcm_format_set_silence(format, buffer, latency*channels) < 0) { ++ if (snd_pcm_format_set_silence(format, buffer, latency * channels) < 0) { + fprintf(stderr, "silence error\n"); + break; + } +@@ -640,6 +727,8 @@ int main(int argc, char *argv[]) + printf("Go error: %s\n", snd_strerror(err)); + exit(0); + } ++ if (realtime_check) ++ timestamp_now(&tstamp_start); + gettimestamp(phandle, &p_tstamp); + gettimestamp(chandle, &c_tstamp); + #if 0 +@@ -651,16 +740,54 @@ int main(int argc, char *argv[]) + + ok = 1; + in_max = 0; ++ first_avail = 1; + while (ok && frames_in < loop_limit) { +- if (use_poll) { ++ cap_avail = latency; ++ if (sys_latency > 0) { ++ poll(NULL, 0, sys_latency); ++ cap_avail = get_avail(chandle); ++ if (cap_avail < 0) { ++ printf("Avail failed: %s\n", snd_strerror(cap_avail)); ++ ok = 0; ++ break; ++ } ++ if (first_avail && realtime_check) { ++ long long diff = timestamp_diff_micro(&tstamp_start); ++ long long pos = frames_to_micro(cap_avail); ++ printf("POS FIRST CHECK: c=%zd (rt=%lldus)\n", cap_avail, pos - diff); ++ first_avail = 0; ++ } ++ } else if (use_poll) { + /* use poll to wait for next event */ + snd_pcm_wait(chandle, 1000); + } +- if ((r = readbuf(chandle, buffer, latency, &frames_in, &in_max)) < 0) ++ if (pos_dump || realtime_check) { ++ if (sys_latency <= 0) ++ cap_avail = get_avail(chandle); ++ pbk_fill = get_avail(phandle); ++ if (pbk_fill >= 0) ++ pbk_fill = playback_buffer_size - pbk_fill; ++ if (cap_avail > cap_avail_max) ++ cap_avail_max = cap_avail; ++ if (pbk_fill >= 0 && pbk_fill < pbk_fill_min) ++ pbk_fill_min = pbk_fill; ++ if (realtime_check) { ++ long long diff = timestamp_diff_micro(&tstamp_start); ++ long long cap_pos = frames_to_micro(frames_in + cap_avail); ++ long long pbk_pos = frames_to_micro(frames_out - pbk_fill); ++ printf("POS: p=%zd (min=%zd, rt=%lldus) c=%zd (max=%zd, rt=%lldus)\n", ++ pbk_fill, pbk_fill_min, pbk_pos - diff, ++ cap_avail, cap_avail_max, cap_pos - diff); ++ } else if (pos_dump) { ++ printf("POS: p=%zd (min=%zd), c=%zd (max=%zd)\n", ++ pbk_fill, pbk_fill_min, cap_avail, cap_avail_max); ++ } ++ } ++ if ((r = readbuf(chandle, buffer, cap_avail, &frames_in, &in_max)) < 0) + ok = 0; + else { + if (effect) +- applyeffect(buffer,r); ++ applyeffect(buffer, r); + if (writebuf(phandle, buffer, r, &frames_out) < 0) + ok = 0; + } +@@ -677,6 +804,13 @@ int main(int argc, char *argv[]) + if (p_tstamp.tv_sec == c_tstamp.tv_sec && + p_tstamp.tv_usec == c_tstamp.tv_usec) + printf("Hardware sync\n"); ++ if (realtime_check) { ++ long long diff = timestamp_diff_micro(&tstamp_start); ++ long long mtime = frames_to_micro(frames_in); ++ printf("Elapsed real time: %lldus\n", diff); ++ printf("Elapsed device time: %lldus\n", mtime); ++ printf("Test time diff (device - real): %lldus\n", mtime - diff); ++ } + snd_pcm_drop(chandle); + snd_pcm_nonblock(phandle, 0); + snd_pcm_drain(phandle); +@@ -698,5 +832,10 @@ int main(int argc, char *argv[]) + } + snd_pcm_close(phandle); + snd_pcm_close(chandle); ++ snd_output_close(output); ++ snd_config_update_free_global(); ++ free(buffer); ++ free(pdevice); ++ free(cdevice); + return 0; + } +-- +2.39.0 + + +From a0836e2af1f2c37b66e723d8caf399e80b76825b Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 14 Nov 2022 21:26:39 +0100 +Subject: [PATCH 09/20] latency: add timestamps to the POS lines + +- remove first capture pos line +- measure the snd_pcm_start() call, too + +Signed-off-by: Jaroslav Kysela +--- + test/latency.c | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +diff --git a/test/latency.c b/test/latency.c +index 91bef1a1..3aff37c1 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -556,7 +556,7 @@ int main(int argc, char *argv[]) + snd_pcm_t *phandle, *chandle; + char *buffer; + int err, latency, morehelp; +- int ok, first_avail; ++ int ok; + snd_timestamp_t p_tstamp, c_tstamp; + ssize_t r, cap_avail, cap_avail_max, pbk_fill, pbk_fill_min; + size_t frames_in, frames_out, in_max; +@@ -723,12 +723,14 @@ int main(int argc, char *argv[]) + break; + } + ++ if (realtime_check) ++ timestamp_now(&tstamp_start); + if ((err = snd_pcm_start(chandle)) < 0) { + printf("Go error: %s\n", snd_strerror(err)); + exit(0); + } + if (realtime_check) +- timestamp_now(&tstamp_start); ++ printf("[%lldus] Stream start\n", timestamp_diff_micro(&tstamp_start)); + gettimestamp(phandle, &p_tstamp); + gettimestamp(chandle, &c_tstamp); + #if 0 +@@ -740,7 +742,6 @@ int main(int argc, char *argv[]) + + ok = 1; + in_max = 0; +- first_avail = 1; + while (ok && frames_in < loop_limit) { + cap_avail = latency; + if (sys_latency > 0) { +@@ -751,12 +752,6 @@ int main(int argc, char *argv[]) + ok = 0; + break; + } +- if (first_avail && realtime_check) { +- long long diff = timestamp_diff_micro(&tstamp_start); +- long long pos = frames_to_micro(cap_avail); +- printf("POS FIRST CHECK: c=%zd (rt=%lldus)\n", cap_avail, pos - diff); +- first_avail = 0; +- } + } else if (use_poll) { + /* use poll to wait for next event */ + snd_pcm_wait(chandle, 1000); +@@ -775,8 +770,8 @@ int main(int argc, char *argv[]) + long long diff = timestamp_diff_micro(&tstamp_start); + long long cap_pos = frames_to_micro(frames_in + cap_avail); + long long pbk_pos = frames_to_micro(frames_out - pbk_fill); +- printf("POS: p=%zd (min=%zd, rt=%lldus) c=%zd (max=%zd, rt=%lldus)\n", +- pbk_fill, pbk_fill_min, pbk_pos - diff, ++ printf("[%lldus] POS: p=%zd (min=%zd, rt=%lldus) c=%zd (max=%zd, rt=%lldus)\n", ++ diff, pbk_fill, pbk_fill_min, pbk_pos - diff, + cap_avail, cap_avail_max, cap_pos - diff); + } else if (pos_dump) { + printf("POS: p=%zd (min=%zd), c=%zd (max=%zd)\n", +-- +2.39.0 + + +From 8b64f22459b6c55ec54f985f35ff701e18800616 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 15 Nov 2022 17:25:59 +0100 +Subject: [PATCH 10/20] ucm: clarify set_defaults calls + +- do full reset in snd_use_case_mgr_reload + +Signed-off-by: Jaroslav Kysela +--- + src/ucm/main.c | 36 +++++++++++++++++++++++++----------- + 1 file changed, 25 insertions(+), 11 deletions(-) + +diff --git a/src/ucm/main.c b/src/ucm/main.c +index 28c60565..4f36648c 100644 +--- a/src/ucm/main.c ++++ b/src/ucm/main.c +@@ -998,13 +998,14 @@ static int add_auto_values(snd_use_case_mgr_t *uc_mgr) + /** + * \brief execute default commands + * \param uc_mgr Use case manager ++ * \param force Force run + * \return zero on success, otherwise a negative error code + */ +-static int set_defaults(snd_use_case_mgr_t *uc_mgr) ++static int set_defaults(snd_use_case_mgr_t *uc_mgr, bool force) + { + int err; + +- if (uc_mgr->default_list_executed) ++ if (!force && uc_mgr->default_list_executed) + return 0; + err = execute_sequence(uc_mgr, NULL, &uc_mgr->default_list, + &uc_mgr->value_list, NULL, NULL); +@@ -1351,7 +1352,7 @@ static int set_verb(snd_use_case_mgr_t *uc_mgr, + int err; + + if (enable) { +- err = set_defaults(uc_mgr); ++ err = set_defaults(uc_mgr, false); + if (err < 0) + return err; + seq = &verb->enable_list; +@@ -1435,6 +1436,22 @@ static int set_device(snd_use_case_mgr_t *uc_mgr, + return err; + } + ++/** ++ * \brief Do the full reset ++ * \param uc_mgr Use case manager ++ * \return zero on success, otherwise a negative error code ++ */ ++static int do_reset(snd_use_case_mgr_t *uc_mgr) ++{ ++ int err; ++ ++ err = set_defaults(uc_mgr, true); ++ INIT_LIST_HEAD(&uc_mgr->active_modifiers); ++ INIT_LIST_HEAD(&uc_mgr->active_devices); ++ uc_mgr->active_verb = NULL; ++ return err; ++} ++ + /** + * \brief Parse open arguments + * \param uc_mgr Use case manager +@@ -1569,6 +1586,8 @@ int snd_use_case_mgr_reload(snd_use_case_mgr_t *uc_mgr) + + pthread_mutex_lock(&uc_mgr->mutex); + ++ do_reset(uc_mgr); ++ + uc_mgr_free_verb(uc_mgr); + + uc_mgr->default_list_executed = 0; +@@ -1633,8 +1652,7 @@ static int dismantle_use_case(snd_use_case_mgr_t *uc_mgr) + } + uc_mgr->active_verb = NULL; + +- err = execute_sequence(uc_mgr, NULL, &uc_mgr->default_list, +- &uc_mgr->value_list, NULL, NULL); ++ err = set_defaults(uc_mgr, true); + + return err; + } +@@ -1649,11 +1667,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr) + int err; + + pthread_mutex_lock(&uc_mgr->mutex); +- err = execute_sequence(uc_mgr, NULL, &uc_mgr->default_list, +- &uc_mgr->value_list, NULL, NULL); +- INIT_LIST_HEAD(&uc_mgr->active_modifiers); +- INIT_LIST_HEAD(&uc_mgr->active_devices); +- uc_mgr->active_verb = NULL; ++ err = do_reset(uc_mgr); + pthread_mutex_unlock(&uc_mgr->mutex); + return err; + } +@@ -2512,7 +2526,7 @@ static int set_defaults_user(snd_use_case_mgr_t *uc_mgr, + uc_error("error: wrong value for _defaults (%s)", value); + return -EINVAL; + } +- return set_defaults(uc_mgr); ++ return set_defaults(uc_mgr, false); + } + + static int handle_transition_verb(snd_use_case_mgr_t *uc_mgr, +-- +2.39.0 + + +From 9649b64c6f72984c53f469dad8dd4221d307e06d Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 22 Nov 2022 09:59:04 +0100 +Subject: [PATCH 11/20] ucm: handle empty string also for ${env:} substitution + +Signed-off-by: Jaroslav Kysela +--- + src/ucm/ucm_subs.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c +index 2261bdc2..e62290ea 100644 +--- a/src/ucm/ucm_subs.c ++++ b/src/ucm/ucm_subs.c +@@ -490,7 +490,13 @@ static char *rval_env(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED, const char *i + { + char *e; + +- e = getenv(id); ++ if (*id == '-') { ++ e = getenv(id + 1); ++ if (e == NULL) ++ e = ""; ++ } else { ++ e = getenv(id); ++ } + if (e) + return strdup(e); + return NULL; +-- +2.39.0 + + +From f0f054517c05ff4ef7a1615851a686a3a202b9ff Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 23 Nov 2022 17:56:20 +0100 +Subject: [PATCH 12/20] test: latency - add -y option (I/O usleep) + +Signed-off-by: Jaroslav Kysela +--- + test/latency.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/test/latency.c b/test/latency.c +index 3aff37c1..161d1f68 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -52,6 +52,7 @@ int latency_max = 2048; /* in frames / 2 */ + int loop_sec = 30; /* seconds */ + int block = 0; /* block mode */ + int use_poll = 0; ++int usleep_val = 0; + int resample = 1; + int sys_latency = 0; /* data I/O: use system timings instead driver wakeups */ + int pos_dump = 0; /* dump positions */ +@@ -509,6 +510,8 @@ void help(void) + "-s,--seconds duration of test in seconds\n" + "-b,--block block mode\n" + "-p,--poll use poll (wait for event - reduces CPU usage)\n" ++"-y,--usleep sleep for the specified amount of microseconds between\n" ++" stream updates (default 0 - off)\n" + "-e,--effect apply an effect (bandpass filter sweep)\n" + "-x,--posdump dump buffer positions\n" + "-X,--realtime do a realtime check (buffering)\n" +@@ -548,6 +551,7 @@ int main(int argc, char *argv[]) + {"seconds", 1, NULL, 's'}, + {"block", 0, NULL, 'b'}, + {"poll", 0, NULL, 'p'}, ++ {"usleep", 1, NULL, 'y'}, + {"effect", 0, NULL, 'e'}, + {"posdump", 0, NULL, 'x'}, + {"realtime", 0, NULL, 'X'}, +@@ -565,7 +569,7 @@ int main(int argc, char *argv[]) + morehelp = 0; + while (1) { + int c; +- if ((c = getopt_long(argc, argv, "hP:C:m:M:U:F:f:c:r:B:E:s:bpenxX", long_option, NULL)) < 0) ++ if ((c = getopt_long(argc, argv, "hP:C:m:M:U:F:f:c:r:B:E:s:y:bpenxX", long_option, NULL)) < 0) + break; + switch (c) { + case 'h': +@@ -624,6 +628,9 @@ int main(int argc, char *argv[]) + case 'p': + use_poll = 1; + break; ++ case 'y': ++ usleep_val = atoi(optarg); ++ break; + case 'e': + effect = 1; + break; +@@ -671,6 +678,8 @@ int main(int argc, char *argv[]) + loop_limit, latency_min * 2, latency_max * 2); + if (sys_latency > 0) + printf(", I/O updates %ims", sys_latency); ++ else if (!block) ++ printf(", I/O usleep %ius", usleep_val); + printf("\n"); + + if ((err = snd_pcm_open(&phandle, pdevice, SND_PCM_STREAM_PLAYBACK, block ? 0 : SND_PCM_NONBLOCK)) < 0) { +@@ -755,6 +764,8 @@ int main(int argc, char *argv[]) + } else if (use_poll) { + /* use poll to wait for next event */ + snd_pcm_wait(chandle, 1000); ++ } else if (usleep_val > 0) { ++ usleep(usleep_val); + } + if (pos_dump || realtime_check) { + if (sys_latency <= 0) +-- +2.39.0 + + +From 536c93928bc57d941a7cd146dbcbd62df0be2d83 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 23 Nov 2022 19:45:15 +0100 +Subject: [PATCH 13/20] test: latency - usleep should not be used in the block + mode + +Signed-off-by: Jaroslav Kysela +--- + test/latency.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/latency.c b/test/latency.c +index 161d1f68..1b4848d6 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -678,7 +678,7 @@ int main(int argc, char *argv[]) + loop_limit, latency_min * 2, latency_max * 2); + if (sys_latency > 0) + printf(", I/O updates %ims", sys_latency); +- else if (!block) ++ else if (!block && !use_poll) + printf(", I/O usleep %ius", usleep_val); + printf("\n"); + +@@ -764,7 +764,7 @@ int main(int argc, char *argv[]) + } else if (use_poll) { + /* use poll to wait for next event */ + snd_pcm_wait(chandle, 1000); +- } else if (usleep_val > 0) { ++ } else if (!block && usleep_val > 0) { + usleep(usleep_val); + } + if (pos_dump || realtime_check) { +-- +2.39.0 + + +From ea0850f3f3780652869c2b4550576894bc21684f Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 24 Nov 2022 08:33:47 +0100 +Subject: [PATCH 14/20] test: latency - add --policy option to allow using + SCHED_FIFO + +Signed-off-by: Jaroslav Kysela +--- + test/latency.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/test/latency.c b/test/latency.c +index 1b4848d6..3b20e1c1 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -40,6 +40,7 @@ + + typedef struct timespec timestamp_t; + ++char *sched_policy = "rr"; + char *pdevice = "hw:0,0"; + char *cdevice = "hw:0,0"; + snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE; +@@ -354,18 +355,24 @@ void gettimestamp(snd_pcm_t *handle, snd_timestamp_t *timestamp) + void setscheduler(void) + { + struct sched_param sched_param; ++ int policy = SCHED_RR; ++ const char *spolicy = "Round Robin"; + ++ if (strcasecmp(sched_policy, "fifo") == 0) { ++ policy = SCHED_FIFO; ++ spolicy = "FIFO"; ++ } + if (sched_getparam(0, &sched_param) < 0) { + printf("Scheduler getparam failed...\n"); + return; + } +- sched_param.sched_priority = sched_get_priority_max(SCHED_RR); +- if (!sched_setscheduler(0, SCHED_RR, &sched_param)) { +- printf("Scheduler set to Round Robin with priority %i...\n", sched_param.sched_priority); ++ sched_param.sched_priority = sched_get_priority_max(policy); ++ if (!sched_setscheduler(0, policy, &sched_param)) { ++ printf("Scheduler set to %s with priority %i...\n", spolicy, sched_param.sched_priority); + fflush(stdout); + return; + } +- printf("!!!Scheduler set to Round Robin with priority %i FAILED!!!\n", sched_param.sched_priority); ++ printf("!!!Scheduler set to %s with priority %i FAILED!!!\n", spolicy, sched_param.sched_priority); + } + + long timediff(snd_timestamp_t t1, snd_timestamp_t t2) +@@ -515,6 +522,7 @@ void help(void) + "-e,--effect apply an effect (bandpass filter sweep)\n" + "-x,--posdump dump buffer positions\n" + "-X,--realtime do a realtime check (buffering)\n" ++"-O,--policy set scheduler policy (RR or FIFO)\n" + ); + printf("Recognized sample formats are:"); + for (k = 0; k < SND_PCM_FORMAT_LAST; ++k) { +@@ -555,6 +563,7 @@ int main(int argc, char *argv[]) + {"effect", 0, NULL, 'e'}, + {"posdump", 0, NULL, 'x'}, + {"realtime", 0, NULL, 'X'}, ++ {"policy", 1, NULL, 'O'}, + {NULL, 0, NULL, 0}, + }; + snd_pcm_t *phandle, *chandle; +@@ -569,7 +578,7 @@ int main(int argc, char *argv[]) + morehelp = 0; + while (1) { + int c; +- if ((c = getopt_long(argc, argv, "hP:C:m:M:U:F:f:c:r:B:E:s:y:bpenxX", long_option, NULL)) < 0) ++ if ((c = getopt_long(argc, argv, "hP:C:m:M:U:F:f:c:r:B:E:s:y:O:bpenxX", long_option, NULL)) < 0) + break; + switch (c) { + case 'h': +@@ -643,6 +652,9 @@ int main(int argc, char *argv[]) + case 'X': + realtime_check = 1; + break; ++ case 'O': ++ sched_policy = optarg; ++ break; + } + } + +-- +2.39.0 + + +From 75f8e2e73e03f628a4f2ba55ca8aa3e9f50cdbd9 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 24 Nov 2022 10:55:32 +0100 +Subject: [PATCH 15/20] test: latency - --policy option - allow using + SCHED_OTHER + +Signed-off-by: Jaroslav Kysela +--- + test/latency.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test/latency.c b/test/latency.c +index 3b20e1c1..5e67015c 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -361,6 +361,9 @@ void setscheduler(void) + if (strcasecmp(sched_policy, "fifo") == 0) { + policy = SCHED_FIFO; + spolicy = "FIFO"; ++ } else if (strcasecmp(sched_policy, "other") == 0) { ++ policy = SCHED_OTHER; ++ spolicy = "OTHER"; + } + if (sched_getparam(0, &sched_param) < 0) { + printf("Scheduler getparam failed...\n"); +@@ -522,7 +525,7 @@ void help(void) + "-e,--effect apply an effect (bandpass filter sweep)\n" + "-x,--posdump dump buffer positions\n" + "-X,--realtime do a realtime check (buffering)\n" +-"-O,--policy set scheduler policy (RR or FIFO)\n" ++"-O,--policy set scheduler policy (RR, FIFO or OTHER)\n" + ); + printf("Recognized sample formats are:"); + for (k = 0; k < SND_PCM_FORMAT_LAST; ++k) { +-- +2.39.0 + + +From d28e8cb29485cc93f741b01dc65893c798359963 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 29 Nov 2022 19:42:13 +0100 +Subject: [PATCH 16/20] topology: ctl - remove the wrong (debug) code + +This code was commited by mistake. It was used for testing +of ALSA_PCM_OLD_HW/SW_PARAMS_API. + +BugLink: https://github.com/thesofproject/sof/issues/6667 +Related-to: 78b20e3c ("test: latency - use snd_pcm_format_physical_width()") +Reported-by: Jaska Uimonen +Signed-off-by: Jaroslav Kysela +--- + src/topology/ctl.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/topology/ctl.c b/src/topology/ctl.c +index 2c500ffc..dd05424d 100644 +--- a/src/topology/ctl.c ++++ b/src/topology/ctl.c +@@ -17,13 +17,9 @@ + Liam Girdwood + */ + +-#define ALSA_PCM_OLD_HW_PARAMS_API 1 +-#define ALSA_PCM_OLD_SW_PARAMS_API 1 +-#include "../../include/asoundlib.h" + #include "list.h" + #include "tplg_local.h" + +- + #define ENUM_VAL_SIZE (SNDRV_CTL_ELEM_ID_NAME_MAXLEN >> 2) + + struct ctl_access_elem { +@@ -75,8 +71,7 @@ static int parse_access_values(snd_config_t *cfg, + } + } + } +- return snd_pcm_hw_params_get_channels(NULL); +- //return snd_pcm_hw_params_get_access(NULL); ++ + return 0; + } + +-- +2.39.0 + + +From e29413a2205099b2bffe584210d7a2b59f531f90 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 14:49:48 +0100 +Subject: [PATCH 17/20] ucm: execute_sysw - fix possible use-after-free + +Signed-off-by: Jaroslav Kysela +--- + src/ucm/main.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/ucm/main.c b/src/ucm/main.c +index 4f36648c..2ff4d3f3 100644 +--- a/src/ucm/main.c ++++ b/src/ucm/main.c +@@ -572,16 +572,17 @@ static int execute_sysw(const char *sysw) + wlen = write(fd, value, len); + myerrno = errno; + close(fd); +- free(s); + + if (ignore_error) +- return 0; ++ goto __end; + + if (wlen != (ssize_t)len) { + uc_error("unable to write '%s' to '%s': %s", value, path, strerror(myerrno)); + return -EINVAL; + } + ++__end: ++ free(s); + return 0; + } + +-- +2.39.0 + + +From 13e31fb1ecd5f666ffda09e87ef1aa53b4fae022 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 14:54:30 +0100 +Subject: [PATCH 18/20] alsa-lib: conf - fix possible use-after-free in + get_char_skip_comments + +Signed-off-by: Jaroslav Kysela +--- + src/conf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/conf.c b/src/conf.c +index eb38c344..65f2e1a7 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -814,11 +814,12 @@ static int get_char_skip_comments(input_t *input) + closedir(dirp); + + err = add_include_path(input->current, str); +- free(str); + if (err < 0) { + SNDERR("Cannot add search dir %s", str); ++ free(str); + return err; + } ++ free(str); + continue; + } + +-- +2.39.0 + + +From 9f2c68cef716aa45942b502a42d94b84289f23bc Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 13 Dec 2022 10:31:32 +0100 +Subject: [PATCH 19/20] pcm: route/softvol use snd_config_get_ireal vs get_real + to handle also integers + +Link: https://lore.kernel.org/alsa-devel/f9a7ad6a256d4ad7a31642dcf875d436@axis.com/ +Signed-off-by: Jaroslav Kysela +--- + src/pcm/pcm_route.c | 11 +++-------- + src/pcm/pcm_softvol.c | 4 ++-- + 2 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c +index d3e5f3ff..21b869cc 100644 +--- a/src/pcm/pcm_route.c ++++ b/src/pcm/pcm_route.c +@@ -1182,15 +1182,10 @@ static int _snd_pcm_route_load_ttable(snd_config_t *tt, snd_pcm_route_ttable_ent + return -EINVAL; + } + +- err = snd_config_get_real(jnode, &value); ++ err = snd_config_get_ireal(jnode, &value); + if (err < 0) { +- long v; +- err = snd_config_get_integer(jnode, &v); +- if (err < 0) { +- SNDERR("Invalid type for %s", id); +- return -EINVAL; +- } +- value = v; ++ SNDERR("Invalid type for %s", id); ++ return -EINVAL; + } + + for (k = 0; (int) k < ss; k++) { +diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c +index 99d0d32e..3e3dbc79 100644 +--- a/src/pcm/pcm_softvol.c ++++ b/src/pcm/pcm_softvol.c +@@ -1190,7 +1190,7 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name, + continue; + } + if (strcmp(id, "min_dB") == 0) { +- err = snd_config_get_real(n, &min_dB); ++ err = snd_config_get_ireal(n, &min_dB); + if (err < 0) { + SNDERR("Invalid min_dB value"); + return err; +@@ -1198,7 +1198,7 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name, + continue; + } + if (strcmp(id, "max_dB") == 0) { +- err = snd_config_get_real(n, &max_dB); ++ err = snd_config_get_ireal(n, &max_dB); + if (err < 0) { + SNDERR("Invalid max_dB value"); + return err; +-- +2.39.0 + + +From 2e82060ebcd68f5ea1fe3dccc5a6518008132a54 Mon Sep 17 00:00:00 2001 +From: Alan Young +Date: Fri, 30 Dec 2022 16:48:14 +0000 +Subject: [PATCH 20/20] pcm: rate: fix last_commit_ptr boundary wrapping + +Wrap last_commit_ptr using boundary. Was just wrapped to 0, which is +correct only if the buffer size, and hence the boundary, is an integer +multiple of the period size. + +Fixes: 467d69c5bc1 ("Fix CPU hog with combination of rate plugin") +Fixes: 29041c52207 ("fix infinite draining of the rate plugin in SND_PCM_NONBLOCK mode") +Link: https://lore.kernel.org/alsa-devel/20221230164814.901457-1-consult.awy@gmail.com/ +Signed-off-by: Alan Young +Signed-off-by: Jaroslav Kysela +--- + src/pcm/pcm_rate.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c +index e5d8eddd..c8076859 100644 +--- a/src/pcm/pcm_rate.c ++++ b/src/pcm/pcm_rate.c +@@ -1018,7 +1018,7 @@ static int snd_pcm_rate_sync_playback_area(snd_pcm_t *pcm, snd_pcm_uframes_t app + slave_size -= rate->gen.slave->period_size; + rate->last_commit_ptr += pcm->period_size; + if (rate->last_commit_ptr >= pcm->boundary) +- rate->last_commit_ptr = 0; ++ rate->last_commit_ptr -= pcm->boundary; + } + return 0; + } +@@ -1163,7 +1163,7 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm) + if (commit_err == 1) { + rate->last_commit_ptr += psize; + if (rate->last_commit_ptr >= pcm->boundary) +- rate->last_commit_ptr = 0; ++ rate->last_commit_ptr -= pcm->boundary; + } else if (commit_err == 0) { + if (pcm->mode & SND_PCM_NONBLOCK) { + commit_err = -EAGAIN; +-- +2.39.0 + diff --git a/SOURCES/alsa-ucm-git.patch b/SOURCES/alsa-ucm-git.patch index e69de29..560f3ec 100644 --- a/SOURCES/alsa-ucm-git.patch +++ b/SOURCES/alsa-ucm-git.patch @@ -0,0 +1,1572 @@ +From 2667378a6b9120d99e44f783ac4d247fb683d83c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?= + +Date: Thu, 24 Mar 2022 18:13:45 -0400 +Subject: [PATCH 01/21] ucm2: Add support for MT8192 Asurada Spherion + Chromebook +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add support for the Acer Chromebook 514 CP514-2H, powered by MediaTek +Kompanio 820 (MT8192). This machine uses a MT6359 PMIC, with RT1015P as +speaker codec and RT5682 as headphone codec. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/217 +Signed-off-by: Nícolas F. R. A. Prado +Signed-off-by: Jaroslav Kysela +--- + .../mt8192/mt6359-rt1015p-rt5682/HiFi.conf | 88 +++++++++++++++++++ + .../mt8192/mt6359-rt1015p-rt5682/init.conf | 24 +++++ + .../mt8192_mt6359_rt1015p_rt5682.conf | 11 +++ + .../mt8192_mt6359_rt1015p_rt5682.conf | 1 + + 4 files changed, 124 insertions(+) + create mode 100644 ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf + create mode 100644 ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf + create mode 100644 ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf + create mode 120000 ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf + +diff --git a/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf +new file mode 100644 +index 0000000..cf0d2c1 +--- /dev/null ++++ b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/HiFi.conf +@@ -0,0 +1,88 @@ ++SectionVerb { ++ EnableSequence [ ++ disdevall "" ++ ] ++ ++ Value { ++ TQ "HiFi" ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cset "name='Speakers Switch' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='Speakers Switch' 0" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:${CardId},0" ++ PlaybackPriority 100 ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Headphones" ++ ++ EnableSequence [ ++ cset "name='Headphone Jack Switch' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='Headphone Jack Switch' 0" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:${CardId},3" ++ JackControl "Headphone Jack" ++ PlaybackMixerElem "DAC1" ++ PlaybackPriority 200 ++ } ++} ++ ++SectionDevice."Mic" { ++ Comment "Internal Microphone" ++ ++ EnableSequence [ ++ cset "name='MTKAIF_DMIC Switch' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='MTKAIF_DMIC Switch' 0" ++ ] ++ ++ Value { ++ CapturePCM "hw:${CardId},10" ++ CapturePriority 100 ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Headset Microphone" ++ ++ EnableSequence [ ++ cset "name='Headset Mic Switch' 1" ++ cset "name='STO1 ADC Capture Switch' 1" ++ cset "name='RECMIX1L CBJ Switch' 1" ++ cset "name='Stereo1 ADC MIXL ADC1 Switch' 1" ++ cset "name='Stereo1 ADC MIXR ADC1 Switch' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='STO1 ADC Capture Switch' 0" ++ cset "name='RECMIX1L CBJ Switch' 0" ++ cset "name='Stereo1 ADC MIXL ADC1 Switch' 0" ++ cset "name='Stereo1 ADC MIXR ADC1 Switch' 0" ++ cset "name='Headset Mic Switch' 0" ++ ] ++ ++ Value { ++ CapturePCM "hw:${CardId},11" ++ JackControl "Headset Mic Jack" ++ CapturePriority 200 ++ } ++} +diff --git a/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf +new file mode 100644 +index 0000000..b53178e +--- /dev/null ++++ b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/init.conf +@@ -0,0 +1,24 @@ ++BootSequence [ ++ # Speaker ++ cset "name='I2S3_CH1 DL1_CH1' 1" ++ cset "name='I2S3_CH2 DL1_CH2' 1" ++ cset "name='I2S3_HD_Mux' 1" ++ ++ # Headphone ++ cset "name='I2S9_CH1 DL3_CH1' 1" ++ cset "name='I2S9_CH2 DL3_CH2' 1" ++ cset "name='I2S9_HD_Mux' 1" ++ ++ # Internal Mic ++ cset "name='UL1_CH1 ADDA_UL_CH1' 1" ++ cset "name='UL1_CH2 ADDA_UL_CH2' 1" ++ cset "name='UL_SRC_MUX' DMIC" ++ ++ # Headset Mic ++ cset "name='UL2_CH1 I2S8_CH1' 1" ++ cset "name='UL2_CH2 I2S8_CH2' 1" ++ cset "name='I2S8_HD_Mux' 1" ++ cset "name='Stereo1 ADC L1 Mux' 1" ++ cset "name='Stereo1 ADC R1 Mux' 1" ++ cset "name='CBJ Boost Volume' 3" ++] +diff --git a/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf +new file mode 100644 +index 0000000..b4e124d +--- /dev/null ++++ b/ucm2/MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf +@@ -0,0 +1,11 @@ ++Comment "MT8192 MT6359 RT1015P RT5682 sound card" ++Syntax 4 ++ ++SectionUseCase."HiFi" { ++ File "HiFi.conf" ++ Comment "Default" ++} ++ ++Include.card-init.File "/lib/card-init.conf" ++Include.ctl-remap.File "/lib/ctl-remap.conf" ++Include.init.File "init.conf" +diff --git a/ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf b/ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf +new file mode 120000 +index 0000000..4425b19 +--- /dev/null ++++ b/ucm2/conf.d/mt8192_mt6359/mt8192_mt6359_rt1015p_rt5682.conf +@@ -0,0 +1 @@ ++../../MediaTek/mt8192/mt6359-rt1015p-rt5682/mt8192_mt6359_rt1015p_rt5682.conf +\ No newline at end of file +-- +2.39.0 + + +From 6dee56f11fbd48dd412179722a445416fcd779ef Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 6 Nov 2022 18:08:27 +0100 +Subject: [PATCH 02/21] ucm: USB-Audio - Add support for Focusrite Scarlett 2i2 + gen2 + +BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/234 +Signed-off-by: Jaroslav Kysela +--- + ...2-HiFi.conf => Scarlett-2i-gen2-HiFi.conf} | 45 +++++++++++-------- + .../USB-Audio/Focusrite/Scarlett-2i-gen2.conf | 22 +++++++++ + .../Focusrite/Scarlett-2i4-gen2.conf | 11 ----- + ucm2/USB-Audio/USB-Audio.conf | 10 ++--- + 4 files changed, 53 insertions(+), 35 deletions(-) + rename ucm2/USB-Audio/Focusrite/{Scarlett-2i4-gen2-HiFi.conf => Scarlett-2i-gen2-HiFi.conf} (65%) + create mode 100644 ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf + delete mode 100644 ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf + +diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf +similarity index 65% +rename from ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf +rename to ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf +index 5ee5076..ab69bc7 100644 +--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf ++++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf +@@ -3,7 +3,7 @@ Include.pcm_split.File "/common/pcm/split.conf" + Macro [ + { + SplitPCM { +- Name "scarlett2i4_stereo_out" ++ Name "scarlett2i_stereo_out" + Direction Playback + Format S32_LE + Channels 2 +@@ -16,7 +16,7 @@ Macro [ + } + { + SplitPCM { +- Name "scarlett2i4_mono_in" ++ Name "scarlett2i_mono_in" + Direction Capture + Format S32_LE + Channels 1 +@@ -33,7 +33,7 @@ SectionDevice."Line1" { + PlaybackPriority 200 + } + Macro.pcm_split.SplitPCMDevice { +- Name "scarlett2i4_stereo_out" ++ Name "scarlett2i_stereo_out" + Direction Playback + HWChannels 4 + Channels 2 +@@ -44,21 +44,28 @@ SectionDevice."Line1" { + } + } + +-SectionDevice."Line2" { +- Comment "Line 3-4" +- +- Value { +- PlaybackPriority 100 ++If.scarlett_2i4 { ++ Condition { ++ Type String ++ String1 "${var:PlaybackChannels}" ++ String2 "4" + } +- Macro.pcm_split.SplitPCMDevice { +- Name "scarlett2i4_stereo_out" +- Direction Playback +- HWChannels 4 +- Channels 2 +- Channel0 2 +- Channel1 3 +- ChannelPos0 FL +- ChannelPos1 FR ++ True.SectionDevice."Line2" { ++ Comment "Line 3-4" ++ ++ Value { ++ PlaybackPriority 100 ++ } ++ Macro.pcm_split.SplitPCMDevice { ++ Name "scarlett2i_stereo_out" ++ Direction Playback ++ HWChannels 4 ++ Channels 2 ++ Channel0 2 ++ Channel1 3 ++ ChannelPos0 FL ++ ChannelPos1 FR ++ } + } + } + +@@ -69,7 +76,7 @@ SectionDevice."Mic1" { + CapturePriority 200 + } + Macro.pcm_split.SplitPCMDevice { +- Name "scarlett2i4_mono_in" ++ Name "scarlett2i_mono_in" + Direction Capture + HWChannels 2 + Channels 1 +@@ -85,7 +92,7 @@ SectionDevice."Mic2" { + CapturePriority 100 + } + Macro.pcm_split.SplitPCMDevice { +- Name "scarlett2i4_mono_in" ++ Name "scarlett2i_mono_in" + Direction Capture + HWChannels 2 + Channels 1 +diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf +new file mode 100644 +index 0000000..ee5b0b5 +--- /dev/null ++++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf +@@ -0,0 +1,22 @@ ++Define.PlaybackChannels 4 ++ ++If.scarlett_2i4 { ++ Condition { ++ Type String ++ Haystack "${CardComponents}" ++ Needle "USB1235:8202" ++ } ++ True.Define.PlaybackChannels 2 ++} ++ ++Comment "Focusrite Scarlett 2i${var:PlaybackChannels} Gen 2" ++ ++SectionUseCase."HiFi" { ++ Comment "Default" ++ File "/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf" ++} ++ ++Define.DirectPlaybackChannels "${var:PlaybackChannels}" ++Define.DirectCaptureChannels 2 ++ ++Include.dhw.File "/common/direct.conf" +diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf +deleted file mode 100644 +index ffc296d..0000000 +--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i4-gen2.conf ++++ /dev/null +@@ -1,11 +0,0 @@ +-Comment "Focusrite Scarlett 2i4 Gen 2" +- +-SectionUseCase."HiFi" { +- Comment "Default" +- File "/USB-Audio/Focusrite/Scarlett-2i4-gen2-HiFi.conf" +-} +- +-Define.DirectPlaybackChannels 4 +-Define.DirectCaptureChannels 2 +- +-Include.dhw.File "/common/direct.conf" +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index 90a88d4..3479ba1 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -135,14 +135,14 @@ If.goxlr { + True.Define.ProfileName "GoXLR/GoXLR" + } + +-If.focusrite-scarlett-2i4-gen2 { ++If.focusrite-scarlett-2i-gen2 { + Condition { +- Type String +- Haystack "${CardComponents}" +- Needle "USB1235:8200" ++ Type RegexMatch ++ String "${CardComponents}" ++ Regex "USB1235:820[02]" + } + True.Define { +- ProfileName "Focusrite/Scarlett-2i4-gen2" ++ ProfileName "Focusrite/Scarlett-2i-gen2" + } + } + +-- +2.39.0 + + +From b50a903f488e3f6479001b603c1b42b2a9600882 Mon Sep 17 00:00:00 2001 +From: Manu Linares +Date: Sat, 5 Nov 2022 19:32:27 -0300 +Subject: [PATCH 04/21] ucm2: USB-Audio - Added Digidesign Mbox 3 support + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/237 +Signed-off-by: Manu Linares +Signed-off-by: Jaroslav Kysela +--- + .../Digidesign/Digidesign-Mbox-3-HiFi.conf | 126 ++++++++++++++++++ + .../Digidesign/Digidesign-Mbox-3.conf | 11 ++ + ucm2/USB-Audio/USB-Audio.conf | 9 ++ + 3 files changed, 146 insertions(+) + create mode 100644 ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf + create mode 100644 ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf + +diff --git a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf +new file mode 100644 +index 0000000..7219bea +--- /dev/null ++++ b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf +@@ -0,0 +1,126 @@ ++Include.pcm_split.File "/common/pcm/split.conf" ++ ++Macro [ ++ { ++ SplitPCM { ++ Name "mbox3_stereo_out" ++ Direction Playback ++ Channels 2 ++ HWChannels 4 ++ HWChannelPos0 FL ++ HWChannelPos1 FR ++ HWChannelPos2 FL ++ HWChannelPos3 FR ++ } ++ } ++ { ++ SplitPCM { ++ Name "mbox3_stereo_in" ++ Direction Capture ++ Channels 2 ++ HWChannels 4 ++ HWChannelPos0 FL ++ HWChannelPos1 FR ++ HWChannelPos2 FL ++ HWChannelPos3 FR ++ } ++ } ++ { ++ SplitPCM { ++ Name "mbox3_mono_in" ++ Direction Capture ++ Channels 1 ++ HWChannels 4 ++ HWChannelPos0 MONO ++ HWChannelPos1 MONO ++ HWChannelPos2 MONO ++ HWChannelPos3 MONO ++ } ++ } ++] ++ ++SectionDevice."Line1" { ++ Comment "Main Output L/R" ++ ++ Value { ++ PlaybackPriority 300 ++ } ++ Macro.pcm_split.SplitPCMDevice { ++ Name "mbox3_stereo_out" ++ Direction Playback ++ HWChannels 4 ++ Channels 2 ++ Channel0 0 ++ Channel1 1 ++ ChannelPos0 FL ++ ChannelPos1 FR ++ } ++} ++ ++ ++SectionDevice."line2SPDIF" { ++ Comment "SPDIF Out" ++ Value { ++ PlaybackPriority 100 ++ } ++ Macro.pcm_split.SplitPCMDevice { ++ Name "mbox3_stereo_out" ++ Direction Playback ++ HWChannels 4 ++ Channels 2 ++ Channel0 2 ++ Channel1 3 ++ ChannelPos0 FL ++ ChannelPos1 FR ++ } ++} ++ ++SectionDevice."mic1" { ++ Comment "Mic/Line 1" ++ ++ Value { ++ CapturePriority 300 ++ } ++ Macro.pcm_split.SplitPCMDevice { ++ Name "mbox3_mono_in" ++ Direction Capture ++ HWChannels 4 ++ Channels 1 ++ Channel0 0 ++ ChannelPos0 MONO ++ } ++} ++ ++SectionDevice."mic2" { ++ Comment "Mic/Line 2" ++ ++ Value { ++ CapturePriority 200 ++ } ++ Macro.pcm_split.SplitPCMDevice { ++ Name "mbox3_mono_in" ++ Direction Capture ++ HWChannels 4 ++ Channels 1 ++ Channel0 1 ++ ChannelPos0 MONO ++ } ++} ++ ++SectionDevice."mic3SPDIF" { ++ Comment "SPDIF In" ++ ++ Value { ++ CapturePriority 100 ++ } ++ Macro.pcm_split.SplitPCMDevice { ++ Name "mbox3_stereo_in" ++ Direction Capture ++ HWChannels 4 ++ Channels 2 ++ Channel0 2 ++ Channel1 3 ++ ChannelPos0 FL ++ ChannelPos1 FR ++ } ++} +diff --git a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf +new file mode 100644 +index 0000000..d6e19f9 +--- /dev/null ++++ b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3.conf +@@ -0,0 +1,11 @@ ++Comment "Digidesign Mbox 3" ++ ++SectionUseCase."Mixer" { ++ Comment "Stereo Duplex" ++ File "/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf" ++} ++ ++Define.DirectPlaybackChannels 4 ++Define.DirectCaptureChannels 4 ++ ++Include.dhw.File "/common/direct.conf" +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index 3479ba1..d1d70d8 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -126,6 +126,15 @@ If.dell-desktop-rear { + True.Define.ProfileName "Dell/Desktop-Rear" + } + ++If.mbox3 { ++ Condition { ++ Type String ++ Haystack "${CardComponents}" ++ Needle "USB0dba:5000" ++ } ++ True.Define.ProfileName "Digidesign/Digidesign-Mbox-3" ++} ++ + If.goxlr { + Condition { + Type RegexMatch +-- +2.39.0 + + +From 88f232dffd54e1b9222ea76c7885445efebaa74d Mon Sep 17 00:00:00 2001 +From: "Ben Scholzen (DASPRiD)" +Date: Mon, 31 Oct 2022 17:41:02 +0100 +Subject: [PATCH 05/21] ucm2: Alc4080 - add support for ASUS ROG Strix Z790-E + Gaming Wifi + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/235 +Signed-off-by: Ben Scholzen (DASPRiD) +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf | 2 +- + ucm2/USB-Audio/USB-Audio.conf | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf +index 519f3b0..fa8d445 100644 +--- a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf ++++ b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf +@@ -68,7 +68,7 @@ If.spdif_dev2 { + Condition { + Type RegexMatch + String "${CardComponents}" +- Regex "USB(0b05:1996|0db0:1feb)" ++ Regex "USB(0b05:1996|0b05:1a52|0db0:1feb)" + } + True.Define.SpdifPCM "hw:${CardId},2" + } +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index d1d70d8..e30dc2b 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -41,6 +41,7 @@ If.realtek-alc4080 { + # 0b05:1a16 ASUS ROG Strix B660-F Gaming WiFi + # 0b05:1a20 ASUS ROG STRIX Z690-I Gaming Wifi + # 0b05:1a27 ALC4082 on ASUS ROG Maximus Z690 Hero ++ # 0b05:1a52 ASUS ROG Strix Z790-E Gaming Wifi + # 0db0:005a MSI MPG Z690 CARBON WIFI + # 0db0:151f MSI X570S EDGE MAX WIFI + # 0db0:1feb MSI Edge Wifi Z690 +@@ -50,7 +51,7 @@ If.realtek-alc4080 { + # 0db0:a47c MSI MEG X570S Ace Max + # 0db0:b202 MSI MAG Z690 Tomahawk Wifi + # 0db0:d6e7 MSI MPG X670E Carbon Wifi +- Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07])))|(0db0:(005a|151f|1feb|419c|82c7|a073|a47c|b202|d6e7)))" ++ Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|82c7|a073|a47c|b202|d6e7)))" + } + True.Define.ProfileName "Realtek/ALC4080" + } +-- +2.39.0 + + +From b121b63f30c24e89beec506ae1d2bac9ebb3cc61 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 15 Nov 2022 17:49:13 +0100 +Subject: [PATCH 06/21] USB-Audio: ALC4080 - add 0db0:6cc9 MSI MPG Z590 Gaming + Plus device + +BugLink: https://github.com/alsa-project/alsa-ucm-conf/issues/241 +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/USB-Audio.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index e30dc2b..89482cb 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -46,12 +46,13 @@ If.realtek-alc4080 { + # 0db0:151f MSI X570S EDGE MAX WIFI + # 0db0:1feb MSI Edge Wifi Z690 + # 0db0:419c MSI MPG X570S Carbon Max Wifi ++ # 0db0:6cc9 MSI MPG Z590 Gaming Plus + # 0db0:82c7 MSI MEG Z690I Unify + # 0db0:a073 MSI MAG X570S Torpedo Max + # 0db0:a47c MSI MEG X570S Ace Max + # 0db0:b202 MSI MAG Z690 Tomahawk Wifi + # 0db0:d6e7 MSI MPG X670E Carbon Wifi +- Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|82c7|a073|a47c|b202|d6e7)))" ++ Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|6cc9|82c7|a073|a47c|b202|d6e7)))" + } + True.Define.ProfileName "Realtek/ALC4080" + } +-- +2.39.0 + + +From c82c400fb653292bbf0570e278d60e1ba14cc341 Mon Sep 17 00:00:00 2001 +From: Shuming Fan +Date: Wed, 16 Nov 2022 17:36:51 +0800 +Subject: [PATCH 07/21] ucm2: sof-soundwire: add basic settings for RT1318 SDCA + device + +Add support for rt1318 amplifier + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/242 +Signed-off-by: Shuming Fan +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-soundwire/rt1318-1.conf | 20 ++++++++++++++++++++ + ucm2/sof-soundwire/rt1318-2.conf | 25 +++++++++++++++++++++++++ + 2 files changed, 45 insertions(+) + create mode 100644 ucm2/sof-soundwire/rt1318-1.conf + create mode 100644 ucm2/sof-soundwire/rt1318-2.conf + +diff --git a/ucm2/sof-soundwire/rt1318-1.conf b/ucm2/sof-soundwire/rt1318-1.conf +new file mode 100644 +index 0000000..13d77e1 +--- /dev/null ++++ b/ucm2/sof-soundwire/rt1318-1.conf +@@ -0,0 +1,20 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cset "name='rt1318-1 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt1318-1 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} +diff --git a/ucm2/sof-soundwire/rt1318-2.conf b/ucm2/sof-soundwire/rt1318-2.conf +new file mode 100644 +index 0000000..5602470 +--- /dev/null ++++ b/ucm2/sof-soundwire/rt1318-2.conf +@@ -0,0 +1,25 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cset "name='rt1318-1 RX Channel Select' L,L" ++ cset "name='rt1318-2 RX Channel Select' R,R" ++ ++ cset "name='rt1318-1 DAC Switch' 1" ++ cset "name='rt1318-2 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt1318-1 DAC Switch' 0" ++ cset "name='rt1318-2 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} +-- +2.39.0 + + +From 998849d9510754960d808e20dad4c440adaf87ef Mon Sep 17 00:00:00 2001 +From: Clayton Craft +Date: Wed, 29 Jun 2022 15:23:23 -0700 +Subject: [PATCH 08/21] ucm2: add profile for the Librem 5 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/181 +Tested-by: Guido Günther +Signed-off-by: Jaroslav Kysela +--- + ucm2/NXP/iMX8/Librem_5/HiFi.conf | 151 ++++++++++++++++++++++++++ + ucm2/NXP/iMX8/Librem_5/Librem 5.conf | 25 +++++ + ucm2/conf.d/simple-card/Librem 5.conf | 1 + + 3 files changed, 177 insertions(+) + create mode 100644 ucm2/NXP/iMX8/Librem_5/HiFi.conf + create mode 100644 ucm2/NXP/iMX8/Librem_5/Librem 5.conf + create mode 120000 ucm2/conf.d/simple-card/Librem 5.conf + +diff --git a/ucm2/NXP/iMX8/Librem_5/HiFi.conf b/ucm2/NXP/iMX8/Librem_5/HiFi.conf +new file mode 100644 +index 0000000..55eabe3 +--- /dev/null ++++ b/ucm2/NXP/iMX8/Librem_5/HiFi.conf +@@ -0,0 +1,151 @@ ++SectionVerb { ++ EnableSequence [ ++ disdevall "" ++ ] ++ ++ Value.TQ "HiFi" ++} ++ ++SectionDevice."Handset" { ++ Comment "Handset" ++ ++ ConflictingDevice [ ++ "Headphones" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cset "name='Speaker Switch' off,on" ++ cset "name='DAC L/R Swap Switch' on" ++ cset "name='DAC Monomix Switch' on" ++ cset "name='SPKOUTR PGA' DAC" ++ cset "name='Speaker Boost Volume' 2" ++ ] ++ ++ DisableSequence [ ++ cset "name='Speaker Switch' off,off" ++ cset "name='DAC L/R Swap Switch' off" ++ cset "name='DAC Monomix Switch' off" ++ cset "name='SPKOUTR PGA' Mixer" ++ ] ++ ++ Value { ++ PlaybackPriority "100" ++ PlaybackVolume "name='Speaker Volume'" ++ PlaybackSwitch "name='Speaker Switch'" ++ PlaybackMixerElem "Speaker" ++ PlaybackPCM "hw:${CardId}" ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ ConflictingDevice [ ++ "Handset" ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cset "name='Speaker Switch' on,off" ++ cset "name='DAC Monomix Switch' on" ++ cset "name='SPKOUTL PGA' DAC" ++ cset "name='Speaker Boost Volume' 6" ++ ] ++ ++ DisableSequence [ ++ cset "name='Speaker Switch' off,off" ++ cset "name='DAC Monomix Switch' off" ++ cset "name='SPKOUTL PGA' Mixer" ++ ] ++ ++ Value { ++ PlaybackPriority "500" ++ PlaybackVolume "name='Speaker Volume'" ++ PlaybackSwitch "name='Speaker Switch'" ++ PlaybackMixerElem "Speaker" ++ PlaybackPCM "hw:${CardId}" ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Headphones" ++ ++ ConflictingDevice [ ++ "Handset" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cset "name='Headphone Switch' on,on" ++ cset "name='HPOUTL PGA' 0 unmute" ++ cset "name='HPOUTR PGA' 0 unmute" ++ ] ++ ++ DisableSequence [ ++ cset "name='Headphone Switch' off off" ++ cset "name='HPOUTL PGA' 0 mute" ++ cset "name='HPOUTR PGA' 0 mute" ++ ] ++ ++ Value { ++ PlaybackPriority "1000" ++ PlaybackVolume "name='Headphone Volume'" ++ PlaybackSwitch "name='Headphone Switch'" ++ PlaybackMixerElem "Headphone" ++ PlaybackPCM "hw:${CardId}" ++ JackControl "Headphones Jack" ++ } ++} ++ ++SectionDevice."Mic" { ++ Comment "Internal Microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cset "name='ADC L/R Swap Switch' on" ++ cset "name='Input Mode' Digital" ++ ] ++ ++ DisableSequence [ ++ cset "name='ADC L/R Swap Switch' off" ++ ] ++ ++ Value { ++ CapturePriority "500" ++ CaptureVolume "name='Digital Capture Volume'" ++ CaptureMixerElem "Digital" ++ CapturePCM "hw:${CardId}" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Mic" ++ ] ++ ++ EnableSequence [ ++ cset "name='Input Mode' Analog" ++ cset "name='MIXINR PGA Switch' on,on" ++ cset "name='Capture Switch' on,on" ++ ] ++ ++ DisableSequence [ ++ cset "name='Capture Switch' off,off" ++ cset "name='MIXINR PGA Switch' off,off" ++ cset "name='Input Mode' Digital" ++ ] ++ ++ Value { ++ CapturePriority "100" ++ CaptureVolume "name='Capture Volume'" ++ CaptureMixerElem "Capture" ++ CapturePCM "hw:${CardId}" ++ JackControl "Headphones Jack" ++ } ++} +diff --git a/ucm2/NXP/iMX8/Librem_5/Librem 5.conf b/ucm2/NXP/iMX8/Librem_5/Librem 5.conf +new file mode 100644 +index 0000000..4d7dbd6 +--- /dev/null ++++ b/ucm2/NXP/iMX8/Librem_5/Librem 5.conf +@@ -0,0 +1,25 @@ ++Syntax 2 ++ ++SectionUseCase."HiFi" { ++ File "HiFi.conf" ++ Comment "Default" ++} ++ ++BootSequence [ ++ cset "name='Digital Playback Volume' 100,100" ++ cset "name='MIXINL IN2L Switch' off" ++ cset "name='MIXINL IN3L Switch' off" ++ cset "name='MIXINR IN2R Switch' off" ++ cset "name='MIXINR IN3R Switch' off" ++ cset "name='INPGAR IN1R Switch' off" ++ cset "name='INPGAR IN2R Switch' off" ++ cset "name='INPGAR IN3R Switch' on" ++ cset "name='INPGAR IN4R Switch' off" ++ cset "name='INPGAL IN1L Switch' off" ++ cset "name='INPGAL IN2L Switch' off" ++ cset "name='INPGAL IN3L Switch' off" ++ cset "name='INPGAL IN4L Switch' off" ++ cset "name='Input Mixer Switch' off,on" ++ cset "name='SPKOUTL PGA' Mixer" ++ cset "name='SPKOUTR PGA' Mixer" ++] +diff --git a/ucm2/conf.d/simple-card/Librem 5.conf b/ucm2/conf.d/simple-card/Librem 5.conf +new file mode 120000 +index 0000000..c687942 +--- /dev/null ++++ b/ucm2/conf.d/simple-card/Librem 5.conf +@@ -0,0 +1 @@ ++../../NXP/iMX8/Librem_5/Librem 5.conf +\ No newline at end of file +-- +2.39.0 + + +From 71ff24cdd2e0fecb71c2fcf8a45a1ae50233c34b Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 21 Nov 2022 09:51:54 +0100 +Subject: [PATCH 09/21] USB-Audio: allow to configure period size for PCM split +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The environment variable UCM_USB_PERIOD_TIME (microseconds / μs) +can define the period size for the PCM channel split over +the default value 10000μs. + +BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/240 +Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/238 +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/USB-Audio.conf | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index 89482cb..fdc29ec 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -4,6 +4,14 @@ Define.ProfileName "" + Define.MixerRemap "" + Define.SplitPCMPeriodTime 10000 # 10ms + ++If.env1 { ++ Condition { ++ Type String ++ Empty "${env:UCM_USB_PERIOD_TIME}" ++ } ++ False.Define.SplitPCMPeriodTime "${env:UCM_USB_PERIOD_TIME}" ++} ++ + If.linked { + Condition { + Type RegexMatch +-- +2.39.0 + + +From 445c079665979802d50b237fe5a55be82ffd0bd9 Mon Sep 17 00:00:00 2001 +From: Fadwa Chiby +Date: Fri, 22 Jul 2022 09:45:07 +0000 +Subject: [PATCH 10/21] mt8195-demo: fix soundcard initialization + +The previous initialization in Bootsequence set all Switch +to off after boot. + +So remove the setting off of the Switch in the BootSequence +and define Enable/DisableSequence in verb section for +a proper setting. + +Note that the controls enable access to the PCM devices +(controls routes between Front End and Back End in ASoC). + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/211 +Signed-off-by: Fadwa Chiby +Signed-off-by: Jaroslav Kysela +--- + ucm2/MediaTek/mt8195_demo/HiFi.conf | 57 ++++++++++++++++++++++ + ucm2/MediaTek/mt8195_demo/mt8195_demo.conf | 36 ++++---------- + 2 files changed, 66 insertions(+), 27 deletions(-) + +diff --git a/ucm2/MediaTek/mt8195_demo/HiFi.conf b/ucm2/MediaTek/mt8195_demo/HiFi.conf +index 95f2b51..660b4ad 100644 +--- a/ucm2/MediaTek/mt8195_demo/HiFi.conf ++++ b/ucm2/MediaTek/mt8195_demo/HiFi.conf +@@ -1,3 +1,60 @@ ++SectionVerb { ++ ++ EnableSequence [ ++ cset "name='HDMI_OUT_MUX' Connect" ++ cset "name='DPTX_OUT_MUX' Connect" ++ cset "name='O176 I070 Switch' on" ++ cset "name='O177 I071 Switch' on" ++ cset "name='O034 I168 Switch' on" ++ cset "name='O035 I169 Switch' on" ++ cset "name='O036 I012 Switch' on" ++ cset "name='O037 I013 Switch' on" ++ cset "name='O072 I022 Switch' on" ++ cset "name='O073 I023 Switch' on" ++ cset "name='O074 I024 Switch' on" ++ cset "name='O075 I025 Switch' on" ++ cset "name='O076 I026 Switch' on" ++ cset "name='O077 I027 Switch' on" ++ cset "name='O078 I028 Switch' on" ++ cset "name='O079 I029 Switch' on" ++ cset "name='O002 I004 Switch' on" ++ cset "name='O003 I005 Switch' on" ++ cset "name='O004 I006 Switch' on" ++ cset "name='O005 I007 Switch' on" ++ cset "name='O006 I008 Switch' on" ++ cset "name='O007 I009 Switch' on" ++ cset "name='O008 I010 Switch' on" ++ cset "name='O009 I011 Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='HDMI_OUT_MUX' Disconnect" ++ cset "name='DPTX_OUT_MUX' Disconnect" ++ cset "name='O176 I070 Switch' off" ++ cset "name='O177 I071 Switch' off" ++ cset "name='O034 I168 Switch' off" ++ cset "name='O035 I169 Switch' off" ++ cset "name='O036 I012 Switch' off" ++ cset "name='O037 I013 Switch' off" ++ cset "name='O072 I022 Switch' off" ++ cset "name='O073 I023 Switch' off" ++ cset "name='O074 I024 Switch' off" ++ cset "name='O075 I025 Switch' off" ++ cset "name='O076 I026 Switch' off" ++ cset "name='O077 I027 Switch' off" ++ cset "name='O078 I028 Switch' off" ++ cset "name='O079 I029 Switch' off" ++ cset "name='O002 I004 Switch' off" ++ cset "name='O003 I005 Switch' off" ++ cset "name='O004 I006 Switch' off" ++ cset "name='O005 I007 Switch' off" ++ cset "name='O006 I008 Switch' off" ++ cset "name='O007 I009 Switch' off" ++ cset "name='O008 I010 Switch' off" ++ cset "name='O009 I011 Switch' off" ++ ] ++} ++ + SectionDevice."HDMI" { + Comment "Hdmi/DP output" + +diff --git a/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf b/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf +index c23dc37..896b6dc 100644 +--- a/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf ++++ b/ucm2/MediaTek/mt8195_demo/mt8195_demo.conf +@@ -1,4 +1,4 @@ +-Syntax 3 ++Syntax 2 + + SectionUseCase."HiFi" { + File "/MediaTek/mt8195_demo/HiFi.conf" +@@ -16,12 +16,12 @@ BootSequence [ + cset "name='PGA_L_Mux' AIN1" + cset "name='HDMI_OUT_MUX' Connect" + cset "name='DPTX_OUT_MUX' Connect" ++ # we need to enable all devices before starting PA. ++ # In our driver we use PCM, which means that we have ++ # to route Front End to a BackEnd and then only we can ++ # open a device. Without linking to BE it will fail. + cset "name='O176 I070 Switch' on" + cset "name='O177 I071 Switch' on" +- cset "name='O034 I168 Switch' on" +- cset "name='O035 I169 Switch' on" +- cset "name='O036 I012 Switch' on" +- cset "name='O037 I013 Switch' on" + cset "name='O072 I022 Switch' on" + cset "name='O073 I023 Switch' on" + cset "name='O074 I024 Switch' on" +@@ -30,6 +30,10 @@ BootSequence [ + cset "name='O077 I027 Switch' on" + cset "name='O078 I028 Switch' on" + cset "name='O079 I029 Switch' on" ++ cset "name='O034 I168 Switch' on" ++ cset "name='O035 I169 Switch' on" ++ cset "name='O036 I012 Switch' on" ++ cset "name='O037 I013 Switch' on" + cset "name='O002 I004 Switch' on" + cset "name='O003 I005 Switch' on" + cset "name='O004 I006 Switch' on" +@@ -38,26 +42,4 @@ BootSequence [ + cset "name='O007 I009 Switch' on" + cset "name='O008 I010 Switch' on" + cset "name='O009 I011 Switch' on" +- cset "name='O176 I070 Switch' off" +- cset "name='O177 I071 Switch' off" +- cset "name='O034 I168 Switch' off" +- cset "name='O035 I169 Switch' off" +- cset "name='O036 I012 Switch' off" +- cset "name='O037 I013 Switch' off" +- cset "name='O072 I022 Switch' off" +- cset "name='O073 I023 Switch' off" +- cset "name='O074 I024 Switch' off" +- cset "name='O075 I025 Switch' off" +- cset "name='O076 I026 Switch' off" +- cset "name='O077 I027 Switch' off" +- cset "name='O078 I028 Switch' off" +- cset "name='O079 I029 Switch' off" +- cset "name='O002 I004 Switch' off" +- cset "name='O003 I005 Switch' off" +- cset "name='O004 I006 Switch' off" +- cset "name='O005 I007 Switch' off" +- cset "name='O006 I008 Switch' off" +- cset "name='O007 I009 Switch' off" +- cset "name='O008 I010 Switch' off" +- cset "name='O009 I011 Switch' off" + ] +-- +2.39.0 + + +From 5c865236e8de9fd75c741892fd3bd2cff62d4f3f Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 22 Nov 2022 09:54:22 +0100 +Subject: [PATCH 11/21] USB-Audio: the environment variable UCM_USB_PERIOD_TIME + may be undefined + +Fixes: 71ff24c ("USB-Audio: allow to configure period size for PCM split") +BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/240 +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/USB-Audio.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index fdc29ec..1c11da9 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -7,7 +7,7 @@ Define.SplitPCMPeriodTime 10000 # 10ms + If.env1 { + Condition { + Type String +- Empty "${env:UCM_USB_PERIOD_TIME}" ++ Empty "$${env:UCM_USB_PERIOD_TIME}" + } + False.Define.SplitPCMPeriodTime "${env:UCM_USB_PERIOD_TIME}" + } +-- +2.39.0 + + +From 01e37f4fb7aab57e3f0051d81f5f6e5b2f15c831 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 21 Nov 2022 10:16:57 +0100 +Subject: [PATCH 12/21] HDA: DualCodecs - handle S/PDIF without analog + connections + +When no analog wires are connected, the S/PDIF output cannot be +selected in pipewire. Handle this for motherboards without Speaker +UCM device. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/239 +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/DualCodecs/HiFi.conf | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/ucm2/HDA/DualCodecs/HiFi.conf b/ucm2/HDA/DualCodecs/HiFi.conf +index 10c9162..8c0f403 100644 +--- a/ucm2/HDA/DualCodecs/HiFi.conf ++++ b/ucm2/HDA/DualCodecs/HiFi.conf +@@ -66,13 +66,20 @@ SectionDevice."Line1" { + } + True.Value.PlaybackMixerElem "Front" + } +- If.1 { ++ # make S/PDIF output working when no analog jacks are connected ++ If.speaker { + Condition { + Type ControlExists +- Control "iface=CARD,name='Line Out Front Jack'" ++ Control "name='Speaker Playback Switch'" ++ } ++ True.If.1 { ++ Condition { ++ Type ControlExists ++ Control "iface=CARD,name='Line Out Front Jack'" ++ } ++ True.Value.JackControl "Line Out Front Jack" ++ False.Value.JackControl "Line Out Jack" + } +- True.Value.JackControl "Line Out Front Jack" +- False.Value.JackControl "Line Out Jack" + } + } + +-- +2.39.0 + + +From 79a8ec44d3dcf097f4a4492c506cbcf338324175 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 10:18:04 +0100 +Subject: [PATCH 13/21] ucm2: sof-hda-dsp: Update Mic LED settings + +Users expect to turn the LED on when only internal mic is off, but +it makes sense to turn this LED when all internal inputs are off. + +This configuration may be changed when the affected applications +are updated. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2134824 +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index e6a8a15..9e85914 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -9,7 +9,17 @@ If.devdmic { + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } +- True.Define.DeviceDmic "Mic1" ++ True { ++ Define.DeviceDmic "Mic1" ++ FixedBootSequence [ ++ # ++ # users expect to turn the LED on when only internal ++ # mic is off, but it makes sense to turn this LED ++ # when all internal inputs are off ++ # ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" ++ ] ++ } + True.Define.DeviceMic "Mic2" + } + +-- +2.39.0 + + +From 9ce9ddb4a84fb467602b716575ea1d8f2bab0c39 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 15:00:35 +0100 +Subject: [PATCH 14/21] ucm2: HDA: Update Mic LED settings for ACP DMIC + +Users expect to turn the LED on when only internal mic is off, but +it makes sense to turn this LED when all internal inputs are off. + +This configuration may be changed when the affected applications +are updated. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2134824 +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 64ffe83..47dfc05 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -55,6 +55,7 @@ If.use { + cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off" + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch" ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" + ] + } + } +-- +2.39.0 + + +From 3984514b25a5b2a2a09d29ad8ddbc1ad78c6a1e4 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 15:48:05 +0100 +Subject: [PATCH 15/21] ucm2: sof-hda-dsp - If.devdmic cleanup + +Simplify the If.devdmic block. + +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index 9e85914..7ef4f24 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -11,6 +11,7 @@ If.devdmic { + } + True { + Define.DeviceDmic "Mic1" ++ Define.DeviceMic "Mic2" + FixedBootSequence [ + # + # users expect to turn the LED on when only internal +@@ -20,7 +21,6 @@ If.devdmic { + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" + ] + } +- True.Define.DeviceMic "Mic2" + } + + SectionUseCase."HiFi" { +-- +2.39.0 + + +From e395d7b743584cba60876b6356fb3bc7834992aa Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 26 Dec 2022 09:20:51 +0100 +Subject: [PATCH 16/21] sof-soundwire: set PGA capture switch for rt715 mic in + BootSequence + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/255 +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-soundwire/sof-soundwire.conf | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf +index 03df16c..bdc48ff 100644 +--- a/ucm2/sof-soundwire/sof-soundwire.conf ++++ b/ucm2/sof-soundwire/sof-soundwire.conf +@@ -61,3 +61,14 @@ If.mic_init { + } + True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" + } ++ ++If.mic_init_rt715 { ++ Condition { ++ Type String ++ Needle "rt715" ++ Haystack "${var:MicCodec1}" ++ } ++ True.BootSequence [ ++ cset "name='PGA5.0 5 Master Capture Switch' 1" ++ ] ++} +-- +2.39.0 + + +From c0b9d6fb207d533d348942e02ecdc57984eb5fc3 Mon Sep 17 00:00:00 2001 +From: Kai-Chuan Hsieh +Date: Mon, 26 Dec 2022 10:24:20 +0800 +Subject: [PATCH 17/21] sof-hda-dsp: Set Dmic0 Capture Switch on + +Internal micrphone default is off after fresh installation. +Add operation to set the control on to align with other architecture. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/259 +Signed-off-by: Kai-Chuan Hsieh +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index 7ef4f24..6887938 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -83,6 +83,7 @@ If.dmic { + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" ++ cset "name='Dmic0 Capture Switch' on" + ] + } + } +-- +2.39.0 + + +From 1923bd19c0bef947c085e2941dd8ed2d1310731e Mon Sep 17 00:00:00 2001 +From: 13r0ck +Date: Mon, 19 Dec 2022 18:08:38 -0700 +Subject: [PATCH 18/21] USB-Audio: alc4080 - add MSI MAG B650I Edge WiFi (ID + 0db0:36e7) + +This motherboard is recognized as the thelio-r3 by System76 + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/254 +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/USB-Audio.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index 1c11da9..6e48f98 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -53,6 +53,7 @@ If.realtek-alc4080 { + # 0db0:005a MSI MPG Z690 CARBON WIFI + # 0db0:151f MSI X570S EDGE MAX WIFI + # 0db0:1feb MSI Edge Wifi Z690 ++ # 0db0:36e7 MSI MAG B650I Edge WiFi + # 0db0:419c MSI MPG X570S Carbon Max Wifi + # 0db0:6cc9 MSI MPG Z590 Gaming Plus + # 0db0:82c7 MSI MEG Z690I Unify +@@ -60,7 +61,7 @@ If.realtek-alc4080 { + # 0db0:a47c MSI MEG X570S Ace Max + # 0db0:b202 MSI MAG Z690 Tomahawk Wifi + # 0db0:d6e7 MSI MPG X670E Carbon Wifi +- Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|419c|6cc9|82c7|a073|a47c|b202|d6e7)))" ++ Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))" + } + True.Define.ProfileName "Realtek/ALC4080" + } +-- +2.39.0 + + +From fea43c9342dd32ab93fa71b419abb97778def5c9 Mon Sep 17 00:00:00 2001 +From: Samuel Williams +Date: Sun, 11 Dec 2022 18:30:40 +1300 +Subject: [PATCH 19/21] USB-Audio: ALC4080 - Add support for ASUS ROG Crosshair + X670 Extreme (ID 0b05:1a53) + +- Confirmed working. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/249 +Signed-off-by: Samuel Williams +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/USB-Audio.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index 6e48f98..041db9d 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -50,6 +50,7 @@ If.realtek-alc4080 { + # 0b05:1a20 ASUS ROG STRIX Z690-I Gaming Wifi + # 0b05:1a27 ALC4082 on ASUS ROG Maximus Z690 Hero + # 0b05:1a52 ASUS ROG Strix Z790-E Gaming Wifi ++ # 0b05:1a53 ALC4082 on ASUS ROG Crosshair X670E Extreme + # 0db0:005a MSI MPG Z690 CARBON WIFI + # 0db0:151f MSI X570S EDGE MAX WIFI + # 0db0:1feb MSI Edge Wifi Z690 +@@ -61,7 +62,7 @@ If.realtek-alc4080 { + # 0db0:a47c MSI MEG X570S Ace Max + # 0db0:b202 MSI MAG Z690 Tomahawk Wifi + # 0db0:d6e7 MSI MPG X670E Carbon Wifi +- Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|52)))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))" ++ Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))" + } + True.Define.ProfileName "Realtek/ALC4080" + } +-- +2.39.0 + + +From 12db78292676441dfea39c2d0e5db448ec740e2a Mon Sep 17 00:00:00 2001 +From: Adrian Rudnik +Date: Thu, 8 Dec 2022 00:49:13 +0100 +Subject: [PATCH 20/21] ucm2: alc4080 - add support for MSI PRO Z790-A WIFI (ID + 0db0:d1d7) + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/248 +Signed-off-by: Adrian Rudnik +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/USB-Audio.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index 041db9d..da9acd0 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -61,8 +61,9 @@ If.realtek-alc4080 { + # 0db0:a073 MSI MAG X570S Torpedo Max + # 0db0:a47c MSI MEG X570S Ace Max + # 0db0:b202 MSI MAG Z690 Tomahawk Wifi ++ # 0db0:d1d7 MSI PRO Z790-A WIFI + # 0db0:d6e7 MSI MPG X670E Carbon Wifi +- Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d6e7)))" ++ Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d1d7|d6e7)))" + } + True.Define.ProfileName "Realtek/ALC4080" + } +-- +2.39.0 + + +From d771df0333e70cd474389bade0f52a804de7b5ea Mon Sep 17 00:00:00 2001 +From: 13r0ck +Date: Tue, 22 Nov 2022 15:40:50 -0700 +Subject: [PATCH 21/21] Add: 0b05:1999 ASUS ROG Strix Z590-A Gaming WiFi + +This model is recognized as a thelio-mira-b1 by system76 + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/247/ +Signed-off-by: Jaroslav Kysela +--- + ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf | 13 +++++++++++++ + ucm2/USB-Audio/USB-Audio.conf | 3 ++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf +index fa8d445..868e267 100644 +--- a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf ++++ b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf +@@ -100,6 +100,19 @@ If.msi-meg-unify { + } + } + ++If.asus-rog-strix { ++ Condition { ++ Type RegexMatch ++ String "${CardComponents}" ++ Regex "USB(0b05:1999)" ++ } ++ True.Define { ++ Line1PCM "hw:${CardId},3" ++ HeadphonesName "" ++ SpdifName "" ++ } ++} ++ + SectionVerb { + EnableSequence [ + disdevall "" +diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf +index da9acd0..2a27b89 100644 +--- a/ucm2/USB-Audio/USB-Audio.conf ++++ b/ucm2/USB-Audio/USB-Audio.conf +@@ -46,6 +46,7 @@ If.realtek-alc4080 { + String "${CardComponents}" + # 0414:a00e Gigabyte Z590 Aorus Pro AX + # 0b05:1996 ASUS on multiple boards (including ASUS ROG Maximus XIII) ++ # 0b05:1999 ASUS ROG Strix Z590-A Gaming WiFi + # 0b05:1a16 ASUS ROG Strix B660-F Gaming WiFi + # 0b05:1a20 ASUS ROG STRIX Z690-I Gaming Wifi + # 0b05:1a27 ALC4082 on ASUS ROG Maximus Z690 Hero +@@ -63,7 +64,7 @@ If.realtek-alc4080 { + # 0db0:b202 MSI MAG Z690 Tomahawk Wifi + # 0db0:d1d7 MSI PRO Z790-A WIFI + # 0db0:d6e7 MSI MPG X670E Carbon Wifi +- Regex "USB((0414:a00e)|(0b05:(1996|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d1d7|d6e7)))" ++ Regex "USB((0414:a00e)|(0b05:(199[69]|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|36e7|419c|6cc9|82c7|a073|a47c|b202|d1d7|d6e7)))" + } + True.Define.ProfileName "Realtek/ALC4080" + } +-- +2.39.0 + diff --git a/SPECS/alsa-lib.spec b/SPECS/alsa-lib.spec index 76adc68..6301df0 100644 --- a/SPECS/alsa-lib.spec +++ b/SPECS/alsa-lib.spec @@ -2,21 +2,27 @@ #define prever_dot .rc3 #define postver a -%define version_alsa_lib 1.2.7.2 -%define version_alsa_ucm 1.2.7.2 +%define version_alsa_lib 1.2.8 +%define version_alsa_ucm 1.2.8 %define version_alsa_tplg 1.2.5 +%if 0%{?rhel} +%global _without_topology 1 +%endif + Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} -Release: 1%{?prever_dot}%{?dist} +Release: 2%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2 +%if 0%{!?_without_topology:1} Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2 +%endif Source10: asound.conf Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf @@ -61,16 +67,20 @@ Requires: %{name} >= %{version_alsa_lib} The Advanced Linux Sound Architecture (ALSA) Universal Configuration Manager allows configuration of Audio input/output names and routing +%if 0%{!?_without_topology:1} %package -n alsa-topology Summary: ALSA Topology configuration Group: System Environment/Libraries BuildArch: noarch License: BSD Requires: %{name} >= %{version_alsa_lib} +%endif +%if 0%{!?_without_topology:1} %description -n alsa-topology The Advanced Linux Sound Architecture (ALSA) topology configuration contains alsa-lib configuration of SoC topology +%endif %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} @@ -116,7 +126,9 @@ patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE20} mkdir -p %{buildroot}/%{_datadir}/alsa/topology # Unpack topologies +%if 0%{!?_without_topology:1} tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/topology" +%endif # Remove libtool archives. find %{buildroot} -name '*.la' -delete @@ -158,11 +170,17 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/ucm %{_datadir}/alsa/ucm2 +%if 0%{!?_without_topology:1} %files -n alsa-topology # BSD %{_datadir}/alsa/topology +%endif %changelog +* Thu Jan 5 2023 Jaroslav Kysela - 1.2.8-2 +- update to alsa-lib 1.2.8 and alsa-ucm-conf 1.2.8 +- remove alsa-topology package for rhel + * Fri Jul 8 2022 Jaroslav Kysela - 1.2.7.2-1 - Updated to 1.2.7.2