June 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: mt6797-mt6351: Fix refcount leak in mt6797_mt6351_dev_probe
by Miaoqian Lin 03 Jun '22

03 Jun '22

of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak. Fixes: f0ab0bf250da ("ASoC: add mt6797-mt6351 driver and config option") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- changes in v2: - update Fixes tag v1 link: https://lore.kernel.org/r/20220603083417.9011-1-linmq006@gmail.com/ --- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c index 496f32bcfb5e..d2f6213a6bfc 100644 --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c @@ -217,7 +217,8 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev) if (!codec_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - return -EINVAL; + ret = -EINVAL; + goto put_platform_node; } for_each_card_prelinks(card, i, dai_link) { if (dai_link->codecs->name) @@ -230,6 +231,9 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", __func__, ret); + of_node_put(codec_node); +put_platform_node: + of_node_put(platform_node); return ret; } -- 2.25.1

1 0

[PATCH 0/6] Fixup Cirrus SX control usage
by Charles Keepax 03 Jun '22

03 Jun '22

Mostly the usage of the SX controls seems to match the lowest gain value + number of gain levels expected. The one notable exception there being cs53l30 as David noted. However, there are a couple of other places where the minimum value/TLVs are slightly incorrectly specified. There are two I couldn't quite work out yet, any input on these greatly appreciated: SOC_DOUBLE_R_SX_TLV("Speaker Volume", CS42L52_SPKA_VOL, CS42L52_SPKB_VOL, 0, 0x40, 0xC0, hl_tlv), 0.5dB step 0x40 - -96dB 0x00 - 0dB This one is weird, the datasheet says 0x40 is the minimum, which matches, but the datasheet also says 0.5dB steps to 0x00 being 0dB which doesn't match with 0x40 being the minimum, or 0xC0 being the number of levels. Some clarification will needed from the hardware guys. SOC_SINGLE_SX_TLV("Beep Volume", CS42L56_BEEP_FREQ_OFFTIME, 0, 0x07, 0x23, beep_tlv), 2dB step 0x07 - -50dB 0x00 - 0dB 0x06 - +6dB The minimum checks out at 0x07, but rest of this is weird. The values in the datasheet don't make sense, based on starting at -50dB with a 2dB step, 0x06 should equate to 12dB, over 31 volume levels, not 6dB over 35 volume levels as stated. The control specifies 0x23(35) levels, which takes us up to a final value of 0x0A at 20dB. Again some clarification from the hardware guys might be needed here. Finally it is worth noting I don't actually have hardware for most of these devices, so mostly this is just build tested. Thanks, Charles Charles Keepax (6): ASoC: cs42l52: Fix TLV scales for mixer controls ASoC: cs35l36: Update digital volume TLV ASoC: cs53l30: Correct number of volume levels on SX controls ASoC: cs42l52: Correct TLV for Bypass Volume ASoC: cs42l56: Correct typo in minimum level for SX volume controls ASoC: cs42l51: Correct minimum value for SX volume control sound/soc/codecs/cs35l36.c | 3 ++- sound/soc/codecs/cs42l51.c | 2 +- sound/soc/codecs/cs42l52.c | 8 +++++--- sound/soc/codecs/cs42l56.c | 4 ++-- sound/soc/codecs/cs53l30.c | 16 ++++++++-------- 5 files changed, 18 insertions(+), 15 deletions(-) -- 2.30.2

2 7

[PATCH v2] ASoC: Intel: cirrus-common: fix incorrect channel mapping
by Brent Lu 03 Jun '22

03 Jun '22

From: xliu <xiang.liu(a)cirrus.com> The default mapping of ASPRX1 (DAC source) is slot 0. Change the slot mapping of right amplifiers (WR and TR) to slot 1 to receive right channel data. Also update the ACPI instance ID mapping according to HW configuration. Signed-off-by: xliu <xiang.liu(a)cirrus.com> Signed-off-by: Brent Lu <brent.lu(a)intel.com> --- sound/soc/intel/boards/sof_cirrus_common.c | 40 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/sof_cirrus_common.c b/sound/soc/intel/boards/sof_cirrus_common.c index e71d74ec1b0b..f4192df962d6 100644 --- a/sound/soc/intel/boards/sof_cirrus_common.c +++ b/sound/soc/intel/boards/sof_cirrus_common.c @@ -54,22 +54,29 @@ static struct snd_soc_dai_link_component cs35l41_components[] = { }, }; +/* + * Mapping between ACPI instance id and speaker position. + * + * Four speakers: + * 0: Tweeter left, 1: Woofer left + * 2: Tweeter right, 3: Woofer right + */ static struct snd_soc_codec_conf cs35l41_codec_conf[] = { { .dlc = COMP_CODEC_CONF(CS35L41_DEV0_NAME), - .name_prefix = "WL", + .name_prefix = "TL", }, { .dlc = COMP_CODEC_CONF(CS35L41_DEV1_NAME), - .name_prefix = "WR", + .name_prefix = "WL", }, { .dlc = COMP_CODEC_CONF(CS35L41_DEV2_NAME), - .name_prefix = "TL", + .name_prefix = "TR", }, { .dlc = COMP_CODEC_CONF(CS35L41_DEV3_NAME), - .name_prefix = "TR", + .name_prefix = "WR", }, }; @@ -101,6 +108,21 @@ static int cs35l41_init(struct snd_soc_pcm_runtime *rtd) return ret; } +/* + * Channel map: + * + * TL/WL: ASPRX1 on slot 0, ASPRX2 on slot 1 (default) + * TR/WR: ASPRX1 on slot 1, ASPRX2 on slot 0 + */ +static const struct { + unsigned int rx[2]; +} cs35l41_channel_map[] = { + {.rx = {0, 1}}, /* TL */ + {.rx = {0, 1}}, /* WL */ + {.rx = {1, 0}}, /* TR */ + {.rx = {1, 0}}, /* WR */ +}; + static int cs35l41_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -134,6 +156,16 @@ static int cs35l41_hw_params(struct snd_pcm_substream *substream, ret); return ret; } + + /* setup channel map */ + ret = snd_soc_dai_set_channel_map(codec_dai, 0, NULL, + ARRAY_SIZE(cs35l41_channel_map[i].rx), + (unsigned int *)cs35l41_channel_map[i].rx); + if (ret < 0) { + dev_err(codec_dai->dev, "fail to set channel map, ret %d\n", + ret); + return ret; + } } return 0; -- 2.25.1

4 3

[PATCH V0 1/1] asoc: msm: use hashtable to check kcontrol
by Raghu Bankapur 03 Jun '22

03 Jun '22

use hashtable instead of linear list to check kcontrol before adding them for improving early audio KPI. With this changes we see 600ms improvement in start of audio Change-Id: I1a95d88ef41b48430b57307a0e6a8e82788b4372 Signed-off-by: Raghu Bankapur <quic_rbankapu(a)quicinc.com> --- include/sound/control.h | 2 + include/sound/core.h | 5 +- sound/core/control.c | 106 +++++++++++++++++++++++----------------- sound/core/init.c | 1 + 4 files changed, 68 insertions(+), 46 deletions(-) diff --git a/include/sound/control.h b/include/sound/control.h index 985c51a8fb74..e50db5c45114 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -70,6 +70,8 @@ struct snd_kcontrol_volatile { struct snd_kcontrol { struct list_head list; /* list of controls */ struct snd_ctl_elem_id id; + struct hlist_node hnode; + unsigned int knametoint; /* kctl name to uint, hash key value */ unsigned int count; /* count of same elements */ snd_kcontrol_info_t *info; snd_kcontrol_get_t *get; diff --git a/include/sound/core.h b/include/sound/core.h index b7e9b58d3c78..90341d6f1573 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -14,6 +14,7 @@ #include <linux/pm.h> /* pm_message_t */ #include <linux/stringify.h> #include <linux/printk.h> +#include <linux/hashtable.h> /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS @@ -24,6 +25,8 @@ #define CONFIG_SND_MAJOR 116 /* standard configuration */ +#define SND_CTL_HASH_TABLE_BITS 14 /* buckets numbers: 1 << 14 */ + /* forward declarations */ struct pci_dev; struct module; @@ -103,7 +106,7 @@ struct snd_card { size_t user_ctl_alloc_size; // current memory allocation by user controls. struct list_head controls; /* all controls for this card */ struct list_head ctl_files; /* active control files */ - + DECLARE_HASHTABLE(ctl_htable, SND_CTL_HASH_TABLE_BITS); struct snd_info_entry *proc_root; /* root for soundcard specific files */ struct proc_dir_entry *proc_root_link; /* number link to real id */ diff --git a/sound/core/control.c b/sound/core/control.c index a25c0d64d104..e00a02015837 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -331,43 +331,49 @@ void snd_ctl_free_one(struct snd_kcontrol *kcontrol) } EXPORT_SYMBOL(snd_ctl_free_one); -static bool snd_ctl_remove_numid_conflict(struct snd_card *card, - unsigned int count) +enum snd_ctl_add_mode { + CTL_ADD_EXCLUSIVE, CTL_REPLACE, CTL_ADD_ON_REPLACE, +}; + +char snd_ctl_string[50] = { '\0' }; + +/* Used to convert the string into int value -- BKDRHash */ +static unsigned int snd_ctl_strtoint(const char *s) { - struct snd_kcontrol *kctl; + unsigned int res = 0; - /* Make sure that the ids assigned to the control do not wrap around */ - if (card->last_numid >= UINT_MAX - count) - card->last_numid = 0; + while (*s) + res = (res << 5) - res + (*s++); - list_for_each_entry(kctl, &card->controls, list) { - if (kctl->id.numid < card->last_numid + 1 + count && - kctl->id.numid + kctl->count > card->last_numid + 1) { - card->last_numid = kctl->id.numid + kctl->count - 1; - return true; - } - } - return false; + return (res & 0x7FFFFFFF); } -static int snd_ctl_find_hole(struct snd_card *card, unsigned int count) +/** + * snd_ctl_hash_check - Check the duplicate enrty on snd hashtable + * @card: the card instance + * @nametoint: kctl name to uint + * + * Finds the control instance with the given nametoint from the card. + * + * Return: The pointer of the instance if found, or %NULL if not. + * + */ +static struct snd_kcontrol *snd_ctl_hash_check(struct snd_card *card, + unsigned int nametoint) { - unsigned int iter = 100000; + struct snd_kcontrol *kctl = NULL; - while (snd_ctl_remove_numid_conflict(card, count)) { - if (--iter == 0) { - /* this situation is very unlikely */ - dev_err(card->dev, "unable to allocate new control numid\n"); - return -ENOMEM; - } + if (snd_BUG_ON(!card)) + return NULL; + + hash_for_each_possible(card->ctl_htable, kctl, hnode, nametoint) { + if (kctl->knametoint != nametoint) + continue; + return kctl; } - return 0; + return NULL; } -enum snd_ctl_add_mode { - CTL_ADD_EXCLUSIVE, CTL_REPLACE, CTL_ADD_ON_REPLACE, -}; - /* add/replace a new kcontrol object; call with card->controls_rwsem locked */ static int __snd_ctl_add_replace(struct snd_card *card, struct snd_kcontrol *kcontrol, @@ -382,26 +388,34 @@ static int __snd_ctl_add_replace(struct snd_card *card, if (id.index > UINT_MAX - kcontrol->count) return -EINVAL; - old = snd_ctl_find_id(card, &id); - if (!old) { - if (mode == CTL_REPLACE) - return -EINVAL; - } else { - if (mode == CTL_ADD_EXCLUSIVE) { - dev_err(card->dev, - "control %i:%i:%i:%s:%i is already present\n", - id.iface, id.device, id.subdevice, id.name, - id.index); - return -EBUSY; - } + snprintf(snd_ctl_string, strlen(kcontrol->id.name) + 6, "%s%d%d%d", + kcontrol->id.name, kcontrol->id.iface, kcontrol->id.device, + kcontrol->id.subdevice); - err = snd_ctl_remove(card, old); - if (err < 0) - return err; - } + kcontrol->knametoint = snd_ctl_strtoint(snd_ctl_string); + if (kcontrol->knametoint < 0) + return -EINVAL; - if (snd_ctl_find_hole(card, kcontrol->count) < 0) - return -ENOMEM; + old = snd_ctl_hash_check(card, kcontrol->knametoint); + if (old) { + old = snd_ctl_find_id(card, &id); + if (!old) { + if (mode == CTL_REPLACE) + return -EINVAL; + } else { + if (mode == CTL_ADD_EXCLUSIVE) { + dev_err(card->dev, + "control %i:%i:%i:%s:%i is already present\n", + id.iface, id.device, id.subdevice, id.name, + id.index); + return -EBUSY; + } + + err = snd_ctl_remove(card, old); + if (err < 0) + return err; + } + } list_add_tail(&kcontrol->list, &card->controls); card->controls_count += kcontrol->count; @@ -411,6 +425,8 @@ static int __snd_ctl_add_replace(struct snd_card *card, for (idx = 0; idx < kcontrol->count; idx++) snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_ADD, kcontrol, idx); + hash_add(card->ctl_htable, &kcontrol->hnode, kcontrol->knametoint); + return 0; } diff --git a/sound/core/init.c b/sound/core/init.c index 31ba7024e3ad..24138902e5f2 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -284,6 +284,7 @@ static int snd_card_init(struct snd_card *card, struct device *parent, INIT_LIST_HEAD(&card->ctl_files); spin_lock_init(&card->files_lock); INIT_LIST_HEAD(&card->files_list); + hash_init(card->ctl_htable); mutex_init(&card->memory_mutex); #ifdef CONFIG_PM init_waitqueue_head(&card->power_sleep); -- 2.17.1

1 0

[PATCH V1 1/1] asoc: msm: use hashtable to check kcontrol
by Raghu Bankapur 03 Jun '22

03 Jun '22

use hashtabe instead of linear list to check kcontrol before adding them for improving early audio KPI. Change-Id: I7134816736e08e338c0f22a8ae283a0520aa847a Signed-off-by: Raghu Bankapur <quic_rbankapu(a)quicinc.com> --- include/sound/control.h | 2 + include/sound/core.h | 5 +- sound/core/control.c | 106 +++++++++++++++++++++++----------------- sound/core/init.c | 1 + 4 files changed, 68 insertions(+), 46 deletions(-) diff --git a/include/sound/control.h b/include/sound/control.h index 985c51a8fb74..e50db5c45114 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -70,6 +70,8 @@ struct snd_kcontrol_volatile { struct snd_kcontrol { struct list_head list; /* list of controls */ struct snd_ctl_elem_id id; + struct hlist_node hnode; + unsigned int knametoint; /* kctl name to uint, hash key value */ unsigned int count; /* count of same elements */ snd_kcontrol_info_t *info; snd_kcontrol_get_t *get; diff --git a/include/sound/core.h b/include/sound/core.h index b7e9b58d3c78..90341d6f1573 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -14,6 +14,7 @@ #include <linux/pm.h> /* pm_message_t */ #include <linux/stringify.h> #include <linux/printk.h> +#include <linux/hashtable.h> /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS @@ -24,6 +25,8 @@ #define CONFIG_SND_MAJOR 116 /* standard configuration */ +#define SND_CTL_HASH_TABLE_BITS 14 /* buckets numbers: 1 << 14 */ + /* forward declarations */ struct pci_dev; struct module; @@ -103,7 +106,7 @@ struct snd_card { size_t user_ctl_alloc_size; // current memory allocation by user controls. struct list_head controls; /* all controls for this card */ struct list_head ctl_files; /* active control files */ - + DECLARE_HASHTABLE(ctl_htable, SND_CTL_HASH_TABLE_BITS); struct snd_info_entry *proc_root; /* root for soundcard specific files */ struct proc_dir_entry *proc_root_link; /* number link to real id */ diff --git a/sound/core/control.c b/sound/core/control.c index a25c0d64d104..e00a02015837 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -331,43 +331,49 @@ void snd_ctl_free_one(struct snd_kcontrol *kcontrol) } EXPORT_SYMBOL(snd_ctl_free_one); -static bool snd_ctl_remove_numid_conflict(struct snd_card *card, - unsigned int count) +enum snd_ctl_add_mode { + CTL_ADD_EXCLUSIVE, CTL_REPLACE, CTL_ADD_ON_REPLACE, +}; + +char snd_ctl_string[50] = { '\0' }; + +/* Used to convert the string into int value -- BKDRHash */ +static unsigned int snd_ctl_strtoint(const char *s) { - struct snd_kcontrol *kctl; + unsigned int res = 0; - /* Make sure that the ids assigned to the control do not wrap around */ - if (card->last_numid >= UINT_MAX - count) - card->last_numid = 0; + while (*s) + res = (res << 5) - res + (*s++); - list_for_each_entry(kctl, &card->controls, list) { - if (kctl->id.numid < card->last_numid + 1 + count && - kctl->id.numid + kctl->count > card->last_numid + 1) { - card->last_numid = kctl->id.numid + kctl->count - 1; - return true; - } - } - return false; + return (res & 0x7FFFFFFF); } -static int snd_ctl_find_hole(struct snd_card *card, unsigned int count) +/** + * snd_ctl_hash_check - Check the duplicate enrty on snd hashtable + * @card: the card instance + * @nametoint: kctl name to uint + * + * Finds the control instance with the given nametoint from the card. + * + * Return: The pointer of the instance if found, or %NULL if not. + * + */ +static struct snd_kcontrol *snd_ctl_hash_check(struct snd_card *card, + unsigned int nametoint) { - unsigned int iter = 100000; + struct snd_kcontrol *kctl = NULL; - while (snd_ctl_remove_numid_conflict(card, count)) { - if (--iter == 0) { - /* this situation is very unlikely */ - dev_err(card->dev, "unable to allocate new control numid\n"); - return -ENOMEM; - } + if (snd_BUG_ON(!card)) + return NULL; + + hash_for_each_possible(card->ctl_htable, kctl, hnode, nametoint) { + if (kctl->knametoint != nametoint) + continue; + return kctl; } - return 0; + return NULL; } -enum snd_ctl_add_mode { - CTL_ADD_EXCLUSIVE, CTL_REPLACE, CTL_ADD_ON_REPLACE, -}; - /* add/replace a new kcontrol object; call with card->controls_rwsem locked */ static int __snd_ctl_add_replace(struct snd_card *card, struct snd_kcontrol *kcontrol, @@ -382,26 +388,34 @@ static int __snd_ctl_add_replace(struct snd_card *card, if (id.index > UINT_MAX - kcontrol->count) return -EINVAL; - old = snd_ctl_find_id(card, &id); - if (!old) { - if (mode == CTL_REPLACE) - return -EINVAL; - } else { - if (mode == CTL_ADD_EXCLUSIVE) { - dev_err(card->dev, - "control %i:%i:%i:%s:%i is already present\n", - id.iface, id.device, id.subdevice, id.name, - id.index); - return -EBUSY; - } + snprintf(snd_ctl_string, strlen(kcontrol->id.name) + 6, "%s%d%d%d", + kcontrol->id.name, kcontrol->id.iface, kcontrol->id.device, + kcontrol->id.subdevice); - err = snd_ctl_remove(card, old); - if (err < 0) - return err; - } + kcontrol->knametoint = snd_ctl_strtoint(snd_ctl_string); + if (kcontrol->knametoint < 0) + return -EINVAL; - if (snd_ctl_find_hole(card, kcontrol->count) < 0) - return -ENOMEM; + old = snd_ctl_hash_check(card, kcontrol->knametoint); + if (old) { + old = snd_ctl_find_id(card, &id); + if (!old) { + if (mode == CTL_REPLACE) + return -EINVAL; + } else { + if (mode == CTL_ADD_EXCLUSIVE) { + dev_err(card->dev, + "control %i:%i:%i:%s:%i is already present\n", + id.iface, id.device, id.subdevice, id.name, + id.index); + return -EBUSY; + } + + err = snd_ctl_remove(card, old); + if (err < 0) + return err; + } + } list_add_tail(&kcontrol->list, &card->controls); card->controls_count += kcontrol->count; @@ -411,6 +425,8 @@ static int __snd_ctl_add_replace(struct snd_card *card, for (idx = 0; idx < kcontrol->count; idx++) snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_ADD, kcontrol, idx); + hash_add(card->ctl_htable, &kcontrol->hnode, kcontrol->knametoint); + return 0; } diff --git a/sound/core/init.c b/sound/core/init.c index 31ba7024e3ad..24138902e5f2 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -284,6 +284,7 @@ static int snd_card_init(struct snd_card *card, struct device *parent, INIT_LIST_HEAD(&card->ctl_files); spin_lock_init(&card->files_lock); INIT_LIST_HEAD(&card->files_list); + hash_init(card->ctl_htable); mutex_init(&card->memory_mutex); #ifdef CONFIG_PM init_waitqueue_head(&card->power_sleep); -- 2.17.1

2 1

[PATCH] ASoC: mediatek: mt8173-rt5650: Fix refcount leak in mt8173_rt5650_dev_probe
by Miaoqian Lin 03 Jun '22

03 Jun '22

of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Fix refcount leak in some error paths. Fixes: format:0f83f9296d5c ("ASoC: mediatek: Add machine driver for ALC5650 codec") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index d1c94acb4516..e05f2b0231fe 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -280,7 +280,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - return -EINVAL; + ret = -EINVAL; + goto put_platform_node; } mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node = mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node; @@ -293,7 +294,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "%s codec_capture_dai name fail %d\n", __func__, ret); - return ret; + goto put_platform_node; } mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].dai_name = codec_capture_dai; @@ -315,12 +316,14 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_dais[DAI_LINK_HDMI_I2S].codecs->of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - return -EINVAL; + ret = -EINVAL; + goto put_platform_node; } card->dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, card); +put_platform_node: of_node_put(platform_node); return ret; } -- 2.25.1

1 0

[bug report] ASoC: SOF: ipc-msg-injector: Separate the message sending
by Dan Carpenter 03 Jun '22

03 Jun '22

Hello Peter Ujfalusi, The patch a9aa3381e404: "ASoC: SOF: ipc-msg-injector: Separate the message sending" from May 6, 2022, leads to the following Smatch static checker warning: sound/soc/sof/sof-client-ipc-msg-injector.c:162 sof_msg_inject_dfs_write() warn: kernel error codes cast to unsigned 'size' sound/soc/sof/sof-client-ipc-msg-injector.c 148 static ssize_t sof_msg_inject_dfs_write(struct file *file, const char __user *buffer, 149 size_t count, loff_t *ppos) 150 { 151 struct sof_client_dev *cdev = file->private_data; 152 struct sof_msg_inject_priv *priv = cdev->data; 153 size_t size; 154 int ret; 155 156 if (*ppos) 157 return 0; I think there needs to be an "if (count != priv->max_msg_size)" check or something. Or another option would be the do a memset() memset(priv->tx_buffer, 0, priv->max_msg_size); before the simple_write_to_buffer(). Otherwise if count == 1 then we re-use stale data. 158 159 size = simple_write_to_buffer(priv->tx_buffer, priv->max_msg_size, 160 ppos, buffer, count); 161 if (size != count) --> 162 return size > 0 ? -EFAULT : size; 163 164 memset(priv->rx_buffer, 0, priv->max_msg_size); 165 166 ret = sof_msg_inject_send_message(cdev); 167 168 /* return the error code if test failed */ 169 if (ret < 0) 170 size = ret; 171 172 return size; 173 }; regards, dan carpenter

2 1

Issues with ALSA after update to Pop!_OS 22.04 LTS Jaunty Pipewire
by Mikhail Kravchenko 03 Jun '22

03 Jun '22

I updated the operating system running on my machine to 22.04 Jaunty. This update brings the system over to pipe-wire. After running certain programs that utilize alsa, the audio on my system becomes intermittent and runs only one application's audio at a time. Resetting the pipe-wire services and forcing alsa to reload its modules does not reliably mitigate the issue. This is the url generated by alsa-info. http://alsa-project.org/db/?f=4d643a3153ffabd5c72313e8ffa3c9f393e676ef On a power cycle, the audio seems to work fine, but as soon as I run the problematic program I get the output: ALSA lib pcm_dmix.c:1032:(snd_pcm_dmix_open) unable to open slave If the program's audio is successful, and it opens the slave. Audio to other applications is upset. sudo alsa force-reload Unloading ALSA sound driver modules: snd-seq-dummy snd-seq-midi snd-seq-midi-event snd-hda-codec-realtek snd-hda-codec-generic snd-hda-codec-hdmi snd-hda-intel snd-intel-dspcfg snd-intel-sdw-acpi snd-hda-codec snd-hda-core snd-hrtimer snd-usb-audio snd-usbmidi-lib snd-hwdep snd-rawmidi snd-seq snd-pcm snd-seq-device snd-timer (failed: modules still loaded: snd-hda-codec-realtek snd-hda-codec-generic snd-hda-codec-hdmi snd-hda-intel snd-intel-dspcfg snd-intel-sdw-acpi snd-hda-codec snd-hda-core snd-hrtimer snd-usb-audio snd-usbmidi-lib snd-hwdep snd-rawmidi snd-seq snd-pcm snd-seq-device snd-timer). Loading ALSA sound driver modules: snd-seq-dummy snd-seq-midi snd-seq-midi-event snd-hda-codec-realtek snd-hda-codec-generic snd-hda-codec-hdmi snd-hda-intel snd-intel-dspcfg snd-intel-sdw-acpi snd-hda-codec snd-hda-core snd-hrtimer snd-usb-audio snd-usbmidi-lib snd-hwdep snd-rawmidi snd-seq snd-pcm snd-seq-device snd-timer. MK

1 0

USB-Audio: Steinberg UR44 not getting expected results
by GitHub issues - opened 02 Jun '22

02 Jun '22

alsa-project/alsa-ucm-conf issue #163 was opened from CameronNemo: I am testing the following software: * alsa-lib: 1.2.7 * alsa-utils: 1.2.7 * alsa-ucm-conf: 1.2.7 Unfortunately the changes for the Steinberg UR44 do not seem to be working as intended. I am not seeing the expected mono inputs and stereo outputs that I see defined in `/usr/share/alsa/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf`. I am seeing the following from `aplay -L`: ``` null Discard all samples (playback) or generate zero samples (capture) default Default Audio Device sysdefault Default Audio Device default:CARD=UR44 Steinberg UR44, USB Audio Default Audio Device sysdefault:CARD=UR44 Steinberg UR44, USB Audio Default Audio Device front:CARD=UR44,DEV=0 Steinberg UR44, USB Audio Front output / input surround21:CARD=UR44,DEV=0 Steinberg UR44, USB Audio 2.1 Surround output to Front and Subwoofer speakers surround40:CARD=UR44,DEV=0 Steinberg UR44, USB Audio 4.0 Surround output to Front and Rear speakers surround41:CARD=UR44,DEV=0 Steinberg UR44, USB Audio 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=UR44,DEV=0 Steinberg UR44, USB Audio 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=UR44,DEV=0 Steinberg UR44, USB Audio 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=UR44,DEV=0 Steinberg UR44, USB Audio 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers ``` And the following from `arecord -L`: ``` null Discard all samples (playback) or generate zero samples (capture) default Default Audio Device sysdefault Default Audio Device default:CARD=UR44 Steinberg UR44, USB Audio Default Audio Device sysdefault:CARD=UR44 Steinberg UR44, USB Audio Default Audio Device front:CARD=UR44,DEV=0 Steinberg UR44, USB Audio Front output / input ``` `spa-acp-tool list`: ``` card 0: profiles:2 devices:2 ports:2 profile 0: name:"off" prio:0 (available: yes) * profile 1: name:"Direct" prio:1 (available: unknown) * port 0: name:"[Out] Direct" direction:playback prio:1000 (available: unknown) * port 1: name:"[In] Direct" direction:capture prio:1000 (available: unknown) * device 0: direction:playback name:"Direct: hw:UR44: sink" prio:1000 flags:00000009 devices: "hw:UR44" * device 1: direction:capture name:"Direct: hw:UR44: source" prio:1000 flags:00000009 devices: "hw:UR44" ``` `pactl list sources`: ``` Source #56 State: SUSPENDED Name: alsa_output.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__sink.monitor Description: Monitor of Steinberg UR44 Direct Steinberg UR44 Driver: PipeWire Sample Specification: s24le 4ch 48000Hz Channel Map: front-left,front-right,rear-left,rear-right Owner Module: 4294967295 Mute: no Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB, rear-left: 65536 / 100% / 0.00 dB, rear-right: 65536 / 100% / 0.00 dB balance 0.00 Base Volume: 65536 / 100% / 0.00 dB Monitor of Sink: alsa_output.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__sink Latency: 0 usec, configured 0 usec Flags: HARDWARE DECIBEL_VOLUME LATENCY Properties: object.path = "alsa:pcm:0:hw:UR44:playback" api.alsa.path = "hw:UR44" api.alsa.open.ucm = "true" api.alsa.pcm.card = "0" api.alsa.pcm.stream = "playback" audio.channels = "4" audio.position = "FL,FR,RL,RR" device.routes = "1" alsa.mixer_device = "_ucm0003.hw:UR44" alsa.resolution_bits = "24" device.api = "alsa" device.class = "monitor" alsa.class = "generic" alsa.subclass = "generic-mix" alsa.name = "USB Audio" alsa.id = "USB Audio" alsa.subdevice = "0" alsa.subdevice_name = "subdevice #0" alsa.device = "0" alsa.card = "0" alsa.card_name = "Steinberg UR44" alsa.long_card_name = "Yamaha Corporation Steinberg UR44 at usb-0000:04:00.4-1, high speed" alsa.driver_name = "snd_usb_audio" device.profile.name = "Direct: hw:UR44: sink" device.profile.description = "Direct Steinberg UR44" card.profile.device = "0" device.id = "54" factory.name = "api.alsa.pcm.sink" priority.driver = "1000" priority.session = "1000" media.class = "Audio/Sink" node.nick = "Steinberg UR44" node.name = "alsa_output.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__sink" device.description = "Steinberg UR44 Direct Steinberg UR44" device.icon_name = "audio-card" device.bus = "usb" device.bus_path = "pci-0000:04:00.4-usb-0:1:1.0" node.pause-on-idle = "false" factory.id = "18" client.id = "34" clock.quantum-limit = "8192" node.driver = "true" factory.mode = "merge" audio.adapt.follower = "" library.name = "audioconvert/libspa-audioconvert" object.id = "56" object.serial = "56" Formats: pcm Source #57 State: SUSPENDED Name: alsa_input.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__source Description: Steinberg UR44 Direct Steinberg UR44 Driver: PipeWire Sample Specification: s24le 6ch 48000Hz Channel Map: front-left,front-right,rear-left,rear-right,front-center,lfe Owner Module: 4294967295 Mute: no Volume: front-left: 48287 / 74% / -7.96 dB, front-right: 48287 / 74% / -7.96 dB, rear-left: 48287 / 74% / -7.96 dB, rear-right: 48287 / 74% / -7.96 dB, front-center: 48287 / 74% / -7.96 dB, lfe: 48287 / 74% / -7.96 dB balance 0.00 Base Volume: 65536 / 100% / 0.00 dB Monitor of Sink: n/a Latency: 0 usec, configured 0 usec Flags: HARDWARE DECIBEL_VOLUME LATENCY Properties: object.path = "alsa:pcm:0:hw:UR44:capture" api.alsa.path = "hw:UR44" api.alsa.open.ucm = "true" api.alsa.pcm.card = "0" api.alsa.pcm.stream = "capture" audio.channels = "6" audio.position = "FL,FR,RL,RR,FC,LFE" device.routes = "1" alsa.mixer_device = "_ucm0003.hw:UR44" alsa.resolution_bits = "24" device.api = "alsa" device.class = "sound" alsa.class = "generic" alsa.subclass = "generic-mix" alsa.name = "USB Audio" alsa.id = "USB Audio" alsa.subdevice = "0" alsa.subdevice_name = "subdevice #0" alsa.device = "0" alsa.card = "0" alsa.card_name = "Steinberg UR44" alsa.long_card_name = "Yamaha Corporation Steinberg UR44 at usb-0000:04:00.4-1, high speed" alsa.driver_name = "snd_usb_audio" device.profile.name = "Direct: hw:UR44: source" device.profile.description = "Direct Steinberg UR44" card.profile.device = "1" device.id = "54" factory.name = "api.alsa.pcm.source" priority.driver = "2000" priority.session = "2000" media.class = "Audio/Source" node.nick = "Steinberg UR44" node.name = "alsa_input.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__source" device.description = "Steinberg UR44 Direct Steinberg UR44" device.icon_name = "audio-input-microphone" device.bus = "usb" device.bus_path = "pci-0000:04:00.4-usb-0:1:1.0" node.pause-on-idle = "false" factory.id = "18" client.id = "34" clock.quantum-limit = "8192" node.driver = "true" factory.mode = "split" audio.adapt.follower = "" library.name = "audioconvert/libspa-audioconvert" object.id = "57" object.serial = "57" Ports: [In] Direct: Direct Steinberg UR44 (type: Unknown, priority: 1000, availability unknown) Active Port: [In] Direct Formats: pcm ``` `pactl list sinks`: ``` Sink #56 State: SUSPENDED Name: alsa_output.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__sink Description: Steinberg UR44 Direct Steinberg UR44 Driver: PipeWire Sample Specification: s24le 4ch 48000Hz Channel Map: front-left,front-right,rear-left,rear-right Owner Module: 4294967295 Mute: no Volume: front-left: 48287 / 74% / -7.96 dB, front-right: 48287 / 74% / -7.96 dB, rear-left: 48287 / 74% / -7.96 dB, rear-right: 48287 / 74% / -7.96 dB balance 0.00 Base Volume: 65536 / 100% / 0.00 dB Monitor Source: alsa_output.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__sink.monitor Latency: 0 usec, configured 0 usec Flags: HARDWARE DECIBEL_VOLUME LATENCY Properties: object.path = "alsa:pcm:0:hw:UR44:playback" api.alsa.path = "hw:UR44" api.alsa.open.ucm = "true" api.alsa.pcm.card = "0" api.alsa.pcm.stream = "playback" audio.channels = "4" audio.position = "FL,FR,RL,RR" device.routes = "1" alsa.mixer_device = "_ucm0003.hw:UR44" alsa.resolution_bits = "24" device.api = "alsa" device.class = "sound" alsa.class = "generic" alsa.subclass = "generic-mix" alsa.name = "USB Audio" alsa.id = "USB Audio" alsa.subdevice = "0" alsa.subdevice_name = "subdevice #0" alsa.device = "0" alsa.card = "0" alsa.card_name = "Steinberg UR44" alsa.long_card_name = "Yamaha Corporation Steinberg UR44 at usb-0000:04:00.4-1, high speed" alsa.driver_name = "snd_usb_audio" device.profile.name = "Direct: hw:UR44: sink" device.profile.description = "Direct Steinberg UR44" card.profile.device = "0" device.id = "54" factory.name = "api.alsa.pcm.sink" priority.driver = "1000" priority.session = "1000" media.class = "Audio/Sink" node.nick = "Steinberg UR44" node.name = "alsa_output.usb-Yamaha_Corporation_Steinberg_UR44-00.Direct__hw_UR44__sink" device.description = "Steinberg UR44 Direct Steinberg UR44" device.icon_name = "audio-card" device.bus = "usb" device.bus_path = "pci-0000:04:00.4-usb-0:1:1.0" node.pause-on-idle = "false" factory.id = "18" client.id = "34" clock.quantum-limit = "8192" node.driver = "true" factory.mode = "merge" audio.adapt.follower = "" library.name = "audioconvert/libspa-audioconvert" object.id = "56" object.serial = "56" Ports: [Out] Direct: Direct Steinberg UR44 (type: Unknown, priority: 1000, availability unknown) Active Port: [Out] Direct Formats: pcm ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/163 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 0/4] hwdep: define interface for hwdep device
by GitHub pull_request - edited 02 Jun '22

02 Jun '22

alsa-project/alsa-gobject pull request #73 was edited from takaswie: The protocol in ALSA HwDep character device has common feature to each device. It's suitable for userspace implementation to have GObject interface for such features. This patchset adds the interface. The implementation of interface should have four methods; open, get_protocol_version, get_device_info, and create_source. Additionally, it should emit handle-disconnection signal when detecting ENODEV error in the interation of source. It requires to notify userspace application since the application should release character device immediately. ``` Takashi Sakamoto (4): hwdep: use explicit value for iface type enumeration hwdep: device-common: add interface for common feature of ALSA HwDep device hwdep: add error domain for implementators of DeviceCommon interface hwdep: device-info: allow to set property at instantiation src/hwdep/alsahwdep-enum-types.h | 89 +++++++++------- src/hwdep/alsahwdep.h | 2 + src/hwdep/alsahwdep.map | 10 ++ src/hwdep/device-common.c | 178 +++++++++++++++++++++++++++++++ src/hwdep/device-common.h | 106 ++++++++++++++++++ src/hwdep/device-info.c | 38 ++++++- src/hwdep/meson.build | 2 + tests/alsahwdep-enums | 10 ++ 8 files changed, 389 insertions(+), 46 deletions(-) create mode 100644 src/hwdep/device-common.c create mode 100644 src/hwdep/device-common.h ``` Request URL : https://github.com/alsa-project/alsa-gobject/pull/73 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/73.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0