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

[PATCH net-next] ALSA: ice1724: return void from snd_vt1724_chip_init()
by Lu Wei 16 May '22

16 May '22

Return int in snd_vt1724_chip_init() is useless since it always returns 0. Signed-off-by: Lu Wei <luwei32(a)huawei.com> --- sound/pci/ice1712/ice1724.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 6fab2ad85bbe..dfef468ad6dc 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -2347,7 +2347,7 @@ static void snd_vt1724_chip_reset(struct snd_ice1712 *ice) msleep(10); } -static int snd_vt1724_chip_init(struct snd_ice1712 *ice) +static void snd_vt1724_chip_init(struct snd_ice1712 *ice) { outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG)); outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG)); @@ -2369,8 +2369,6 @@ static int snd_vt1724_chip_init(struct snd_ice1712 *ice) * since they cause machine lockups */ outb(VT1724_MULTI_FIFO_ERR, ICEMT1724(ice, DMA_INT_MASK)); - - return 0; } static int snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice) @@ -2506,8 +2504,8 @@ static int snd_vt1724_create(struct snd_card *card, snd_vt1724_chip_reset(ice); if (snd_vt1724_read_eeprom(ice, modelname) < 0) return -EIO; - if (snd_vt1724_chip_init(ice) < 0) - return -EIO; + + snd_vt1724_chip_init(ice); return 0; } @@ -2702,11 +2700,7 @@ static int snd_vt1724_resume(struct device *dev) return 0; snd_vt1724_chip_reset(ice); - - if (snd_vt1724_chip_init(ice) < 0) { - snd_card_disconnect(card); - return -EIO; - } + snd_vt1724_chip_init(ice); if (ice->pm_resume) ice->pm_resume(ice); -- 2.17.1

1 0

Weaknesses in alsa_info on new Ubuntu systems
by GitHub issues - opened 15 May '22

15 May '22

alsa-project/alsa-utils issue #146 was opened from mhampl: There are some weaknesses on current Ubuntu systems (e.g. release 22.04) where the alsa_info scripts does not deliver the desired information: The command "tree" is no more provided by default (but can be installed in addition) This results in the error message "./alsa-info.sh: line 661: tree: command not found" and causes missing output in "Sysfs card info" The command "dmesg" requires administrative authorizations (e.g. "sudo dmesg | grep ...") This results in the error message "dmesg: read kernel buffer failed: Operation not permitted" and causes missing output in "ALSA/HDA dmesg" Issue URL : https://github.com/alsa-project/alsa-utils/issues/146 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Missing documentation
by GitHub issues - opened 15 May '22

15 May '22

alsa-project/alsa-lib issue #227 was opened from fedeb95: Hi, this probably isn't the right place, but I couldn't find anything specific for documentation bugs. The links under https://www.alsa-project.org/wiki/ALSA_Driver_Documentation currently give a 404. Issue URL : https://github.com/alsa-project/alsa-lib/issues/227 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

chore: Unify Travis CI process to GitHub Actions
by GitHub pull_request - opened 15 May '22

15 May '22

alsa-project/alsa-lib pull request #226 was opened from Korilakkuma: [Travis are now recommending removing the sudo tag](https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-mi…. Request URL : https://github.com/alsa-project/alsa-lib/pull/226 Patch URL : https://github.com/alsa-project/alsa-lib/pull/226.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

chore: Add link to GitHub Actions
by GitHub pull_request - opened 15 May '22

15 May '22

alsa-project/alsa-lib pull request #225 was opened from Korilakkuma: This PR enables to transition GitHub Actions by clicking badge. Request URL : https://github.com/alsa-project/alsa-lib/pull/225 Patch URL : https://github.com/alsa-project/alsa-lib/pull/225.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH v2] ASoC: hdmi-codec: Add option for ELD bypass
by Sugar Zhang 14 May '22

14 May '22

This patch allow users to enable "ELD Bypass" who don't care anything from EDID Link Data. Currently, this driver gets ELD(from EDID) to constraint channels and rates. Unfortunately, EDID is not always valid, maybe caused by the fragile HDMI port or cable, in this situation, the max features are limited to 48kHz stereo. So, add this option to allow user to select the manual way to output audio as expected. such as multi-channels LPCM(7.1), or HBR bitstream for these sink devices. Signed-off-by: Sugar Zhang <sugar.zhang(a)rock-chips.com> --- Changes in v2: - Use MACRO SOC_SINGLE_BOOL_EXT to simplify code. Fix event_missing checked by mixer-test. Add suffix "Switch" for "ELD Bypass". sound/soc/codecs/hdmi-codec.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index b07607a..be46fbd 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -275,6 +275,7 @@ struct hdmi_codec_priv { unsigned int chmap_idx; struct mutex lock; bool busy; + bool eld_bypass; struct snd_soc_jack *jack; unsigned int jack_status; u8 iec_status[AES_IEC958_STATUS_SIZE]; @@ -427,6 +428,31 @@ static int hdmi_codec_iec958_mask_get(struct snd_kcontrol *kcontrol, return 0; } +static int hdmi_codec_eld_bypass_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component); + + ucontrol->value.integer.value[0] = hcp->eld_bypass; + + return 0; +} + +static int hdmi_codec_eld_bypass_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component); + + if (hcp->eld_bypass == ucontrol->value.integer.value[0]) + return 0; + + hcp->eld_bypass = ucontrol->value.integer.value[0]; + + return 1; +} + static int hdmi_codec_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -447,7 +473,7 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, goto err; } - if (tx && hcp->hcd.ops->get_eld) { + if (tx && !hcp->eld_bypass && hcp->hcd.ops->get_eld) { ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->hcd.data, hcp->eld, sizeof(hcp->eld)); if (ret) @@ -770,6 +796,8 @@ static struct snd_kcontrol_new hdmi_codec_controls[] = { .info = hdmi_eld_ctl_info, .get = hdmi_eld_ctl_get, }, + SOC_SINGLE_BOOL_EXT("ELD Bypass Switch", 0, + hdmi_codec_eld_bypass_get, hdmi_codec_eld_bypass_put), }; static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, @@ -854,7 +882,7 @@ static void plugged_cb(struct device *dev, bool plugged) struct hdmi_codec_priv *hcp = dev_get_drvdata(dev); if (plugged) { - if (hcp->hcd.ops->get_eld) { + if (!hcp->eld_bypass && hcp->hcd.ops->get_eld) { hcp->hcd.ops->get_eld(dev->parent, hcp->hcd.data, hcp->eld, sizeof(hcp->eld)); } -- 2.7.4

3 3

Add "Pro Audio" profile for UMC204HD
by GitHub pull_request - opened 14 May '22

14 May '22

alsa-project/alsa-ucm-conf pull request #153 was opened from brndd: Follow-up to #128 I figured that some users might prefer to keep the channel mapping untouched from what the card defaults to when unconfigured. Providing an alternative profile like this (implementation adapted from #145) for these users seems like a good idea. I believe PipeWire autogenerates profiles like these for unconfigured devices, so that's where the "Pro Audio" nomenclature comes from. Likely a good idea to match that since PipeWire is increasingly the default on most distributions. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/153 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/153.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] sound: sound_core: changed spaces to tabs
by Paul Lemmermann 14 May '22

14 May '22

changed spaces to tabs in sound_core.c according to kernel styling guidelines. found using checkpatch.pl. Signed-off-by: Paul Lemmermann <thepaulodoom(a)thepaulodoom.com> --- sound/sound_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/sound_core.c b/sound/sound_core.c index 3332fe321..28bc038dc 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -290,7 +290,7 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati * completed the removal before their file operations become * invalid. */ - + static void sound_remove_unit(struct sound_unit **list, int unit) { struct sound_unit *p; @@ -395,12 +395,12 @@ int register_sound_special_device(const struct file_operations *fops, int unit, name = "admmidi"; break; default: - { + { __unknown: sprintf(_name, "unknown%d", chain); - if (unit >= SOUND_STEP) - strcat(_name, "-"); - name = _name; + if (unit >= SOUND_STEP) + strcat(_name, "-"); + name = _name; } break; } -- 2.35.1

1 0

Re: [PATCH 19/32] afs: Use mem_to_flex_dup() with struct afs_acl
by David Howells 13 May '22

13 May '22

Kees Cook <keescook(a)chromium.org> wrote: > struct afs_acl { > - u32 size; > - u8 data[]; > + DECLARE_FLEX_ARRAY_ELEMENTS_COUNT(u32, size); > + DECLARE_FLEX_ARRAY_ELEMENTS(u8, data); > }; Oof... That's really quite unpleasant syntax. Is it not possible to have mem_to_flex_dup() and friends work without that? You are telling them the fields they have to fill in. > + struct afs_acl *acl = NULL; > > - acl = kmalloc(sizeof(*acl) + size, GFP_KERNEL); > - if (!acl) { > + if (mem_to_flex_dup(&acl, buffer, size, GFP_KERNEL)) { Please don't do that. Either do: acl = mem_to_flex_dup(buffer, size, GFP_KERNEL); if (!acl) or: acl = mem_to_flex_dup(buffer, size, GFP_KERNEL); if (IS_ERR(acl)) Please especially don't make it that an apparent 'true' return indicates an error. If you absolutely must return the acl pointer through the argument list (presumably because it's actually a macro), make it return false on failure: if (!mem_to_flex_dup(&acl, buffer, size, GFP_KERNEL)) or return and explicitly check for an error code: if (mem_to_flex_dup(&acl, buffer, size, GFP_KERNEL) < 0) or: ret = mem_to_flex_dup(&acl, buffer, size, GFP_KERNEL); if (ret < 0) (or use != 0 rather than < 0) David

2 1

[PATCH 1/2 v2] ASoC: ADAU7118: add bindings for managing pins drive strength
by Dylan Laduranty 13 May '22

13 May '22

This allows users to change SDATA and both PDM clocks pins drive strength during device probing according to their need. Signed-off-by: Dylan Laduranty <dylan.laduranty(a)mesotic.com> --- Changes since v1: split new bindings and documentation into separate patches sound/soc/codecs/adau7118.c | 62 ++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/adau7118.c b/sound/soc/codecs/adau7118.c index 841229dcbca1..18c1f246f911 100644 --- a/sound/soc/codecs/adau7118.c +++ b/sound/soc/codecs/adau7118.c @@ -29,6 +29,12 @@ FIELD_PREP(ADAU7118_LRCLK_BCLK_POL_MASK, x) #define ADAU7118_SPT_SLOT_MASK GENMASK(7, 4) #define ADAU7118_SPT_SLOT(x) FIELD_PREP(ADAU7118_SPT_SLOT_MASK, x) +#define ADAU7118_DS_PDM_CLK0_MASK GENMASK(1, 0) +#define ADAU7118_DS_PDM_CLK0(x) FIELD_PREP(ADAU7118_DS_PDM_CLK0_MASK, x) +#define ADAU7118_DS_PDM_CLK1_MASK GENMASK(3, 2) +#define ADAU7118_DS_PDM_CLK1(x) FIELD_PREP(ADAU7118_DS_PDM_CLK1_MASK, x) +#define ADAU7118_DS_SDATA_MASK GENMASK(5, 4) +#define ADAU7118_DS_SDATA(x) FIELD_PREP(ADAU7118_DS_SDATA_MASK, x) #define ADAU7118_FULL_SOFT_R_MASK BIT(1) #define ADAU7118_FULL_SOFT_R(x) FIELD_PREP(ADAU7118_FULL_SOFT_R_MASK, x) @@ -489,7 +495,7 @@ static int adau7118_regulator_setup(struct adau7118_data *st) static int adau7118_parset_dt(const struct adau7118_data *st) { int ret; - u32 dec_ratio = 0; + u32 val32 = 0; /* 4 inputs */ u32 clk_map[4], regval; @@ -497,9 +503,9 @@ static int adau7118_parset_dt(const struct adau7118_data *st) return 0; ret = device_property_read_u32(st->dev, "adi,decimation-ratio", - &dec_ratio); + &val32); if (!ret) { - switch (dec_ratio) { + switch (val32) { case 64: regval = ADAU7118_DEC_RATIO(0); break; @@ -510,7 +516,7 @@ static int adau7118_parset_dt(const struct adau7118_data *st) regval = ADAU7118_DEC_RATIO(2); break; default: - dev_err(st->dev, "Invalid dec ratio: %u", dec_ratio); + dev_err(st->dev, "Invalid dec ratio: %u", val32); return -EINVAL; } @@ -537,6 +543,54 @@ static int adau7118_parset_dt(const struct adau7118_data *st) return ret; } + ret = device_property_read_u32(st->dev, "adi,pdm-clk0-ds", + &val32); + if (!ret) { + if (val32 > 3) { + dev_err(st->dev, "Invalid pdm-clk0-ds: %u", val32); + return -EINVAL; + } + + ret = regmap_update_bits(st->map, + ADAU7118_REG_DRIVE_STRENGTH, + ADAU7118_DS_PDM_CLK0_MASK, + ADAU7118_DS_PDM_CLK0(val32)); + if (ret) + return ret; + } + + ret = device_property_read_u32(st->dev, "adi,pdm-clk1-ds", + &val32); + if (!ret) { + if (val32 > 3) { + dev_err(st->dev, "Invalid pdm-clk1-ds: %u", val32); + return -EINVAL; + } + + ret = regmap_update_bits(st->map, + ADAU7118_REG_DRIVE_STRENGTH, + ADAU7118_DS_PDM_CLK1_MASK, + ADAU7118_DS_PDM_CLK1(val32)); + if (ret) + return ret; + } + + ret = device_property_read_u32(st->dev, "adi,sdata-ds", + &val32); + if (!ret) { + if (val32 > 3) { + dev_err(st->dev, "Invalid sdata-ds: %u", val32); + return -EINVAL; + } + + ret = regmap_update_bits(st->map, + ADAU7118_REG_DRIVE_STRENGTH, + ADAU7118_DS_SDATA_MASK, + ADAU7118_DS_SDATA(val32)); + if (ret) + return ret; + } + return 0; } -- 2.17.1

2 5