From 1b436862ed6253629d79edc2e09826efd4e0f4e3 Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

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 <tiwai@suse.de>

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 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 <perex@perex.cz>

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 <shengjiu.wang@nxp.com>

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 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 <perex@perex.cz>

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 <perex@perex.cz>

---

 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 <perex@perex.cz>

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 <perex@perex.cz>

---

 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 <perex@perex.cz>

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 <perex@perex.cz>

---

 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 <perex@perex.cz>

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 <perex@perex.cz>

---

 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 <liam.r.girdwood@linux.intel.com>

 */

+#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 <perex@perex.cz>

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 <perex@perex.cz>

---

 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 <perex@perex.cz>

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 <perex@perex.cz>

---

 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 <sched.h>

 #include <errno.h>

 #include <getopt.h>

+#include <time.h>

 #include "../include/asoundlib.h"

 #include <sys/time.h>

 #include <math.h>

+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:");