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

ASUS ROG Maximus Z690 Hero (ALC4082) - No audio from microphone, no audio on the front panel
by GitHub issues - edited 04 Jun '22

04 Jun '22

alsa-project/alsa-ucm-conf issue #165 was edited from Lastique: I'm having a problem with getting audio from the microphone connected to the rear panel jack. Also, if I connect the headset to the front panel headphone/mic jacks, I get neither audio out or in. My main concern is the rear panel jack though. The motherboard is ASUS ROG Maximus Z690 Hero, ALC4082 USB Audio chipset. I have tried this: 1. Installed linux kernel 5.18.0. 2. Copied `ucm2` from alsa-ucm-conf master (rev ef3b6513b6581705d36432428a7f6a4ae23b1276 which is after https://github.com/alsa-project/alsa-ucm-conf/pull/143 was merged) to `/usr/share/alsa`. 3. In `/usr/share/alsa/ucm2/USB-Audio/USB-Audio.conf` added hardware id of my USB Audio device (`0b05:1a27`) to the `realtek-alc4080` rule. Also added the hardware id in `/usr/share/alsa/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf`, in the `asus-rog-usb` block condition. 4. Rebooted. 5. The headset is connected to the rear panel (Front out and Mic in jacks; also tried Line in). There are three devices for the USB Audio card, and there are three volume controls in alsamixer: "Line", "Mic" and "Analog In". The problem is that there is no audio coming from the first two devices (which are presumably "Line" and "Mic"). I can record audio from the third device ("Analog In") when the microphone is connected to Mic jack. Unfortunately, "Analog In" cannot be selected in PulseAudio for some reason (I created a [bug](https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1364) for PA), which means no audio can be recorded. I also tried to connect the headset to the front panel connectors, but got no audio output nor capture. This is not my intended configuration though, I normally connect the headset to the rear panel. `arecord` output: [arecord.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8838239/ar… `lsusb` output: [lsusb.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8838241/lsus… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/165 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ASUS ROG Maximus Z690 Hero (ALC4082) - No audio from microphone, no audio on the front panel
by GitHub issues - opened 04 Jun '22

04 Jun '22

alsa-project/alsa-ucm-conf issue #165 was opened from Lastique: I'm having a problem with getting audio from the microphone connected to the rear panel jack. Also, if I connect the headset to the front panel headphone/mic jacks, I get neither audio out or in. My main concern is the rear panel jack though. The motherboard is ASUS ROG Maximus Z690 Hero, ALC4082 USB Audio chipset. I have tried this: 1. Installed linux kernel 5.18.0. 2. Copied `ucm2` from alsa-ucm-conf master (rev ef3b6513b6581705d36432428a7f6a4ae23b1276 which is after https://github.com/alsa-project/alsa-ucm-conf/pull/143 was merged) to `/usr/share/alsa`. 3. In `/usr/share/alsa/ucm2/USB-Audio/USB-Audio.conf` added hardware id of my USB Audio device (`0b05:1a27`) to the `realtek-alc4080` rule. Also added the hardware id in `/usr/share/alsa/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf`, in the `asus-rog-usb` block condition. 4. Rebooted. 5. The headset is connected to the rear panel (Front out and Mic in jacks; also tried Line in). There are three devices for the USB Audio card, and there are three volume controls in alsamixer: "Line", "Mic" and "Analog In". The problem is that there is no audio coming from the first two devices (which are presumably "Line" and "Mic"). I can record audio from the third device ("Analog In") when the microphone is connected to Mic jack. Unfortunately, "Analog In" cannot be selected in PulseAudio for some reason (I created a [bug](https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1364) for PA), which means no audio can be recorded. `arecord` output: [arecord.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8838239/ar… `lsusb` output: [lsusb.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8838241/lsus… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/165 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Fixes for veyron chromebooks
by GitHub pull_request - opened 04 Jun '22

04 Jun '22

alsa-project/alsa-ucm-conf pull request #164 was opened from jenneron: Add PlaybackVolume and JackControl. I didn't add JackControl for headset mic because internal mic breaks after switching to headset and back Add symlink to VEYRON-I2S, so ucm config will get probed Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/164 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/164.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Re: [Sound-open-firmware] jack detection via input/event on linux
by Pierre-Louis Bossart 03 Jun '22

03 Jun '22

[Adding alsa-devel, Mark and Takashi to this thread] On 6/3/22 08:33, Jaroslav Kysela wrote: > On 03. 06. 22 13:17, hede wrote: >> Am 03.06.2022 11:34, schrieb Jaroslav Kysela: >>> PA/PW use only ALSA controls at the moment - thus you should define >>> JackControl as defined in use-case.h. But it seems that the driver >>> does not create or publish the ALSA jack control (I see only >>> "iface=CARD,name='HDMI/DP,pcm=2 Jack'" jack controls for HDMI). >>> >>> Jaroslav >> >> Ah, thank you Jaroslav. That's the hint I was searching for atm. >> JackDev vs. JackControl. I had a vague guess on this but now you made it >> certain. >> >> Maybe I should take a look into the driver directly. > > It seems that many ASoC drivers do not create kctls - the argument pins > is zero in the snd_soc_card_jack_new() call. The SND_JACK_HEADSET should > be remapped to kctl in sound/soc/intel/boards/sof_rt5682.c, too. Did you mean something like the patch below Jaroslav? If yes, most of the Chromebook machine drivers are missing this remapping. That would also explain why the jack detection didn't work on my GLK test device, despite a UCM file that looked good... diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 5d67a2c87a1d4..1db17ebd26f63 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -85,6 +85,17 @@ struct sof_card_private { bool idisp_codec; }; +static struct snd_soc_jack_pin sof_jack_pins[] = { + { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, + }, + { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, + }, +}; + static int sof_rt5682_quirk_cb(const struct dmi_system_id *id) { sof_rt5682_quirk = (unsigned long)id->driver_data; @@ -295,11 +306,13 @@ static int sof_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) * Headset buttons map to the google Reference headset. * These can be configured by userspace. */ - ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", - SND_JACK_HEADSET | SND_JACK_BTN_0 | - SND_JACK_BTN_1 | SND_JACK_BTN_2 | - SND_JACK_BTN_3, - &ctx->sof_headset); + ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack", + SND_JACK_HEADSET | SND_JACK_BTN_0 | + SND_JACK_BTN_1 | SND_JACK_BTN_2 | + SND_JACK_BTN_3, + &ctx->sof_headset, + sof_jack_pins, + ARRAY_SIZE(sof_jack_pins)); if (ret) { dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret); return ret; @@ -481,7 +494,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) } static const struct snd_kcontrol_new sof_controls[] = { - SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), SOC_DAPM_PIN_SWITCH("Left Spk"), SOC_DAPM_PIN_SWITCH("Right Spk"), @@ -489,7 +502,7 @@ static const struct snd_kcontrol_new sof_controls[] = { }; static const struct snd_soc_dapm_widget sof_widgets[] = { - SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_SPK("Left Spk", NULL), SND_SOC_DAPM_SPK("Right Spk", NULL), @@ -501,8 +514,8 @@ static const struct snd_soc_dapm_widget dmic_widgets[] = { static const struct snd_soc_dapm_route sof_map[] = { /* HP jack connectors - unknown if we have jack detection */ - { "Headphone Jack", NULL, "HPOL" }, - { "Headphone Jack", NULL, "HPOR" }, + { "Headphone", NULL, "HPOL" }, + { "Headphone", NULL, "HPOR" }, /* other jacks */ { "IN1P", NULL, "Headset Mic" },

3 3

[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